* Updated documentation in README.initramfs-transition to include

  information related to #380089.

6 files changed, 12 insertions, 9 deletions

diff --git a/debian/README.experimental b/debian/README.initramfs-transition
index 287fb029..287fb029 100644
--- a/debian/README.experimental
+++ b/debian/README.initramfs-transition
diff --git a/debian/README.mdrun b/debian/README.mdrun
index 71834595..858a53cb 100644
--- a/debian/README.mdrun
+++ b/debian/README.mdrun
@@ -7,14 +7,14 @@ problems (see e.g. #354705) and can cause major headaches.
 
 Fortunately, mdadm has since added all the functionality needed to replace
 mdrun. Thus, with mdadm 2.5, mdrun has been deprecated in Debian, and will be
-removed in a future release.
+removed in a future release (but not before etch).
 
 mdrun may be used in three cases, and the following list includes what you can
 do to rid yourself of mdrun:
 
   initramfs:
-    upgrade to the latest version of initramfs (and see README.experimental
-    for now).
+    upgrade to the latest version of initramfs (and see
+    README.initramfs-transition for now).
 
   custom scripts / command line use:
     the command to replace mdrun is:
@@ -24,8 +24,8 @@ do to rid yourself of mdrun:
     to be able to run this command, you need to ensure that
     /etc/mdadm/mdadm.conf (or /etc/mdadm.conf, which is less preferred)
     properly describes your RAID volumes. You can use the output generated by
-    the script /usr/share/mdadm/mkconf to help you migrate an existing or
-    create a new configuration file.
+    the script /usr/share/mdadm/mkconf to help you migrate an existing
+    configuration or to create a new configuration file.
 
     You can find more information in the mdadm(8) and mdadm.conf(5) manpages.
 
@@ -40,4 +40,4 @@ do to rid yourself of mdrun:
 
 Have fun,
 
- -- martin f. krafft <madduck@debian.org>  Tue, 27 Jun 2006 14:19:23 +0200
+ -- martin f. krafft <madduck@debian.org>  Mon, 31 Jul 2006 14:35:08 +0100
diff --git a/debian/changelog b/debian/changelog
index aa8bbdb6..6f051785 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,12 @@ mdadm (2.5.2-9) unstable; urgency=low
     (closes: #380596).
   * Forcing RAID assembly to run the arrays, working around an upstream bug
     until that's fixed (closes: #287415).
+  * Updated documentation in README.initramfs-transition to include
+    information related to #380089.
   * Updated debconf translations:
     - Vietnamese by Clytie Syddall, thanks!
 
- -- martin f. krafft <madduck@debian.org>  Mon, 31 Jul 2006 12:37:29 +0100
+ -- martin f. krafft <madduck@debian.org>  Mon, 31 Jul 2006 14:35:38 +0100
 
 mdadm (2.5.2-8) unstable; urgency=low
 
diff --git a/debian/initramfs/hook b/debian/initramfs/hook
index 77f4e630..313f2322 100644
--- a/debian/initramfs/hook
+++ b/debian/initramfs/hook
@@ -21,7 +21,7 @@ esac
 
 if [ -e /usr/share/initramfs-tools/hooks/md ]; then
   echo "I: mdadm: initramfs md hook still present, stepping out of its way." >&2
-  echo "I: Please see /usr/share/doc/mdadm/README.experimental ." >&2
+  echo "I: Please see /usr/share/doc/mdadm/README.initramfs-transition ." >&2
   exit 0
 fi
 
diff --git a/debian/mdadm.docs b/debian/mdadm.docs
index d5bfc116..09deee41 100644
--- a/debian/mdadm.docs
+++ b/debian/mdadm.docs
@@ -1,4 +1,5 @@
 debian/README.recipes
+debian/README.initramfs-transition
 debian/README.mdrun
 md.txt
 rootraiddoc.97.html
diff --git a/debian/rules b/debian/rules
index bbef7d7e..8a169647 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,7 +84,7 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdebconf	
-	dh_installdocs debian/README.experimental
+	dh_installdocs
 	dh_installexamples
 	dh_installinit --init-script=mdadm-raid --no-start -- start 25 S . start 50 0 6 .
 	dh_installinit -- defaults 25