* boot-new:

  - Remove reference to apt guide (not installed by default) and obsolete
    debian-guide. Thanks, Philippe Batailler. Closes: #402439, #402492.
  - As lynx is no longer installed, suggest w3m as text based browser.
  - Explain how to browse /usr/share/doc/ using a graphical web browser.
  - Mention documentation packages.

1 files changed, 30 insertions, 22 deletions

diff --git a/en/boot-new/boot-new.xml b/en/boot-new/boot-new.xml
index 9b6a72533..402523655 100644
--- a/en/boot-new/boot-new.xml
+++ b/en/boot-new/boot-new.xml
@@ -196,7 +196,7 @@ for more information.
 
 Once your system boots, you'll be presented with the login
 prompt.  Log in using the personal login and password you
-selected during the installation process. Your system is now ready to use.
+selected during the installation process. Your system is now ready for use.
 
 </para><para>
 
@@ -208,29 +208,42 @@ starting points.
 
 </para><para>
 
-Documentation accompanying programs you have installed is in
-<filename>/usr/share/doc/</filename>, under a subdirectory named after
-the program.  For example, the APT User's Guide for using
-<command>apt</command> to install other programs on your system, is
-located in
-<filename>/usr/share/doc/apt/guide.html/index.html</filename>.
+Documentation accompanying programs you have installed can be found in
+<filename>/usr/share/doc/</filename>, under a subdirectory named after the
+program (or, more precise, the Debian package that contains the program).
+However, more extensive documentation is often packaged separately in
+special documentation packages that are mostly not installed by default.
+For example, documentation about the package management tool
+<command>apt</command> can be found in the packages
+<classname>apt-doc</classname> or <classname>apt-howto</classname>.
 
 </para><para>
 
-
 In addition, there are some special folders within the
 <filename>/usr/share/doc/</filename> hierarchy. Linux HOWTOs are
-installed in <emphasis>.gz</emphasis> format, in
+installed in <emphasis>.gz</emphasis> (compressed) format, in
 <filename>/usr/share/doc/HOWTO/en-txt/</filename>. After installing
-<command>dhelp</command> you will find a browse-able index of
+<classname>dhelp</classname>, you will find a browse-able index of
 documentation in <filename>/usr/share/doc/HTML/index.html</filename>.
 
 </para><para>
 
-One easy way to view these documents is to <userinput>cd
-/usr/share/doc/</userinput>, and type <userinput>lynx</userinput>
-followed by a space and a dot (the dot stands for the current
-directory).
+One easy way to view these documents using a text based browser is to
+enter the following commands:
+
+<informalexample><screen>
+$ cd /usr/share/doc/
+$ w3c .
+</screen></informalexample>
+
+The dot after the <command>w3c</command> command tells it to show the
+contents of the current directory.
+
+</para><para>
+
+If you have a graphical desktop environment installed, you can also its
+web browser. Start the web browser from the application menu and enter
+<userinput>/usr/share/doc/</userinput> in the address bar.
 
 </para><para>
 
@@ -241,17 +254,12 @@ most commands available at the command prompt. Typing
 <userinput>help</userinput> will display help on shell commands. And
 typing a command followed by <userinput>--help</userinput> will
 usually display a short summary of the command's usage. If a command's
-results scroll past the top of the screen, type <userinput>|
-more</userinput> after the command to cause the results to pause
-before scrolling past the top of the screen. To see a list of all
+results scroll past the top of the screen, type
+<userinput>|&nbsp;more</userinput> after the command to cause the results
+to pause before scrolling past the top of the screen. To see a list of all
 commands available which begin with a certain letter, type the letter
 and then two tabs.
 
-</para><para>
-
-For a more complete introduction to Debian and GNU/Linux, see
-<filename>/usr/share/doc/debian-guide/html/noframes/index.html</filename>.
-
 </para>
 
  </sect1>