diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 571052f549..45846b8d7f 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -579,11 +579,11 @@
         </itemizedlist>
 
         <para>You will almost certainly get a conflict because
-          of the <literal>$Id: article.sgml,v 1.129 2002-07-03 23:19:04 jim Exp $</literal> (or in FreeBSD's case,
+          of the <literal>$Id: article.sgml,v 1.130 2002-07-11 19:07:44 trhodes Exp $</literal> (or in FreeBSD's case,
           <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) lines, so you will have to edit
           the file to resolve the conflict (remove the marker lines and
-          the second <literal>$Id: article.sgml,v 1.129 2002-07-03 23:19:04 jim Exp $</literal> line, leaving the original
-          <literal>$Id: article.sgml,v 1.129 2002-07-03 23:19:04 jim Exp $</literal> line intact).</para>
+          the second <literal>$Id: article.sgml,v 1.130 2002-07-11 19:07:44 trhodes Exp $</literal> line, leaving the original
+          <literal>$Id: article.sgml,v 1.130 2002-07-11 19:07:44 trhodes Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -1197,7 +1197,7 @@ docs:Documentation Bug:nik:</programlisting>
 	
 	<listitem>
 	  <para>Ruslan is Mister &man.mdoc.7;.  If you are writing a
-	    man page and need
+	    manual page and need
 	    some advice on the structure, or the markup, ask Ruslan.</para>
 	</listitem>
       </varlistentry>
@@ -1595,7 +1595,7 @@ docs:Documentation Bug:nik:</programlisting>
 	    committed only once something resembling consensus has
 	    been reached.  This does not mean that you have to ask
 	    permission before correcting every obvious syntax error or
-	    man page misspelling, simply that you should try to
+	    manual page misspelling, simply that you should try to
 	    develop a feel for when a proposed change is not quite such
 	    a no-brainer and requires some feedback first.  People
 	    really do not mind sweeping changes if the result is
@@ -1711,7 +1711,7 @@ docs:Documentation Bug:nik:</programlisting>
 	    developers, so allow some time to elapse before merging
 	    unless the &os.stable; fix is critical,
 	    time sensitive or so obvious as to make further testing
-	    unnecessary (spelling fixes to man pages, obvious bug/typo
+	    unnecessary (spelling fixes to manual pages, obvious bug/typo
 	    fixes, etc.)  In other words, apply common sense.</para>
 
 	  <para>Changes to the security branches
@@ -1843,7 +1843,7 @@ docs:Documentation Bug:nik:</programlisting>
 	<command>make lint</command>.</para>
 
       <para>For all on-line manual pages, run <command>manck</command>
-	(from ports) over the man page to verify all of the cross
+	(from ports) over the manual page to verify all of the cross
 	references and file references are correct and that the man
 	page has all of the appropriate <makevar>MLINK</makevar>s
 	installed.</para>
diff --git a/en_US.ISO8859-1/articles/console-server/article.sgml b/en_US.ISO8859-1/articles/console-server/article.sgml
index c6e45d065d..ebdd3d0eed 100644
--- a/en_US.ISO8859-1/articles/console-server/article.sgml
+++ b/en_US.ISO8859-1/articles/console-server/article.sgml
@@ -273,7 +273,7 @@
     <p>The Stallion driver is not included in the default
       <samp>GENERIC</samp> kernel, so you will need to create a kernel
       config file with the appropriate entries.  See the
-      <samp>stl(4)</samp> man page and the appropriate section of the
+      <samp>stl(4)</samp> manual page and the appropriate section of the
       <a
       href="../../../../doc/en_US.ISO8859-1/books/handbook/kernelconfig.html">FreeBSD
       Handbook</a>.</p>
@@ -305,7 +305,7 @@
 
     <p>to create dial-out devices for the first Stallion card.  See
       the comments in <samp>MAKEDEV</samp> and the <samp>stl(4)</samp>
-      man page for more details.</p>
+      manual page for more details.</p>
 
     <h4>Compiling conserver</h4>
 
@@ -416,10 +416,10 @@ trusted:        127.0.0.1 buzz
       carrier</em> on these ports, perhaps by setting this using the
       ttyiE<em>x</em> device in the <code>/etc/rc.serial</code> file.
       See the comments in this file for more details.  Also see the
-      <code>sio(4)</code> man page for information on the
+      <code>sio(4)</code> manual page for information on the
       initial-state and locked-state devices.  (The Stallion driver
       also supports these conventions).  And see the
-      <code>stty(1)</code> man page for details on setting device
+      <code>stty(1)</code> manual page for details on setting device
       modes.</p>
 
     <p>The last section shows that any user logged into the server
@@ -569,7 +569,7 @@ exit 0
       master server, and it will arrange to signal all the child
       processes.  Yes, this will send a HUP to all clients whenever a
       single log file needs rotating, but that is quite cheap.  See
-      the newsysylog(8) man page for details.</p>
+      the newsysylog(8) manual page for details.</p>
 
     <h2>Cabling</h2>
 
@@ -966,7 +966,7 @@ use a serial console.
       key sequence &lt;Return&gt;&lt;Tilda&gt;&lt;control-B&gt;
       (within 5 seconds) will drop to the ROM.  You can enable this
       permanently by editing the <code>/etc/default/kbd</code> file;
-      see the <code>kbd(1)</code> man page.  Note that this alternate
+      see the <code>kbd(1)</code> manual page.  Note that this alternate
       break sequence is only active once the kernel has started
       running multiuser and processed the default file.  While the ROM
       is active (during power-on and during the boot process) and
@@ -1225,7 +1225,7 @@ conventions
 Last modified: Thu Jul 19 10:19:28 EST 2001
 <!-- hhmts end -->
 <br>
-$Id: article.sgml,v 1.7 2002-07-07 17:48:21 dannyboy Exp $
+$Id: article.sgml,v 1.8 2002-07-11 19:07:48 trhodes Exp $
 
   </body>
 </html>
diff --git a/en_US.ISO8859-1/articles/contributing/article.sgml b/en_US.ISO8859-1/articles/contributing/article.sgml
index 710b557c1c..180d547b1c 100644
--- a/en_US.ISO8859-1/articles/contributing/article.sgml
+++ b/en_US.ISO8859-1/articles/contributing/article.sgml
@@ -329,7 +329,7 @@ FreeBSD Entities//EN"> %freebsd;
 	<screen>&prompt.user; <userinput>diff -c -r olddir newdir</userinput></screen>
 
 	would generate such a set of context diffs for the given
-	source file or directory hierarchy.  See the man page for
+	source file or directory hierarchy.  See the manual page for
 	&man.diff.1; for more details.</para>
 
       <para>Once you have a set of diffs (which you may test with the
diff --git a/en_US.ISO8859-1/articles/fonts/article.sgml b/en_US.ISO8859-1/articles/fonts/article.sgml
index 32d4668dc2..c2a23f32ce 100644
--- a/en_US.ISO8859-1/articles/fonts/article.sgml
+++ b/en_US.ISO8859-1/articles/fonts/article.sgml
@@ -7,7 +7,7 @@
 
 <!-- Recently, I wanted to figure out how to use some additional fonts that
      I had accumulated.  I finally figured out *how to do it* from the various
-     man pages and documentation.  Since it might be of use to other users,
+     manual pages and documentation.  Since it might be of use to other users,
      and I didn't see any reference to this topic in the FAQ or handbook, I
      thought I'd try my hand at a simple cookbook tutorial addressing the
      use of fonts.  I have included my unanswered questions at the end of
diff --git a/en_US.ISO8859-1/articles/formatting-media/article.sgml b/en_US.ISO8859-1/articles/formatting-media/article.sgml
index fae503f463..9264687fc9 100644
--- a/en_US.ISO8859-1/articles/formatting-media/article.sgml
+++ b/en_US.ISO8859-1/articles/formatting-media/article.sgml
@@ -521,7 +521,7 @@ swapon:  added /dev/da0b as swap space</screen>
 	several identical disks as a single disk.  Striping can result
 	in increased disk performance by distributing reads and writes
 	across the disks.  See the &man.ccd.4; and &man.ccdconfig.8;
-	man pages or the <ulink
+	manual pages or the <ulink
 	  URL="http://stampede.cs.berkeley.edu/ccd/">CCD
 	  Homepage</ulink> for further details.</para>
 
diff --git a/en_US.ISO8859-1/articles/laptop/article.sgml b/en_US.ISO8859-1/articles/laptop/article.sgml
index 564c6f38a2..83ee699425 100644
--- a/en_US.ISO8859-1/articles/laptop/article.sgml
+++ b/en_US.ISO8859-1/articles/laptop/article.sgml
@@ -128,7 +128,7 @@
       card, remove irq 5 (otherwise you may experience hangs when you 
       insert a card).  Check also the available memory slots; if your 
       card is not being detected, try changing it to one of the other 
-      allowed values (listed in the man page &man.pccardc.8;).
+      allowed values (listed in the manual page &man.pccardc.8;).
     </para>
 
     <para>If it is not running already, start the pccardd daemon.
@@ -174,7 +174,7 @@
     </para>
 
     <para>The X window system (XFree86) also includes display power
-      management (look at the &man.xset.1; man page, and search for
+      management (look at the &man.xset.1; manual page, and search for
       dpms there).  You may want to investigate this.  However, this, 
       too, works inconsistently on laptops: it
       often turns off the display but does not turn off the
diff --git a/en_US.ISO8859-1/articles/mh/article.sgml b/en_US.ISO8859-1/articles/mh/article.sgml
index e627be25d5..167418bca1 100644
--- a/en_US.ISO8859-1/articles/mh/article.sgml
+++ b/en_US.ISO8859-1/articles/mh/article.sgml
@@ -72,7 +72,7 @@
 
     <para>This primer is not a full comprehensive explanation of how
       MH works. This is just intended to get you started on the road
-      to happier, faster mail reading. You should read the man pages
+      to happier, faster mail reading. You should read the manual pages
       for the various commands. You might also want to read the <ulink
 	URL="news:comp.mail.mh">comp.mail.mh</ulink> newsgroup. Also
       you can read the <ulink
@@ -519,7 +519,7 @@ which I am probably the guilty party).</screen>
 	evaluate from left to right and you do multiplication and
 	division first and addition and subtraction second? MH has the
 	same type of rules for <command>pick</command>. It is fairly complex
-	so you might want to study the man page. This document is just
+	so you might want to study the manual page. This document is just
 	to help you get acquainted with MH.</para>
     </sect2>
 
@@ -754,7 +754,7 @@ message</emphasis>, %&gt; <emphasis remap=bf>endif</emphasis>.</screen>
       <para>As you can tell MH formatting can get rather involved. You
 	can probably decipher what most of the other functions and
 	variables mean. All of the information on writing these format
-	strings is in the MH-Format man page. The really nice thing is
+	strings is in the MH-Format manual page. The really nice thing is
 	that once you have built your customized
 	<filename>replcomps</filename> file you will not need to touch it again.
 	No other email program really gives you the power and
diff --git a/en_US.ISO8859-1/articles/new-users/article.sgml b/en_US.ISO8859-1/articles/new-users/article.sgml
index 017fe58515..0040270578 100644
--- a/en_US.ISO8859-1/articles/new-users/article.sgml
+++ b/en_US.ISO8859-1/articles/new-users/article.sgml
@@ -250,7 +250,7 @@
 	    screen.  If it is too long and you can see only the end of
 	    it, press <keycap>ScrollLock</keycap> and use the
 	    <keycap>up-arrow</keycap> to move backward; you can use
-	    <keycap>ScrollLock</keycap> with man pages too.  Press
+	    <keycap>ScrollLock</keycap> with manual pages too.  Press
 	    <keycap>ScrollLock</keycap> again to quit scrolling.  You
 	    might want to try <command>cat</command> on some of the
 	    dot files in your home directory&mdash;<command>cat
@@ -295,7 +295,7 @@
 	    <replaceable>text</replaceable></command></term>
 
 	<listitem>
-	  <para>The man page for <replaceable>text</replaceable>.  The
+	  <para>The manual page for <replaceable>text</replaceable>.  The
 	    major source of documentation for Un*x systems.
 	    <command>man <parameter>ls</parameter></command> will tell
 	    you all the ways to use the <command>ls</command> command.
@@ -335,7 +335,7 @@
 
 	<listitem>
 	  <para>Tells you what the command
-	    <replaceable>text</replaceable> does and its man page.
+	    <replaceable>text</replaceable> does and its manual page.
 	    Typing <command>whatis *</command> will tell you about all
 	    the binaries in the current directory.</para>
 	</listitem>
@@ -610,7 +610,7 @@
     <title>Printing Files from DOS</title>
 
     <para>At this point you probably do not have the printer working,
-      so here is a way to create a file from a man page, move it to a
+      so here is a way to create a file from a manual page, move it to a
       floppy, and then print it from DOS.  Suppose you want to read
       carefully about changing permissions on files (pretty
       important).  You can use <command>man chmod</command> to read
@@ -620,7 +620,7 @@
       <screen>&prompt.user; <userinput>man chmod | col -b &gt; chmod.txt</></screen>
     </informalexample>
 
-    <para>will remove formatting codes and send the man page to the
+    <para>will remove formatting codes and send the manual page to the
       <filename>chmod.txt</filename> file instead of showing it on
       your screen.  Now put a dos-formatted diskette in your floppy
       drive a, <command>su</command> to root, and type</para>
@@ -672,7 +672,7 @@
       directory, call them up with DOS EDIT, Windows Notepad or
       Wordpad, or a word processor, make a minor change so the file
       has to be saved, and print as you normally would from DOS or
-      Windows.  Hope it works!  man pages come out best if printed
+      Windows.  Hope it works!  manual pages come out best if printed
       with the DOS <command>print</command> command.  (Copying files
       from FreeBSD to a mounted DOS partition is in some cases still a
       little risky.)</para>
@@ -757,7 +757,7 @@
 	<term><command>man hier</command></term>
 
 	<listitem>
-	  <para>man page on the Unix filesystem</para>
+	  <para>manual page on the Unix filesystem</para>
 	</listitem>
       </varlistentry>
     </variablelist>
diff --git a/en_US.ISO8859-1/articles/problem-reports/article.sgml b/en_US.ISO8859-1/articles/problem-reports/article.sgml
index c5d41c879c..9382d00a36 100644
--- a/en_US.ISO8859-1/articles/problem-reports/article.sgml
+++ b/en_US.ISO8859-1/articles/problem-reports/article.sgml
@@ -316,7 +316,7 @@
 	    </listitem>
 
 	    <listitem>
-	      <para><literal>docs:</literal> problems with man pages
+	      <para><literal>docs:</literal> problems with manual pages
 	        or on-line documentation.</para>
 	    </listitem>
 
diff --git a/en_US.ISO8859-1/articles/storage-devices/article.sgml b/en_US.ISO8859-1/articles/storage-devices/article.sgml
index 718901108e..5db99aec8b 100644
--- a/en_US.ISO8859-1/articles/storage-devices/article.sgml
+++ b/en_US.ISO8859-1/articles/storage-devices/article.sgml
@@ -1021,7 +1021,7 @@ da0(bt0:0:0): Direct-Access 1350MB (2766300 512 byte sectors)</screen>
 	  
 	  <para>Dependent on your hardware, the kernel configuration file must
 	    contain one or more lines describing your host adapter(s).  This
-	    includes I/O addresses, interrupts etc. Consult the man page for
+	    includes I/O addresses, interrupts etc. Consult the manual page for
 	    your adapter driver to get more info. Apart from that, check out
 	    <filename>/sys/i386/conf/LINT</filename> for an overview of a
 	    kernel config file.  <filename>LINT</filename> contains every
@@ -1319,7 +1319,7 @@ Mar 29 21:16:37 yedi /kernel: sa1: Archive  Viper 150 is a known rogue </screen>
 	      
 	  <programlisting>options        "TUNE_1542"             #dynamic tune of bus DMA speed</programlisting>
 	      
-	  <para>Check the man pages for the host adapter that you use.  Or
+	  <para>Check the manual pages for the host adapter that you use.  Or
 	    better still, use the ultimate documentation (read: driver
 	    source).</para>
 	</sect3>
diff --git a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml
index 2ee7478f28..b5294e63fc 100644
--- a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml
@@ -8,7 +8,7 @@
   <title>Writing FreeBSD Device Drivers</title>
 
   <para>This chapter was written by &a.murray; with selections from a
-    variety of sources including the intro(4) man page by
+    variety of sources including the intro(4) manual page by
     &a.joerg;.</para>
 
   <sect1>
diff --git a/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml
index 2ee7478f28..b5294e63fc 100644
--- a/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml
@@ -8,7 +8,7 @@
   <title>Writing FreeBSD Device Drivers</title>
 
   <para>This chapter was written by &a.murray; with selections from a
-    variety of sources including the intro(4) man page by
+    variety of sources including the intro(4) manual page by
     &a.joerg;.</para>
 
   <sect1>
diff --git a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
index d65c161379..c495b69b10 100644
--- a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
@@ -29,7 +29,7 @@
 	is not a complete list - this is too hard to maintain...).</para>
 
         <para>For details please refer to specific chapter in the document,
-	RFCs, man pages, or comments in the source code.</para>
+	RFCs, manual pages, or comments in the source code.</para>
 
         <para>Conformance tests have been performed on the KAME STABLE kit
         at TAHI project.  Results can be viewed at <ulink
diff --git a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml
index 3addb790be..775740fe50 100644
--- a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml
@@ -991,13 +991,13 @@ free(foo);
 
 	    <para>Alternatively, you can create a core dump from
 	      inside your program, by calling the
-	      <function>abort()</function> function. See the man page
+	      <function>abort()</function> function. See the manual page
 	      of &man.abort.3; to learn more.</para>
 
             <para>If you want to create a core dump from outside your
               program, but do not want the process to terminate, you
               can use the <command>gcore</command> program. See the
-              man page of &man.gcore.1; for more information.</para>
+              manual page of &man.gcore.1; for more information.</para>
 
 	  </answer>
 	</qandaentry>
diff --git a/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml
index e7f77daa55..c47301953d 100644
--- a/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml
@@ -372,7 +372,7 @@ we passed an invalid parameter, etc.
 
 <para>
 The traditional place to look for information about various
-system calls under Unix systems are the man pages.
+system calls under Unix systems are the manual pages.
 FreeBSD describes its system calls in section 2, sometimes
 in section 3.
 </para>
@@ -397,7 +397,7 @@ immediately ask the puzzling question: Where is
 
 <note>
 <para>
-The information presented in the man pages applies
+The information presented in the manual pages applies
 to C programs. The assembly language programmer needs additional
 information.
 </para>
diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index 324d2c7e2d..e09a868182 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -979,7 +979,7 @@ File: +DESC (ignored)</screen>
                 <ulink URL="http://www.efnet.org/index.php">EFNet</ulink>
                 is a FreeBSD forum, but do not go there for tech
                 support or try to get folks there to help you avoid
-                the pain of reading man pages or doing your own research.
+                the pain of reading manual pages or doing your own research.
                 It is a chat channel, first and foremost, and topics there
                 are just as likely to involve sex, sports or nuclear
                 weapons as they are FreeBSD.  You Have Been Warned!
@@ -2331,7 +2331,7 @@ disk            wd2     at wdc1 drive 1 # change from wd3 to wd2</programlisting
 
 	<answer>
 	  <para>FreeBSD supports any ATAPI-compatible IDE CD-R or CD-RW
-	    drive.  For FreeBSD versions 4.0 and later, see the man page for
+	    drive.  For FreeBSD versions 4.0 and later, see the manual page for
 	      &man.burncd.8;.  For earlier FreeBSD versions, see the examples
 	    in <filename>/usr/share/examples/atapi</filename>.</para>
 
@@ -2416,7 +2416,7 @@ disk            wd2     at wdc1 drive 1 # change from wd3 to wd2</programlisting
             especially those that claim to be AST compatible.</para>
 
           <para>Check the &man.sio.4;
-            man page to get more information on configuring such cards.</para>
+            manual page to get more information on configuring such cards.</para>
         </answer>
       </qandaentry>
 
@@ -2505,7 +2505,7 @@ usbd_flags=""</programlisting>
             before you start the system and leave it connected until the
             system is shutdown to avoid troubles.</para>
 
-          <para>See the &man.ukbd.4; man page for more information.</para>
+          <para>See the &man.ukbd.4; manual page for more information.</para>
         </answer>
       </qandaentry>
 
@@ -2538,7 +2538,7 @@ usbd_flags=""</programlisting>
           <para>Bus mice usually comes with dedicated interface cards.
             These cards may allow you to set the port address and the IRQ
             number other than shown above. Refer to the manual of your
-            mouse and the &man.mse.4; man page for more information.</para>
+            mouse and the &man.mse.4; manual page for more information.</para>
         </answer>
       </qandaentry>
 
@@ -2611,7 +2611,7 @@ usbd_flags=""</programlisting>
 
           <para>Where <replaceable>xxxx</replaceable> is the mouse device
             name and <replaceable>yyyy</replaceable> is a protocol type for
-            the mouse.  See the &man.moused.8; man page for supported
+            the mouse.  See the &man.moused.8; manual page for supported
             protocol types.</para>
 
           <para>You may wish to run the mouse daemon automatically when the
@@ -2672,7 +2672,7 @@ moused_flags=""</programlisting>
             <quote>extend</quote> the selected region of text. If your
             mouse does not have the middle button, you may wish to emulate
             it or remap buttons using moused options. See the
-            &man.moused.8; man page for details.</para>
+            &man.moused.8; manual page for details.</para>
         </answer>
       </qandaentry>
 
@@ -2881,7 +2881,7 @@ diff -u -r1.60.2.1 -r1.60.2.2
             command. The details of how you actually control the changer
             can be found in the
             &man.chio.1;
-            man page.</para>
+            manual page.</para>
 
           <para>If you are not using <application>AMANDA</application>
             or some other product that already understands changers,
@@ -4505,7 +4505,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
               </listitem>
 
               <listitem>
-              <para>Preformatted man pages.</para>
+              <para>Preformatted manual pages.</para>
               </listitem>
 
               </itemizedlist>
@@ -4539,7 +4539,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
               </listitem>
 
               <listitem>
-                <para>Preformatted man pages.</para>
+                <para>Preformatted manual pages.</para>
               </listitem>
             </itemizedlist>
 
@@ -7197,9 +7197,9 @@ define(`confDELIVERY_MODE',`deferred')dnl</programlisting>
            <para>You cannot lower the security level; you have to boot to
              single mode to install the kernel, or change the security
              level in <filename>/etc/rc.conf</filename> then reboot. See
-             the &man.init.8; man page for details on securelevel, and see
+             the &man.init.8; manual page for details on securelevel, and see
              <filename>/etc/defaults/rc.conf</filename> and the
-             &man.rc.conf.5; man page for more information on
+             &man.rc.conf.5; manual page for more information on
              rc.conf.</para>
         </answer>
       </qandaentry>
@@ -7224,9 +7224,9 @@ define(`confDELIVERY_MODE',`deferred')dnl</programlisting>
            <para>You cannot lower the security level; you have to boot
              to single mode to change the date, or change the security
              level in <filename>/etc/rc.conf</filename> then reboot. See
-             the &man.init.8; man page for details on securelevel, and
+             the &man.init.8; manual page for details on securelevel, and
              see <filename>/etc/defaults/rc.conf</filename> and the
-             &man.rc.conf.5; man page for more information on rc.conf.</para>
+             &man.rc.conf.5; manual page for more information on rc.conf.</para>
         </answer>
       </qandaentry>
 
@@ -9091,7 +9091,7 @@ Key F15        A        A        Menu Workplace Nop</programlisting>
         <answer>
           <para>You should first read the
             &man.ppp.8;
-            man page and the <ulink
+            manual page and the <ulink
             URL="../handbook/ppp-and-slip.html#USERPPP">
             PPP section of the handbook</ulink>.  Enable logging with
             the command</para>
@@ -9141,7 +9141,7 @@ Key F15        A        A        Menu Workplace Nop</programlisting>
           <programlisting>127.0.0.1        foo.example.com foo localhost</programlisting>
 
           <para>Otherwise, simply add another entry for your host.
-            Consult the relevant man pages for more details.</para>
+            Consult the relevant manual pages for more details.</para>
 
           <para>You should be able to successfully
             <command>ping -c1 `hostname`</command> when you are done.</para>
@@ -9163,7 +9163,7 @@ default            10.0.0.2           UGSc        0        0      tun0
 10.0.0.2           10.0.0.1           UH          0        0      tun0</programlisting>
 
           <para>This is assuming that you have used the addresses from the
-            handbook, the man page or from the ppp.conf.sample file.
+            handbook, the manual page or from the ppp.conf.sample file.
             If you do not have a default route, it may be because you are
             running an old version of &man.ppp.8;
             that does not understand the word <literal>HISADDR</literal>
@@ -9774,7 +9774,7 @@ CCP: Received Terminate Ack (1) state = Req-Sent (6)</programlisting>
           <para>When the chat interpreter parses each argument, it
             re-interprets the argument in order to find any special
             escape sequences such as <literal>\P</literal> or
-            <literal>\T</literal> (see the man page).  As a result of this
+            <literal>\T</literal> (see the manual page).  As a result of this
             double-parsing, you must remember to use the correct number of
             escapes.</para>
 
@@ -9870,7 +9870,7 @@ ATDT1234567</programlisting>
           <para>This was a known problem with
             &man.ppp.8; set up to negotiate a
             dynamic local IP number with the peer in auto mode.  It is
-            fixed in the latest version - search the man page for
+            fixed in the latest version - search the manual page for
             <literal>iface</literal>.</para>
 
           <para>The problem was that when that initial program calls
@@ -10570,7 +10570,7 @@ device sio7 at isa? port 0x2b8 tty flags 0x781 irq 7 vector siointr</programlist
         </question>
 
         <answer>
-          <para>Actually, the man page for &man.tip.1; is
+          <para>Actually, the manual page for &man.tip.1; is
             out of date.  There is a generic Hayes dialer already built in.
             Just use <literal>at=hayes</literal> in your
             <filename>/etc/remote</filename> (see &man.remote.5;) file.</para>
@@ -10977,7 +10977,7 @@ raisechar=^^</programlisting>
                   by providing a utility for <emphasis>branding</emphasis>
                   a known <acronym>ELF</acronym> executable with
                   information about the ABI it is compliant with.  See the
-                  man page for &man.brandelf.1;
+                  manual page for &man.brandelf.1;
                   for more information.</para>
               </listitem>
             </itemizedlist>
@@ -11123,7 +11123,7 @@ raisechar=^^</programlisting>
             <option>-L</option> together with the <option>-R</option>
             option to make this work.  See the
             &man.chmod.1; and &man.symlink.7;
-            man pages for more info.</para>
+            manual pages for more info.</para>
 
             <warning>
               <para>The <option>-R</option> option does a
diff --git a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml
index 6351630c1b..008fc0d017 100644
--- a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml
@@ -34,7 +34,7 @@
   <title>Translations</title>
 
   <para>This is the FAQ for people translating the FreeBSD documentation
-    (FAQ, Handbook, tutorials, man pages, and others) to different
+    (FAQ, Handbook, tutorials, manual pages, and others) to different
     languages.</para>
   
   <para>It is <emphasis>very</emphasis> heavily based on the translation FAQ
diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
index 6a18455448..a2b55488b3 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -1046,7 +1046,7 @@ Exports list on foobar:
 	<filename>/etc/amd.conf</filename> file defines some of the more
 	advanced features of <application>amd</application>.</para>
 
-      <para>Consult the &man.amd.8; and &man.amd.conf.5; man pages for more
+      <para>Consult the &man.amd.8; and &man.amd.conf.5; manual pages for more
 	information.</para>
     </sect2>
 
diff --git a/en_US.ISO8859-1/books/handbook/basics/chapter.sgml b/en_US.ISO8859-1/books/handbook/basics/chapter.sgml
index 4eb1082c40..b84425b5f5 100644
--- a/en_US.ISO8859-1/books/handbook/basics/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/basics/chapter.sgml
@@ -1332,7 +1332,7 @@ Swap: 256M Total, 38M Used, 217M Free, 15% Inuse
 	  Instead of having to create and modify device nodes,
 	  <literal>DEVFS</literal> maintains this particular filesystem for you.</para>
 
-	<para>See the &man.devfs.5; man page for more
+	<para>See the &man.devfs.5; manual page for more
 	  information.</para>
 
 	<para><literal>DEVFS</literal> is used by default in FreeBSD 5.0.</para>
diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.sgml b/en_US.ISO8859-1/books/handbook/install/chapter.sgml
index 8c185caf59..2053a0b3fc 100644
--- a/en_US.ISO8859-1/books/handbook/install/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/install/chapter.sgml
@@ -4301,7 +4301,7 @@ failed.  Would you like to try again?
 	X Window. There may be some display differences when switching
 	back to text mode, but it is better than damaging equipment.</para>
 
-      <para>Read the &man.xvidtune.1; man page before making
+      <para>Read the &man.xvidtune.1; manual page before making
 	any adjustments.</para>
 
       <para>Following a successful XFree86 configuration, it will proceed
diff --git a/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml b/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
index f5c9d6fc65..fc05ff119d 100644
--- a/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
@@ -504,7 +504,7 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz joint-stereo
 	<option>--t</option> indicate ID3 tags, which usually contain
 	song information, to be embedded within the MP3 file.
 	Additional encoding options can be found by consulting the
-	lame man page.</para>
+	lame manual page.</para>
     </sect2>
 
     <sect2 id="mp3-decoding">
diff --git a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
index 900c49ac8b..93304cfef6 100644
--- a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
@@ -449,7 +449,7 @@ OK
                 option however, you should also use the <option>set accmap</option>
                 option, which may be required to defeat hardware dependent on
                 passing certain characters from end to end, most of the time
-                XON/XOFF.  See the &man.ppp.8; man page for more information
+                XON/XOFF.  See the &man.ppp.8; manual page for more information
                 on this option, and how it is used.</para>
 
               <para>If you have an older modem, you may need to use the
diff --git a/en_US.ISO8859-1/books/handbook/sound/chapter.sgml b/en_US.ISO8859-1/books/handbook/sound/chapter.sgml
index f5c9d6fc65..fc05ff119d 100644
--- a/en_US.ISO8859-1/books/handbook/sound/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/sound/chapter.sgml
@@ -504,7 +504,7 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz joint-stereo
 	<option>--t</option> indicate ID3 tags, which usually contain
 	song information, to be embedded within the MP3 file.
 	Additional encoding options can be found by consulting the
-	lame man page.</para>
+	lame manual page.</para>
     </sect2>
 
     <sect2 id="mp3-decoding">
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index 3fcd845b2f..ac61c952e9 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -199,7 +199,7 @@ lib/X11/oneko/cat2.xpm
 lib/X11/oneko/mouse.xpm
 @dirrm lib/X11/oneko</programlisting>
 
-          <para>Refer to the &man.pkg.create.1; man page for details on the
+          <para>Refer to the &man.pkg.create.1; manual page for details on the
             packing list.</para>
 
           <note>
@@ -3205,7 +3205,7 @@ PLIST_SUB=      OCTAVE_VERSION=${OCTAVE_VERSION}</programlisting>
           lines in the <filename>pkg-plist</filename>.</para>
 
         <para>This substitution (as well as addition of any <link
-          linkend="porting-manpages">man pages</link>) will be done between
+          linkend="porting-manpages">manual pages</link>) will be done between
           the <maketarget>do-install</maketarget> and
           <maketarget>post-install</maketarget> targets, by reading from
           <makevar>PLIST</makevar> and writing to <makevar>TMPPLIST</makevar>
diff --git a/en_US.ISO8859-1/books/ppp-primer/book.sgml b/en_US.ISO8859-1/books/ppp-primer/book.sgml
index 1cc9bf7ab0..4e15680841 100644
--- a/en_US.ISO8859-1/books/ppp-primer/book.sgml
+++ b/en_US.ISO8859-1/books/ppp-primer/book.sgml
@@ -1397,7 +1397,7 @@ Internet, one of the following command lines would be used instead:</para>
 <para><emphasis remap=tt># ppp -auto -alias demand  (Dial-on-Demand mode)</emphasis></para>
   
 <para>You can alternatively use the command <emphasis remap=tt>``alias enable yes''</emphasis>
-in your ppp configuration file (refer to the man page for details).</para>
+in your ppp configuration file (refer to the manual page for details).</para>
   
 <para>Keep this in mind if you intend to proceed with <xref
 	  linkend="config-window-system">.</para>      
@@ -2220,7 +2220,7 @@ is used.</para>
 FreeBSD system.)</para>
   
 <para>The complete documentation for the various filters and rules under
-PPP are available in the PPP man page.</para>
+PPP are available in the PPP manual page.</para>
   
 <para>There are four distinct classes of rules which may be applied to
 the PPP program: