svn commit: r44655 - head/en_US.ISO8859-1/books/handbook/bsdinstall

Dru Lavigne dru at FreeBSD.org
Thu Apr 24 23:01:57 UTC 2014


Author: dru
Date: Thu Apr 24 23:01:56 2014
New Revision: 44655
URL: http://svnweb.freebsd.org/changeset/doc/44655

Log:
  White space fix only. Translators can ignore.
  
  Sponsored by:	iXsystems

Modified:
  head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml	Thu Apr 24 22:11:46 2014	(r44654)
+++ head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml	Thu Apr 24 23:01:56 2014	(r44655)
@@ -20,8 +20,8 @@
 	  <surname>Mock</surname>
 	</personname>
 
-	<contrib>Restructured, reorganized, and parts
-	  rewritten by </contrib>
+	<contrib>Restructured, reorganized, and parts rewritten
+	  by </contrib>
       </author>
     </authorgroup>
 
@@ -79,8 +79,8 @@
       <application>sysinstall</application> for installation.  This
       chapter describes the use of
       <application>bsdinstall</application>.  The use of
-      <application>sysinstall</application> is covered in
-      <xref linkend="install"/>.</para>
+      <application>sysinstall</application> is covered in <xref
+	linkend="install"/>.</para>
 
     <para>After reading this chapter, you will know:</para>
 
@@ -145,14 +145,15 @@
 	<title>&os;/&arch.i386;</title>
 
 	<para>&os;/&arch.i386; requires a 486 or better processor and
-	  at least 64 MB of <acronym>RAM</acronym>.  At least 1.1 GB of free
-	  hard drive space is needed for the most minimal
-	  installation.</para>
+	  at least 64 MB of <acronym>RAM</acronym>.  At least
+	  1.1 GB of free hard drive space is needed for the most
+	  minimal installation.</para>
 
 	<note>
-	  <para>On old computers, increasing <acronym>RAM</acronym> and hard drive space
-	    is usually more effective at improving performance than
-	    installing a faster processor.</para>
+	  <para>On old computers, increasing <acronym>RAM</acronym>
+	    and hard drive space is usually more effective at
+	    improving performance than installing a faster
+	    processor.</para>
 	</note>
       </sect3>
 
@@ -161,9 +162,8 @@
 
 	<para>There are two classes of processors capable of running
 	  &os;/&arch.amd64;.  The first are AMD64 processors,
-	  including the &amd.athlon;64,
-	  &amd.athlon;64-FX, &amd.opteron; or better
-	  processors.</para>
+	  including the &amd.athlon;64, &amd.athlon;64-FX,
+	  &amd.opteron; or better processors.</para>
 
 	<para>The second class of processors that can use
 	  &os;/&arch.amd64; includes those using the
@@ -174,22 +174,25 @@
 	  &intel; &xeon; E3, E5 and E7 processors, and the
 	  &intel; &core; i3, i5 and i7 processors.</para>
 
-	<para>If the system is based on an nVidia nForce3
-	  Pro-150, the <acronym>IO</acronym> <acronym>APIC</acronym> <emphasis>must</emphasis> be disabled
-	  in the <acronym>BIOS</acronym> setup.  If this <acronym>BIOS</acronym> option does not exist,
-	  disable <acronym>ACPI</acronym> instead.</para>
+	<para>If the system is based on an nVidia nForce3 Pro-150, the
+	  <acronym>IO</acronym> <acronym>APIC</acronym>
+	  <emphasis>must</emphasis> be disabled in the
+	  <acronym>BIOS</acronym> setup.  If this
+	  <acronym>BIOS</acronym> option does not exist, disable
+	  <acronym>ACPI</acronym> instead.</para>
       </sect3>
 
       <sect3>
 	<title>&os;/&arch.powerpc; &apple; &macintosh;</title>
 
 	<para>All New World &apple; &macintosh; systems with built-in
-	  <acronym>USB</acronym> are supported.  <acronym>SMP</acronym> is supported on machines with
+	  <acronym>USB</acronym> are supported.
+	  <acronym>SMP</acronym> is supported on machines with
 	  multiple <acronym>CPU</acronym>s.</para>
 
-	<para>A 32-bit kernel can only use the first 2 GB of <acronym>RAM</acronym>.
-	  &firewire; is not supported on the Blue & White PowerMac
-	  G3.</para>
+	<para>A 32-bit kernel can only use the first 2 GB of
+	  <acronym>RAM</acronym>.  &firewire; is not supported on the
+	  Blue & White PowerMac G3.</para>
       </sect3>
 
       <sect3>
@@ -224,21 +227,20 @@
     <sect2>
       <title>Back Up Important Data</title>
 
-      <para>Back up all important data on the target computer
-	where &os; will be installed.  Test the backups before
-	continuing.  The &os; installer will ask before making changes
-	to the disk, but once the process has started it cannot be
-	undone.</para>
+      <para>Back up all important data on the target computer where
+	&os; will be installed.  Test the backups before continuing.
+	The &os; installer will ask before making changes to the disk,
+	but once the process has started it cannot be undone.</para>
     </sect2>
 
     <sect2 xml:id="bsdinstall-where">
       <title>Decide Where to Install &os;</title>
 
       <para>If &os; will be the only operating system installed, and
-	will be allowed to use the entire hard disk, the rest of
-	this section can be skipped.  But if &os; will share the disk
-	with other operating systems, an understanding of disk
-	layout is useful during the installation.</para>
+	will be allowed to use the entire hard disk, the rest of this
+	section can be skipped.  But if &os; will share the disk with
+	other operating systems, an understanding of disk layout is
+	useful during the installation.</para>
 
       <sect3 xml:id="bsdinstall-where-i386">
 	<title>Disk Layouts for &os;/&arch.i386; and
@@ -250,38 +252,37 @@
 
 	<para>There are two ways of dividing a disk into partitions.
 	  A traditional <firstterm>Master Boot Record</firstterm>
-	  (<acronym>MBR</acronym>) holds a
-	  partition table defining up to four <firstterm>primary
-	    partitions</firstterm>.  For historical reasons, &os;
-	  calls primary partitions <firstterm>slices</firstterm>.  A
-	  limit of only four partitions is restrictive for large
-	  disks, so one of these primary partitions can be made into
-	  an <firstterm>extended partition</firstterm>.  Multiple
-	  <firstterm>logical partitions</firstterm> may then be
-	  created inside the extended partition.  This may sound a
-	  little unwieldy, and it is.</para>
+	  (<acronym>MBR</acronym>) holds a partition table defining up
+	  to four <firstterm>primary partitions</firstterm>.  For
+	  historical reasons, &os; calls primary partitions
+	  <firstterm>slices</firstterm>.  A limit of only four
+	  partitions is restrictive for large disks, so one of these
+	  primary partitions can be made into an <firstterm>extended
+	    partition</firstterm>.  Multiple <firstterm>logical
+	    partitions</firstterm> may then be created inside the
+	  extended partition.  This may sound a little unwieldy, and
+	  it is.</para>
 
 	<para>The <firstterm>GUID Partition Table</firstterm>
-	  (<acronym>GPT</acronym>) is a
-	  newer and simpler method of partitioning a disk.
-	  <acronym>GPT</acronym> is far
-	  more versatile than the traditional <acronym>MBR </acronym>partition table.
-	  Common <acronym>GPT</acronym> implementations allow up to
-	  128 partitions per disk, eliminating the need for
-	  inconvenient workarounds like logical partitions.</para>
+	  (<acronym>GPT</acronym>) is a newer and simpler method of
+	  partitioning a disk.  <acronym>GPT</acronym> is far more
+	  versatile than the traditional <acronym>MBR</acronym>
+	  partition table.  Common <acronym>GPT</acronym>
+	  implementations allow up to 128 partitions per disk,
+	  eliminating the need for inconvenient workarounds like
+	  logical partitions.</para>
 
 	<warning>
 	  <para>Some older operating systems, like &windows; XP,
 	    are not compatible with the <acronym>GPT</acronym>
 	    partition scheme.  If &os; will be sharing a disk with
-	    such an operating system,
-	    <acronym>MBR</acronym>
+	    such an operating system, <acronym>MBR</acronym>
 	    partitioning is required.</para>
 	</warning>
 
 	<para>&os;'s standard boot loader requires either a primary or
-	  <acronym>GPT</acronym> partition.  Refer to
-	  <xref linkend="boot"/> for more information about the &os;
+	  <acronym>GPT</acronym> partition.  Refer to <xref
+	    linkend="boot"/> for more information about the &os;
 	  booting process.  If all of the primary or
 	  <acronym>GPT</acronym> partitions are already in use, one
 	  must be freed for &os;.</para>
@@ -311,8 +312,8 @@
 	</warning>
 
 	<para>Resizing µsoft; Vista partitions can be
-	  difficult.  A Vista installation <acronym>CD</acronym> can be useful when
-	  attempting such an operation.</para>
+	  difficult.  A Vista installation <acronym>CD</acronym> can
+	  be useful when attempting such an operation.</para>
 
 	<example>
 	  <title>Using an Existing Partition</title>
@@ -320,14 +321,14 @@
 	  <para>A &windows; computer has a single 40 GB disk that
 	    has been split into two 20 GB partitions.  &windows;
 	    calls them <filename>C:</filename> and
-	    <filename>D:</filename>.  The
-	    <filename>C:</filename> partition contains 10 GB
-	    of data, and the <filename>D:</filename> partition
-	    contains 5 GB of data.</para>
+	    <filename>D:</filename>.  The <filename>C:</filename>
+	    partition contains 10 GB of data, and the
+	    <filename>D:</filename> partition contains 5 GB of
+	    data.</para>
 
 	  <para>Moving the data from <filename>D:</filename> to
-	    <filename>C:</filename> frees up the second partition
-	    to be used for &os;.</para>
+	    <filename>C:</filename> frees up the second partition to
+	    be used for &os;.</para>
 	</example>
 
 	<example>
@@ -372,14 +373,15 @@
 
       <para>Some &os; installation methods need a network connection
 	to download files.  To connect to an Ethernet network (or
-	cable or <acronym>DSL</acronym> modem with an Ethernet interface), the installer
-	will request some information about the network.</para>
-
-      <para><acronym>DHCP</acronym> is commonly
-	used to provide automatic network configuration.  If
-	<acronym>DHCP</acronym> is not available, this network
-	information must be obtained from the local network
-	administrator or service provider:</para>
+	cable or <acronym>DSL</acronym> modem with an Ethernet
+	interface), the installer will request some information about
+	the network.</para>
+
+      <para><acronym>DHCP</acronym> is commonly used to provide
+	automatic network configuration.  If <acronym>DHCP</acronym>
+	is not available, this network information must be obtained
+	from the local network administrator or service
+	provider:</para>
 
       <orderedlist>
 	<title>Network Information</title>
@@ -417,9 +419,9 @@
 	affect the installation process.  As these problems are
 	discovered and fixed, they are noted in the &os; Errata (<link
 	  xlink:href="&url.base;/releases/&rel.current;R/errata.html">http://www.freebsd.org/releases/&rel.current;R/errata.html</link>)
-	on the &os; web site.  Check the errata before
-	installing to make sure that there are no problems that might
-	affect the installation.</para>
+	on the &os; web site.  Check the errata before installing to
+	make sure that there are no problems that might affect the
+	installation.</para>
 
       <para>Information and errata for all the releases can be found
 	on the release information section of the &os; web site (<link
@@ -430,43 +432,49 @@
       <title>Prepare the Installation Media</title>
 
       <para>A &os; installation is started by booting the computer
-	with a &os; installation <acronym>CD</acronym>, <acronym>DVD</acronym>, or <acronym>USB</acronym> memory stick.  The
-	installer is not a program that can be run from within another
-	operating system.</para>
+	with a &os; installation <acronym>CD</acronym>,
+	<acronym>DVD</acronym>, or <acronym>USB</acronym> memory
+	stick.  The installer is not a program that can be run from
+	within another operating system.</para>
 
       <para>In addition to the standard installation media which
 	contains copies of all the &os; installation files, there is a
 	<emphasis>bootonly</emphasis> variant.  Bootonly install media
 	does not have copies of the installation files, but downloads
 	them from the network during an install.  The bootonly install
-	<acronym>CD</acronym> is consequently much smaller, and reduces bandwidth usage
-	during the install by only downloading required files.</para>
-
-      <para>Copies of &os; installation media are available at
-	<link xlink:href="&url.base;/where.html#download">www.freebsd.org/where.html#download</link>.
-	Also download
-	<filename>CHECKSUM.SHA256</filename> from the same directory
-	as the image file, and use it to check the image file's
-	integrity by calculating a <emphasis>checksum</emphasis>.
-	&os; provides &man.sha256.1; for this, while other operating
-	systems have similar programs.  Compare the calculated
-	checksum with the one shown in
+	<acronym>CD</acronym> is consequently much smaller, and
+	reduces bandwidth usage during the install by only downloading
+	required files.</para>
+
+      <para>Copies of &os; installation media are available at <link
+	  xlink:href="&url.base;/where.html#download">www.freebsd.org/where.html#download</link>.
+	Also download <filename>CHECKSUM.SHA256</filename> from the
+	same directory as the image file, and use it to check the
+	image file's integrity by calculating a
+	<emphasis>checksum</emphasis>.  &os; provides &man.sha256.1;
+	for this, while other operating systems have similar programs.
+	Compare the calculated checksum with the one shown in
 	<filename>CHECKSUM.SHA256</filename>.  The checksums must
 	match exactly.  If the checksums do not match, the file is
 	corrupt and should be discarded.</para>
 
       <tip>
-	<para>If a copy of &os; already exists on <acronym>CD</acronym>, <acronym>DVD</acronym>, or <acronym>USB</acronym>
-	  memory stick, this section can be skipped.</para>
+	<para>If a copy of &os; already exists on
+	  <acronym>CD</acronym>, <acronym>DVD</acronym>, or
+	  <acronym>USB</acronym> memory stick, this section can be
+	  skipped.</para>
       </tip>
 
-      <para>&os; <acronym>CD</acronym> and <acronym>DVD</acronym> images are bootable <acronym>ISO</acronym> files.  Only one
-	<acronym>CD</acronym> or <acronym>DVD</acronym> is needed for an install.  Burn the <acronym>ISO</acronym> image to a
-	bootable <acronym>CD</acronym> or <acronym>DVD</acronym> using the burning applications
-	available with the current operating system.  On &os;,
-	recording is provided by <command>cdrecord</command> from
-	<package>sysutils/cdrtools</package>, installed
-	from the Ports Collection.</para>
+      <para>&os; <acronym>CD</acronym> and <acronym>DVD</acronym>
+	images are bootable <acronym>ISO</acronym> files.  Only one
+	<acronym>CD</acronym> or <acronym>DVD</acronym> is needed for
+	an install.  Burn the <acronym>ISO</acronym> image to a
+	bootable <acronym>CD</acronym> or <acronym>DVD</acronym> using
+	the burning applications available with the current operating
+	system.  On &os;, recording is provided by
+	<command>cdrecord</command> from
+	<package>sysutils/cdrtools</package>, installed from the Ports
+	Collection.</para>
 
       <para>To create a bootable memory stick, follow these
 	steps:</para>
@@ -481,11 +489,10 @@
 	    directory at
 	    <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/<replaceable>arch</replaceable>/<replaceable>arch</replaceable>/ISO-IMAGES/<replaceable>version</replaceable>/&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-memstick.img</literal>.
 	    Replace <replaceable>arch</replaceable> and
-	    <replaceable>version</replaceable> with the
-	    architecture and the version number to
-	    install, respectively.  For example, the memory stick
-	    images for &os;/&arch.i386; 9.0-RELEASE are
-	    available from <uri
+	    <replaceable>version</replaceable> with the architecture
+	    and the version number to install, respectively.  For
+	    example, the memory stick images for
+	    &os;/&arch.i386; 9.0-RELEASE are available from <uri
 	      xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/&arch.i386;/&arch.i386;/ISO-IMAGES/9.0/&os;-9.0-RELEASE-&arch.i386;-memstick.img">ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/&arch.i386;/&arch.i386;/ISO-IMAGES/9.0/&os;-9.0-RELEASE-&arch.i386;-memstick.img</uri>.</para>
 
 	  <tip>
@@ -519,8 +526,8 @@
 	      <para>The example below shows
 		<filename>/dev/da0</filename> as the target device
 		where the image will be written.  Be very careful that
-		the correct device is used as the output target, as this command will
-		destroy existing data.</para>
+		the correct device is used as the output target, as
+		this command will destroy existing data.</para>
 	    </warning>
 
 	    <step>
@@ -529,10 +536,9 @@
 	      <para>The <filename>.img</filename> file is
 		<emphasis>not</emphasis> a regular file.  It is an
 		<emphasis>image</emphasis> of the complete contents of
-		the memory stick.  It <emphasis>cannot</emphasis>
-		be copied like a regular file, but must be
-		written directly to the target device with
-		&man.dd.1;:</para>
+		the memory stick.  It <emphasis>cannot</emphasis> be
+		copied like a regular file, but must be written
+		directly to the target device with &man.dd.1;:</para>
 
 	      <screen>&prompt.root; <userinput>dd if=&os;-9.0-RELEASE-&arch.i386;-memstick.img of=/dev/<replaceable>da0</replaceable> bs=64k</userinput></screen>
 	    </step>
@@ -603,9 +609,9 @@ commit your changes?</literallayout>
 
       <para>The install can be exited at any time prior to this
 	warning without changing the contents of the hard drive.  If
-	there is a concern that something is
-	incorrectly configured, just turn the computer off before this
-	point, and no damage will be done.</para>
+	there is a concern that something is incorrectly configured,
+	just turn the computer off before this point, and no damage
+	will be done.</para>
     </important>
 
     <sect2 xml:id="bsdinstall-starting">
@@ -616,24 +622,25 @@ commit your changes?</literallayout>
 
 	<procedure>
 	  <step>
-	    <para>When using a prepared <quote>bootable</quote> USB stick,
-	      as described in
-	      <xref linkend="bsdinstall-installation-media"/>,
-	      plug in the <acronym>USB</acronym> stick before turning on the
+	    <para>When using a prepared <quote>bootable</quote> USB
+	      stick, as described in <xref
+		linkend="bsdinstall-installation-media"/>, plug in the
+	      <acronym>USB</acronym> stick before turning on the
 	      computer.</para>
 
-	    <para>When booting from <acronym>CD</acronym>,
-	      turn on the computer and insert the <acronym>CD</acronym> at the first
-	      opportunity.</para>
+	    <para>When booting from <acronym>CD</acronym>, turn on the
+	      computer and insert the <acronym>CD</acronym> at the
+	      first opportunity.</para>
 	  </step>
 
 	  <step>
-	    <para>Configure the system to boot from either the <acronym>CD</acronym>
-	      or from <acronym>USB</acronym>, depending on the media being used for the
-	      installation.  <acronym>BIOS</acronym> configurations
-	      allow the selection of a specific boot device.  Most
-	      systems also provide for selecting a boot device during
-	      startup, typically by pressing <keycap>F10</keycap>,
+	    <para>Configure the system to boot from either the
+	      <acronym>CD</acronym> or from <acronym>USB</acronym>,
+	      depending on the media being used for the installation.
+	      <acronym>BIOS</acronym> configurations allow the
+	      selection of a specific boot device.  Most systems also
+	      provide for selecting a boot device during startup,
+	      typically by pressing <keycap>F10</keycap>,
 	      <keycap>F11</keycap>, <keycap>F12</keycap>, or
 	      <keycap>Escape</keycap>.</para>
 	  </step>
@@ -645,31 +652,32 @@ commit your changes?</literallayout>
 	    <orderedlist>
 	      <listitem>
 		<para>The disks were not inserted early enough in the
-		  boot process.  Leave them in, and try restarting
-		  the computer.</para>
+		  boot process.  Leave them in, and try restarting the
+		  computer.</para>
 	      </listitem>
 
 	      <listitem>
 		<para>The <acronym>BIOS</acronym> changes earlier did
-		  not work correctly.  Redo that step until
-		  the right option is selected.</para>
+		  not work correctly.  Redo that step until the right
+		  option is selected.</para>
 	      </listitem>
 
 	      <listitem>
 		<para>This particular <acronym>BIOS</acronym> does not
-		  support booting from the desired media.  The 
+		  support booting from the desired media.  The
 		  <application>Plop Boot Manager</application> (<link
 		    xlink:href="http://www.plop.at/en/bootmanager.html">http://www.plop.at/en/bootmanager.html</link>)
-		  can be used to boot older
-		  computers from <acronym>CD</acronym> or <acronym>USB</acronym> media.</para>
+		  can be used to boot older computers from
+		  <acronym>CD</acronym> or <acronym>USB</acronym>
+		  media.</para>
 	      </listitem>
 	    </orderedlist>
 	  </step>
 
 	  <step>
 	    <para>&os; will start to boot.  When booting from
-	      <acronym>CD</acronym>, messages similar to this will be displayed (version
-	      information omitted):</para>
+	      <acronym>CD</acronym>, messages similar to this will be
+	      displayed (version information omitted):</para>
 
 	    <screen>Booting from CD-ROM...
 645MB medium detected
@@ -718,7 +726,8 @@ Loading /boot/defaults/loader.conf
 	<title>Booting for &macintosh; &powerpc;</title>
 
 	<para>On most machines, holding <keycap>C</keycap> on the
-	  keyboard during boot will boot from the <acronym>CD</acronym>.  Otherwise, hold
+	  keyboard during boot will boot from the
+	  <acronym>CD</acronym>.  Otherwise, hold
 	  <keycombo action="simul">
 	    <keycap>Command</keycap>
 	    <keycap>Option</keycap>
@@ -739,19 +748,16 @@ Loading /boot/defaults/loader.conf
 
 	<para>For Xserves without keyboards, refer to <link
 	    xlink:href="http://support.apple.com/kb/TA26930">http://support.apple.com/kb/TA26930</link>
-	  about booting into Open
-	  Firmware.</para>
+	  about booting into Open Firmware.</para>
       </sect3>
 
       <sect3>
 	<title>Booting for &sparc64;</title>
 
 	<para>Most &sparc64; systems are set up to boot automatically
-	  from disk.  To install &os;, booting over the
-	  network or from a <acronym>CD</acronym> requires a break into
-	  the
-	  <acronym>PROM</acronym>
-	  (OpenFirmware).</para>
+	  from disk.  To install &os;, booting over the network or
+	  from a <acronym>CD</acronym> requires a break into the
+	  <acronym>PROM</acronym> (OpenFirmware).</para>
 
 	<para>To do this, reboot the system, and wait until the boot
 	  message appears.  It depends on the model, but should look
@@ -763,17 +769,14 @@ OpenBoot 4.2, 128 MB memory installed, S
 Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
 	<para>If the system proceeds to boot from disk at this point,
-	  press
-	  <keycombo
+	  press <keycombo
 	    action="simul"><keycap>L1</keycap><keycap>A</keycap></keycombo>
-	  or
-	  <keycombo
+	  or <keycombo
 	    action="simul"><keycap>Stop</keycap><keycap>A</keycap></keycombo>
 	  on the keyboard, or send a <command>BREAK</command> over the
 	  serial console (using for example <command>~#</command> in
 	  &man.tip.1; or &man.cu.1;) to get to the
-	  <acronym>PROM</acronym>
-	  prompt.  It looks like this:</para>
+	  <acronym>PROM</acronym> prompt.  It looks like this:</para>
 
 	<screen><prompt>ok    </prompt><co xml:id="bsdinstall-prompt-single"/>
 <prompt>ok {0} </prompt><co xml:id="bsdinstall-prompt-smp"/></screen>
@@ -785,13 +788,14 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	  </callout>
 
 	  <callout arearefs="bsdinstall-prompt-smp">
-	    <para>This is the prompt used on <acronym>SMP</acronym> systems, the digit
-	      indicates the number of the active <acronym>CPU</acronym>.</para>
+	    <para>This is the prompt used on <acronym>SMP</acronym>
+	      systems, the digit indicates the number of the active
+	      <acronym>CPU</acronym>.</para>
 	  </callout>
 	</calloutlist>
 
-	<para>At this point, place the <acronym>CD</acronym> into the drive, and from
-	  the <acronym>PROM</acronym> prompt, type
+	<para>At this point, place the <acronym>CD</acronym> into the
+	  drive, and from the <acronym>PROM</acronym> prompt, type
 	  <command>boot cdrom</command>.</para>
       </sect3>
     </sect2>
@@ -803,17 +807,16 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	screen are stored and can be reviewed.</para>
 
       <para>To review the buffer, press <keycap>Scroll Lock</keycap>.
-	This turns on scrolling in the display.  Use the
-	arrow keys, or <keycap>PageUp</keycap> and
-	<keycap>PageDown</keycap>, to view the results.  Press
-	<keycap>Scroll Lock</keycap> again to stop scrolling.</para>
+	This turns on scrolling in the display.  Use the arrow keys,
+	or <keycap>PageUp</keycap> and <keycap>PageDown</keycap>, to
+	view the results.  Press <keycap>Scroll Lock</keycap> again to
+	stop scrolling.</para>
 
       <para>Do this now, to review the text that scrolled off the
 	screen when the kernel was carrying out the device probes.
-	Text similar to
-	<xref linkend="bsdinstall-dev-probe"/> will be displayed, although the precise
-	text will differ depending on the devices in
-	the computer.</para>
+	Text similar to <xref linkend="bsdinstall-dev-probe"/> will be
+	displayed, although the precise text will differ depending on
+	the devices in the computer.</para>
 
       <figure xml:id="bsdinstall-dev-probe">
 	<title>Typical Device Probe Results</title>
@@ -968,19 +971,19 @@ Trying to mount root from cd9660:/dev/is
       </figure>
 
       <para>Check the probe results carefully to make sure that &os;
-	found all the devices.  If a device was not
-	found, it will not be listed.  Refer to
-	<xref linkend="kernelconfig-custom-kernel"/>
-	for instructions on how to add in support for devices
-	which are not in the <filename>GENERIC</filename>
-	kernel.</para>
+	found all the devices.  If a device was not found, it will not
+	be listed.  Refer to <xref
+	  linkend="kernelconfig-custom-kernel"/> for instructions on
+	how to add in support for devices which are not in the
+	<filename>GENERIC</filename> kernel.</para>
 
       <para>After the procedure of device probing, the menu shown in
-	<xref linkend="bsdinstall-choose-mode"/> will be displayed.  The install media
-	can be used in three ways: to install &os;, as a live <acronym>CD</acronym> as described in
-	<xref linkend="using-live-cd"/>, or
-	to access a &os; shell.  Use the arrow keys to choose
-	an option, and <keycap>Enter</keycap> to select.</para>
+	<xref linkend="bsdinstall-choose-mode"/> will be displayed.
+	The install media can be used in three ways: to install &os;,
+	as a live <acronym>CD</acronym> as described in <xref
+	  linkend="using-live-cd"/>, or to access a &os; shell.  Use
+	the arrow keys to choose an option, and <keycap>Enter</keycap>
+	to select.</para>
 
       <figure xml:id="bsdinstall-choose-mode">
 	<title>Selecting Installation Media Mode</title>
@@ -1007,8 +1010,8 @@ Trying to mount root from cd9660:/dev/is
     <note>
       <para>&a.kmoore.email;'s
 	<application>pc-sysinstall</application> is included with
-	PC-BSD and can
-	be used to install &os; using the instructions at <link
+	PC-BSD and can be used to install &os; using the instructions
+	at <link
 	  xlink:href="http://wiki.pcbsd.org/index.php/Use_PC-BSD_Installer_to_Install_FreeBSD">http://wiki.pcbsd.org/index.php/Use_PC-BSD_Installer_to_Install_FreeBSD</link>.
 	Although sometimes confused with
 	<application>bsdinstall</application>, the two are not
@@ -1124,8 +1127,9 @@ Trying to mount root from cd9660:/dev/is
 
       <para>Deciding which components to install will depend largely
 	on the intended use of the system and the amount of disk space
-	available.  The &os; kernel and userland, collectively known as the
-	<quote>base system</quote>, are always installed.</para>
+	available.  The &os; kernel and userland, collectively known
+	as the <quote>base system</quote>, are always
+	installed.</para>
 
       <para>Depending on the type of installation, some of these
 	components may not appear.</para>
@@ -1141,8 +1145,9 @@ Trying to mount root from cd9660:/dev/is
 	</listitem>
 
 	<listitem>
-	  <para><literal>games</literal> - Several traditional <acronym>BSD</acronym>
-	    games, including <application>fortune</application>,
+	  <para><literal>games</literal> - Several traditional
+	    <acronym>BSD</acronym> games, including
+	    <application>fortune</application>,
 	    <application>rot13</application>, and others.</para>
 	</listitem>
 
@@ -1167,9 +1172,9 @@ Trying to mount root from cd9660:/dev/is
 	  <warning>
 	    <para>The installation program does not check for
 	      adequate disk space.  Select this option only if
-	      sufficient hard disk space is available.  The
-	      &os; Ports Collection takes up about &ports.size; of
-	      disk space.</para>
+	      sufficient hard disk space is available.  The &os; Ports
+	      Collection takes up about &ports.size; of disk
+	      space.</para>
 	  </warning>
 	</listitem>
 
@@ -1242,10 +1247,10 @@ Trying to mount root from cd9660:/dev/is
       allows advanced users to create customized partitions.  The
       <acronym>ZFS</acronym> option, only available in &os; 10 and
       later, will create an optionally encrypted root-on-ZFS system
-      with support for Boot Environments.  Finally,
-      there's the option of starting a shell where command-line
-      programs like &man.gpart.8;, &man.fdisk.8;, and &man.bsdlabel.8;
-      can be used directly.</para>
+      with support for Boot Environments.  Finally, there's the option
+      of starting a shell where command-line programs like
+      &man.gpart.8;, &man.fdisk.8;, and &man.bsdlabel.8; can be used
+      directly.</para>
 
     <figure xml:id="bsdinstall-part-guided-manual">
       <title>Selecting Guided, Manual or Shell Partitioning</title>
@@ -1269,12 +1274,12 @@ Trying to mount root from cd9660:/dev/is
       </mediaobject>
     </figure>
 
-    <para>This section describes what to consider when laying
-      out the disk partitions.  It then demonstrates how to use both
-      the Guided Partitioning and Manual Partitioning screens.</para>
-    
-   <sect2 xml:id="configtuning-initial">
-    <title>Designing the Partition Layout</title>
+    <para>This section describes what to consider when laying out the
+      disk partitions.  It then demonstrates how to use both the
+      Guided Partitioning and Manual Partitioning screens.</para>
+
+    <sect2 xml:id="configtuning-initial">
+      <title>Designing the Partition Layout</title>
 
       <indexterm><primary>partition layout</primary></indexterm>
       <indexterm>
@@ -1287,86 +1292,86 @@ Trying to mount root from cd9660:/dev/is
 	<primary><filename>/usr</filename></primary>
       </indexterm>
 
-	<para>When laying out file systems, remember that hard drives transfer data
-	  faster from the outer tracks to the inner.  Thus, smaller
-	  and heavier-accessed file systems should be closer to the
-	  outside of the drive, while larger partitions like
-	  <filename>/usr</filename> should be placed toward the inner
-	  parts of the disk.  It is a good idea to create partitions
-	  in an order similar to: <filename>/</filename>, swap,
-	  <filename>/var</filename>, and
-	  <filename>/usr</filename>.</para>
-
-	<para>The size of the <filename>/var</filename> partition
-	  reflects the intended machine's usage.  This partition is
-	  used to hold mailboxes, log files, and printer spools.
-	  Mailboxes and log files can grow to unexpected sizes
-	  depending on the number of users and how long log files are
-	  kept.  On average, most users rarely need more than about a
-	  gigabyte of free disk space in
-	  <filename>/var</filename>.</para>
+      <para>When laying out file systems, remember that hard drives
+	transfer data faster from the outer tracks to the inner.
+	Thus, smaller and heavier-accessed file systems should be
+	closer to the outside of the drive, while larger partitions
+	like <filename>/usr</filename> should be placed toward the
+	inner parts of the disk.  It is a good idea to create
+	partitions in an order similar to: <filename>/</filename>,
+	swap, <filename>/var</filename>, and
+	<filename>/usr</filename>.</para>
+
+      <para>The size of the <filename>/var</filename> partition
+	reflects the intended machine's usage.  This partition is
+	used to hold mailboxes, log files, and printer spools.
+	Mailboxes and log files can grow to unexpected sizes
+	depending on the number of users and how long log files are
+	kept.  On average, most users rarely need more than about a
+	gigabyte of free disk space in
+	<filename>/var</filename>.</para>
 
-	<note>
-	  <para>Sometimes, a lot of disk space is required in
-	    <filename>/var/tmp</filename>.  When new software is
-	    installed, the packaging tools
-	    extract a temporary copy of the packages under
-	    <filename>/var/tmp</filename>.  Large software packages,
-	    like <application>Firefox</application>,
-	    <application>OpenOffice</application> or
-	    <application>LibreOffice</application> may be tricky to
-	    install if there is not enough disk space under
-	    <filename>/var/tmp</filename>.</para>
-	</note>
+      <note>
+	<para>Sometimes, a lot of disk space is required in
+	  <filename>/var/tmp</filename>.  When new software is
+	  installed, the packaging tools extract a temporary copy of
+	  the packages under <filename>/var/tmp</filename>.  Large
+	  software packages, like <application>Firefox</application>,
+	  <application>OpenOffice</application> or
+	  <application>LibreOffice</application> may be tricky to
+	  install if there is not enough disk space under
+	  <filename>/var/tmp</filename>.</para>
+      </note>
+
+      <para>The <filename>/usr</filename> partition holds many of the
+	files which support the system, including the &os; Ports
+	Collection and system source code.  At least 2 gigabytes is
+	recommended for this partition.</para>
+
+      <para>When selecting partition sizes, keep the space
+	requirements in mind.  Running out of space in one partition
+	while barely using another can be a hassle.</para>
+
+      <indexterm>
+	<primary>swap sizing</primary>
+      </indexterm>
+      <indexterm>
+	<primary>swap partition</primary>
+      </indexterm>
+
+      <para>As a rule of thumb, the swap partition should be about
+	double the size of physical memory (<acronym>RAM</acronym>).
+	Systems with minimal <acronym>RAM</acronym> may perform
+	better with more swap.  Configuring too little swap can lead
+	to inefficiencies in the <acronym>VM</acronym> page scanning
+	code and might create issues later if more memory is
+	added.</para>
+
+      <para>On larger systems with multiple <acronym>SCSI</acronym>
+	disks or multiple <acronym>IDE</acronym> disks operating on
+	different controllers, it is recommended that swap be
+	configured on each drive, up to four drives.  The swap
+	partitions should be approximately the same size.  The
+	kernel can handle arbitrary sizes but internal data structures
+	scale to 4 times the largest swap partition.  Keeping the swap
+	partitions near the same size will allow the kernel to
+	optimally stripe swap space across disks.  Large swap sizes
+	are fine, even if swap is not used much.  It might be easier
+	to recover from a runaway program before being forced to
+	reboot.</para>
+
+      <para>By properly partitioning a system, fragmentation
+	introduced in the smaller write heavy partitions will not
+	bleed over into the mostly read partitions.  Keeping the
+	write loaded partitions closer to the disk's edge will
+	increase <acronym> I/O</acronym> performance in the
+	partitions where it occurs the most.  While
+	<acronym>I/O</acronym> performance in the larger partitions
+	may be needed, shifting them more toward the edge of the disk
+	will not lead to a significant performance improvement over
+	moving <filename>/var</filename> to the edge.</para>
+    </sect2>
 
-	<para>The <filename>/usr</filename> partition holds many of
-	  the files which support the system, including the &os; Ports
-	  Collection and system source code.  At least 2 gigabytes is
-	  recommended for this partition.</para>
-
-	<para>When selecting partition sizes, keep the space
-	  requirements in mind.  Running out of space in one partition
-	  while barely using another can be a hassle.</para>
-
-	<indexterm>
-	  <primary>swap sizing</primary>
-	</indexterm>
-	<indexterm>
-	  <primary>swap partition</primary>
-	</indexterm>
-
-	<para>As a rule of thumb, the swap partition should be about
-	  double the size of physical memory (<acronym>RAM</acronym>).
-	  Systems with minimal <acronym>RAM</acronym> may perform
-	  better with more swap.  Configuring too little swap can
-	  lead to inefficiencies in the <acronym>VM</acronym> page
-	  scanning code and might create issues later if more memory
-	  is added.</para>
-
-	<para>On larger systems with multiple <acronym>SCSI</acronym>
-	  disks or multiple <acronym>IDE</acronym> disks operating
-	  on different controllers, it is recommended that swap be
-	  configured on each drive, up to four drives.  The swap
-	  partitions should be approximately the same size.  The
-	  kernel can handle arbitrary sizes but internal data
-	  structures scale to 4 times the largest swap partition.
-	  Keeping the swap partitions near the same size will allow
-	  the kernel to optimally stripe swap space across disks.
-	  Large swap sizes are fine, even if swap is not used much.
-	  It might be easier to recover from a runaway program before
-	  being forced to reboot.</para>
-
-	<para>By properly partitioning a system, fragmentation
-	  introduced in the smaller write heavy partitions will not
-	  bleed over into the mostly read partitions.  Keeping the
-	  write loaded partitions closer to the disk's edge will
-	  increase<acronym> I/O</acronym> performance in the partitions where it occurs
-	  the most.  While <acronym>I/O</acronym> performance in the larger partitions
-	  may be needed, shifting them more toward the edge of the
-	  disk will not lead to a significant performance improvement
-	  over moving <filename>/var</filename> to the edge.</para>
-    </sect2>  
-    
     <sect2 xml:id="bsdinstall-part-guided">
       <title>Guided Partitioning</title>
 
@@ -1384,8 +1389,8 @@ Trying to mount root from cd9660:/dev/is
 	</mediaobject>
       </figure>
 
-      <para>The entire disk or a portion of it can be allocated to &os;.
-	If
+      <para>The entire disk or a portion of it can be allocated to
+	&os;.  If
 	<guibutton>[ Entire Disk ]</guibutton> is
 	chosen, a general partition layout filling the whole disk is
 	created.  Selecting
@@ -1441,8 +1446,8 @@ Trying to mount root from cd9660:/dev/is
 	</mediaobject>
       </figure>
 
-      <para>Highlighting a drive (<filename>ada0</filename> in
-	this example) and selecting
+      <para>Highlighting a drive (<filename>ada0</filename> in this
+	example) and selecting
 	<guibutton>[ Create ]</guibutton> displays a menu
 	for choosing the type of <emphasis>partitioning
 	  scheme</emphasis>.</para>
@@ -1480,7 +1485,7 @@ Trying to mount root from cd9660:/dev/is
 	    <row>
 	      <entry>APM</entry>
 	      <entry>Apple Partition Map, used by &powerpc;
-		  &macintosh; (<link
+		&macintosh; (<link
 		  xlink:href="http://support.apple.com/kb/TA21692">http://support.apple.com/kb/TA21692</link>).</entry>
 	    </row>
 
@@ -1545,8 +1550,8 @@ Trying to mount root from cd9660:/dev/is
 	</listitem>
 
 	<listitem>
-	  <para><literal>freebsd-ufs</literal> - A &os; UFS
-	    file system.</para>
+	  <para><literal>freebsd-ufs</literal> - A &os; UFS file
+	    system.</para>
 	</listitem>
 
 	<listitem>
@@ -1557,17 +1562,16 @@ Trying to mount root from cd9660:/dev/is
 
       <para>Another partition type worth noting is
 	<literal>freebsd-zfs</literal>, used for partitions that will
-	contain a &os; <acronym>ZFS</acronym> file system.
-	<xref linkend="filesystems-zfs"/>.  &man.gpart.8; shows more
-	of the available <acronym>GPT</acronym> partition
-	types.</para>
+	contain a &os; <acronym>ZFS</acronym> file system.  <xref
+	  linkend="filesystems-zfs"/>.  &man.gpart.8; shows more of
+	the available <acronym>GPT</acronym> partition types.</para>
 
       <para>Multiple file system partitions can be used, and some
 	people may prefer a traditional layout with separate
 	partitions for the <filename>/</filename>,
 	<filename>/var</filename>, <filename>/tmp</filename>, and
-	<filename>/usr</filename> file systems.  See
-	<xref linkend="bsdinstall-part-manual-splitfs"/> for an
+	<filename>/usr</filename> file systems.  See <xref
+	  linkend="bsdinstall-part-manual-splitfs"/> for an
 	example.</para>
 
       <para>Size may be entered with common abbreviations:
@@ -1598,10 +1602,10 @@ Trying to mount root from cd9660:/dev/is
 	and partition numbers in files like
 	<filename>/etc/fstab</filename> makes the system more tolerant
 	of changing hardware.  GPT labels appear in
-	<filename>/dev/gpt/</filename> when a disk is attached.
-	Other partitioning schemes have different label
-	capabilities, and their labels appear in different directories
-	in <filename>/dev/</filename>.</para>
+	<filename>/dev/gpt/</filename> when a disk is attached.  Other
+	partitioning schemes have different label capabilities, and
+	their labels appear in different directories in
+	<filename>/dev/</filename>.</para>
 
       <tip>
 	<para>Use a unique label on every file system to avoid
@@ -1620,14 +1624,14 @@ Trying to mount root from cd9660:/dev/is
 	  <filename>/</filename>, <filename>/var</filename>,
 	  <filename>/tmp</filename>, and <filename>/usr</filename>
 	  directories are separate file systems on their own
-	  partitions, create a <acronym>GPT</acronym> partitioning scheme, then create
-	  the partitions as shown.  Partition sizes shown are typical
-	  for a 20G target disk.  If more space is available on the
-	  target disk, larger swap or <filename>/var</filename>
-	  partitions may be useful.  Labels shown here are prefixed
-	  with <literal>ex</literal> for <quote>example</quote>, but
-	  readers should use other unique label values as described
-	  above.</para>
+	  partitions, create a <acronym>GPT</acronym> partitioning
+	  scheme, then create the partitions as shown.  Partition
+	  sizes shown are typical for a 20G target disk.  If more
+	  space is available on the target disk, larger swap or
+	  <filename>/var</filename> partitions may be useful.  Labels
+	  shown here are prefixed with <literal>ex</literal> for
+	  <quote>example</quote>, but readers should use other unique
+	  label values as described above.</para>
 
 	<para>By default, &os;'s <filename>gptboot</filename> expects
 	  the first UFS partition found to be the
@@ -1732,22 +1736,22 @@ Trying to mount root from cd9660:/dev/is
 	</mediaobject>
       </figure>
 
-      <para>The most important option is selecting the vdev type
-	and one or more disks that will make up the vdev that will
+      <para>The most important option is selecting the vdev type and
+	one or more disks that will make up the vdev that will
 	constitute the pool.  The automatic <acronym>ZFS</acronym>
 	installer currently only supports the creation of a single
 	top level vdev, except in stripe mode.  To create more complex
 	pools, use the instructions in <xref
-	linkend="bsdinstall-part-shell"/> to create
-	the pool.  The installer supports the creation of various
-	pool types, including stripe (not recommended, no redundancy),
-	mirror (best performance, least usable space), and RAID-Z 1,
-	2, and 3 (with the capability to withstand the concurrent
-	failure of 1, 2, and 3 disks, respectively).  A tooltip across
-	the bottom of the screen while selecting the pool type
-	provides advice about the number of required disks for each
-	type, and in the case of RAID-Z, the optimal number of disks
-	for each configuration.</para>
+	linkend="bsdinstall-part-shell"/> to create the pool.  The
+	installer supports the creation of various pool types,
+	including stripe (not recommended, no redundancy), mirror
+	(best performance, least usable space), and RAID-Z 1, 2, and 3
+	(with the capability to withstand the concurrent failure of 1,
+	2, and 3 disks, respectively).  A tooltip across the bottom of
+	the screen while selecting the pool type provides advice about
+	the number of required disks for each type, and in the case of
+	RAID-Z, the optimal number of disks for each
+	configuration.</para>
 
       <figure xml:id="bsdinstall-zfs-vdev_type">
 	<title><acronym>ZFS</acronym> Pool Type</title>
@@ -1773,7 +1777,8 @@ Trying to mount root from cd9660:/dev/is
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-zfs-disk_select"/>
+	    <imagedata
+	      fileref="bsdinstall/bsdinstall-zfs-disk_select"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1783,13 +1788,14 @@ Trying to mount root from cd9660:/dev/is
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-zfs-vdev_invalid"/>
+	    <imagedata
+	      fileref="bsdinstall/bsdinstall-zfs-vdev_invalid"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
 
-      <para>If one or more disks are missing from the list, or if disks
-	were attached after the installer was started, select
+      <para>If one or more disks are missing from the list, or if
+	disks were attached after the installer was started, select
 	<guibutton>- Rescan Devices</guibutton> to repopulate the list

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


More information about the svn-doc-all mailing list