Remove trailing whitespace.

4 files changed, 148 insertions, 148 deletions

diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
index 49ec3ca7fb..b663ca2a88 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml,v 1.68 2000/01/16 02:46:09 obrien Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml,v 1.69 2000/01/16 02:51:01 obrien Exp $
 -->
 
 <chapter id="ports">
@@ -39,7 +39,7 @@
       you are able to install any of the Ports collection ports by simply
       typing <command>make install</command>.</para>
   </sect1>
-  
+
   <sect1 id="ports-using">
     <title>Using the Ports Collection</title>
 
@@ -183,7 +183,7 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
 
         <para>As you may have guessed from the title, everything
 	  described in this section assumes you have a FreeBSD CDROM set.
-	  If you do not, you can order one from the <ulink 
+	  If you do not, you can order one from the <ulink
 	  url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>.</para>
 
         <para>Assuming that your FreeBSD CDROM is in the drive and is
@@ -225,7 +225,7 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
         <para>Take notice that once the compile is complete you are
 	  returned to your prompt.  The next step is to install the
 	  port.  In order to install it, you simply need to tack one word
-	  onto the <command>make</command> command, and that word is 
+	  onto the <command>make</command> command, and that word is
 	  <command>install</command>:</para>
 
         <screen>&prompt.root; <userinput>make install</userinput>
@@ -246,7 +246,7 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
 
         <note>
           <para>You can save an extra step by just running <command>make
-            install</command> instead of <command>make</command> and 
+            install</command> instead of <command>make</command> and
 	    <command>make install</command> as two separate steps.</para>
         </note>
 
@@ -254,7 +254,7 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
           <para>Please be aware that the licenses of a few ports do not
             allow for inclusion on the CDROM.  This could be for various
 	    reasons, including things such as as registration form needs
-	    to be filled out before downloading, if redistribution is not 
+	    to be filled out before downloading, if redistribution is not
 	    allowed, and so on.  If you wish to install a port not
 	    included on the CDROM, you will need to be online in order to
 	    do so (see the <link linkend="ports-inet">next
@@ -270,10 +270,10 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
 	  you will need to do the <link linkend="ports-cd">CDROM
 	  installation</link>.</para>
 
-        <para>Installing a port from the Internet is done exactly the same 
+        <para>Installing a port from the Internet is done exactly the same
 	  way as it would be if you were installing from a CDROM.  The
 	  only difference between the two is that the program's source
-	  code is downloaded from the Internet instead of pulled from the 
+	  code is downloaded from the Internet instead of pulled from the
 	  CDROM.</para>
 
         <para>The steps involved are identical:</para>
@@ -1027,23 +1027,23 @@ ade game.</screen>
 #
 # &dollar;FreeBSD&dollar;
 #
-       
+
 DISTNAME=      oneko-1.1b
 CATEGORIES=    games
 MASTER_SITES=  ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/
-       
+
 MAINTAINER=    asami@FreeBSD.org
-       
+
 MAN1=          oneko.1
 MANCOMPRESSED= yes
 USE_IMAKE=     yes
-       
+
 .include &lt;bsd.port.mk&gt;</programlisting>
 
         <para>See if you can figure it out.  Do not worry about the contents
-          of the <literal>&dollar;FreeBSD&dollar;</literal> line, it will be filled in
-          automatically by CVS when the port is imported to our main ports
-          tree.  You can find a more detailed example in the <link
+          of the <literal>&dollar;FreeBSD&dollar;</literal> line, it will be
+          filled in automatically by CVS when the port is imported to our main
+          ports tree.  You can find a more detailed example in the <link
             linkend="porting-samplem">sample Makefile</link> section.</para>
       </sect3>
 
@@ -1098,7 +1098,7 @@ the screen.
  :
 (etc.)
 
-WWW: http://www.oneko.org/            
+WWW: http://www.oneko.org/
 
 - Satoshi
 asami@cs.berkeley.edu</programlisting>
@@ -2468,14 +2468,14 @@ Options:
 --- ./man/vip.texi.org  Fri Jun 16 15:31:11 1995
 +++ ./man/vip.texi      Tue May 20 01:28:33 1997
 @@ -2,6 +2,10 @@
-             
+
  @setfilename ../info/vip
  @settitle VIP
 +@dircategory The Emacs editor and associated tools
 +@direntry
 +* VIP: (vip).          A VI-emulation for Emacs.
 +@end direntry
-             
+
  @iftex
  @finalout
  :</programlisting>
@@ -2532,7 +2532,7 @@ Options:
  # and you cannot remake them without installing Emacs first.
 -SUBDIR = lib-src src
 +SUBDIR = lib-src src man
- 
+
  # The makefiles of the directories in $SUBDIR.
  SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile
  lwlib/Makefile
@@ -2541,10 +2541,10 @@ Options:
 @@ -66,6 +66,7 @@
  ${srcdir}/gnu1.texi \
  ${srcdir}/glossary.texi
-             
+
 +all: info
  info: $(INFO_TARGETS)
-             
+
  dvi: $(DVI_TARGETS)</programlisting>
 
           <para>The second hunk was necessary because the default target in
@@ -2576,7 +2576,7 @@ Options:
 -            else mv -f dir dir.bak; fi; \
 -          fi; \
            cd ${srcdir}/info ; \
--          (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); 
+-          (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir);
 \
 -          (cd $${thisdir}; chmod a+r ${infodir}/dir); \
            for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \
@@ -2637,7 +2637,7 @@ diff -u -r1.26 Makefile
 +.for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode
 +       install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 +.endfor
-             
+
  .include &lt;bsd.port.mk&gt;</programlisting>
         </step>
 
@@ -3996,7 +3996,7 @@ not be changed when upgrading the port later.]
 when it is committed to our repository.  If upgrading a port, do not alter
 this line back to "&dollar;FreeBSD&dollar;".  CVS deals with it automatically.]
 #
-       
+
 [section to describe the port itself and the master site - DISTNAME
  is always first, followed by PKGNAME (if necessary), CATEGORIES,
  and then MASTER_SITES, which can be followed by MASTER_SITE_SUBDIR.
@@ -4004,28 +4004,28 @@ this line back to "&dollar;FreeBSD&dollar;".  CVS deals with it automatically.]
 DISTNAME=      xdvi
 PKGNAME=       xdvi-pl18
 CATEGORIES=    print
-[do not forget the trailing slash ("/")! 
+[do not forget the trailing slash ("/")!
  if you are not using MASTER_SITE_* macros]
 MASTER_SITES=  ${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR= applications
 [set this if the source is not in the standard ".tar.gz" form]
 EXTRACT_SUFX=  .tar.Z
-       
+
 [section for distributed patches -- can be empty]
 PATCH_SITES=   ftp://ftp.sra.co.jp/pub/X11/japanese/
 PATCHFILES=    xdvi-18.patch1.gz xdvi-18.patch2.gz
-       
+
 [maintainer; *mandatory*!  This is the person (preferably with commit
  privileges) who a user can contact for questions and bug reports - this
  person should be the porter or someone who can forward questions to the
  original porter reasonably promptly.  If you really do not want to have
  your address here, set it to "ports@FreeBSD.org".]
 MAINTAINER=    asami@FreeBSD.org
-       
+
 [dependencies -- can be empty]
 RUN_DEPENDS=   gs:${PORTSDIR}/print/ghostscript
 LIB_DEPENDS=   Xpm.5:${PORTSDIR}/graphics/xpm
-       
+
 [this section is for other standard bsd.port.mk variables that do not
  belong to any of the above]
 [If it asks questions during configure, build, install...]
@@ -4042,20 +4042,20 @@ USE_GMAKE=     yes
 [If it is an X application and requires "xmkmf -a" to be run...]
 USE_IMAKE=     yes
 [et cetera.]
-       
+
 [non-standard variables to be used in the rules below]
 MY_FAVORITE_RESPONSE=  "yeah, right"
-       
+
 [then the special rules, in the order they are called]
 pre-fetch:
         i go fetch something, yeah
-       
+
 post-patch:
         i need to do something after patch, great
-       
+
 pre-install:
         and then some more stuff before installing, wow
-       
+
 [and then the epilogue]
 .include &lt;bsd.port.mk&gt;</programlisting>
     </sect2>
@@ -4749,8 +4749,8 @@ pre-install:
      mode: sgml
      sgml-declaration: "../chapter.decl"
      sgml-indent-data: t
-     sgml-omittag: nil 
-     sgml-always-quote-attributes: t 
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
      sgml-parent-document: ("../book.sgml" "part" "chapter")
-     End: 
+     End:
 -->
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index 49ec3ca7fb..b663ca2a88 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml,v 1.68 2000/01/16 02:46:09 obrien Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml,v 1.69 2000/01/16 02:51:01 obrien Exp $
 -->
 
 <chapter id="ports">
@@ -39,7 +39,7 @@
       you are able to install any of the Ports collection ports by simply
       typing <command>make install</command>.</para>
   </sect1>
-  
+
   <sect1 id="ports-using">
     <title>Using the Ports Collection</title>
 
@@ -183,7 +183,7 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
 
         <para>As you may have guessed from the title, everything
 	  described in this section assumes you have a FreeBSD CDROM set.
-	  If you do not, you can order one from the <ulink 
+	  If you do not, you can order one from the <ulink
 	  url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>.</para>
 
         <para>Assuming that your FreeBSD CDROM is in the drive and is
@@ -225,7 +225,7 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
         <para>Take notice that once the compile is complete you are
 	  returned to your prompt.  The next step is to install the
 	  port.  In order to install it, you simply need to tack one word
-	  onto the <command>make</command> command, and that word is 
+	  onto the <command>make</command> command, and that word is
 	  <command>install</command>:</para>
 
         <screen>&prompt.root; <userinput>make install</userinput>
@@ -246,7 +246,7 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
 
         <note>
           <para>You can save an extra step by just running <command>make
-            install</command> instead of <command>make</command> and 
+            install</command> instead of <command>make</command> and
 	    <command>make install</command> as two separate steps.</para>
         </note>
 
@@ -254,7 +254,7 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
           <para>Please be aware that the licenses of a few ports do not
             allow for inclusion on the CDROM.  This could be for various
 	    reasons, including things such as as registration form needs
-	    to be filled out before downloading, if redistribution is not 
+	    to be filled out before downloading, if redistribution is not
 	    allowed, and so on.  If you wish to install a port not
 	    included on the CDROM, you will need to be online in order to
 	    do so (see the <link linkend="ports-inet">next
@@ -270,10 +270,10 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
 	  you will need to do the <link linkend="ports-cd">CDROM
 	  installation</link>.</para>
 
-        <para>Installing a port from the Internet is done exactly the same 
+        <para>Installing a port from the Internet is done exactly the same
 	  way as it would be if you were installing from a CDROM.  The
 	  only difference between the two is that the program's source
-	  code is downloaded from the Internet instead of pulled from the 
+	  code is downloaded from the Internet instead of pulled from the
 	  CDROM.</para>
 
         <para>The steps involved are identical:</para>
@@ -1027,23 +1027,23 @@ ade game.</screen>
 #
 # &dollar;FreeBSD&dollar;
 #
-       
+
 DISTNAME=      oneko-1.1b
 CATEGORIES=    games
 MASTER_SITES=  ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/
-       
+
 MAINTAINER=    asami@FreeBSD.org
-       
+
 MAN1=          oneko.1
 MANCOMPRESSED= yes
 USE_IMAKE=     yes
-       
+
 .include &lt;bsd.port.mk&gt;</programlisting>
 
         <para>See if you can figure it out.  Do not worry about the contents
-          of the <literal>&dollar;FreeBSD&dollar;</literal> line, it will be filled in
-          automatically by CVS when the port is imported to our main ports
-          tree.  You can find a more detailed example in the <link
+          of the <literal>&dollar;FreeBSD&dollar;</literal> line, it will be
+          filled in automatically by CVS when the port is imported to our main
+          ports tree.  You can find a more detailed example in the <link
             linkend="porting-samplem">sample Makefile</link> section.</para>
       </sect3>
 
@@ -1098,7 +1098,7 @@ the screen.
  :
 (etc.)
 
-WWW: http://www.oneko.org/            
+WWW: http://www.oneko.org/
 
 - Satoshi
 asami@cs.berkeley.edu</programlisting>
@@ -2468,14 +2468,14 @@ Options:
 --- ./man/vip.texi.org  Fri Jun 16 15:31:11 1995
 +++ ./man/vip.texi      Tue May 20 01:28:33 1997
 @@ -2,6 +2,10 @@
-             
+
  @setfilename ../info/vip
  @settitle VIP
 +@dircategory The Emacs editor and associated tools
 +@direntry
 +* VIP: (vip).          A VI-emulation for Emacs.
 +@end direntry
-             
+
  @iftex
  @finalout
  :</programlisting>
@@ -2532,7 +2532,7 @@ Options:
  # and you cannot remake them without installing Emacs first.
 -SUBDIR = lib-src src
 +SUBDIR = lib-src src man
- 
+
  # The makefiles of the directories in $SUBDIR.
  SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile
  lwlib/Makefile
@@ -2541,10 +2541,10 @@ Options:
 @@ -66,6 +66,7 @@
  ${srcdir}/gnu1.texi \
  ${srcdir}/glossary.texi
-             
+
 +all: info
  info: $(INFO_TARGETS)
-             
+
  dvi: $(DVI_TARGETS)</programlisting>
 
           <para>The second hunk was necessary because the default target in
@@ -2576,7 +2576,7 @@ Options:
 -            else mv -f dir dir.bak; fi; \
 -          fi; \
            cd ${srcdir}/info ; \
--          (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); 
+-          (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir);
 \
 -          (cd $${thisdir}; chmod a+r ${infodir}/dir); \
            for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \
@@ -2637,7 +2637,7 @@ diff -u -r1.26 Makefile
 +.for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode
 +       install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 +.endfor
-             
+
  .include &lt;bsd.port.mk&gt;</programlisting>
         </step>
 
@@ -3996,7 +3996,7 @@ not be changed when upgrading the port later.]
 when it is committed to our repository.  If upgrading a port, do not alter
 this line back to "&dollar;FreeBSD&dollar;".  CVS deals with it automatically.]
 #
-       
+
 [section to describe the port itself and the master site - DISTNAME
  is always first, followed by PKGNAME (if necessary), CATEGORIES,
  and then MASTER_SITES, which can be followed by MASTER_SITE_SUBDIR.
@@ -4004,28 +4004,28 @@ this line back to "&dollar;FreeBSD&dollar;".  CVS deals with it automatically.]
 DISTNAME=      xdvi
 PKGNAME=       xdvi-pl18
 CATEGORIES=    print
-[do not forget the trailing slash ("/")! 
+[do not forget the trailing slash ("/")!
  if you are not using MASTER_SITE_* macros]
 MASTER_SITES=  ${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR= applications
 [set this if the source is not in the standard ".tar.gz" form]
 EXTRACT_SUFX=  .tar.Z
-       
+
 [section for distributed patches -- can be empty]
 PATCH_SITES=   ftp://ftp.sra.co.jp/pub/X11/japanese/
 PATCHFILES=    xdvi-18.patch1.gz xdvi-18.patch2.gz
-       
+
 [maintainer; *mandatory*!  This is the person (preferably with commit
  privileges) who a user can contact for questions and bug reports - this
  person should be the porter or someone who can forward questions to the
  original porter reasonably promptly.  If you really do not want to have
  your address here, set it to "ports@FreeBSD.org".]
 MAINTAINER=    asami@FreeBSD.org
-       
+
 [dependencies -- can be empty]
 RUN_DEPENDS=   gs:${PORTSDIR}/print/ghostscript
 LIB_DEPENDS=   Xpm.5:${PORTSDIR}/graphics/xpm
-       
+
 [this section is for other standard bsd.port.mk variables that do not
  belong to any of the above]
 [If it asks questions during configure, build, install...]
@@ -4042,20 +4042,20 @@ USE_GMAKE=     yes
 [If it is an X application and requires "xmkmf -a" to be run...]
 USE_IMAKE=     yes
 [et cetera.]
-       
+
 [non-standard variables to be used in the rules below]
 MY_FAVORITE_RESPONSE=  "yeah, right"
-       
+
 [then the special rules, in the order they are called]
 pre-fetch:
         i go fetch something, yeah
-       
+
 post-patch:
         i need to do something after patch, great
-       
+
 pre-install:
         and then some more stuff before installing, wow
-       
+
 [and then the epilogue]
 .include &lt;bsd.port.mk&gt;</programlisting>
     </sect2>
@@ -4749,8 +4749,8 @@ pre-install:
      mode: sgml
      sgml-declaration: "../chapter.decl"
      sgml-indent-data: t
-     sgml-omittag: nil 
-     sgml-always-quote-attributes: t 
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
      sgml-parent-document: ("../book.sgml" "part" "chapter")
-     End: 
+     End:
 -->
diff --git a/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml b/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml
index 49ec3ca7fb..b663ca2a88 100644
--- a/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml,v 1.68 2000/01/16 02:46:09 obrien Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml,v 1.69 2000/01/16 02:51:01 obrien Exp $
 -->
 
 <chapter id="ports">
@@ -39,7 +39,7 @@
       you are able to install any of the Ports collection ports by simply
       typing <command>make install</command>.</para>
   </sect1>
-  
+
   <sect1 id="ports-using">
     <title>Using the Ports Collection</title>
 
@@ -183,7 +183,7 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
 
         <para>As you may have guessed from the title, everything
 	  described in this section assumes you have a FreeBSD CDROM set.
-	  If you do not, you can order one from the <ulink 
+	  If you do not, you can order one from the <ulink
 	  url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>.</para>
 
         <para>Assuming that your FreeBSD CDROM is in the drive and is
@@ -225,7 +225,7 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
         <para>Take notice that once the compile is complete you are
 	  returned to your prompt.  The next step is to install the
 	  port.  In order to install it, you simply need to tack one word
-	  onto the <command>make</command> command, and that word is 
+	  onto the <command>make</command> command, and that word is
 	  <command>install</command>:</para>
 
         <screen>&prompt.root; <userinput>make install</userinput>
@@ -246,7 +246,7 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
 
         <note>
           <para>You can save an extra step by just running <command>make
-            install</command> instead of <command>make</command> and 
+            install</command> instead of <command>make</command> and
 	    <command>make install</command> as two separate steps.</para>
         </note>
 
@@ -254,7 +254,7 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
           <para>Please be aware that the licenses of a few ports do not
             allow for inclusion on the CDROM.  This could be for various
 	    reasons, including things such as as registration form needs
-	    to be filled out before downloading, if redistribution is not 
+	    to be filled out before downloading, if redistribution is not
 	    allowed, and so on.  If you wish to install a port not
 	    included on the CDROM, you will need to be online in order to
 	    do so (see the <link linkend="ports-inet">next
@@ -270,10 +270,10 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
 	  you will need to do the <link linkend="ports-cd">CDROM
 	  installation</link>.</para>
 
-        <para>Installing a port from the Internet is done exactly the same 
+        <para>Installing a port from the Internet is done exactly the same
 	  way as it would be if you were installing from a CDROM.  The
 	  only difference between the two is that the program's source
-	  code is downloaded from the Internet instead of pulled from the 
+	  code is downloaded from the Internet instead of pulled from the
 	  CDROM.</para>
 
         <para>The steps involved are identical:</para>
@@ -1027,23 +1027,23 @@ ade game.</screen>
 #
 # &dollar;FreeBSD&dollar;
 #
-       
+
 DISTNAME=      oneko-1.1b
 CATEGORIES=    games
 MASTER_SITES=  ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/
-       
+
 MAINTAINER=    asami@FreeBSD.org
-       
+
 MAN1=          oneko.1
 MANCOMPRESSED= yes
 USE_IMAKE=     yes
-       
+
 .include &lt;bsd.port.mk&gt;</programlisting>
 
         <para>See if you can figure it out.  Do not worry about the contents
-          of the <literal>&dollar;FreeBSD&dollar;</literal> line, it will be filled in
-          automatically by CVS when the port is imported to our main ports
-          tree.  You can find a more detailed example in the <link
+          of the <literal>&dollar;FreeBSD&dollar;</literal> line, it will be
+          filled in automatically by CVS when the port is imported to our main
+          ports tree.  You can find a more detailed example in the <link
             linkend="porting-samplem">sample Makefile</link> section.</para>
       </sect3>
 
@@ -1098,7 +1098,7 @@ the screen.
  :
 (etc.)
 
-WWW: http://www.oneko.org/            
+WWW: http://www.oneko.org/
 
 - Satoshi
 asami@cs.berkeley.edu</programlisting>
@@ -2468,14 +2468,14 @@ Options:
 --- ./man/vip.texi.org  Fri Jun 16 15:31:11 1995
 +++ ./man/vip.texi      Tue May 20 01:28:33 1997
 @@ -2,6 +2,10 @@
-             
+
  @setfilename ../info/vip
  @settitle VIP
 +@dircategory The Emacs editor and associated tools
 +@direntry
 +* VIP: (vip).          A VI-emulation for Emacs.
 +@end direntry
-             
+
  @iftex
  @finalout
  :</programlisting>
@@ -2532,7 +2532,7 @@ Options:
  # and you cannot remake them without installing Emacs first.
 -SUBDIR = lib-src src
 +SUBDIR = lib-src src man
- 
+
  # The makefiles of the directories in $SUBDIR.
  SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile
  lwlib/Makefile
@@ -2541,10 +2541,10 @@ Options:
 @@ -66,6 +66,7 @@
  ${srcdir}/gnu1.texi \
  ${srcdir}/glossary.texi
-             
+
 +all: info
  info: $(INFO_TARGETS)
-             
+
  dvi: $(DVI_TARGETS)</programlisting>
 
           <para>The second hunk was necessary because the default target in
@@ -2576,7 +2576,7 @@ Options:
 -            else mv -f dir dir.bak; fi; \
 -          fi; \
            cd ${srcdir}/info ; \
--          (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); 
+-          (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir);
 \
 -          (cd $${thisdir}; chmod a+r ${infodir}/dir); \
            for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \
@@ -2637,7 +2637,7 @@ diff -u -r1.26 Makefile
 +.for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode
 +       install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 +.endfor
-             
+
  .include &lt;bsd.port.mk&gt;</programlisting>
         </step>
 
@@ -3996,7 +3996,7 @@ not be changed when upgrading the port later.]
 when it is committed to our repository.  If upgrading a port, do not alter
 this line back to "&dollar;FreeBSD&dollar;".  CVS deals with it automatically.]
 #
-       
+
 [section to describe the port itself and the master site - DISTNAME
  is always first, followed by PKGNAME (if necessary), CATEGORIES,
  and then MASTER_SITES, which can be followed by MASTER_SITE_SUBDIR.
@@ -4004,28 +4004,28 @@ this line back to "&dollar;FreeBSD&dollar;".  CVS deals with it automatically.]
 DISTNAME=      xdvi
 PKGNAME=       xdvi-pl18
 CATEGORIES=    print
-[do not forget the trailing slash ("/")! 
+[do not forget the trailing slash ("/")!
  if you are not using MASTER_SITE_* macros]
 MASTER_SITES=  ${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR= applications
 [set this if the source is not in the standard ".tar.gz" form]
 EXTRACT_SUFX=  .tar.Z
-       
+
 [section for distributed patches -- can be empty]
 PATCH_SITES=   ftp://ftp.sra.co.jp/pub/X11/japanese/
 PATCHFILES=    xdvi-18.patch1.gz xdvi-18.patch2.gz
-       
+
 [maintainer; *mandatory*!  This is the person (preferably with commit
  privileges) who a user can contact for questions and bug reports - this
  person should be the porter or someone who can forward questions to the
  original porter reasonably promptly.  If you really do not want to have
  your address here, set it to "ports@FreeBSD.org".]
 MAINTAINER=    asami@FreeBSD.org
-       
+
 [dependencies -- can be empty]
 RUN_DEPENDS=   gs:${PORTSDIR}/print/ghostscript
 LIB_DEPENDS=   Xpm.5:${PORTSDIR}/graphics/xpm
-       
+
 [this section is for other standard bsd.port.mk variables that do not
  belong to any of the above]
 [If it asks questions during configure, build, install...]
@@ -4042,20 +4042,20 @@ USE_GMAKE=     yes
 [If it is an X application and requires "xmkmf -a" to be run...]
 USE_IMAKE=     yes
 [et cetera.]
-       
+
 [non-standard variables to be used in the rules below]
 MY_FAVORITE_RESPONSE=  "yeah, right"
-       
+
 [then the special rules, in the order they are called]
 pre-fetch:
         i go fetch something, yeah
-       
+
 post-patch:
         i need to do something after patch, great
-       
+
 pre-install:
         and then some more stuff before installing, wow
-       
+
 [and then the epilogue]
 .include &lt;bsd.port.mk&gt;</programlisting>
     </sect2>
@@ -4749,8 +4749,8 @@ pre-install:
      mode: sgml
      sgml-declaration: "../chapter.decl"
      sgml-indent-data: t
-     sgml-omittag: nil 
-     sgml-always-quote-attributes: t 
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
      sgml-parent-document: ("../book.sgml" "part" "chapter")
-     End: 
+     End:
 -->
diff --git a/en_US.ISO_8859-1/books/porters-handbook/book.sgml b/en_US.ISO_8859-1/books/porters-handbook/book.sgml
index 49ec3ca7fb..b663ca2a88 100644
--- a/en_US.ISO_8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO_8859-1/books/porters-handbook/book.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml,v 1.68 2000/01/16 02:46:09 obrien Exp $
+     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml,v 1.69 2000/01/16 02:51:01 obrien Exp $
 -->
 
 <chapter id="ports">
@@ -39,7 +39,7 @@
       you are able to install any of the Ports collection ports by simply
       typing <command>make install</command>.</para>
   </sect1>
-  
+
   <sect1 id="ports-using">
     <title>Using the Ports Collection</title>
 
@@ -183,7 +183,7 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
 
         <para>As you may have guessed from the title, everything
 	  described in this section assumes you have a FreeBSD CDROM set.
-	  If you do not, you can order one from the <ulink 
+	  If you do not, you can order one from the <ulink
 	  url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>.</para>
 
         <para>Assuming that your FreeBSD CDROM is in the drive and is
@@ -225,7 +225,7 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
         <para>Take notice that once the compile is complete you are
 	  returned to your prompt.  The next step is to install the
 	  port.  In order to install it, you simply need to tack one word
-	  onto the <command>make</command> command, and that word is 
+	  onto the <command>make</command> command, and that word is
 	  <command>install</command>:</para>
 
         <screen>&prompt.root; <userinput>make install</userinput>
@@ -246,7 +246,7 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
 
         <note>
           <para>You can save an extra step by just running <command>make
-            install</command> instead of <command>make</command> and 
+            install</command> instead of <command>make</command> and
 	    <command>make install</command> as two separate steps.</para>
         </note>
 
@@ -254,7 +254,7 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
           <para>Please be aware that the licenses of a few ports do not
             allow for inclusion on the CDROM.  This could be for various
 	    reasons, including things such as as registration form needs
-	    to be filled out before downloading, if redistribution is not 
+	    to be filled out before downloading, if redistribution is not
 	    allowed, and so on.  If you wish to install a port not
 	    included on the CDROM, you will need to be online in order to
 	    do so (see the <link linkend="ports-inet">next
@@ -270,10 +270,10 @@ R-deps: XFree86-3.3.5 gettext-0.10.35 giflib-4.1.0 glib-1.2.6 gtk-1.2.6 imlib-1.
 	  you will need to do the <link linkend="ports-cd">CDROM
 	  installation</link>.</para>
 
-        <para>Installing a port from the Internet is done exactly the same 
+        <para>Installing a port from the Internet is done exactly the same
 	  way as it would be if you were installing from a CDROM.  The
 	  only difference between the two is that the program's source
-	  code is downloaded from the Internet instead of pulled from the 
+	  code is downloaded from the Internet instead of pulled from the
 	  CDROM.</para>
 
         <para>The steps involved are identical:</para>
@@ -1027,23 +1027,23 @@ ade game.</screen>
 #
 # &dollar;FreeBSD&dollar;
 #
-       
+
 DISTNAME=      oneko-1.1b
 CATEGORIES=    games
 MASTER_SITES=  ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/
-       
+
 MAINTAINER=    asami@FreeBSD.org
-       
+
 MAN1=          oneko.1
 MANCOMPRESSED= yes
 USE_IMAKE=     yes
-       
+
 .include &lt;bsd.port.mk&gt;</programlisting>
 
         <para>See if you can figure it out.  Do not worry about the contents
-          of the <literal>&dollar;FreeBSD&dollar;</literal> line, it will be filled in
-          automatically by CVS when the port is imported to our main ports
-          tree.  You can find a more detailed example in the <link
+          of the <literal>&dollar;FreeBSD&dollar;</literal> line, it will be
+          filled in automatically by CVS when the port is imported to our main
+          ports tree.  You can find a more detailed example in the <link
             linkend="porting-samplem">sample Makefile</link> section.</para>
       </sect3>
 
@@ -1098,7 +1098,7 @@ the screen.
  :
 (etc.)
 
-WWW: http://www.oneko.org/            
+WWW: http://www.oneko.org/
 
 - Satoshi
 asami@cs.berkeley.edu</programlisting>
@@ -2468,14 +2468,14 @@ Options:
 --- ./man/vip.texi.org  Fri Jun 16 15:31:11 1995
 +++ ./man/vip.texi      Tue May 20 01:28:33 1997
 @@ -2,6 +2,10 @@
-             
+
  @setfilename ../info/vip
  @settitle VIP
 +@dircategory The Emacs editor and associated tools
 +@direntry
 +* VIP: (vip).          A VI-emulation for Emacs.
 +@end direntry
-             
+
  @iftex
  @finalout
  :</programlisting>
@@ -2532,7 +2532,7 @@ Options:
  # and you cannot remake them without installing Emacs first.
 -SUBDIR = lib-src src
 +SUBDIR = lib-src src man
- 
+
  # The makefiles of the directories in $SUBDIR.
  SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile
  lwlib/Makefile
@@ -2541,10 +2541,10 @@ Options:
 @@ -66,6 +66,7 @@
  ${srcdir}/gnu1.texi \
  ${srcdir}/glossary.texi
-             
+
 +all: info
  info: $(INFO_TARGETS)
-             
+
  dvi: $(DVI_TARGETS)</programlisting>
 
           <para>The second hunk was necessary because the default target in
@@ -2576,7 +2576,7 @@ Options:
 -            else mv -f dir dir.bak; fi; \
 -          fi; \
            cd ${srcdir}/info ; \
--          (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); 
+-          (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir);
 \
 -          (cd $${thisdir}; chmod a+r ${infodir}/dir); \
            for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \
@@ -2637,7 +2637,7 @@ diff -u -r1.26 Makefile
 +.for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode
 +       install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 +.endfor
-             
+
  .include &lt;bsd.port.mk&gt;</programlisting>
         </step>
 
@@ -3996,7 +3996,7 @@ not be changed when upgrading the port later.]
 when it is committed to our repository.  If upgrading a port, do not alter
 this line back to "&dollar;FreeBSD&dollar;".  CVS deals with it automatically.]
 #
-       
+
 [section to describe the port itself and the master site - DISTNAME
  is always first, followed by PKGNAME (if necessary), CATEGORIES,
  and then MASTER_SITES, which can be followed by MASTER_SITE_SUBDIR.
@@ -4004,28 +4004,28 @@ this line back to "&dollar;FreeBSD&dollar;".  CVS deals with it automatically.]
 DISTNAME=      xdvi
 PKGNAME=       xdvi-pl18
 CATEGORIES=    print
-[do not forget the trailing slash ("/")! 
+[do not forget the trailing slash ("/")!
  if you are not using MASTER_SITE_* macros]
 MASTER_SITES=  ${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR= applications
 [set this if the source is not in the standard ".tar.gz" form]
 EXTRACT_SUFX=  .tar.Z
-       
+
 [section for distributed patches -- can be empty]
 PATCH_SITES=   ftp://ftp.sra.co.jp/pub/X11/japanese/
 PATCHFILES=    xdvi-18.patch1.gz xdvi-18.patch2.gz
-       
+
 [maintainer; *mandatory*!  This is the person (preferably with commit
  privileges) who a user can contact for questions and bug reports - this
  person should be the porter or someone who can forward questions to the
  original porter reasonably promptly.  If you really do not want to have
  your address here, set it to "ports@FreeBSD.org".]
 MAINTAINER=    asami@FreeBSD.org
-       
+
 [dependencies -- can be empty]
 RUN_DEPENDS=   gs:${PORTSDIR}/print/ghostscript
 LIB_DEPENDS=   Xpm.5:${PORTSDIR}/graphics/xpm
-       
+
 [this section is for other standard bsd.port.mk variables that do not
  belong to any of the above]
 [If it asks questions during configure, build, install...]
@@ -4042,20 +4042,20 @@ USE_GMAKE=     yes
 [If it is an X application and requires "xmkmf -a" to be run...]
 USE_IMAKE=     yes
 [et cetera.]
-       
+
 [non-standard variables to be used in the rules below]
 MY_FAVORITE_RESPONSE=  "yeah, right"
-       
+
 [then the special rules, in the order they are called]
 pre-fetch:
         i go fetch something, yeah
-       
+
 post-patch:
         i need to do something after patch, great
-       
+
 pre-install:
         and then some more stuff before installing, wow
-       
+
 [and then the epilogue]
 .include &lt;bsd.port.mk&gt;</programlisting>
     </sect2>
@@ -4749,8 +4749,8 @@ pre-install:
      mode: sgml
      sgml-declaration: "../chapter.decl"
      sgml-indent-data: t
-     sgml-omittag: nil 
-     sgml-always-quote-attributes: t 
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
      sgml-parent-document: ("../book.sgml" "part" "chapter")
-     End: 
+     End:
 -->