Document how to shut down the system; based on patch from Holger Levsen

4 files changed, 21 insertions, 11 deletions

diff --git a/build/templates/docstruct.ent b/build/templates/docstruct.ent
index d6aa6a299..98d0939d6 100644
--- a/build/templates/docstruct.ent
+++ b/build/templates/docstruct.ent
@@ -188,6 +188,7 @@
  <!ENTITY kernel-install.xml   SYSTEM "##SRCPATH##/kernel-install/kernel-install.xml">
 
  <!ENTITY post-install.xml     SYSTEM "##SRCPATH##/post-install/post-install.xml">
+  <!ENTITY shutdown.xml         SYSTEM "##SRCPATH##/post-install/shutdown.xml">
   <!ENTITY new-to-unix.xml      SYSTEM "##SRCPATH##/post-install/new-to-unix.xml">
   <!ENTITY orientation.xml      SYSTEM "##SRCPATH##/post-install/orientation.xml">
   <!ENTITY reactivating-win.xml SYSTEM "##SRCPATH##/post-install/reactivating-win.xml">
diff --git a/debian/changelog b/debian/changelog
index 4d4924e63..d553abf67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,12 +15,14 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low
   * Suppress warnings about missing IDs for sections and such.
   * Reorganize supported hardware table; i386 no longer has flavors.
   * Document SMP-alternatives as one of the variants of SMP support.
+  * Document how to shut down the system. Based on patch from Holger Levsen.
+    Closes: #248067.
 
   [ Miroslav Kure ]
   * Update information about booting with encrypted partitions.
     Closes: #378651.
 
- -- Frans Pop <fjp@debian.org>  Wed, 16 Aug 2006 19:06:05 +0200
+ -- Frans Pop <fjp@debian.org>  Wed, 16 Aug 2006 22:16:55 +0200
 
 installation-guide (20060726) unstable; urgency=low
 
diff --git a/en/post-install/post-install.xml b/en/post-install/post-install.xml
index fae552701..1ae693078 100644
--- a/en/post-install/post-install.xml
+++ b/en/post-install/post-install.xml
@@ -4,6 +4,7 @@
 <chapter id="post-install">
  <title>Next Steps and Where to Go From Here</title>
 
+&shutdown.xml;
 &new-to-unix.xml;
 &orientation.xml;
 &reactivating-win.xml;
diff --git a/en/post-install/shutdown.xml b/en/post-install/shutdown.xml
index d838a38c2..f5936eaaa 100644
--- a/en/post-install/shutdown.xml
+++ b/en/post-install/shutdown.xml
@@ -3,23 +3,29 @@
 
 
  <sect1 id="shutdown">
- <title>Shutting Down the System</title>
+ <title>Shutting down the system</title>
 
 <para>
 
 To shut down a running Linux system, you must not reboot with the
 reset switch on the front or back of your computer, or just turn off
-the computer.  Linux must be shut down in a controlled manner,
-otherwise files may be lost and disk damage incurred. You can press
-the key combination <keycombo> <keycap>Ctrl</keycap>
-<keycap>Alt</keycap> <keycap>Del</keycap> </keycombo>
+the computer.  Linux should be shut down in a controlled manner,
+otherwise files might get lost and/or disk damage might occur. If you run a 
+desktop environment, there is usually an option to <quote>log out</quote>
+available from the application menu that allows you to shutdown (or reboot)
+the system.
+
+</para><para>
+
+Alternativly you can press the key combination <keycombo> 
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo>
 <phrase arch="powerpc;m68k"> or <keycombo> <keycap>Control</keycap>
 <keycap>Shift</keycap> <keycap>Power</keycap> </keycombo> on Macintosh
-systems</phrase>. You may also log in as
-root and type <userinput>shutdown -h now</userinput>,
-<userinput>reboot</userinput>, or <userinput>halt</userinput> if
-either of the key combinations do not work or you prefer to type
-commands.
+systems</phrase>. A last option is to log in as root and type one of the
+commands <command>poweroff</command>, <command>halt</command> or
+<command>shutdown -h now</command> if either of the key combinations do not 
+work or you prefer to type commands; use <command>reboot</command> to reboot
+the system.
 
 </para>
  </sect1>