Attachment 50045 Details for Bug 76324 – handbook.patch

[patch] handbook.patch

handbook.patch (text/plain), 33.70 KB, created by Siebrand Mazeland on 2005-01-16 23:00:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Siebrand Mazeland

Created: 2005-01-16 23:00:49 UTC

Size: 33.70 KB

patch

obsolete

>Index: en_US.ISO8859-1/books/handbook/basics/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml,v
>retrieving revision 1.134
>diff -u -r1.134 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/basics/chapter.sgml	12 Jan 2005 15:44:55 -0000	1.134
>+++ en_US.ISO8859-1/books/handbook/basics/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -774,7 +774,7 @@
> 	    
> 	    <row>
> 	      <entry><filename class="directory">/usr/ports</filename></entry>
>-	      <entry>The FreeBSD ports collection (optional).</entry>
>+	      <entry>The FreeBSD Ports Collection (optional).</entry>
> 	    </row>
> 	    
> 	    <row>
>@@ -2132,7 +2132,7 @@
>     <para>A lot of configuration in FreeBSD is done by editing text files.
>       Because of this, it would be a good idea to become familiar
>       with a text editor.  FreeBSD comes with a few as part of the base
>-      system, and many more are available in the ports collection.</para>
>+      system, and many more are available in the Ports Collection.</para>
> 
>     <indexterm>
>       <primary><command>ee</command></primary>
>Index: en_US.ISO8859-1/books/handbook/config/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v
>retrieving revision 1.198
>diff -u -r1.198 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/config/chapter.sgml	14 Jan 2005 12:51:52 -0000	1.198
>+++ en_US.ISO8859-1/books/handbook/config/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -335,7 +335,7 @@
>     <indexterm><primary>services</primary></indexterm>
> 
>     <para>Many users choose to install third party software on &os;
>-      from the ports collection.  In many of these situations it
>+      from the Ports Collection.  In many of these situations it
>       may be necessary to configure the software in a manner which
>       will allow it to be started upon system initialization.  Services,
>       such as <filename role="package">mail/postfix</filename> or
>@@ -484,7 +484,7 @@
>       <para>Other services, such as <acronym>POP</acronym>3 server
> 	daemons, <acronym>IMAP</acronym>, etc. could be started using
> 	the &man.inetd.8;.  This involves installing the service
>-	utility from the ports collection with a configuration line
>+	utility from the Ports Collection with a configuration line
> 	appended to the <filename>/etc/inetd.conf</filename> file,
> 	or uncommenting one of the current configuration lines.  Working
> 	with <application>inetd</application> and its configuration is
>Index: en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v
>retrieving revision 1.46
>diff -u -r1.46 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/desktop/chapter.sgml	12 Jan 2005 23:56:24 -0000	1.46
>+++ en_US.ISO8859-1/books/handbook/desktop/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -25,14 +25,14 @@
>       collection.  Many new users expect to find these kinds of
>       applications on their desktop.  This chapter will show you how
>       to install some popular desktop applications effortlessly,
>-      either from their packages or from the ports collection.</para>
>+      either from their packages or from the Ports Collection.</para>
> 
>     <para>Note that when installing programs from the ports, they are
>       compiled from source.  This can take a very long time, depending
>       on what you are compiling and the processing power of your
>       machine(s).  If building from source takes a prohibitively long
>       amount of time for you, you can install most of the programs of
>-      the ports collection from pre-built packages.</para>
>+      the Ports Collection from pre-built packages.</para>
> 
>     <para>As FreeBSD features Linux binary compatibility, many
>       applications originally developed for Linux are available for
>@@ -109,7 +109,7 @@
>     <para>FreeBSD does not come with a particular browser
>       pre-installed.  Instead, the
>       <ulink url="http://www.FreeBSD.org/ports/www.html">www</ulink>
>-      directory of the ports collection contains a lot of browsers
>+      directory of the Ports Collection contains a lot of browsers
>       ready to be installed.  If you do not have time to compile
>       everything (this can take a very long time in some cases) many
>       of them are available as packages.</para>
>@@ -120,7 +120,7 @@
>       how to set up these complete desktops.</para>
> 
>     <para>If you are looking for light-weight browsers, you should
>-      investigate the ports collection for
>+      investigate the Ports Collection for
>       <filename role="package">www/dillo</filename>,
>       <filename role="package">www/links</filename>, or
>       <filename role="package">www/w3m</filename>.</para>
>@@ -321,7 +321,7 @@
> 	<primary><application>Netscape</application></primary>
>       </indexterm>
> 
>-      <para>The ports collection contains several versions of the
>+      <para>The Ports Collection contains several versions of the
>         &netscape; browser.  Since the native FreeBSD ones contain a
>         serious security bug, installing them is strongly
>         discouraged.  Instead, use a more recent Linux or DIGITAL UNIX
>@@ -329,7 +329,7 @@
> 
>       <para>The latest stable release of the &netscape; browser is
>         <application>&netscape; 7</application>.  It can be installed
>-        from the ports collection:</para>
>+        from the Ports Collection:</para>
> 
>       <screen>&prompt.root; <userinput>cd /usr/ports/www/netscape7</userinput>
> &prompt.root; <userinput>make install clean</userinput></screen>
>@@ -367,7 +367,7 @@
>       <screen>&prompt.root; <userinput>pkg_add -r opera</userinput></screen>
> 
>       <para>Some FTP sites do not have all the packages, but the same
>-        result can be obtained with the ports collection by
>+        result can be obtained with the Ports Collection by
>         typing:</para>
> 
>       <screen>&prompt.root; <userinput>cd /usr/ports/www/opera</userinput>
>@@ -402,7 +402,7 @@
> 
>       <screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen>
> 
>-      <para>You can also use the ports collection if you
>+      <para>You can also use the Ports Collection if you
>          prefer to compile from source code:</para>
> 
>       <screen>&prompt.root; <userinput>cd /usr/ports/www/firefox</userinput>
>@@ -544,7 +544,7 @@
>       <screen>&prompt.root; <userinput>pkg_add -r AbiWord2</userinput></screen>
> 
>       <para>If the package is not available, it can be compiled from
>-        the ports collection.  The ports collection should be more
>+        the Ports Collection.  The Ports Collection should be more
>         up to date.  It can be done as follows:</para>
> 
>       <screen>&prompt.root; <userinput>cd /usr/ports/editors/AbiWord2</userinput>
>@@ -572,9 +572,9 @@
>       <screen>&prompt.root; <userinput>pkg_add -r gimp</userinput></screen>
> 
>       <para>If your FTP site does not have this package, you can use
>-        the ports collection.  The
>+        the Ports Collection.  The
>         <ulink url="http://www.FreeBSD.org/ports/graphics.html">graphics</ulink>
>-        directory of the ports collection also contains
>+        directory of the Ports Collection also contains
>         <application>The Gimp Manual</application>.  Here is how to
>         get them installed:</para>
> 
>@@ -586,7 +586,7 @@
>       <note>
>         <para>The
>           <ulink url="http://www.FreeBSD.org/ports/graphics.html">graphics</ulink>
>-          directory of the ports collection holds the development
>+          directory of the Ports Collection holds the development
>           version of <application>The GIMP</application> in
>           <filename role="package">graphics/gimp-devel</filename>.
>           An HTML version of
>@@ -878,7 +878,7 @@
>       <screen>&prompt.root; <userinput>pkg_add -r acroread</userinput></screen>
> 
>       <para>As usual, if the package is not available or you want the
>-        latest version, you can use the ports collection as
>+        latest version, you can use the Ports Collection as
>         well:</para>
> 
>       <screen>&prompt.root; <userinput>cd /usr/ports/print/acroread5</userinput>
>@@ -942,7 +942,7 @@
>       <screen>&prompt.root; <userinput>pkg_add -r xpdf</userinput></screen>
> 
>       <para>If the package is not available or you prefer to use the
>-        ports collection, do:</para>
>+        Ports Collection, do:</para>
> 
>       <screen>&prompt.root; <userinput>cd /usr/ports/graphics/xpdf</userinput>
> &prompt.root; <userinput>make install clean</userinput></screen>
>@@ -972,7 +972,7 @@
>       <screen>&prompt.root; <userinput>pkg_add -r gqview</userinput></screen>
> 
>       <para>If the package is not available or you prefer to use the
>-        ports collection, do:</para>
>+        Ports Collection, do:</para>
> 
>       <screen>&prompt.root; <userinput>cd /usr/ports/graphics/gqview</userinput>
> &prompt.root; <userinput>make install clean</userinput></screen>
>Index: en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml,v
>retrieving revision 1.164
>diff -u -r1.164 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/eresources/chapter.sgml	12 Jan 2005 01:55:04 -0000	1.164
>+++ en_US.ISO8859-1/books/handbook/eresources/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -396,7 +396,7 @@
> 
> 	    <row>
> 	      <entry>&a.ports.name;</entry>
>-	      <entry>Discussion of the ports collection</entry>
>+	      <entry>Discussion of the Ports Collection</entry>
> 	    </row>
> 
> 	    <row>
>Index: en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml,v
>retrieving revision 1.15
>diff -u -r1.15 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml	12 Jan 2005 01:55:04 -0000	1.15
>+++ en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -195,7 +195,7 @@
> 
>     <para>As of July 2003 the OpenBSD firewall software application
>       known as <acronym>PF</acronym> was ported to &os; and was made
>-      available in the &os; ports collection; the first release that
>+      available in the &os; Ports Collection; the first release that
>       contained <acronym>PF</acronym> as an integrated part of the
>       base system was &os;&nbsp;5.3 in November 2004.
>       <acronym>PF</acronym> is a complete, fully featured firewall
>@@ -207,7 +207,7 @@
>       just be duplicated effort.</para>
> 
>     <para>For older 5.X version of &os; you can find
>-      <acronym>PF</acronym> in the &os; ports collection here:
>+      <acronym>PF</acronym> in the &os; Ports Collection here:
>       <filename role="package">security/pf</filename>.</para>
> 
>     <para>More info can be found at the PF for &os; web site: <ulink
>@@ -218,7 +218,7 @@
> 
>     <warning>
>       <para>PF in &os; 5.X is at the level of OpenBSD version 3.5. The
>-        port from the &os; ports collection is at the level of OpenBSD
>+        port from the &os; Ports Collection is at the level of OpenBSD
>         version 3.4. Keep that in mind when browsing the user's
>         guide.</para>
>     </warning>
>Index: en_US.ISO8859-1/books/handbook/install/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v
>retrieving revision 1.317
>diff -u -r1.317 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/install/chapter.sgml	12 Jan 2005 23:56:24 -0000	1.317
>+++ en_US.ISO8859-1/books/handbook/install/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -2258,7 +2258,7 @@
>       <para>After selecting the desired distribution, an opportunity to
> 	install the FreeBSD Ports Collection is presented.  The ports
> 	collection is an easy and convenient way to install software.
>-	The ports collection does not contain the source code necessary
>+	The Ports Collection does not contain the source code necessary
> 	to compile the software.  Instead, it is a collection of files which
> 	automates the downloading, compiling and installation
> 	of third-party software packages.
>@@ -2273,7 +2273,7 @@
> 	of FreeBSD.</para>
> 
> <screen>                         User Confirmation Requested
>- Would you like to install the FreeBSD ports collection? 
>+ Would you like to install the FreeBSD Ports Collection? 
> 
>  This will give you ready access to over &os.numports; ported software packages,
>  at a cost of around &ports.size; of disk space when "clean" and possibly much
>@@ -2282,17 +2282,17 @@
>  available and can mount it on /cdrom, in which case this is far less
>  of a problem). 
> 
>- The ports collection is a very valuable resource and well worth having
>+ The Ports Collection is a very valuable resource and well worth having
>  on your /usr partition, so it is advisable to say Yes to this option. 
> 
>- For more information on the ports collection & the latest ports,
>+ For more information on the Ports Collection & the latest ports,
>  visit: 
>      http://www.FreeBSD.org/ports  
> 
>                               [ Yes ]     No</screen>
> 
>       <para>Select &gui.yes; with the arrow keys to
>-	install the ports collection or &gui.no; to
>+	install the Ports Collection or &gui.no; to
> 	skip this option.  Press <keycap>Enter</keycap> to continue.
> 	The Choose Distributions menu will redisplay.</para>
> 
>@@ -3566,7 +3566,7 @@
>       <para>The next option is the <acronym>PCNFSD</acronym> selection.
> 	This option will install the
> 	<filename role="package">net/pcnfsd</filename> package from
>-	the ports collection.  This is a useful utility which provides
>+	the Ports Collection.  This is a useful utility which provides
> 	<acronym>NFS</acronym> authentication services for systems which
> 	are unable to provide their own, such as Microsoft's
> 	&ms-dos; operating system.</para>
>@@ -4217,7 +4217,7 @@
> 	large suite of software.  Some require only minimal disk space and
> 	low memory while others with more features require much more.  The
> 	best way to determine which is most suitable for you is to try a few
>-	different ones.  Those are available from the ports collection or as
>+	different ones.  Those are available from the Ports Collection or as
> 	packages and can be added after installation.</para>
> 
>       <para>You can select one of the popular desktops to be installed
>Index: en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml,v
>retrieving revision 1.106
>diff -u -r1.106 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/introduction/chapter.sgml	11 Jan 2005 12:34:27 -0000	1.106
>+++ en_US.ISO8859-1/books/handbook/introduction/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -881,11 +881,11 @@
>         sought-after programs.  At the time of this printing, there
>         were over &os.numports; ports!  The list of ports ranges from
>         http (WWW) servers, to games, languages, editors, and almost
>-        everything in between.  The entire ports collection requires
>+        everything in between.  The entire Ports Collection requires
>         approximately &ports.size; of storage, all ports being expressed as
>         <quote>deltas</quote> to their original sources.  This makes
>         it much easier for us to update ports, and greatly reduces the
>-        disk space demands made by the older 1.0 ports collection.  To
>+        disk space demands made by the older 1.0 Ports Collection.  To
>         compile a port, you simply change to the directory of the
>         program you wish to install, type <command>make
>         install</command>, and let the system do the rest.  The full
>Index: en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v
>retrieving revision 1.153
>diff -u -r1.153 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml	14 Jan 2005 17:04:36 -0000	1.153
>+++ en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -876,7 +876,7 @@
>     <programlisting>options 	     _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions</programlisting>
> 
>     <para>Real-time extensions added in the 1993 &posix;.  Certain
>-      applications in the ports collection use these
>+      applications in the Ports Collection use these
>       (such as <application>&staroffice;</application>).</para>
> 
>     <programlisting>options          KBD_INSTALL_CDEV  # install a CDEV entry in /dev</programlisting>
>Index: en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml,v
>retrieving revision 1.109
>diff -u -r1.109 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/l10n/chapter.sgml	11 Jan 2005 12:34:28 -0000	1.109
>+++ en_US.ISO8859-1/books/handbook/l10n/chapter.sgml	16 Jan 2005 22:40:03 -0000
>@@ -169,7 +169,7 @@
> 	implementation, users may be required to compile an application
> 	with wide or multibyte characters support, or configure it correctly.
> 	To be able to input and process wide or multibyte characters, the <ulink 
>-	url="&url.base;/ports/index.html">FreeBSD Ports collection</ulink> has provided
>+	url="&url.base;/ports/index.html">FreeBSD Ports Collection</ulink> has provided
> 	each language with different programs.  Refer to the I18N
> 	documentation in the respective FreeBSD Port.</para>
> 
>Index: en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v
>retrieving revision 1.122
>diff -u -r1.122 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml	13 Jan 2005 16:01:34 -0000	1.122
>+++ en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -150,11 +150,11 @@
> 
>       <sect3 id="linuxemu-libs-port">
> 	<title>Installing Using the linux_base Port</title>
>-	<indexterm><primary>ports collection</primary></indexterm>
>+	<indexterm><primary>Ports Collection</primary></indexterm>
> 
> 	<para>This is by far the easiest method to use when installing the
> 	  runtime libraries.  It is just like installing any other port
>-	  from the <ulink type="html" url="file://localhost/usr/ports/">ports collection</ulink>.
>+	  from the <ulink type="html" url="file://localhost/usr/ports/">Ports Collection</ulink>.
> 	  Simply do the following:</para>
> 
> 	<screen>&prompt.root; <userinput>cd /usr/ports/emulators/linux_base</userinput>
>@@ -937,10 +937,10 @@
>       <title>Installing the Linux Environment</title>
> 
>       <para>Make sure you have both <filename role='package'>emulators/linux_base</filename> and
>-	<filename role='package'>devel/linux_devtools</filename> from the ports collection
>+	<filename role='package'>devel/linux_devtools</filename> from the Ports Collection
> 	installed.  If you run into difficulties with these ports,
> 	you may have to use
>-	the packages or older versions available in the ports collection.</para>
>+	the packages or older versions available in the Ports Collection.</para>
> 
>       <para>If you want to run the intelligent agent, you will
> 	also need to install the Red Hat Tcl package:
>Index: en_US.ISO8859-1/books/handbook/mail/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml,v
>retrieving revision 1.125
>diff -u -r1.125 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/mail/chapter.sgml	11 Jan 2005 12:34:28 -0000	1.125
>+++ en_US.ISO8859-1/books/handbook/mail/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -1533,7 +1533,7 @@
>       install a retrieval agent.  The
>       <application>fetchmail</application> utility is a good choice as
>       it supports many different protocols.  This program is available
>-      as a package or from the ports collection (<filename
>+      as a package or from the Ports Collection (<filename
>       role="package">mail/fetchmail</filename>).  Usually, your <acronym>ISP</acronym> will
>       provide <acronym>POP</acronym>. If you are using user <acronym>PPP</acronym>, you can
>       automatically fetch your mail when an Internet connection is
>Index: en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v
>retrieving revision 1.374
>diff -u -r1.374 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml	12 Jan 2005 23:56:25 -0000	1.374
>+++ en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -430,8 +430,8 @@
> 
> 	<para><xref linkend="cvs-tags"> contains revision tags that users
>  	  might be interested
>-	  in.  Again, none of these are valid for the ports collection
>-	  since the ports collection does not have multiple
>+	  in.  Again, none of these are valid for the Ports Collection
>+	  since the Ports Collection does not have multiple
> 	  revisions.</para>
> 
> 	<para>When you specify a branch tag, you normally receive the
>@@ -1094,7 +1094,7 @@
> 	    (<literal>RELENG_4</literal> will become
> 	    <literal>tag=RELENG_4</literal>).
> 	    Keep in mind that only the <literal>tag=.</literal> is
>-	    relevant for the ports collection.</para>
>+	    relevant for the Ports Collection.</para>
> 
> 	  <warning>
> 	    <para>Be very careful to type the tag name exactly as shown.
>@@ -1257,7 +1257,7 @@
>        <filename>www</filename> trees &mdash; most people cannot read four or five
>        languages, and therefore they do not need to download the
>        language-specific files. If you are
>-       <application>CVSup</application>ing the ports collection, you
>+       <application>CVSup</application>ing the Ports Collection, you
>        can get around this by specifying each collection individually
>        (e.g., <emphasis>ports-astrology</emphasis>,
>        <emphasis>ports-biology</emphasis>, etc instead of simply
>Index: en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v
>retrieving revision 1.56
>diff -u -r1.56 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml	12 Jan 2005 23:56:25 -0000	1.56
>+++ en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -2735,7 +2735,7 @@
> 	    FreeBSD, and so you will need to install the
> 	    <filename role="package">net/isc-dhcp3-server</filename>
> 	    port to provide this service.  See <xref linkend="ports"> for
>-	    more information on using the ports collection.</para>
>+	    more information on using the Ports Collection.</para>
> 	</sect3>
> 
> 	<sect3>
>Index: en_US.ISO8859-1/books/handbook/ports/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v
>retrieving revision 1.237
>diff -u -r1.237 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/ports/chapter.sgml	13 Jan 2005 15:48:00 -0000	1.237
>+++ en_US.ISO8859-1/books/handbook/ports/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -301,7 +301,7 @@
> 
>       <listitem>
> 	<para>Yet another way to find a particular port is by using the
>-        ports collection's built-in search mechanism.  To use the
>+        Ports Collection's built-in search mechanism.  To use the
>         search feature, you will need to be in the
>         <filename>/usr/ports</filename> directory.  Once in that
>         directory, run <command>make search
>@@ -519,7 +519,7 @@
> 
>         <row><entry>?</entry><entry>The installed package cannot be
> 	  found in the ports index.  (This can happen, for instance, if an
>-	  installed port is removed from the ports collection or
>+	  installed port is removed from the Ports Collection or
> 	  renamed.)</entry></row>
> 
>         <row><entry>*</entry><entry>There are multiple versions of the
>@@ -560,21 +560,21 @@
>     <title>Using the Ports Collection</title>
> 
>     <para>The following sections provide basic instructions on using the
>-      ports collection to install or remove programs from your
>+      Ports Collection to install or remove programs from your
>       system.</para>
> 
>     <sect2 id="ports-tree">
>       <title>Obtaining the Ports Collection</title>
> 
>       <para>Before you can install ports, you must first obtain the
>-	ports collection&mdash;which is essentially a set of
>+	Ports Collection&mdash;which is essentially a set of
> 	<filename>Makefiles</filename>, patches, and description files
> 	placed in <filename>/usr/ports</filename>.
>       </para>
> 
>       <para>When installing your FreeBSD system,
> 	<application>sysinstall</application> asked if you would like
>-	to install the ports collection.  If you chose no, you can
>+	to install the Ports Collection.  If you chose no, you can
> 	follow these instructions to obtain the ports
> 	collection:</para>
> 
>@@ -583,7 +583,7 @@
> 
> 	<para>This method involves using
> 	  <application>sysinstall</application> again to manually
>-	  install the ports collection.</para>
>+	  install the Ports Collection.</para>
> 
> 	<step>
> 	  <para>As <username>root</username>, run
>@@ -643,7 +643,7 @@
>       <procedure>
> 	<title>CVSup Method</title>
> 
>-	<para>This is a quick method for getting the ports collection
>+	<para>This is a quick method for getting the Ports Collection
> 	  using <application>CVSup</application>.  If you want to keep
> 	  your ports tree up to date, or learn more about
> 	  <application>CVSup</application>, read the previously
>@@ -684,7 +684,7 @@
> 
> 	<step>
> 	  <para>Running this command later will download and apply all
>-	    the recent changes to your ports collection, except
>+	    the recent changes to your Ports Collection, except
> 	    actually rebuilding the ports for your own system.</para>
> 	</step>
>       </procedure>
>@@ -698,7 +698,7 @@
>         <secondary>installing</secondary>
>       </indexterm>
>       <para>The first thing that should be explained when it comes to
>-        the ports collection is what is actually meant by a
>+        the Ports Collection is what is actually meant by a
>         <quote>skeleton</quote>.  In a nutshell, a port skeleton is a
>         minimal set of files that tell your FreeBSD system how to
>         cleanly compile and install a program.  Each port skeleton
>@@ -772,14 +772,14 @@
> 
>       <warning>
> 	<para>Before installing any port, you should be sure to have
>-	  an up-to-date ports collection and you should check <ulink
>+	  an up-to-date Ports Collection and you should check <ulink
> 	  url="http://vuxml.freebsd.org/"></ulink> for security issues
> 	  related to your port.</para>
> 
> 	<para>A security vulnerabilities check can be automatically
> 	  done by <application>portaudit</application> before any new
> 	  application installation.  This tool can be found in the
>-	  ports collection (<filename
>+	  Ports Collection (<filename
> 	  role="package">security/portaudit</filename>).  Consider
> 	  running <command>portaudit -F</command> before installing a
> 	  new port, to fetch the current vulnerabilities database.  A
>@@ -1100,7 +1100,7 @@
>         <primary>ports</primary>
>         <secondary>disk-space</secondary>
>       </indexterm>
>-      <para>Using the ports collection will use up disk
>+      <para>Using the Ports Collection will use up disk
> 	space over time.  Because of this tendency of the ports tree to grow in size,
> 	after building and installing software from the ports,
> 	you should always remember to clean up
>@@ -1130,7 +1130,7 @@
> 	<secondary>upgrading</secondary>
>       </indexterm>
>       <note>
>-	<para>Once you updated your ports collection, before
>+	<para>Once you updated your Ports Collection, before
> 	  attempting a port upgrade, you should check the
> 	  <filename>/usr/ports/UPDATING</filename> file.  This file
> 	  describes various issues and additional steps users may
>Index: en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml,v
>retrieving revision 1.145
>diff -u -r1.145 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml	13 Jan 2005 16:06:58 -0000	1.145
>+++ en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -2100,7 +2100,7 @@
>       <para>As a last resort, you could try the method suggested by the
> 	<ulink url="http://www.roaringpenguin.com/pppoe/">Roaring Penguin
> 	PPPoE</ulink> program which can be found in the <link
>-	linkend="ports">ports collection</link>.  Bear in mind however,
>+	linkend="ports">Ports Collection</link>.  Bear in mind however,
> 	this may de-program your modem and render it useless, so
> 	think twice before doing it.  Simply install the program shipped
> 	with the modem by your provider.  Then, access the
>@@ -2189,7 +2189,7 @@
> 	with the base system of FreeBSD.</para>
> 
>       <para>To install the software, simply use the <link
>-	  linkend="ports">ports collection</link>. Install the
>+	  linkend="ports">Ports Collection</link>. Install the
> 	<filename role="package">net/pppoa</filename> port and follow the
> 	instructions provided with it.</para>
> 
>@@ -2236,7 +2236,7 @@
> 
>       <para>You can use <application>mpd</application> to connect to a
>         variety of services, in particular PPTP services. You can find
>-        <application>mpd</application> in the ports collection,
>+        <application>mpd</application> in the Ports Collection,
>         <filename role="package">net/mpd</filename>.  Many ADSL modems
>         require that a PPTP tunnel is created between the modem and
>         computer, one such modem is the Alcatel &speedtouch;
>Index: en_US.ISO8859-1/books/handbook/printing/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v
>retrieving revision 1.92
>diff -u -r1.92 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/printing/chapter.sgml	11 Jan 2005 12:34:28 -0000	1.92
>+++ en_US.ISO8859-1/books/handbook/printing/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -1864,7 +1864,7 @@
>           <command>lprps</command>, just specify the pathname to the
>           <command>psif</command> program that is part of
>           <command>lprps</command>.  If you installed <command>lprps</command>
>-          from the ports collection, use the following in the serial
>+          from the Ports Collection, use the following in the serial
>           &postscript; printer's entry in
>           <filename>/etc/printcap</filename>:</para>
>               
>Index: en_US.ISO8859-1/books/handbook/security/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v
>retrieving revision 1.259
>diff -u -r1.259 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/security/chapter.sgml	12 Jan 2005 23:56:25 -0000	1.259
>+++ en_US.ISO8859-1/books/handbook/security/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -1732,7 +1732,7 @@
>         code from the USA.</para>
> 
>       <para>Alternatively, the MIT implementation of Kerberos is
>-        available from the ports collection as
>+        available from the Ports Collection as
>         <filename role="package">security/krb5</filename>.</para>
>     </sect2>
> 
>@@ -2980,7 +2980,7 @@
>       <application>OpenSSL</application>.</para>
> 
>     <note>
>-      <para>In most cases the ports collection will attempt to build
>+      <para>In most cases the Ports Collection will attempt to build
> 	the <filename role="package">security/openssl</filename> port
> 	unless the <makevar>WITH_OPENSSL_BASE</makevar> make variable
> 	is explicitly set to <quote>yes</quote>.</para>
>@@ -4701,7 +4701,7 @@
> 	    contributed to the &os; Project, such as
> 	    <application>sendmail</application>.  Finally the <literal>ports</literal>
> 	    category indicates that the vulnerability affects add on
>-	    software available as part of the ports collection.</para>
>+	    software available as part of the Ports Collection.</para>
> 	</callout>
> 
> 	<callout arearefs="co-module">
>Index: en_US.ISO8859-1/books/handbook/x11/chapter.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v
>retrieving revision 1.161
>diff -u -r1.161 chapter.sgml
>--- en_US.ISO8859-1/books/handbook/x11/chapter.sgml	12 Jan 2005 23:56:25 -0000	1.161
>+++ en_US.ISO8859-1/books/handbook/x11/chapter.sgml	16 Jan 2005 22:36:35 -0000
>@@ -325,10 +325,10 @@
>       <application>&xfree86&nbsp;4.4RC2</application> and X11R6.6.
>       The X.Org Foundation released X11R6.7 in April 2004 and
>       X11R6.8.1 in September 2004, this latter is the version
>-      currently available in the &os; ports collection.</para>
>+      currently available in the &os; Ports Collection.</para>
> 
>     <para>To build and install <application>&xorg;</application> from the
>-      ports collection:</para>
>+      Ports Collection:</para>
> 
>     <screen>&prompt.root; <userinput>cd /usr/ports/x11/xorg</userinput>
> &prompt.root; <userinput>make install clean</userinput></screen>
>@@ -340,7 +340,7 @@
>     </note>
> 
>     <para>To build and install <application>&xfree86;</application>
>-      from the ports collection:</para>
>+      from the Ports Collection:</para>
> 
>     <screen>&prompt.root; <userinput>cd /usr/ports/x11/XFree86-4</userinput>
> &prompt.root; <userinput>make install clean</userinput></screen>
>@@ -1518,7 +1518,7 @@
>           Configuration</quote> menu during the FreeBSD installation
> 	  process as described in <xref linkend="default-desktop"> of Chapter
> 	  2.  Once again, the software can be easily installed from a package
>-	  or from the ports collection:</para>
>+	  or from the Ports Collection:</para>
> 
>         <para>To install the <application>KDE</application> package
>           from the network, simply type:</para>

Actions: View | Diff

Attachments on bug 76324: 50045