docs/76932: [PATCH] faq updates and fixes

[Jesus R. Camou]

>Number:         76932
>Category:       docs
>Synopsis:       [PATCH] faq updates and fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 01 00:30:22 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Jesus R. Camou
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD opensea.cox.net 4.11-STABLE FreeBSD 4.11-STABLE #4: Sun Jan 30 06:26:38 MST 2005 root at opensea.cox.net:/usr/obj/usr/src/sys/OPENSEA i386


>Description:

The following patch:

	o Bump copyright year
	o Correction: 4.11-RELEASE is not the lastest
	  release of the 5-STABLE branch.
	o Change the following words:
		favourite -> favorite
		colour -> colour (US English spelling)
		categorised -> categorrized
		practise -> practice

>How-To-Repeat:

>Fix:

--- faqupdate.diff begins here ---
Index: book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/faq/book.sgml,v
retrieving revision 1.681
diff -u -r1.681 book.sgml
--- book.sgml	6 Jan 2005 17:11:07 -0000	1.681
+++ book.sgml	31 Jan 2005 15:01:06 -0000
@@ -23,6 +23,7 @@
       <year>2002</year>
       <year>2003</year>
       <year>2004</year>
+      <year>2005</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
@@ -525,7 +526,7 @@
 
           <itemizedlist>
             <listitem>
-              <para>The latest release, &rel.current;-RELEASE can be
+              <para>The latest 5-STABLE release, &rel.current;-RELEASE can be
                 found in the <ulink
                 url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">&rel.current;-RELEASE directory</ulink>.</para>
             </listitem>
@@ -540,7 +541,7 @@
             </listitem>
 
             <listitem>
-              <para>The latest 5-STABLE release, &rel2.current;-RELEASE can be
+              <para>The latest 4-STABLE release, &rel2.current;-RELEASE can be
                 found in the <ulink
                 url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/">&rel2.current;-RELEASE directory</ulink>.</para>
             </listitem>
@@ -6470,8 +6471,8 @@
             pathname, simply press <literal>ENTER</literal>, and run
             <command>mount /</command> to re-mount the root filesystem in
             read/write mode. You may also need to run <command>mount -a -t
-            ufs</command> to mount the filesystem where your favourite
-            editor is defined. If your favourite editor is on a network
+            ufs</command> to mount the filesystem where your favorite
+            editor is defined. If your favorite editor is on a network
             filesystem, you will need to either configure the network
             manually before you can mount network filesystems, or use an
             editor which resides on a local filesystem, such as
@@ -11436,7 +11437,7 @@
             fractional second arguments, &a.phk; posted a long
             message entitled <quote><ulink
             url="http://www.FreeBSD.org/cgi/getmsg.cgi?fetch=506636+517178+/usr/local/www/db/text/1999/freebsd-hackers/19991003.freebsd-hackers">A bike
-            shed (any colour will do) on greener grass...</ulink></quote>.
+            shed (any color will do) on greener grass...</ulink></quote>.
             The appropriate portions of that message are quoted
             below.</para>
 
@@ -11705,12 +11706,12 @@
 	  <para><emphasis>Paul Robinson adds:</emphasis></para>
 
 	  <para>There are other methods. As every good sysadmin knows,
-            it is part of standard practise to send data to the screen
+            it is part of standard practice to send data to the screen
             of interesting variety to keep all the pixies that make up
             your picture happy. Screen pixies (commonly mis-typed or
-            re-named as <quote>pixels</quote> are categorised by the type of hat
+            re-named as <quote>pixels</quote> are categorized by the type of hat
             they wear (red, green or blue) and will hide or appear
-            (thereby showing the colour of their hat) whenever they
+            (thereby showing the color of their hat) whenever they
             receive a little piece of food. Video cards turn data into
             pixie-food, and then send them to the pixies - the more
             expensive the card, the better the food, so the better
--- faqupdate.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: