Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 Nov 2012 22:40:54 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-translations@freebsd.org
Subject:   svn commit: r39940 - in translations/en_US.ISO8859-1: articles/committers-guide articles/contributing articles/contributing-ports articles/contributors articles/java-tomcat articles/linux-users art...
Message-ID:  <201211042240.qA4MesWE070189@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gjb
Date: Sun Nov  4 22:40:53 2012
New Revision: 39940
URL: http://svnweb.freebsd.org/changeset/doc/39940

Log:
  Merge r39770 through r39936 from head/ into translations/

Added:
  translations/en_US.ISO8859-1/books/handbook/jails/Makefile
     - copied unchanged from r39936, head/en_US.ISO8859-1/books/handbook/jails/Makefile
Deleted:
  translations/en_US.ISO8859-1/articles/java-tomcat/
  translations/en_US.ISO8859-1/articles/programming-tools/
  translations/en_US.ISO8859-1/articles/smp/
  translations/en_US.ISO8859-1/books/developers-handbook/boot/
  translations/en_US.ISO8859-1/books/developers-handbook/dma/
  translations/en_US.ISO8859-1/books/developers-handbook/driverbasics/
  translations/en_US.ISO8859-1/books/developers-handbook/isa/
  translations/en_US.ISO8859-1/books/developers-handbook/jail/
  translations/en_US.ISO8859-1/books/developers-handbook/kobj/
  translations/en_US.ISO8859-1/books/developers-handbook/locking/
  translations/en_US.ISO8859-1/books/developers-handbook/mac/
  translations/en_US.ISO8859-1/books/developers-handbook/newbus/
  translations/en_US.ISO8859-1/books/developers-handbook/pccard/
  translations/en_US.ISO8859-1/books/developers-handbook/pci/
  translations/en_US.ISO8859-1/books/developers-handbook/scsi/
  translations/en_US.ISO8859-1/books/developers-handbook/sound/
  translations/en_US.ISO8859-1/books/developers-handbook/sysinit/
  translations/en_US.ISO8859-1/books/developers-handbook/usb/
  translations/en_US.ISO8859-1/books/developers-handbook/vm/
  translations/en_US.ISO8859-1/books/ppp-primer/
  translations/en_US.ISO8859-1/htdocs/alpha/
  translations/en_US.ISO8859-1/htdocs/conspectus/
  translations/en_US.ISO8859-1/htdocs/gallery/
  translations/en_US.ISO8859-1/htdocs/gnome/images/team/
  translations/en_US.ISO8859-1/htdocs/gnome/patches/
  translations/en_US.ISO8859-1/htdocs/platforms/amd64/
  translations/en_US.ISO8859-1/htdocs/projects/dingo/
  translations/en_US.ISO8859-1/htdocs/projects/nanobsd/
  translations/en_US.ISO8859-1/htdocs/releases/2.0.5A/
  translations/en_US.ISO8859-1/htdocs/releases/2.0A/
  translations/en_US.ISO8859-1/htdocs/releases/4.6.1R/
  translations/en_US.ISO8859-1/share/images/
Modified:
  translations/en_US.ISO8859-1/articles/committers-guide/article.xml
  translations/en_US.ISO8859-1/articles/contributing-ports/article.xml
  translations/en_US.ISO8859-1/articles/contributing/article.xml
  translations/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
  translations/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
  translations/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
  translations/en_US.ISO8859-1/articles/linux-users/article.xml
  translations/en_US.ISO8859-1/articles/portbuild/article.xml
  translations/en_US.ISO8859-1/articles/rc-scripting/article.xml
  translations/en_US.ISO8859-1/books/dev-model/book.xml
  translations/en_US.ISO8859-1/books/faq/book.xml
  translations/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/audit/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/basics/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/boot/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/colophon.xml
  translations/en_US.ISO8859-1/books/handbook/config/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/disks/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/geom/chapter.xml
  translations/en_US.ISO8859-1/books/porters-handbook/book.xml
  translations/en_US.ISO8859-1/htdocs/administration.xml
  translations/en_US.ISO8859-1/htdocs/cgi/man.cgi
  translations/en_US.ISO8859-1/htdocs/internal/Makefile
  translations/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml
  translations/en_US.ISO8859-1/htdocs/privacy.xml
  translations/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.xml
  translations/en_US.ISO8859-1/share/xml/release.l10n.ent
Directory Properties:
  translations/en_US.ISO8859-1/   (props changed)

Modified: translations/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- translations/en_US.ISO8859-1/articles/committers-guide/article.xml	Sun Nov  4 22:17:58 2012	(r39939)
+++ translations/en_US.ISO8859-1/articles/committers-guide/article.xml	Sun Nov  4 22:40:53 2012	(r39940)
@@ -2189,8 +2189,8 @@ U    stable/9/share/man/man4/netmap.4
       </listitem>
 
       <listitem>
-	<para>(For committers only:)
-	  If you subscribe to &a.svn-src-all.name; or the &a.cvsall;,
+	<para>If you subscribe to &a.svn-src-all.name;,
+	  &a.svn-ports-all.name; or &a.svn-doc-all.name;,
 	  you will probably want to unsubscribe to avoid receiving duplicate
 	  copies of commit messages and their followups.</para>
       </listitem>

Modified: translations/en_US.ISO8859-1/articles/contributing-ports/article.xml
==============================================================================
--- translations/en_US.ISO8859-1/articles/contributing-ports/article.xml	Sun Nov  4 22:17:58 2012	(r39939)
+++ translations/en_US.ISO8859-1/articles/contributing-ports/article.xml	Sun Nov  4 22:40:53 2012	(r39940)
@@ -465,7 +465,7 @@
 	    <para>Regularly check the automated ports building
 	      cluster, <ulink
 		url="http://pointyhat.FreeBSD.org">pointyhat</ulink>,
-	      and the <ulink url="http://www.portscout.org">distfiles
+	      and the <ulink url="http://portscout.FreeBSD.org">distfiles
 		scanner</ulink> to see if any of the ports you
 	      maintain are failing to build or fetch (see <link
 		linkend="resources">resources</link> for more
@@ -797,7 +797,7 @@
       build status of your ports.  As a contributor you can use it to
       find broken and unmaintained ports that need to be fixed.</para>
 
-    <para>The <ulink url="http://www.portscout.org">FreeBSD Ports
+    <para>The <ulink url="http://portscout.FreeBSD.org">FreeBSD Ports
 	distfile scanner</ulink> can show you ports for which the
       distfiles are not fetchable.  You can check on your own ports or
       use it to find ports that need their

Modified: translations/en_US.ISO8859-1/articles/contributing/article.xml
==============================================================================
--- translations/en_US.ISO8859-1/articles/contributing/article.xml	Sun Nov  4 22:17:58 2012	(r39939)
+++ translations/en_US.ISO8859-1/articles/contributing/article.xml	Sun Nov  4 22:40:53 2012	(r39940)
@@ -88,7 +88,7 @@
 	  <para>Read through the FAQ and Handbook periodically.  If
 	    anything is badly explained, out of date or even just
 	    completely wrong, let us know.  Even better, send us a fix
-	    (SGML is not difficult to learn, but there is no objection
+	    (Docbook is not difficult to learn, but there is no objection
 	    to ASCII submissions).</para>
 	</listitem>
 
@@ -565,16 +565,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
 	  <ulink url="&url.base;/donations/">Donations Liaison
 	    Office</ulink>.</para>
       </sect3>
-
-      <sect3>
-	<title>Donating Internet Access</title>
-
-	<para>We can always use new mirror sites for FTP, WWW or
-	  <command>cvsup</command>.  If you would like to be such a
-	  mirror, please see the
-	  <ulink url="&url.articles.hubs;/index.html">Mirroring
-	    FreeBSD</ulink> article for more information.</para>
-      </sect3>
     </sect2>
   </sect1>
 

Modified: translations/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- translations/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Sun Nov  4 22:17:58 2012	(r39939)
+++ translations/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Sun Nov  4 22:40:53 2012	(r39940)
@@ -3595,11 +3595,6 @@
     </listitem>
 
     <listitem>
-      <para>Grzegorz Blach
-	<email>magik@roorback.net</email></para>
-    </listitem>
-
-    <listitem>
       <para>Guillaume Paquet
 	<email>amyfoub@videotron.ca</email></para>
     </listitem>
@@ -4433,6 +4428,11 @@
     </listitem>
 
     <listitem>
+      <para>Jean Benoit
+	<email>jean@unistra.fr</email></para>
+    </listitem>
+
+    <listitem>
       <para>Jean-Sebastien Roy
 	<email>js@jeannot.org</email></para>
     </listitem>
@@ -6018,6 +6018,11 @@
     </listitem>
 
     <listitem>
+      <para>Manuel Creach
+        <email>manuel.creach@me.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Manuel Rabade Garcia
 	<email>mig@mig-29.net</email></para>
     </listitem>
@@ -8325,6 +8330,11 @@
     </listitem>
 
     <listitem>
+      <para>Pierre David
+	<email>pdagog@gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Pierre Y. Dampure
 	<email>pierre.dampure@k2c.co.uk</email></para>
     </listitem>
@@ -9347,11 +9357,6 @@
     </listitem>
 
     <listitem>
-      <para>Simon J Gerraty
-	<email>sjg@juniper.net</email></para>
-    </listitem>
-
-    <listitem>
       <para>Simon Lang
 	<email>simon@lang-clan.de</email></para>
     </listitem>

Modified: translations/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
==============================================================================
--- translations/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Sun Nov  4 22:17:58 2012	(r39939)
+++ translations/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Sun Nov  4 22:40:53 2012	(r39940)
@@ -116,6 +116,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.gblach;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.mbr;</para>
     </listitem>
 
@@ -448,6 +452,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.sjg;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.gibbs;</para>
     </listitem>
 

Modified: translations/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
==============================================================================
--- translations/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml	Sun Nov  4 22:17:58 2012	(r39939)
+++ translations/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml	Sun Nov  4 22:40:53 2012	(r39940)
@@ -3,6 +3,10 @@
 
   <itemizedlist>
     <listitem>
+      <para>&a.pav; (2006 - 2012)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.flz; (2008 - 2012)</para>
     </listitem>
 

Modified: translations/en_US.ISO8859-1/articles/linux-users/article.xml
==============================================================================
--- translations/en_US.ISO8859-1/articles/linux-users/article.xml	Sun Nov  4 22:17:58 2012	(r39939)
+++ translations/en_US.ISO8859-1/articles/linux-users/article.xml	Sun Nov  4 22:40:53 2012	(r39940)
@@ -407,7 +407,7 @@ ifconfig_em0="DHCP"</programlisting>
     <para>Updating from source is the most involved update method, but offers
       the greatest amount of flexibility.  The process involves synchronizing a
       local copy of the FreeBSD source code with the &os;
-      <application>CVS</application> (Concurrent Versioning System) servers.
+      <application>Subversion</application> servers.
       Once the local source code is up to date you can build new versions of
       the kernel and userland.  For more information on source updates see
       <ulink url="&url.base;/doc/en_US.ISO8859-1/books/handbook/updating-upgrading.html">the chapter on updating</ulink>

Modified: translations/en_US.ISO8859-1/articles/portbuild/article.xml
==============================================================================
--- translations/en_US.ISO8859-1/articles/portbuild/article.xml	Sun Nov  4 22:17:58 2012	(r39939)
+++ translations/en_US.ISO8859-1/articles/portbuild/article.xml	Sun Nov  4 22:40:53 2012	(r39940)
@@ -703,7 +703,7 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
       <para><command>dopackages.wrapper sparc64 7 -finish</command></para>
     </example>
 
-    <para>Hint: it us usually best to run the <command>dopackages</command>
+    <para>Hint: it is usually best to run the <command>dopackages</command>
       command inside of <command>screen(1)</command>.</para>
     </sect3>
     </sect2>

Modified: translations/en_US.ISO8859-1/articles/rc-scripting/article.xml
==============================================================================
--- translations/en_US.ISO8859-1/articles/rc-scripting/article.xml	Sun Nov  4 22:17:58 2012	(r39939)
+++ translations/en_US.ISO8859-1/articles/rc-scripting/article.xml	Sun Nov  4 22:40:53 2012	(r39940)
@@ -400,8 +400,8 @@ start_cmd="${name}_start"
 stop_cmd=":"
 
 load_rc_config $name<co id="rcng-confdummy-loadconfig"/>
-eval "${rcvar}=\${${rcvar}:-'NO'}"<co id="rcng-confdummy-enable"/>
-dummy_msg=${dummy_msg:-"Nothing started."}<co id="rcng-confdummy-opt"/>
+: ${dummy_enable:=no} <co id="rcng-confdummy-enable"/>
+: ${dummy_msg="Nothing started."}<co id="rcng-confdummy-opt"/>
 
 dummy_start()
 {
@@ -448,7 +448,7 @@ run_rc_command "$1"</programlisting>
 	  system, you should add a default setting for the knob to
 	  <filename>/etc/defaults/rc.conf</filename> and document
 	  it in &man.rc.conf.5;.  Otherwise it is your script that
-	  should provide a default setting for the knob.  A portable
+	  should provide a default setting for the knob.  The canonical
 	  approach to the latter case is shown in the example.</para>
 
 	<note>
@@ -479,7 +479,7 @@ run_rc_command "$1"</programlisting>
 	<important>
 	  <para>The names of all &man.rc.conf.5; variables used
 	    exclusively by our script <emphasis>must</emphasis>
-	    have the same prefix: <envar>${name}</envar>.  For
+	    have the same prefix: <envar>${name}_</envar>.  For
 	    example: <envar>dummy_mode</envar>,
 	    <envar>dummy_state_file</envar>, and so on.</para>
 	</important>
@@ -487,19 +487,10 @@ run_rc_command "$1"</programlisting>
 	<note>
 	  <para>While it is possible to use a shorter name internally,
 	    e.g., just <envar>msg</envar>, adding the unique prefix
-	    <envar>${name}</envar> to all global names introduced by
+	    <envar>${name}_</envar> to all global names introduced by
 	    our script will save us from possible
 	    collisions with the &man.rc.subr.8; namespace.</para>
 
-	  <para>As long as an &man.rc.conf.5; variable and its
-	    internal equivalent are the same, we can use a more
-	    compact expression to set the default value:</para>
-
-	  <programlisting>: ${dummy_msg:="Nothing started."}</programlisting>
-
-	  <para>The current style is to use the more verbose form
-	    though.</para>
-
 	  <para>As a rule, <filename>rc.d</filename> scripts of the
 	    base system need not provide defaults for their
 	    &man.rc.conf.5; variables because the defaults should
@@ -512,7 +503,11 @@ run_rc_command "$1"</programlisting>
 
       <callout arearefs="rcng-confdummy-msg">
 	<para>Here we use <envar>dummy_msg</envar> to actually
-	  control our script, i.e., to emit a variable message.</para>
+	  control our script, i.e., to emit a variable message.
+	  Use of a shell function is overkill here, since it only
+	  runs a single command; an equally valid alternative is:</para>
+
+	<programlisting>start_cmd="echo \"$dummy_msg\""</programlisting>
       </callout>
     </calloutlist>
   </sect1>

Modified: translations/en_US.ISO8859-1/books/dev-model/book.xml
==============================================================================
--- translations/en_US.ISO8859-1/books/dev-model/book.xml	Sun Nov  4 22:17:58 2012	(r39939)
+++ translations/en_US.ISO8859-1/books/dev-model/book.xml	Sun Nov  4 22:40:53 2012	(r39940)
@@ -46,7 +46,13 @@
             <year>2002-2005</year>
             <holder>Niklas Saers</holder>
         </copyright>
-        <revhistory>
+	<revhistory>
+	  <revision>
+	      <revnumber>1.3</revnumber>
+	      <date>October, 2012</date>
+	      <revremark>Remove hats held by specific people, these
+		are documented elsewhere.</revremark>
+	    </revision>
             <revision>
                 <revnumber>1.2</revnumber>
                 <date>April, 2005</date>
@@ -884,8 +890,6 @@
                     </para>
 
                     <para>
-                     	<!-- [TODO] - check all email adresses and names -->
-
                         Hat held by:
                         The DocEng team <email>doceng@FreeBSD.org</email>.
                         The
@@ -959,8 +963,6 @@
                     <para id="role-releng" xreflabel="Release Engineering Team">
                         Hat held by:
                         the Release Engineering team <email>re@FreeBSD.org</email>.
-                        The current Release Engineer is
-                        Ken Smith <email>kensmith@FreeBSD.org</email>.
                         The
                         <ulink url="http://www.freebsd.org/releng/charter.html">;
                         Release Engineering Charter</ulink>.
@@ -1018,16 +1020,6 @@
                         Officer Team <email>security-team@FreeBSD.org</email> to
                         help do the work.
                     </para>
-                    <para>
-                        Hat held by:
-                        the Security Officer <email>security-officer@FreeBSD.org</email>,
-                        currently headed by
-                        Colin Percival <email>cperciva@FreeBSD.org</email>.
-                        The
-                        <ulink url="http://www.freebsd.org/security/index.html#sec">;
-                            Security Officer and The Security Officer Team's
-                        charter</ulink>.
-                    </para>
                 </section>
 
                 <section id="role-repo-manager" xreflabel="Source Repository Manager">
@@ -1044,8 +1036,7 @@
                     </para>
                     <para>
                         Hat held by:
-                        the Source Repository Manager <email>cvs@FreeBSD.org</email>,
-                        currently headed by Peter Wemm <email>peter@FreeBSD.org</email>.
+			the Source Repository Manager <email>cvs@FreeBSD.org</email>.
                     </para>
                 </section>
 
@@ -1171,10 +1162,7 @@
                     </para>
                     <para>
                         Hat held by:
-                        the Donations Liaison Office <email>donations@FreeBSD.org</email>,
-                        currently headed by
-                        Michael W. Lucas <email>mwlucas@FreeBSD.org</email>.
-
+                        the Donations Liaison Office <email>donations@FreeBSD.org</email>.
                     </para>
                 </section>
 

Modified: translations/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- translations/en_US.ISO8859-1/books/faq/book.xml	Sun Nov  4 22:17:58 2012	(r39939)
+++ translations/en_US.ISO8859-1/books/faq/book.xml	Sun Nov  4 22:40:53 2012	(r39940)
@@ -59,7 +59,6 @@
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
-      &tm-attrib.3com;
       &tm-attrib.adobe;
       &tm-attrib.creative;
       &tm-attrib.ibm;
@@ -1165,44 +1164,83 @@
     <title>Installation</title>
 
     <qandaset>
+
+      <qandaentry>
+	<question id="which-architecture">
+	  <para>Which platform should I download? I have a 64
+	    bit capable &intel; CPU,
+	    but I only see <literal>amd64</literal>.</para>
+	</question>
+
+	<answer>
+	  <para>&arch.amd64; is the term &os; uses for 64-bit
+	    compatible x86 architectures.  Most modern computers
+	    should use &arch.amd64;.  Older hardware should use
+	    &arch.i386;.  If you are installing on a
+	    non-x86-compatible architecture select the platform
+	    which best matches the architecture you are
+	    using.</para>
+	</answer>
+      </qandaentry>
+
       <qandaentry>
 	<question id="floppy-download">
 	  <para>Which file do I download to get &os;?</para>
 	</question>
 
 	<answer>
-	  <para>You need three floppy images:
-	    <filename>floppies/boot.flp</filename>,
-	    <filename>floppies/kern1.flp</filename>, and
-	    <filename>floppies/kern2.flp</filename>.  These images need
-	    to be copied onto floppies by tools like
-	    <command>fdimage</command> or &man.dd.1;.</para>
+	  <para>On the
+	    <ulink url="http://www.freebsd.org/where.html">Get &os; page</ulink>
+	    select <literal>[iso]</literal> next to the
+	    architecture you want to use.</para>
 
-	  <para>If you need to download the distributions yourself (for
-	    a DOS file system install, for instance), below are some
-	    recommendations for distributions to grab:</para>
+	  <para>Any of the following can be used:</para>
 
-	  <itemizedlist>
-	    <listitem>
-	      <para>base/</para>
-	    </listitem>
+	  <informaltable frame="none" pgwide="1">
+	    <tgroup cols="2">
+	      <thead>
+		<row>
+		  <entry>file</entry>
+		  <entry>description</entry>
+		</row>
+	      </thead>
 
-	    <listitem>
-	      <para>manpages/</para>
-	    </listitem>
+	      <tbody>
+		<row>
+		  <entry><filename>disc1.iso</filename></entry>
+		  <entry>Contains enough to install &os; and
+		    a minimal set of packages.</entry>
+		</row>
 
-	    <listitem>
-	      <para>compat*/</para>
-	    </listitem>
+		<row>
+		  <entry><filename>dvd1.iso</filename></entry>
+		  <entry>Similar to <filename>disc1.iso</filename>
+		    but with addtional packages.</entry>
+		</row>
 
-	    <listitem>
-	      <para>doc/</para>
-	    </listitem>
+		<row>
+		  <entry><filename>memstick.iso</filename></entry>
+		  <entry>A bootable image sufficient for copying to a
+		    USB stick.</entry>
+		</row>
 
-	    <listitem>
-	      <para>src/ssys.*</para>
-	    </listitem>
-	  </itemizedlist>
+		<row>
+		  <entry><filename>bootonly.iso</filename></entry>
+		  <entry>A minimal image that requires network
+		    access during installation to completely
+		    install &os;.</entry>
+		</row>
+	      </tbody>
+	    </tgroup>
+	  </informaltable>
+
+	  <para>&arch.pc98; users require three floppy images:
+	    <filename>floppies/boot.flp</filename>,
+	    <filename>floppies/kern1.flp</filename>, and
+	    <filename>floppies/kern2.flp</filename>.  These images
+	    need
+	    to be copied onto floppies by tools like
+	    &man.dd.1;.</para>
 
 	  <para>Full instructions on this procedure and a little bit
 	    more about installation issues in general can be found in
@@ -1214,21 +1252,17 @@
 
       <qandaentry>
 	<question id="floppy-image-too-large">
-	  <para>What do I do if the floppy images does not fit on a
-	    single floppy?</para>
+	  <para>What do I do if the images do not fit on a
+	    single disk?</para>
 	</question>
 
 	<answer>
-	  <para>A 3.5&nbsp;inch (1.44&nbsp;MB) floppy can accommodate
-	    1,474,560&nbsp;bytes of data.  The boot image is exactly
-	    1,474,560&nbsp;bytes in size.</para>
-
-	  <para>Common mistakes when preparing the boot floppy
+	  <para>Common mistakes when preparing the boot media
 	    are:</para>
 
 	  <itemizedlist>
 	    <listitem>
-	      <para>Not downloading the floppy image in
+	      <para>Not downloading the image in
 		<emphasis>binary</emphasis> mode when using
 		<acronym>FTP</acronym>.</para>
 
@@ -1236,7 +1270,8 @@
 		<emphasis>ascii</emphasis> and attempt to change any
 		end-of-line characters received to match the conventions
 		used by the client's system.  This will almost
-		invariably corrupt the boot image.  Check the size of
+		invariably corrupt the boot image.  Check the SHA-256
+		of
 		the downloaded boot image: if it is not
 		<emphasis>exactly</emphasis> that on the server, then
 		the download process is suspect.</para>
@@ -1258,7 +1293,7 @@
 		floppy, track for track, and is not meant to be placed
 		on the floppy as a regular file.  You have to transfer
 		it to the floppy <quote>raw</quote>, using the low-level
-		tools (e.g. <command>fdimage</command> or
+		tools (e.g., <command>fdimage</command> or
 		<command>rawrite</command>) described in the <ulink
 		  url="&url.books.handbook;/install.html">installation guide to &os;</ulink>.
 		</para>
@@ -1313,7 +1348,8 @@
 	</question>
 
 	<answer>
-	  <para>Install &windows; first, then &os;.  &os;'s boot manager
+	  <para>If &windows; is installed first, then yes.
+	    &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
@@ -1351,7 +1387,7 @@
 		<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
+		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
@@ -1383,166 +1419,6 @@
       </qandaentry>
 
       <qandaentry>
-	<question id="boot-on-thinkpad">
-	  <para>My A, T, or X series IBM Thinkpad locks up when I first
-	    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 &os; partition as a potential FAT
-	    suspend-to-disk partition.  When the BIOS tries to parse the
-	    &os; partition it hangs.</para>
-
-	  <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>
-
-	  <informaltable frame="none" pgwide="1">
-	    <tgroup cols="2">
-	      <thead>
-		<row>
-		  <entry>Model</entry>
-
-		  <entry>BIOS revision</entry>
-		</row>
-	      </thead>
-
-	      <tbody>
-		<row>
-		  <entry>T20</entry>
-
-		  <entry>IYET49WW or later</entry>
-		</row>
-
-		<row>
-		  <entry>T21</entry>
-
-		  <entry>KZET22WW or later</entry>
-		</row>
-
-		<row>
-		  <entry>A20p</entry>
-
-		  <entry>IVET62WW or later</entry>
-		</row>
-
-		<row>
-		  <entry>A20m</entry>
-
-		  <entry>IWET54WW or later</entry>
-		</row>
-
-		<row>
-		  <entry>A21p</entry>
-
-		  <entry>KYET27WW or later</entry>
-		</row>
-
-		<row>
-		  <entry>A21m</entry>
-
-		  <entry>KXET24WW or later</entry>
-		</row>
-
-		<row>
-		  <entry>A21e</entry>
-
-		  <entry>KUET30WW</entry>
-		</row>
-	      </tbody>
-	    </tgroup>
-	  </informaltable>
-
-	  <para>It has been reported that later IBM BIOS revisions may
-	    have reintroduced the bug.  <ulink
-	      url="http://docs.FreeBSD.org/cgi/mid.cgi?20010427133759.A71732">This message</ulink>
-	    from &a.nectar; to the &a.mobile; describes a procedure
-	    which may work if your newer IBM 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 &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
-	    &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 &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 &os;
-	    installation.</para>
-
-	  <procedure>
-	    <step>
-	      <para>Download <filename>boot1</filename> and
-		<filename>boot2</filename> from <ulink
-		  url="http://people.FreeBSD.org/~bmah/ThinkPad/"></ulink>.
-		Put these files somewhere you will be able to retrieve
-		them later.</para>
-	    </step>
-
-	    <step>
-	      <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>
-	    </step>
-
-	    <step>
-	      <para>Either switch to the <quote>Emergency Holographic
-		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 &os; partition ID
-		from <literal>165</literal> to <literal>166</literal>
-		(this is the type used by OpenBSD).</para>
-	    </step>
-
-	    <step>
-	      <para>Bring the <filename>boot1</filename> and
-		<filename>boot2</filename> files to the local file
-		system.</para>
-	    </step>
-
-	    <step>
-	      <para>Use &man.disklabel.8; to write
-		<filename>boot1</filename> 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 &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 &os;.</para>
-	    </step>
-	  </procedure>
-
-	  <para>Getting this to work in the case where you want to dual
-	    boot OpenBSD and &os; on the same laptop is left as an
-	    exercise for the reader.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="install-bad-blocks">
 	  <para>Can I install on a disk with bad blocks?</para>
 	</question>
@@ -2063,6 +1939,21 @@
 	    shows up before loader is started.</para>
 	</answer>
       </qandaentry>
+
+      <qandaentry>
+	<question id="general-configuration-tool">
+	  <para>Is there a tool to perform post-installation
+	    configuration tasks?</para>
+	</question>
+
+	<answer>
+	  <para>Yes, &rel.head.releng; users can set
+	    <varname>WITH_BSDCONFIG</varname> in
+	    <filename>/etc/src.conf</filename>.  Users of &rel.relx;
+	    and higher may also install
+	    <filename role="package">sysutils/bsdconfig</filename>.</para>
+	</answer>
+      </qandaentry>
     </qandaset>
   </chapter>
 
@@ -2196,8 +2087,8 @@
 	  </question>
 
 	  <answer>
-	    <para>Yes.  &os; currently runs on the Intel x86 and the
-	      AMD64 architectures.  The Intel EM64T, IA-64, &arm;,
+	    <para>Yes.  &os; currently runs on the &intel; x86 and the
+	      AMD64 architectures.  The &intel; EM64T, IA-64, &arm;,
 	      &powerpc;, and &sparc64; architectures are also
 	      supported.  Upcoming platforms are &mips; and &s390;, join
 	      the &a.mips; for more information about ongoing work on
@@ -2725,48 +2616,6 @@ bindkey ^[[3~ delete-char # for xterm</p
 	      needs.</para>
 	  </answer>
 	</qandaentry>
-
-	<qandaentry>
-	  <question id="micron-hang-boot">
-	    <para>Why does my Micron system hang at boot time?</para>
-	  </question>
-
-	  <answer>
-	    <para>Certain Micron motherboards have a non-conforming PCI
-	      BIOS implementation that causes grief when &os; boots
-	      because PCI devices do not get configured at their
-	      reported addresses.</para>
-
-	    <para>Disable the <quote>Plug and Play Operating
-	      System</quote> flag in the BIOS to work around this
-	      problem.</para>
-	  </answer>
-	</qandaentry>
-
-	<qandaentry>
-	  <question id="asusk7v-boot-failure">
-	    <para>The boot floppy hangs on a system with an ASUS K7V
-	      motherboard.  How do I fix this?</para>
-	  </question>
-
-	  <answer>
-	    <para>Go into the BIOS setup and disable the <quote>boot
-	      virus protection</quote>.</para>
-	  </answer>
-	</qandaentry>
-
-	<qandaentry>
-	  <question id="micron-3comnic-failure">
-	    <para>Why does my &tm.3com; PCI network card not work with my
-	      Micron computer?</para>
-	  </question>
-
-	  <answer>
-	    <para>See <link
-		linkend="micron-hang-boot">the previous answer</link>.
-	      </para>
-	  </answer>
-	</qandaentry>
       </qandaset>
     </sect1>
   </chapter>
@@ -2927,19 +2776,6 @@ quit</programlisting>
       </qandaentry>
 
       <qandaentry>
-	<question id="bad-3c509">
-	  <para>Why did my &tm.3com; 3C509 card stop working for no
-	    apparent reason?</para>
-	</question>
-
-	<answer>
-	  <para>This card has a bad habit of losing its configuration
-	    information.  Refresh your card's settings with the DOS
-	    utility <command>3c5x9.exe</command>.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="signal11">
 	  <para>Why do my programs occasionally die with
 	    <errorname>Signal 11</errorname> errors?</para>
@@ -3011,8 +2847,8 @@ quit</programlisting>
 		on the processor might have died.  In either case you
 		need to ensure that you have hardware running at what it
 		is specified to run at, at least while trying to solve
-		this problem.  i.e.  Clock it back to the default
-		settings.</para>
+		this problem (in other words, clock it back to the default
+		settings.)</para>
 
 	      <para>If you are overclocking then note that it is far
 		cheaper to have a slow system than a fried system that
@@ -3141,36 +2977,6 @@ quit</programlisting>
       </qandaentry>
 
       <qandaentry>
-	<question id="reallybigram">
-	  <para>Why does &os; only use 64&nbsp;MB of RAM when my system
-	    has 128&nbsp;MB of RAM installed?</para>
-	</question>
-
-	<answer>
-	  <para>Due to the manner in which &os; gets the memory size
-	    from the BIOS, it can only detect 16&nbsp;bits worth of
-	    Kbytes in size (65535&nbsp;Kbytes = 64&nbsp;MB) (or less...
-	    some BIOSes peg the memory size to 16&nbsp;MB).  If you have
-	    more than 64&nbsp;MB, &os; will attempt to detect it;
-	    however, the attempt may fail.</para>
-
-	  <para>To work around this problem, you need to use the kernel
-	    option specified below.  There is a way to get complete
-	    memory information from the BIOS, but we do not have room in
-	    the bootblocks to do it.  Someday when lack of room in the
-	    bootblocks is fixed, we will use the extended BIOS functions
-	    to get the full memory information... but for now we are
-	    stuck with the kernel option.</para>
-
-	  <programlisting>options MAXMEM=<replaceable>n</replaceable></programlisting>
-
-	  <para>Where <replaceable>n</replaceable> is your memory in
-	    Kilobytes.  For a 128&nbsp;MB machine, you would want to use
-	    <literal>131072</literal>.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="kmem-map-too-small">
 	  <para>My system has more than 1&nbsp;GB of RAM, and I'm
 	    getting panics with <errorname>kmem_map too small</errorname>
@@ -3179,7 +2985,7 @@ quit</programlisting>
 
 	<answer>
 	  <para>Normally, &os; determines a number of kernel parameters,
-	    such as as the maximum number of files that can be open
+	    such as the maximum number of files that can be open
 	    concurrently, from the amount of memory installed in the
 	    system.  On systems with one gigabyte of RAM or more, this
 	    <quote>auto sizing</quote> mechanism may choose values that
@@ -3641,7 +3447,7 @@ chip1@pci0:31:5:        class=0x040100 c
 	      <para>Break the warnings by changing the value of
 		<varname>MAX_STRAY_LOG</varname> from
 		<literal>5</literal> to <literal>0</literal> in your
-		platform's (e.g.  &i386;)
+		platform's (e.g., &i386;)
 		<filename>intr_machdep.c</filename> file and rebuild the
 		new kernel and all the warnings will be
 		suppressed.</para>
@@ -3984,11 +3790,7 @@ kern.timecounter.hardware: TSC -&gt; i82
 	      url="http://www.openoffice.org">OpenOffice.org</ulink></application>;
 	    and <application><ulink
               url="http://www.libreoffice.org">LibreOffice</ulink></application>;
-            office suites work natively on &os;.  The &linux; version of
-	    <application><ulink
-	      url="http://www.oracle.com/us/products/applications/open-office/index.html">Oracle Open Office</ulink></application>,
-	    the value-added closed-source version of OpenOffice.org,
-	    also works on &os;.</para>
+            office suites work natively on &os;.</para>
 
 	  <para>&os; also includes a variety of text editors,
 	    spreadsheets, and drawing programs in the Ports
@@ -4178,9 +3980,7 @@ kern.timecounter.hardware: TSC -&gt; i82
 	    can be installed and uninstalled again easily without having
 	    to know the gory details of which files it includes.</para>
 
-	  <para>Use the <guimenuitem>Packages</guimenuitem> package
-	    installation menu in &man.sysinstall.8; (under the
-	    <guimenuitem>Configure</guimenuitem> menu item) or invoke
+	  <para>Invoke
 	    the &man.pkg.add.1; command on the specific package files
 	    you are interested in installing.  Package files can usually
 	    be identified by their <filename>.tbz</filename> suffix and
@@ -4322,38 +4122,12 @@ kern.timecounter.hardware: TSC -&gt; i82
 	</question>
 
 	<answer>
-	  <para>First, always make sure that you have a completely
+	  <para>First, always make sure that you have a complete
 	    up-to-date Ports Collection.  Errors that affect building
 	    <filename>INDEX</filename> from an up-to-date copy of the
 	    Ports Collection are high-visibility and are thus almost
 	    always fixed immediately.</para>
 
-	  <para>However, if you are up-to-date, perhaps you are seeing
-	    another problem.  <command>make <maketarget>index</maketarget></command>
-	    has a known bug in dealing with incomplete copies of the
-	    Ports Collection.  It assumes that you have a local copy of
-	    every single port that every other port that you have a
-	    local copy of depends on.  To explain, if you have a copy of
-	    <filename>foo/bar</filename> on your disk, and
-	    <filename>foo/bar</filename> depends on
-	    <filename>baz/quux</filename>, then you must also have a
-	    copy of <filename>baz/quux</filename> on your disk, and the
-	    ports <filename>baz/quux</filename> depends on, and so on.
-	    Otherwise, <command>make <maketarget>index</maketarget></command>
-	    has insufficient information to create its dependency
-	    tree.</para>
-
-	  <para>This is particularly a problem for &os; users who
-	    utilize &man.csup.1; to track the Ports
-	    Collection but choose not to install certain categories by
-	    specifying them in <filename>refuse</filename>.  In theory,
-	    one should be able to refuse categories, but in practice
-	    there are too many ports that depend on ports in other
-	    categories.  Until someone comes up with a solution for this
-	    problem, the general rule is that if you want to build
-	    <filename>INDEX</filename>, you must have a complete copy of
-	    the Ports Collection.</para>
-
 	  <para>There are rare cases where <filename>INDEX</filename>
 	    will not build due to odd cases involving
 	    <makevar>WITH_<replaceable>*</replaceable></makevar> or
@@ -4680,27 +4454,12 @@ device sio5 at isa? port 0x2b8 tty flags
 	</question>
 
 	<answer>
-	  <para>Check for the existence of the
-	    <varname>kern.sched.quantum</varname> sysctl.  If you have
-	    it, you should see something like this:</para>
-
-	  <screen>&prompt.user; sysctl <replaceable>kern.sched.quantum</replaceable>
-kern.sched.quantum: 99960</screen>
-
-	  <para>If the <varname>kern.sched.quantum</varname> sysctl
-	    exists, you are using the 4BSD scheduler (&man.sched.4bsd.4;).
-	    If not, you will get an error printed by &man.sysctl.8;
-	    (which you can safely ignore):</para>
-
-	  <screen>&prompt.user; sysctl <replaceable>kern.sched.quantum</replaceable>
-sysctl: unknown oid 'kern.sched.quantum'</screen>
-
 	  <para>The name of the scheduler currently being used is
 	    directly available as the value of the
 	    <varname>kern.sched.name</varname> sysctl:</para>
 
 	  <screen>&prompt.user; sysctl <replaceable>kern.sched.name</replaceable>
-kern.sched.name: 4BSD</screen>
+kern.sched.name: ULE</screen>
 	</answer>
       </qandaentry>
 
@@ -4867,11 +4626,8 @@ kern.sched.name: 4BSD</screen>
 	    they are getting in contact with such a disk, or even worse,
 	    they might damage the BSD bootstrap without even asking or
 	    notifying you.  In addition, the <quote>dangerously
-	    dedicated</quote> disk's layout is known to confuse many
-	    BIOSes, including those from AWARD (e.g. as found in HP
-	    Netserver and Micronics systems as well as many others) and
-	    Symbios/NCR (for the popular 53C8xx range of SCSI
-	    controllers).  This is not a complete list, there are more.
+	    dedicated</quote> disk's layout is known to confuse some
+	    BIOSes.
 	    Symptoms of this confusion include the <errorname>read
 	    error</errorname> message printed by the &os; bootstrap when
 	    it cannot find itself, as well as system lockups when
@@ -4912,7 +4668,7 @@ kern.sched.name: 4BSD</screen>
 	    &os; lists your disks, first IDE, then SCSI.</para>
 
 	  <para>When you are slicing up your disk, check that the disk
-	    geometry displayed in the FDISK screen is correct (ie.  it
+	    geometry displayed in the FDISK screen is correct (i.e., it
 	    matches the BIOS numbers); if it is wrong, use the
 	    <keycap>G</keycap> key to fix it.  You may have to do this
 	    if there is absolutely nothing on the disk, or if the disk
@@ -5102,11 +4858,10 @@ use "disklabel -r" to install initial la
 	      <term>NTFS</term>
 
 	      <listitem>
-		<para>&os; includes a read-only NTFS driver.  For more
-		  information, see &man.mount.ntfs.8;.  A port of <ulink
-		    url="http://www.tuxera.com/community/"><application>ntfs-3g</application></ulink>;
-		  supports write operations on NTFS (see <filename
-		    role="package">sysutils/fusefs-ntfs</filename>).</para>
+		<para>FUSE based NTFS support is available as a port
+		  (<filename role="package">sysutils/fusefs-ntfs</filename>).
+		  For more information see <ulink
+		    url="http://www.tuxera.com/community/ntfs-3g-manual/"><application>ntfs-3g</application></ulink>.</para>;
 	      </listitem>
 	    </varlistentry>
 
@@ -5287,7 +5042,7 @@ C:\="DOS"</programlisting>
 	    following to your configuration file
 	    <filename>/boot/grub/menu.lst</filename> (or
 	    <filename>/boot/grub/grub.conf</filename> in some systems,
-	    e.g. Red Hat Linux and its derivatives).</para>
+	    e.g., Red Hat Linux and its derivatives).</para>
 
 	  <programlisting>title &os; 6.1
 	root <replaceable>(hd0,a)</replaceable>
@@ -5523,85 +5278,39 @@ C:\="DOS"</programlisting>
 
       <qandaentry>
 	<question id="user-floppymount">
-	  <para>How do I let ordinary users mount floppies, CD-ROMs and
-	    other removable media?</para>
+	  <para>How do I let ordinary users mount CD-ROMs, DVDs,
+	    USB drives, and other removable media?</para>
 	</question>
 
 	<answer>
-	  <para>Ordinary users can be permitted to mount devices.  Here
-	    is how:</para>
-
-	  <procedure>
-	    <step>
-	      <para>As <username>root</username> set the sysctl variable
-		<varname>vfs.usermount</varname> to
-		<literal>1</literal>.</para>

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



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