Consistently change location for installation guide to /doc/manual on the CD

data/etch/README.html.in

@@ -364,7 +364,7 @@ Installing
  An <b>Installation Guide</b> is included on this CD at
  <P>
  <tt>&nbsp;
- <A href="doc/install/manual/en/index.html">doc/install/manual/en/index.html</a> &nbsp;&nbsp;&nbsp; (English version)</tt>
+ <A href="doc/manual/en/index.html">doc/manual/en/index.html</a> &nbsp;&nbsp;&nbsp; (English version)</tt>
  <P>
  Several translations of the Installation Guide are included on this CD in
  the <tt><A href="doc">doc/</a></tt> directory, along with various other documents.

debian/changelog

@@ -1,8 +1,13 @@
 debian-cd (2.2.25) UNRELEASED; urgency=low
 
-  * Remove net-drivers floppy from full CD images.
+  [ Joey Hess ]
+  * Remove net-drivers access floppy from full CD images.
 
- -- Joey Hess <joeyh@debian.org>  Wed,  8 Mar 2006 13:02:01 -0500
+  [ Frans Pop ]
+  * Consistently change location for installation guide to /doc/manual
+    on the CD.
+
+ -- Frans Pop <fjp@debian.org>  Thu,  9 Mar 2006 02:18:47 +0100
 
 debian-cd (2.2.24) unstable; urgency=low
 

tools/etch/installtools.sh

@@ -27,8 +27,8 @@ if [ "$OMIT_MANUAL" != 1 ]; then
 			rm -f changelog* copyright
 			gunzip *.gz || true
 
-			mkdir -p $DIR/$DOCDIR/install
-			if ! cp -a * $DIR/$DOCDIR/install; then
+			mkdir -p $DIR/$DOCDIR/manual
+			if ! cp -a * $DIR/$DOCDIR/manual; then
 				echo "ERROR: Unable to copy installer documentation to CD."
 			fi
 		else