Brought (hopefully) all references of man/info pages into conformity. Updated typography to reflect this.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@6376 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

5 files changed, 26 insertions, 27 deletions

diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 2a0e66910..8d6adacf0 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -36,7 +36,7 @@ GCC, Gettext, Glibc, Grep, M4, Make, and Sed</seg></seglistitem>
 <screen><userinput>patch -Np1 -i ../&flex-fixes-patch;</userinput></screen>
 
 <para>The GNU autotools detects that the Flex source code has been
-modified by the previous patch and tries to update the manual page
+modified by the previous patch and tries to update the man page
 accordingly. This does not work correctly on many systems, and the
 default page is fine, so make sure it does not get regenerated:</para>
 
diff --git a/chapter06/man-pages.xml b/chapter06/man-pages.xml
index 0cd11d0d1..a0d205ba6 100644
--- a/chapter06/man-pages.xml
+++ b/chapter06/man-pages.xml
@@ -12,7 +12,7 @@
 <indexterm zone="ch-system-man-pages"><primary sortas="a-Man-pages">Man-pages</primary></indexterm>
 
 <sect2 role="package"><title/>
-<para>The Man-pages package contains over 1,200 manual pages.</para>
+<para>The Man-pages package contains over 1,200 man pages.</para>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -40,19 +40,19 @@
 
 <segmentedlist>
 <segtitle>Installed files</segtitle>
-<seglistitem><seg>various manual pages</seg></seglistitem>
+<seglistitem><seg>various man pages</seg></seglistitem>
 </segmentedlist>
 
 <variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 <?dbhtml list-presentation="table"?>
 
-<varlistentry id="manual-pages">
-<term><filename>manual pages</filename></term>
+<varlistentry id="man-pages">
+<term><filename>man pages</filename></term>
 <listitem>
 <para>Describe the C and C++ functions, important
 device files, and significant configuration files</para>
-<indexterm zone="ch-system-man-pages manual-pages"><primary sortas="e-manual-pages">manual pages</primary></indexterm>
+<indexterm zone="ch-system-man-pages man-pages"><primary sortas="e-man-pages">man pages</primary></indexterm>
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/chapter06/man.xml b/chapter06/man.xml
index 8a51e43a9..eefa8b065 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -12,7 +12,7 @@
 <indexterm zone="ch-system-man"><primary sortas="a-Man">Man</primary></indexterm>
 
 <sect2 role="package"><title/>
-<para>The Man package contains programs for finding and viewing manual pages.</para>
+<para>The Man package contains programs for finding and viewing man pages.</para>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -86,7 +86,7 @@ and verify that it matches the following:</para>
 the character set of the locale. The reason is that, according to the
 specification, <command>groff</command> has no means of typesetting
 characters outside International Organization for Standards
-(ISO) 8859-1 without some strange escape codes. When formatting manual
+(ISO) 8859-1 without some strange escape codes. When formatting man
 pages, <command>groff</command> thinks that they are in the ISO 8859-1
 encoding and this <parameter>-Tlatin1</parameter> switch tells
 <command>groff</command> to use the same encoding for output. Since
@@ -95,7 +95,7 @@ formatted result is really in the same encoding as input, and therefore
 it is usable as the input for a pager.</para>
 
 <para>This does not solve the problem of a non-working
-<command>man2dvi</command> program for localized manual pages in
+<command>man2dvi</command> program for localized man pages in
 non-ISO 8859-1 locales. Also, it does not work with multibyte
 character sets. The first problem does not currently have a solution.
 The second issue is not of concern because the LFS installation does
@@ -123,7 +123,7 @@ man2dvi, man2html, and whatis</seg></seglistitem>
 <varlistentry id="apropos">
 <term><command>apropos</command></term>
 <listitem>
-<para>Searches the whatis database and displays the short descriptions
+<para>Searches the <command>whatis</command> database and displays the short descriptions
 of system commands that contain a given string</para>
 <indexterm zone="ch-system-man apropos"><primary sortas="b-apropos">apropos</primary></indexterm>
 </listitem>
@@ -132,9 +132,9 @@ of system commands that contain a given string</para>
 <varlistentry id="makewhatis">
 <term><command>makewhatis</command></term>
 <listitem>
-<para>Builds the whatis database; it reads all the manual pages in the
-manpath and writes the name and a short description in the whatis
-database for each page</para>
+<para>Builds the <command>whatis</command> database; it reads all the man pages
+in the <envar>MANPATH</envar> and writes the name and a short description in the
+<command>whatis</command> database for each page</para>
 <indexterm zone="ch-system-man makewhatis"><primary sortas="b-makewhatis">makewhatis</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -142,7 +142,7 @@ database for each page</para>
 <varlistentry id="man">
 <term><command>man</command></term>
 <listitem>
-<para>Formats and displays the requested on-line manual page</para>
+<para>Formats and displays the requested on-line man page</para>
 <indexterm zone="ch-system-man man"><primary sortas="b-man">man</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -150,7 +150,7 @@ database for each page</para>
 <varlistentry id="man2dvi">
 <term><command>man2dvi</command></term>
 <listitem>
-<para>Converts a manual page into dvi format</para>
+<para>Converts a man page into dvi format</para>
 <indexterm zone="ch-system-man man2dvi"><primary sortas="b-man2dvi">man2dvi</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -158,7 +158,7 @@ database for each page</para>
 <varlistentry id="man2html">
 <term><command>man2html</command></term>
 <listitem>
-<para>Converts a manual page into HTML</para>
+<para>Converts a man page into HTML</para>
 <indexterm zone="ch-system-man man2html"><primary sortas="b-man2html">man2html</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -166,7 +166,7 @@ database for each page</para>
 <varlistentry id="whatis">
 <term><command>whatis</command></term>
 <listitem>
-<para>Searches the whatis database and displays the short descriptions
+<para>Searches the <command>whatis</command> database and displays the short descriptions
 of system commands that contain the given keyword as a separate
 word</para>
 <indexterm zone="ch-system-man whatis"><primary sortas="b-whatis">whatis</primary></indexterm>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 23c54ca45..274a8f2d8 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -13,7 +13,7 @@
 
 <sect2 role="package"><title/>
 <para>The Texinfo package contains programs for reading, writing, and
-converting Info documents.</para>
+converting info pages.</para>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -65,7 +65,7 @@ later.</para></listitem>
 list of menu entries. The file is located at
 <filename>/usr/share/info/dir</filename>.  Unfortunately, due to
 occasional problems in the Makefiles of various packages, it can
-sometimes get out of step with the Info manuals installed on the
+sometimes get out of sync with the info pages installed on the
 system. If the <filename>/usr/share/info/dir</filename> file ever
 needs to be recreated, the following optional commands will accomplish
 the task:</para>
@@ -93,10 +93,9 @@ makeinfo, texi2dvi, and texindex</seg></seglistitem>
 <varlistentry id="info">
 <term><command>info</command></term>
 <listitem>
-<para>Used to read Info documents which are similar to man
-pages, but often go much deeper than just explaining all the command
-line options. For example, compare <command>man bison</command> and
-<command>info bison</command>.</para>
+<para>Used to read info pages which are similar to man pages, but often go much
+deeper than just explaining all the available command line options. For example,
+compare <command>man bison</command> and <command>info bison</command>.</para>
 <indexterm zone="ch-system-texinfo info"><primary sortas="b-info">info</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -113,8 +112,8 @@ binary format</para>
 <varlistentry id="install-info">
 <term><command>install-info</command></term>
 <listitem>
-<para>Used to install Info files; it updates entries in the Info index
-file</para>
+<para>Used to install info pages; it updates entries in the
+<command>info</command> index file</para>
 <indexterm zone="ch-system-texinfo install-info"><primary sortas="b-install-info">install-info</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -123,7 +122,7 @@ file</para>
 <term><command>makeinfo</command></term>
 <listitem>
 <para>Translates the given Texinfo source documents into
-Info files, plain text, or HTML</para>
+info pages, plain text, or HTML</para>
 <indexterm zone="ch-system-texinfo makeinfo"><primary sortas="b-makeinfo">makeinfo</primary></indexterm>
 </listitem>
 </varlistentry>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 93e3e2a13..eee00c416 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -609,7 +609,7 @@ escape sequences indicating underlining for the terminal in use</para>
 <varlistentry id="whereis">
 <term><command>whereis</command></term>
 <listitem>
-<para>Reports the location of binary, the source, and the manual page
+<para>Reports the location of the binary, source, and man page
 for the given command</para>
 <indexterm zone="ch-system-util-linux whereis"><primary sortas="b-whereis">whereis</primary></indexterm>
 </listitem>