Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 14 Jul 2008 19:14:00 GMT
From:      Remko Lodder <remko@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 145239 for review
Message-ID:  <200807141914.m6EJE05j062233@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=145239

Change 145239 by remko@remko_nakur on 2008/07/14 19:13:00

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/problem-reports/article.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#3 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mail/chapter.sgml#9 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#4 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#4 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/sson.key#1 branch
.. //depot/projects/docproj_nl/share/sgml/man-refs.ent#3 integrate
.. //depot/projects/docproj_nl/www/en/docproj/current.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/donations/donors.sgml#2 integrate
.. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#2 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#2 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#3 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/problem-reports/article.sgml#3 (text+ko) ====

@@ -7,7 +7,7 @@
   <articleinfo>
     <title>Writing &os; Problem Reports</title>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/problem-reports/article.sgml,v 1.56 2008/05/28 00:36:07 gabor Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/problem-reports/article.sgml,v 1.60 2008/07/13 14:37:24 remko Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -202,7 +202,7 @@
       only result in a developer advising you to upgrade to a
       supported version to see if the problem still recurs.  The
       Security Officer team maintains the
-      <ulink url="http://www.freebsd.org/security/">list of supported
+      <ulink url="&url.base;/security/">list of supported
       versions</ulink>.</para>
 
     <para>If the problem is in a port, note that you must first
@@ -342,7 +342,7 @@
 	  <para><emphasis>If you have a patch, say so.</emphasis>
 	    A PR with a patch included is much more likely to be
 	    looked at than one without.  If you are including one,
-	    put the string <literal>[patch]</literal> at the
+	    put the string <literal>[patch]</literal> (including the brackets) at the
 	    beginning of the <quote>Synopsis</quote>.  (Although it is
 	    not mandatory to use that exact string, by convention,
 	    that is the one that is used.)</para>
@@ -352,7 +352,7 @@
 	  <para><emphasis>If you are a maintainer, say so.</emphasis>
 	    If you are maintaining a part of the source code (for
 	    instance, a port), you might consider adding the string
-	    <literal>[maintainer update]</literal> at the beginning of
+	    <literal>[maintainer update]</literal> (including the brackets) at the beginning of
 	    your synopsis line, and you definitely should set the
 	    <quote>Class</quote> of
 	    your PR to <literal>maintainer-update</literal>.  This way
@@ -521,16 +521,17 @@
 	you insert manual linebreaks somewhere around 70 characters,
 	so that the web display of the PR will be readable.</para>
 
-      <para>Similar considerations apply if you are using the web-based
-	PR submittal form instead of &man.send-pr.1;.  Note that
+      <para>Similar considerations apply if you are using the
+	<ulink url="&url.base;/send-pr.html"> web-based
+	PR submission form</ulink> instead of &man.send-pr.1;.  Note that
 	cut-and-paste operations can have their own side-effects on
 	text formatting.  In certain cases it may be necessary to use
 	&man.uuencode.1; to ensure that patches arrive unmodified.</para>
 
       <para>Finally, if your submission will be lengthy, you should
 	to prepare your work offline so that nothing will be lost in
-	case there is a problem submitting it.  This can be an especial
-	problem with the web form.</para>
+	case there is a problem submitting it.  This can especially be a
+	problem with the <ulink url="&url.base;/send-pr.html">web form</ulink>.</para>
     </section>
 
     <section>
@@ -638,7 +639,7 @@
       </itemizedlist>
 
       <para>The next section describes fields that are common to both
-	the email interface and the web interface:</para>
+	the email interface and the <ulink url="&url.base;/send-pr.html">web interface</ulink>:</para>
 
       <itemizedlist>
 
@@ -677,10 +678,10 @@
 	    get ignored.</para>
 
 	  <para>As noted above, if your problem report includes a patch,
-	    please have the synopsis start with <literal>[patch]</literal>;
+	    please have the synopsis start with <literal>[patch]</literal> (including the brackets);
 	    if this is a ports PR and you are the
 	    maintainer, you may consider adding
-	    <literal>[maintainer update]</literal> and set the
+	    <literal>[maintainer update]</literal> (including the brackets) and set the
 	    <quote>Class</quote> of your PR to
 	    <literal>maintainer-update</literal>.</para>
 	</listitem>
@@ -1107,7 +1108,7 @@
       <para>This will read the specified file, validate the contents,
 	strip comments and send it off.</para>
 
-      <para>If you are using the web form:</para>
+      <para>If you are using the <ulink url="&url.base;/send-pr.html">web form</ulink>:</para>
 
       <para>Before you hit <literal>submit</literal>, you will need to
 	fill in a field containing text that is represented in image

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml#2 (text+ko) ====

@@ -1,11 +1,11 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml,v 1.1 2006/10/16 19:15:36 danger Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml,v 1.2 2008/07/10 22:14:48 miwi Exp $
 -->
 
 <chapter id="kernelbuild">
-  <title>Bulding and Installing a &os; Kernel</title>
+  <title>Building and Installing a &os; Kernel</title>
 
   <para>Being a kernel developer requires understanding of the kernel
     build process.  To debug the &os; kernel it is required to be able

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#4 (text+ko) ====

@@ -6,11 +6,11 @@
 
 <book>
   <bookinfo>
-    <title>Frequently Asked Questions for FreeBSD 6.<replaceable>X</replaceable> and 7.<replaceable>X</replaceable></title>
+    <title>Frequently Asked Questions for &os; 6.<replaceable>X</replaceable> and 7.<replaceable>X</replaceable></title>
 
-    <corpauthor>The FreeBSD Documentation Project</corpauthor>
+    <corpauthor>The &os; Documentation Project</corpauthor>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1065 2008/07/06 09:19:23 pgj Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1073 2008/07/14 00:11:44 pgj Exp $</pubdate>
 
     <copyright>
       <year>1995</year>
@@ -27,7 +27,7 @@
       <year>2006</year>
       <year>2007</year>
       <year>2008</year>
-      <holder>The FreeBSD Documentation Project</holder>
+      <holder>The &os; Documentation Project</holder>
     </copyright>
 
     &bookinfo.legalnotice;
@@ -57,17 +57,17 @@
     </legalnotice>
 
     <abstract>
-      <para>This is the FAQ for FreeBSD versions 6.<replaceable>X</replaceable> and 7.<replaceable>X</replaceable>.
-        All entries are assumed to be relevant to FreeBSD 6.<replaceable>X</replaceable> and
+      <para>This is the FAQ for &os; versions 6.<replaceable>X</replaceable> and 7.<replaceable>X</replaceable>.
+        All entries are assumed to be relevant to &os; 6.<replaceable>X</replaceable> and
         later, unless otherwise noted.  If you are interested in
         helping with this project, send email to the &a.doc;.  The
         latest version of this document is always available from the
         <ulink
-        url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/index.html">FreeBSD
+        url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/index.html">&os;
         World Wide Web server</ulink>. It may also be downloaded as
         one large <ulink url="book.html">HTML</ulink> file with HTTP
         or as plain text, &postscript;, PDF, etc. from the <ulink
-        url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD FTP
+        url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">&os; FTP
         server</ulink>. You may also want to <ulink
         url="&url.base;/search/index.html">Search the
         FAQ</ulink>.</para>
@@ -77,10 +77,10 @@
   <chapter id="introduction">
     <title>Introduction</title>
 
-    <para>Welcome to the FreeBSD 6.<replaceable>X</replaceable>-7.<replaceable>X</replaceable> FAQ!</para>
+    <para>Welcome to the &os; 6.<replaceable>X</replaceable>-7.<replaceable>X</replaceable> FAQ!</para>
 
     <para>As is usual with Usenet FAQs, this document aims to cover the
-      most frequently asked questions concerning the FreeBSD operating
+      most frequently asked questions concerning the &os; operating
       system (and of course answer them!).  Although originally intended
       to reduce bandwidth and avoid the same old questions being asked
       over and over again, FAQs have become recognized as valuable
@@ -93,11 +93,11 @@
     <qandaset>
       <qandaentry>
         <question id="what-is-FreeBSD">
-          <para>What is FreeBSD?</para>
+          <para>What is &os;?</para>
         </question>
 
         <answer>
-         <para>Briefly, FreeBSD is a &unix;&nbsp;like operating system for
+         <para>Briefly, &os; is a &unix;&nbsp;like operating system for
            AMD64 and &intel; EM64T, &i386; PC-98, IA-64, &arm;, &powerpc;
            and &ultrasparc; platforms
            based on U.C. Berkeley's <quote>4.4BSD-Lite</quote>
@@ -106,27 +106,27 @@
            Jolitz's port of U.C.  Berkeley's <quote>Net/2</quote> to
            the &i386;, known as <quote>386BSD</quote>, though very
            little of the 386BSD code remains.  A fuller description of
-           what FreeBSD is and how it can work for you may be found on
-           the <ulink url="&url.base;/index.html">FreeBSD home
+           what &os; is and how it can work for you may be found on
+           the <ulink url="&url.base;/index.html">&os; home
            page</ulink>.</para>
 
-         <para>FreeBSD is used by companies, Internet Service Providers,
+         <para>&os; is used by companies, Internet Service Providers,
            researchers, computer professionals, students and home users
            all over the world in their work, education and recreation.</para>
 
-         <para>For more detailed information on FreeBSD, please see the
-           <ulink url="&url.books.handbook;/index.html">FreeBSD
+         <para>For more detailed information on &os;, please see the
+           <ulink url="&url.books.handbook;/index.html">&os;
            Handbook</ulink>.</para>
        </answer>
       </qandaentry>
 
       <qandaentry>
         <question id="FreeBSD-goals">
-          <para>What is the goal of the FreeBSD Project?</para>
+          <para>What is the goal of the &os; Project?</para>
         </question>
 
         <answer>
-          <para>The goal of the FreeBSD Project is to provide software
+          <para>The goal of the &os; Project is to provide software
             that may be used for any purpose and without strings attached.
             Many of us have a significant investment in the code (and
             project) and would certainly not mind a little financial
@@ -150,18 +150,18 @@
             to replace such software with submissions under the more
             relaxed <ulink
             url="http://www.FreeBSD.org/copyright/freebsd-license.html">;
-            FreeBSD license</ulink> whenever possible.</para>
+            &os; license</ulink> whenever possible.</para>
         </answer>
       </qandaentry>
 
       <qandaentry>
         <question id="bsd-license-restrictions">
-          <para>Does the FreeBSD license have any restrictions?</para>
+          <para>Does the &os; license have any restrictions?</para>
         </question>
 
         <answer>
           <para>Yes.  Those restrictions do not control how you use
-            the code, merely how you treat the FreeBSD Project itself.
+            the code, merely how you treat the &os; Project itself.
             If you have serious license concerns, read the actual
             <ulink
             url="http://www.FreeBSD.org/copyright/freebsd-license.html">;
@@ -182,7 +182,7 @@
 
       <qandaentry>
         <question id="replace-current-OS">
-          <para>Can FreeBSD replace my current operating system?</para>
+          <para>Can &os; replace my current operating system?</para>
         </question>
 
         <answer>
@@ -191,7 +191,7 @@
 
           <para>Most people do not actually use an operating system.
             They use applications.  The applications are what really
-            use the operating system.  FreeBSD is designed to provide
+            use the operating system.  &os; is designed to provide
             a robust and full-featured environment for applications.
             It supports a wide variety of web browsers, office suites,
             email readers, graphics programs, programming
@@ -204,28 +204,28 @@
           <para>If you need to use an application that is only
             available on one operating system, you simply cannot
             replace that operating system.  Chances are there is a very
-            similar application on FreeBSD, however.  If you want a
+            similar application on &os;, however.  If you want a
             solid office or Internet server, a reliable workstation,
             or just the ability to do your job without interruptions,
-            FreeBSD will almost certainly do everything you need.
+            &os; will almost certainly do everything you need.
             Many computer users across the world, including both
-            novices and experienced &unix; administrators, use FreeBSD
+            novices and experienced &unix; administrators, use &os;
             as their only desktop operating system.</para>
 
-          <para>If you are migrating to FreeBSD from some other &unix;
+          <para>If you are migrating to &os; from some other &unix;
             environment, you already know most of what you need to.
             If your background is in graphic-driven operating systems
             such as &windows; and older versions of &macos;, expect to
             invest additional time learning the &unix; way of doing
             things.  This FAQ and the <ulink
-            url="&url.books.handbook;/index.html">FreeBSD Handbook</ulink> are
+            url="&url.books.handbook;/index.html">&os; Handbook</ulink> are
             excellent places to start.</para>
         </answer>
       </qandaentry>
 
       <qandaentry>
         <question id="why-called-FreeBSD">
-          <para>Why is it called FreeBSD?</para>
+          <para>Why is it called &os;?</para>
         </question>
 
         <answer>
@@ -253,7 +253,7 @@
             <quote>free</quote> is being used in two ways here, one meaning
             <quote>at no cost</quote>, the other meaning <quote>you can do
             whatever you like</quote>.  Apart from one or two things you
-            <emphasis>cannot</emphasis> do with the FreeBSD code, for
+            <emphasis>cannot</emphasis> do with the &os; code, for
             example pretending you wrote it, you can really do whatever you
             like with it.</para>
         </answer>
@@ -261,7 +261,7 @@
 
       <qandaentry>
 	<question id="differences-to-other-bsds">
-	  <para>What are the differences between FreeBSD and NetBSD, OpenBSD,
+	  <para>What are the differences between &os; and NetBSD, OpenBSD,
 	    and other open source BSD operating systems?</para>
 	</question>
 
@@ -278,7 +278,7 @@
 
       <qandaentry>
         <question id="latest-version">
-          <para>What is the latest version of FreeBSD?</para>
+          <para>What is the latest version of &os;?</para>
         </question>
 
 <!--
@@ -287,7 +287,7 @@
 -->
 
         <answer>
-	  <para>At this point in FreeBSD's development, there are two
+	  <para>At this point in &os;'s development, there are two
 	    parallel development branches; releases are being made from
 	    both branches.  The 6.<replaceable>X</replaceable> series of releases
 	    is being made from the <emphasis>6-STABLE</emphasis> branch
@@ -325,22 +325,22 @@
 
           <para>Releases are made <link linkend="release-freq">every
             few months</link>. While many people stay more up-to-date with
-            the FreeBSD sources (see the questions on <link
+            the &os; sources (see the questions on <link
             linkend="current">&os.current;</link> and <link
             linkend="stable">&os.stable;</link>) than that, doing so
             is more of a commitment, as the sources are a moving
             target.</para>
 
-	  <para>More information on FreeBSD releases can be found on
+	  <para>More information on &os; releases can be found on
 	    the <ulink
 	    url="http://www.FreeBSD.org/releng/index.html">Release
-	    Engineering page</ulink> on the FreeBSD Web site.</para>
+	    Engineering page</ulink> on the &os; Web site.</para>
         </answer>
       </qandaentry>
 
       <qandaentry>
         <question id="current">
-          <para>What is <emphasis>FreeBSD-CURRENT</emphasis>?</para>
+          <para>What is <emphasis>&os;-CURRENT</emphasis>?</para>
         </question>
 
         <answer>
@@ -421,24 +421,24 @@
 
       <qandaentry>
         <question id="stable">
-          <para>What is the <emphasis>FreeBSD-STABLE</emphasis> concept?</para>
+          <para>What is the <emphasis>&os;-STABLE</emphasis> concept?</para>
         </question>
 
         <answer>
-          <para>Back when FreeBSD 2.0.5 was released, FreeBSD
+          <para>Back when &os;&nbsp;2.0.5 was released, &os;
             development branched in two.  One branch was named <ulink
             url="&url.books.handbook;/current-stable.html#STABLE">-STABLE</ulink>,
             one <ulink
             url="&url.books.handbook;/current-stable.html#CURRENT">-CURRENT</ulink>.
-            <emphasis>FreeBSD-STABLE</emphasis> is intended for Internet Service Providers
+            <emphasis>&os;-STABLE</emphasis> is intended for Internet Service Providers
             and other commercial enterprises for whom sudden shifts or
             experimental features are quite undesirable.  It receives
             only well-tested bug fixes and other small incremental
-            enhancements.  <emphasis>FreeBSD-CURRENT</emphasis>, on the other hand, has
+            enhancements.  <emphasis>&os;-CURRENT</emphasis>, on the other hand, has
             been one unbroken line since 2.0 was released, leading
             towards &rel.current;-RELEASE and beyond. For more detailed information on branches
             see <quote><ulink
-              url="&url.articles.releng;/release-proc.html#REL-BRANCH">FreeBSD Release Engineering: Creating the Release Branch</ulink></quote>,
+              url="&url.articles.releng;/release-proc.html#REL-BRANCH">&os; Release Engineering: Creating the Release Branch</ulink></quote>,
             the status of the branches and the upcoming release schedule can be found on the <ulink
               url="http://www.FreeBSD.org/releng">Release Engineering Information</ulink> page.</para>
 
@@ -467,7 +467,7 @@
 
       <qandaentry>
         <question id="release-freq">
-          <para>When are FreeBSD releases made?</para>
+          <para>When are &os; releases made?</para>
         </question>
 
         <answer>
@@ -480,14 +480,14 @@
 	    that the addition of new features does not compromise the
 	    stability of the release.
 	    Many users regard this caution as one of the best things about
-	    FreeBSD, even though waiting for all the latest goodies to reach
+	    &os;, even though waiting for all the latest goodies to reach
 	    <emphasis>-STABLE</emphasis> can be a little frustrating.</para>
 
 	  <para>More information on the release engineering process
 	    (including a schedule of upcoming releases) can be found
 	    on the <ulink
 	    url="http://www.FreeBSD.org/releng/index.html">release
-	    engineering</ulink> pages on the FreeBSD Web site.</para>
+	    engineering</ulink> pages on the &os; Web site.</para>
 
           <para>For people who need or want a little more excitement,
             binary snapshots are made daily as discussed above.</para>
@@ -496,18 +496,18 @@
 
       <qandaentry>
         <question id="responsible">
-          <para>Who is responsible for FreeBSD?</para>
+          <para>Who is responsible for &os;?</para>
         </question>
 
         <answer>
-          <para>The key decisions concerning the FreeBSD project, such
+          <para>The key decisions concerning the &os; project, such
             as the overall direction of the project and who is allowed
             to add code to the source tree, are made by a <ulink
             url="&url.base;/administration.html#t-core">core
             team</ulink> of 9 people. There is a much larger team of
             more than 350 <ulink
             url="&url.articles.contributors;/article.html#STAFF-COMMITTERS">committers</ulink>
-            who are authorized to make changes directly to the FreeBSD
+            who are authorized to make changes directly to the &os;
             source tree.</para>
 
           <para>However, most non-trivial changes are discussed in advance
@@ -519,14 +519,14 @@
 
       <qandaentry>
         <question id="where-get">
-          <para>Where can I get FreeBSD?</para>
+          <para>Where can I get &os;?</para>
         </question>
 
         <answer>
-          <para>Every significant release of FreeBSD is available via
+          <para>Every significant release of &os; is available via
             anonymous FTP from the <ulink
             url="ftp://ftp.FreeBSD.org/pub/FreeBSD/">;
-            FreeBSD FTP site</ulink>:</para>
+            &os; FTP site</ulink>:</para>
 
           <itemizedlist>
             <listitem>
@@ -552,7 +552,7 @@
             </listitem>
           </itemizedlist>
 
-	  <para>Information about obtaining FreeBSD on CD, DVD, and other
+	  <para>Information about obtaining &os; on CD, DVD, and other
 	    media can be found in <ulink url="&url.books.handbook;/mirrors.html">the
 	      Handbook</ulink>.</para>
         </answer>
@@ -578,7 +578,7 @@
 
           <para>Before submitting a problem report, please read <ulink
             url="&url.articles.problem-reports;/article.html">Writing
-            FreeBSD Problem Reports</ulink>, an article on how to write
+            &os; Problem Reports</ulink>, an article on how to write
             good problem reports.</para>
         </answer>
       </qandaentry>
@@ -592,7 +592,7 @@
           <para>Please check the <ulink
             url="http://www.FreeBSD.org/docs.html">Documentation</ulink>;
             list on the main <ulink
-            url="http://www.FreeBSD.org">FreeBSD</ulink>; web
+            url="http://www.FreeBSD.org">&os;</ulink>; web
             site.</para>
         </answer>
       </qandaentry>
@@ -605,7 +605,7 @@
     <qandaset>
       <qandaentry>
 	<question id="books">
-	  <para>What good books are there about FreeBSD?</para>
+	  <para>What good books are there about &os;?</para>
 	</question>
 	
 	<answer>
@@ -613,7 +613,7 @@
 	    available online from this link: <ulink
 	    url="http://www.FreeBSD.org/docs.html"></ulink>.  The same
 	    documents are available as packages, that you can easily
-	    install on your FreeBSD system.  More details on
+	    install on your &os; system.  More details on
 	    documentation packages can be found in the next
 	    paragraphs.</para>
 	    
@@ -634,7 +634,7 @@
 
         <answer>
           <para>Yes.  The documentation is available in a number of
-            different formats and compression schemes on the FreeBSD
+            different formats and compression schemes on the &os;
             FTP site, in the <ulink
             url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">/pub/FreeBSD/doc/</ulink>;
             directory.</para>
@@ -651,7 +651,7 @@
             <listitem>
               <para>The document's language and encoding.  These are
                 based on the locale names you will find under
-                <filename>/usr/share/locale</filename> on your FreeBSD
+                <filename>/usr/share/locale</filename> on your &os;
                 system.  The current languages and encodings that we
                 have for documentation are as follows:</para>
 
@@ -916,7 +916,7 @@
                           <entry><literal>zip</literal></entry>
 
                           <entry>The Zip format.  If you want to
-                            uncompress this on FreeBSD you will need
+                            uncompress this on &os; you will need
                             to install the <filename
                             role="package">archivers/unzip</filename>
                             port first.</entry>
@@ -970,7 +970,7 @@
 
       <qandaentry>
         <question id="mailing">
-          <para>Where do I find info on the FreeBSD mailing lists?</para>
+          <para>Where do I find info on the &os; mailing lists?</para>
         </question>
 
         <answer>
@@ -982,7 +982,7 @@
 
       <qandaentry>
         <question id="newsgroups">
-          <para>What FreeBSD news groups are available?</para>
+          <para>What &os; news groups are available?</para>
         </question>
 
         <answer>
@@ -994,31 +994,31 @@
 
       <qandaentry>
         <question id="irc">
-          <para>Are there FreeBSD IRC (Internet Relay Chat)
+          <para>Are there &os; IRC (Internet Relay Chat)
             channels?</para>
         </question>
 
         <answer>
-          <para>Yes, most major IRC networks host a FreeBSD chat
+          <para>Yes, most major IRC networks host a &os; chat
             channel:</para>
 
           <itemizedlist>
             <listitem>
               <para>Channel <literal>#FreeBSD</literal> on
                 <ulink url="http://www.efnet.org/index.php">EFNet</ulink>;
-                is a FreeBSD forum, but do not go there for tech
+                is a &os; forum, but do not go there for tech
                 support or try to get folks there to help you avoid
                 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!
+                weapons as they are &os;.  You Have Been Warned!
                 Available at server <hostid>irc.chat.org</hostid>.</para>
             </listitem>
 
             <listitem>
               <para>Channel <literal>#FreeBSDhelp</literal> on
                 <ulink url="http://www.efnet.org/index.php">EFNet</ulink>;
-                is a channel dedicated to helping FreeBSD users. They
+                is a channel dedicated to helping &os; users. They
                 are much more sympathetic to questions than
                 <literal>#FreeBSD</literal> is.</para>
             </listitem>
@@ -1028,7 +1028,7 @@
                 <ulink url="http://freenode.net/">Freenode</ulink>;
 		is a general help channel with about 300 users at any time.
 		The conversations have been known to run off-topic for a while,
-		but priority is given to users with FreeBSD questions.  We are
+		but priority is given to users with &os; questions.  We are
 		good about helping you understand the basics, referring to the
 		Handbook whenever possible, and directing you where to learn
 		more about the topic you need help with.  We are a primarily
@@ -1092,16 +1092,16 @@
 
       <qandaentry>
 	<question id="training">
-	  <para>Where can I get commercial FreeBSD training and support?</para>
+	  <para>Where can I get commercial &os; training and support?</para>
 	</question>
 
 	<answer>
 	  <para>DaemonNews provides commercial training and support for
-	    FreeBSD.  More information can be found at their 
+	    &os;.  More information can be found at their 
 	    <ulink url="http://www.bsdmall.com/">BSD Mall</ulink> 
 	    site.</para>
 
-          <para>The FreeBSD Mall provides commercial FreeBSD support.
+          <para>The &os; Mall provides commercial &os; support.
             You can get more information at their <ulink
             url="http://www.freebsdmall.com/">web site</ulink>.</para>
 
@@ -1129,7 +1129,7 @@
     <qandaset>
       <qandaentry>
         <question id="floppy-download">
-          <para>Which file do I download to get FreeBSD?</para>
+          <para>Which file do I download to get &os;?</para>
         </question>
 
         <answer>
@@ -1141,7 +1141,7 @@
 	    <command>fdimage</command> or &man.dd.1;.</para>
 
           <para>If you need to download the distributions yourself (for a
-            DOS filesystem install, for instance), below are some
+            DOS file system install, for instance), below are some
             recommendations for distributions to grab:</para>
 
 
@@ -1171,7 +1171,7 @@
           <para>Full instructions on this procedure and a little bit more
             about installation issues in general can be found in the
             <ulink url="&url.books.handbook;/install.html">Handbook entry on
-            installing FreeBSD</ulink>.</para>
+            installing &os;</ulink>.</para>
 
         </answer>
       </qandaentry>
@@ -1222,7 +1222,7 @@
                 <command>fdimage</command> or <command>rawrite</command>)
                 described in the <ulink
                 url="&url.books.handbook;/install.html">installation guide to
-                FreeBSD</ulink>.</para>
+                &os;</ulink>.</para>
             </listitem>
           </itemizedlist>
         </answer>
@@ -1230,18 +1230,18 @@
 
       <qandaentry>
         <question id="install-instructions-location">
-          <para>Where are the instructions for installing FreeBSD?</para>
+          <para>Where are the instructions for installing &os;?</para>
         </question>
 
         <answer>
           <para>Installation instructions can be found in the
-            <ulink url="&url.books.handbook;/install.html">Handbook entry on installing FreeBSD</ulink>.</para>
+            <ulink url="&url.books.handbook;/install.html">Handbook entry on installing &os;</ulink>.</para>
         </answer>
       </qandaentry>
 
       <qandaentry>
         <question id="need-to-run">
-          <para>What do I need in order to run FreeBSD?</para>
+          <para>What do I need in order to run &os;?</para>
         </question>
 
         <answer>
@@ -1288,13 +1288,13 @@
 
       <qandaentry>
         <question id="windows-coexist">
-          <para>Can &windows; co-exist with FreeBSD?</para>
+          <para>Can &windows; co-exist with &os;?</para>
         </question>
 
         <answer>
-          <para>Install &windows; first, then FreeBSD.
-            FreeBSD's boot manager will then manage to boot &windows; and
-            FreeBSD. If you install &windows; second, it will boorishly
+          <para>Install &windows; first, then &os;.
+            &os;'s boot manager will then manage to boot &windows; and
+            &os;. If you install &windows; second, it will boorishly
             overwrite your boot manager without even asking. If that
             happens, see the next section.</para>
         </answer>
@@ -1307,13 +1307,13 @@
         </question>
 
         <answer>
-          <para>You can reinstall the boot manager FreeBSD comes with in
+          <para>You can reinstall the boot manager &os; comes with in
             one of three ways:</para>
 
           <itemizedlist>
             <listitem>
               <para>Running DOS, go into the <filename role="directory">tools</filename> directory of your
-                FreeBSD distribution and look for
+                &os; distribution and look for
                 <filename>bootinst.exe</filename>.  You run it like
                 so:</para>
 
@@ -1323,23 +1323,23 @@
             </listitem>
 
             <listitem>
-              <para>Boot the FreeBSD boot floppy again and go to the
+              <para>Boot the &os; boot floppy again and go to the
                  <guimenuitem>Custom</guimenuitem> menu item for custom installation.  Choose <guimenuitem>Partition</guimenuitem>.  Select the
                  drive which used to contain your boot manager (likely the
                  first one) and when you come to the partition editor for
                  it, as the very first thing (e.g. do not make any changes)
                  press <keycap>W</keycap>.  This will ask for confirmation, select &gui.yes;,
                  and when you get the Boot Manager selection prompt, be
-                 sure to select the <application>FreeBSD Boot Manager</application>.  This will
+                 sure to select the <application>&os; Boot Manager</application>.  This will
                  re-write the boot manager to disk. Now quit out of the
                  installation menu and reboot off the hard disk as
                  normal.</para>
             </listitem>
 
             <listitem>
-              <para>Boot the FreeBSD boot floppy (or CDROM) and choose the
+              <para>Boot the &os; boot floppy (or CD-ROM) and choose the
                 <guimenuitem>Fixit</guimenuitem> menu item.  Select either the Fixit
-                floppy or CDROM #2 (the <quote>live</quote> filesystem
+                floppy or CD-ROM #2 (the <quote>live</quote> file system
                 option) as appropriate and enter the fixit shell. Then
                 execute the following command:</para>
 
@@ -1359,16 +1359,16 @@
       <qandaentry>
         <question id="boot-on-thinkpad">
           <para>My A, T, or X series IBM Thinkpad locks up when I first
-            booted up my FreeBSD installation.  How can I solve this?</para>
+            booted up my &os; installation.  How can I solve this?</para>
         </question>
 
         <answer>
           <para>A bug in early revisions of IBM's BIOS on these machines
-            mistakenly identifies the FreeBSD partition as a potential FAT
+            mistakenly identifies the &os; partition as a potential FAT
             suspend-to-disk partition.  When the BIOS tries to parse the
-            FreeBSD partition it hangs.</para>
+            &os; partition it hangs.</para>
 
-          <para>According to IBM<footnote><para>In an e-mail from Keith
+          <para>According to IBM<footnote><para>In an email from Keith
                 Frechette
                 <email>kfrechet@us.ibm.com</email>.</para></footnote>, the
             following model/BIOS release numbers incorporate the fix.</para>
@@ -1426,26 +1426,26 @@
 	    url="http://docs.FreeBSD.org/cgi/mid.cgi?20010427133759.A71732">This
 	    message</ulink> from Jacques Vidrine to the &a.mobile;
 	    describes a procedure which may work if your newer IBM
-	    laptop does not boot FreeBSD properly, and you can upgrade
+	    laptop does not boot &os; properly, and you can upgrade
 	    or downgrade the BIOS.</para>
 	
           <para>If you have an earlier BIOS, and upgrading is not an option, a
-            workaround is to install FreeBSD, change the partition ID FreeBSD
+            workaround is to install &os;, change the partition ID &os;
             uses, and install new boot blocks that can handle the different
             partition ID.</para>
 
           <para>First, you will need to restore the machine to a state where
             it can get through its self-test screen.  Doing this requires
-            powering up the machine without letting it find a FreeBSD
+            powering up the machine without letting it find a &os;
             partition on its primary disk.  One way is to remove the hard disk
             and temporarily move it to an older ThinkPad (such as a ThinkPad
             600) or a desktop PC with an appropriate conversion cable.  Once
-            it is there, you can delete the FreeBSD partition and move the hard
+            it is there, you can delete the &os; partition and move the hard
             disk back.  The ThinkPad should now be in a bootable state
             again.</para>
 
           <para>With the machine functional again, you can use the workaround
-            procedure described here to get a working FreeBSD
+            procedure described here to get a working &os;
             installation.</para>
 
           <procedure>
@@ -1458,7 +1458,7 @@
             </step>
 
             <step>
-              <para>Install FreeBSD as normal on to the ThinkPad.
+              <para>Install &os; as normal on to the ThinkPad.
                 <emphasis>Do not</emphasis> use <literal>Dangerously
                   Dedicated</literal> mode.  <emphasis>Do not</emphasis>
                 reboot when the install has finished.</para>
@@ -1466,13 +1466,13 @@
 
             <step>
               <para>Either switch to the <quote>Emergency Holographic
-                  Shell</quote> (<keycombo action="simul"><keycap>ALT</keycap>
+                  Shell</quote> (<keycombo action="simul"><keycap>Alt</keycap>
                   <keycap>F4</keycap></keycombo>) or start a
                 <quote>fixit</quote> shell.</para>
             </step>
 
             <step>
-              <para>Use &man.fdisk.8; to change the FreeBSD partition ID from
+              <para>Use &man.fdisk.8; to change the &os; partition ID from
                 <literal>165</literal> to <literal>166</literal> (this is the
                   type used by OpenBSD).</para>
             </step>
@@ -1480,28 +1480,28 @@
             <step>
               <para>Bring the <filename>boot1</filename> and
                 <filename>boot2</filename> files to the local
-                filesystem.</para>
+                file system.</para>
             </step>
 
             <step>
               <para>Use &man.disklabel.8; to write <filename>boot1</filename>
-                and <filename>boot2</filename> to your FreeBSD slice.</para>
+                and <filename>boot2</filename> to your &os; slice.</para>
 
               <screen>&prompt.root; <userinput>disklabel -B -b boot1 -s boot2 ad0s<replaceable>n</replaceable></userinput></screen>
 
               <para><replaceable>n</replaceable> is the number of the slice
-                where you installed FreeBSD.</para>
+                where you installed &os;.</para>
             </step>
 
             <step>
               <para>Reboot.  At the boot prompt you will be given the option
                 of booting <literal>OpenBSD</literal>.  This will actually
-                boot FreeBSD.</para>
+                boot &os;.</para>
             </step>
           </procedure>
 
           <para>Getting this to work in the case where you want to dual boot
-          OpenBSD and FreeBSD on the same laptop is left as an exercise for
+          OpenBSD and &os; on the same laptop is left as an exercise for
           the reader.</para>
         </answer>
       </qandaentry>
@@ -1570,21 +1570,21 @@
 
       <qandaentry>
         <question id="no-install-cdrom">
-          <para>I booted from my ATAPI CDROM, but the install program
-            says no CDROM is found.  Where did it go?</para>
+          <para>I booted from my ATAPI CD-ROM, but the install program
+            says no CD-ROM is found.  Where did it go?</para>
         </question>
 
         <answer>
-          <para>The usual cause of this problem is a mis-configured CDROM
-            drive.  Many PCs now ship with the CDROM as the slave device on
+          <para>The usual cause of this problem is a mis-configured CD-ROM
+            drive.  Many PCs now ship with the CD-ROM as the slave device on
             the secondary IDE controller, with no master device on that
             controller.  This is illegal according to the ATAPI specification,
             but &windows; plays fast and loose with the specification, and the
             BIOS ignores it when booting.  This is why the BIOS was able to
-            see the  CDROM to boot from it, but why FreeBSD cannot see it to
+            see the  CD-ROM to boot from it, but why &os; cannot see it to
             complete  the install.</para>
 
-          <para>Reconfigure your system so that the CDROM is either the
+          <para>Reconfigure your system so that the CD-ROM is either the
             master device on the IDE controller it is attached to, or make
             sure that it is the slave on an IDE controller that also has a
             master device.</para>
@@ -1622,20 +1622,20 @@
           <para>This causes a lot of confusion among new system
             administrators.  First of all, the
             <emphasis>physical</emphasis> geometry of a SCSI drive is
-            totally irrelevant, as FreeBSD works in term of disk
+            totally irrelevant, as &os; works in term of disk
             blocks. In fact, there is no such thing as
             <quote>the</quote> physical geometry, as the sector
             density varies across the disk.  What manufacturers claim
             is the <quote>physical geometry</quote> is usually the
             geometry that they have determined wastes the least
-            space. For IDE disks, FreeBSD does work in terms of C/H/S,
+            space. For IDE disks, &os; does work in terms of C/H/S,
             but all modern drives internally convert this into block
             references.</para>
 
           <para>All that matters is the <emphasis>logical</emphasis>
             geometry.  This is the answer that the BIOS gets when it
             asks the drive <quote>what is your geometry?</quote> It
-            then uses this geometry to access the disk. As FreeBSD
+            then uses this geometry to access the disk. As &os;
             uses the BIOS when booting, it is very important to get
             this right. In particular, if you have more than one
             operating system on a disk, they must all agree on the
@@ -1661,7 +1661,7 @@
             have 261 cylinders, 63 sectors per track and 255
             heads.</para>
 
-          <para>If you are not sure about this, or FreeBSD fails to
+          <para>If you are not sure about this, or &os; fails to
             detect the geometry correctly during installation, the
             simplest way around this is usually to create a small DOS
             partition on the disk. The BIOS should then detect the
@@ -1671,10 +1671,10 @@
             programming network cards and the like, however.</para>
 
           <para>Alternatively, there is a freely available utility
-            distributed with FreeBSD called
+            distributed with &os; called
             <filename>pfdisk.exe</filename>.  You can find it in the
-            <filename role="directory">tools</filename> subdirectory on the FreeBSD
-            CDROM or on the various FreeBSD FTP sites.  This program
+            <filename role="directory">tools</filename> subdirectory on the &os;
+            CD-ROM or on the various &os; FTP sites.  This program
             can be used to work out what geometry the other operating
             systems on the disk are using. You can then enter this
             geometry in the partition editor.</para>
@@ -1689,7 +1689,7 @@
         <answer>
           <para>Yes. You must make sure that your root partition is below 1024
             cylinders so the BIOS can boot the kernel from it.  (Note that
-            this is a limitation in the PC's BIOS, not FreeBSD).</para>
+            this is a limitation in the PC's BIOS, not &os;).</para>
 
           <para>For a SCSI drive, this will normally imply that the root
             partition will be in the first 1024&nbsp;MB (or in the first 4096&nbsp;MB
@@ -1725,15 +1725,15 @@
 
       <qandaentry>
         <question id="missing-os">
-          <para>When I boot FreeBSD for the first time after install I get <errorname>Missing Operating
+          <para>When I boot &os; for the first time after install I get <errorname>Missing Operating
             System</errorname>.  What is happening?</para>
         </question>
 
         <answer>
-          <para>This is classically a case of FreeBSD and DOS or some other
+          <para>This is classically a case of &os; and DOS or some other
             OS conflicting over their ideas of disk <link
             linkend="geometry">geometry</link>. You will have to reinstall
-            FreeBSD, but obeying the instructions given above will almost
+            &os;, but obeying the instructions given above will almost
             always get you going.</para>
         </answer>
       </qandaentry>
@@ -1746,11 +1746,11 @@
 
         <answer>
           <para>This is another symptom of the problem described in the
-            preceding question. Your BIOS geometry and FreeBSD geometry
+            preceding question. Your BIOS geometry and &os; geometry
             settings do not agree! If your controller or BIOS supports
             cylinder translation (often marked as <quote>&gt;1GB drive
             support</quote>), try toggling its setting and reinstalling
-            FreeBSD.</para>
+            &os;.</para>
         </answer>
       </qandaentry>
 
@@ -1778,7 +1778,7 @@
 
           <para>Having the sources on-line and knowing how to build a
             system with them will make it much easier for you to upgrade
-            to future releases of FreeBSD.</para>
+            to future releases of &os;.</para>
 
           <para>To actually select a subset of the sources, use the <guimenuitem>Custom</guimenuitem>
             menu item when you are in the <guimenuitem>Distributions</guimenuitem> menu of the
@@ -1793,7 +1793,7 @@
 
         <answer>
           <para>Building a new kernel was originally pretty much a required
-            step in a FreeBSD installation, but more recent releases have

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807141914.m6EJE05j062233>