* Update installation report template and instructions for etch.

3 files changed, 45 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index 5ec47266f..fc7671528 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 installation-guide (20051026) UNRELEASED; urgency=low
 
+  [ Frans Pop ]
   * Fix build error caused by description for s390. Closes: #337382.
 
- -- Frans Pop <fjp@debian.org>  Fri,  4 Nov 2005 11:54:24 +0100
+  [ Joey Hess ]
+  * Update installation report template and instructions for etch.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 18 Nov 2005 16:35:00 -0500
 
 installation-guide (20051025) unstable; urgency=low
 
diff --git a/en/boot-installer/trouble.xml b/en/boot-installer/trouble.xml
index 0553914b8..3c6c2b5b1 100644
--- a/en/boot-installer/trouble.xml
+++ b/en/boot-installer/trouble.xml
@@ -198,8 +198,16 @@ custom kernel later (see <xref linkend="kernel-baking"/>).
 <para>
 
 If you get through the initial boot phase but cannot complete the
-install, the bug reporter menu choice may be helpful. It copies system
-error logs and configuration information to a user-supplied floppy.
+install, the bug reporter menu choice may be helpful.
+<phrase condition="sarge">
+It copies system error logs and configuration information to a user-supplied
+floppy.
+</phrase>
+<phrase condition="etch">
+It lets you store system error logs and configuration information from the
+installer to a floppy, or download them in a web browser.
+</phrase>
+	
 This information may provide clues as to what went wrong and how to
 fix it.  If you are submitting a bug report you may want to attach
 this information to the bug report.
@@ -221,7 +229,23 @@ after the computer has been booted into the installed system.
 If you still have problems, please submit an installation report. We also
 encourage installation reports to be sent even if the installation is
 successful, so that we can get as much information as possible on the largest
-number of hardware configurations. Please use this template when filling out
+number of hardware configurations. 
+
+</para>
+
+<phrase condition="etch">
+<para>
+If you have a working Debian system, the esiest way to send an installation
+report is to install the installation-report and reportbug packages
+(<command>apt-get install installation-report reportbug</command>) and run
+the command <command>reportbug installation-report</command>.
+</para>
+</phrase>
+
+<para>
+
+<para>
+Please use this template when filling out
 installation reports, and file the report as a bug report against the
 <classname>installation-reports</classname> pseudo package, by sending it to
 <email>submit@bugs.debian.org</email>.
@@ -229,18 +253,15 @@ installation reports, and file the report as a bug report against the
 <informalexample><screen>
 Package: installation-reports
 
-Debian-installer-version: &lt;Fill in date and from where you got the image&gt;
-uname -a: &lt;The result of running uname -a on a shell prompt&gt;
+Boot method: &lt;How did you boot the installer? CD? floppy? network?&gt;
+Image version: &lt;Fill in date and from where you got the image&gt;
 Date: &lt;Date and time of the install&gt;
-Method: &lt;How did you install?  What did you boot off?  If network
-      install, from where?  Proxied?&gt;
 
 Machine: &lt;Description of machine (eg, IBM Thinkpad R32)&gt;
 Processor:
 Memory:
-Root Device: &lt;IDE?  SCSI?  Name of device?&gt;
-Root Size/partition table: &lt;Feel free to paste the full partition
-      table, with notes on which partitions are mounted where.&gt;
+Partitions: <df -Tl will do; the raw partition table is preferred>
+
 Output of lspci and lspci -n:
 
 Base System Installation Checklist:
diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml
index 9513858ac..c2f48eaec 100644
--- a/en/howto/installation-howto.xml
+++ b/en/howto/installation-howto.xml
@@ -320,12 +320,20 @@ If you need more information on the install process, see
 <para>
 
 If you successfully managed an installation with &d-i;,
-please take time to provide us with a report. There is a template
+please take time to provide us with a report.
+<phrase condition="sarge">
+There is a template
 named <filename>install-report.template</filename> in the
 <filename>/root</filename> directory of a freshly
 installed system. Please fill it out and file it as a bug against the
 package <classname>installation-reports</classname>, as explained in
 <xref linkend="submit-bug" />.
+</phrase>
+<phrase condition="etch">
+The simplest way to do so is to install the reportbug package
+(<command>apt-get install reportbug</command>), and run
+<command>reportbug installation-report</command>.
+</phrase>
 
 </para><para>