Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 May 2014 20:39:01 +0000 (UTC)
From:      Dru Lavigne <dru@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   svn commit: r44903 - head/en_US.ISO8859-1/books/handbook/bsdinstall
Message-ID:  <201405212039.s4LKd1wN099641@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dru
Date: Wed May 21 20:39:01 2014
New Revision: 44903
URL: http://svnweb.freebsd.org/changeset/doc/44903

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	Wed May 21 19:51:47 2014	(r44902)
+++ head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml	Wed May 21 20:39:01 2014	(r44903)
@@ -431,11 +431,11 @@
     <sect2 xml:id="bsdinstall-installation-media">
       <title>Prepare the Installation Media</title>
 
-      <para>The &os; installer is not an application that can be run from
-	within another operating system.  Instead, download a &os;
-	installation file, burn it to the media associated with its
-	file type and size (<acronym>CD</acronym>,
-	<acronym>DVD</acronym>, or <acronym>USB</acronym>), and boot 
+      <para>The &os; installer is not an application that can be run
+	from within another operating system.  Instead, download a
+	&os; installation file, burn it to the media associated with
+	its file type and size (<acronym>CD</acronym>,
+	<acronym>DVD</acronym>, or <acronym>USB</acronym>), and boot
 	the system to install from the inserted media.</para>
 
       <para>&os; installation files are available at <link
@@ -444,9 +444,9 @@
 	&os;, the architecture, and the type of file.  For example, to
 	install &os; 10.0 on an &arch.amd64; system from a
 	<acronym>DVD</acronym>, download
-	<filename>FreeBSD-10.0-RELEASE-amd64-dvd1.iso</filename>,
-	burn this file to a <acronym>DVD</acronym>, and boot the
-	system with the <acronym>DVD</acronym> inserted.</para>
+	<filename>FreeBSD-10.0-RELEASE-amd64-dvd1.iso</filename>, burn
+	this file to a <acronym>DVD</acronym>, and boot the system
+	with the <acronym>DVD</acronym> inserted.</para>
 
       <para>Several file types are available, though not all file
 	types are available for all architectures.  The possible file
@@ -491,8 +491,8 @@
 	</listitem>
       </itemizedlist>
 
-      <para>Also download <filename>CHECKSUM.SHA256</filename> from the
-	same directory as the image file and use it to check the
+      <para>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
 	<firstterm>checksum</firstterm>.  &os; provides &man.sha256.1;
 	for this, while other operating systems have similar programs.
@@ -509,93 +509,90 @@
 	  memory stick, it <emphasis>cannot</emphasis> just be copied
 	  to the target device.  Several applications are available
 	  for burning the <filename>*.img</filename> to a
-	  <acronym>USB</acronym> stick.  This section describes two
-	  of these utilities.</para>
+	  <acronym>USB</acronym> stick.  This section describes two of
+	  these utilities.</para>
 
-	  <important>
-	    <para>Before proceeding, back up any important
-	      data on the <acronym>USB</acronym> stick as this procedure will
-	      erase the existing data on the stick.</para>
-	  </important>
-
-	  <procedure>
-	    <title>Using <command>dd</command> to Write the
-	      Image</title>
-
-	    <warning>
-	      <para>This example uses
-		<filename>/dev/da0</filename> as the target device
-		where the image will be written.  Be <emphasis>very
-		  careful</emphasis> that the correct device is used as
-		this command will destroy the existing data on the
-		specified target device.</para>
-	    </warning>
-
-	    <step>
-	      <para>The <command>dd</command> command-line utility is
-		included on BSD, Linux, and &macos; systems.  To burn
-		the image using <command>dd</command>, insert the
-		<acronym>USB</acronym> stick and determine its device
-		name.  Then, specify the name of the downloaded
-		installation file and the device name for the
-		<acronym>USB</acronym> stick.  This example burns the
-		&arch.amd64; installation image to the first
-		<acronym>USB</acronym> device on an existing &os;
-		system.</para>
-
-	      <screen>&prompt.root; <userinput>dd if=<replaceable>FreeBSD-10.0-RELEASE-amd64-memstick.img</replaceable> of=/dev/<replaceable>da0</replaceable> bs=64k</userinput></screen>
-
-	      <para>Should this command fail, verify that the
-		<acronym>USB</acronym> stick is not mounted and that
-		the device name is for the disk, not a partition.
-		Depending upon the operating system, this command may
-		need to be issued using
-		<command>sudo</command>.</para>
-	    </step>
-	  </procedure>
-
-	  <procedure>
-	    <title>Using &windows; to Write the Image</title>
-
-	    <warning>
-	      <para>Be sure to give the correct drive letter as the
-		existing data on the specified drive will be overwritten
-		and destroyed.</para>
-	    </warning>
-
-	    <step>
-	      <title>Obtaining <application>Image Writer for
-		  &windows;</application></title>
-
-	      <para><application>Image Writer for
-		  &windows;</application> is a free application that
-		can correctly write an image file to a memory stick.
-		Download it from <uri
-		  xlink:href="https://launchpad.net/win32-image-writer/">https://launchpad.net/win32-image-writer/</uri>;
-		and extract it into a folder.</para>
-	    </step>
-
-	    <step>
-	      <title>Writing the Image with Image Writer</title>
-
-	      <para>Double-click the
-		<application>Win32DiskImager</application> icon to
-		start the program.  Verify that the drive letter shown
-		under <computeroutput>Device</computeroutput> is the
-		drive with the memory stick.  Click the folder icon
-		and select the image to be written to the memory
-		stick.  Click
-		<guibutton>[&nbsp;Save&nbsp;]</guibutton> to accept
-		the image file name.  Verify that everything is
-		correct, and that no folders on the memory stick are
-		open in other windows.  When everything is ready,
-		click <guibutton>[&nbsp;Write&nbsp;]</guibutton> to
-		write the image file to the memory stick.</para>
-	    </step>
-	  </procedure>
+	<important>
+	  <para>Before proceeding, back up any important data on the
+	    <acronym>USB</acronym> stick as this procedure will erase
+	    the existing data on the stick.</para>
+	</important>
+
+	<procedure>
+	  <title>Using <command>dd</command> to Write the
+	    Image</title>
 
-      <para>You are now ready to start installing &os;.</para>
-    </sect3>
+	  <warning>
+	    <para>This example uses <filename>/dev/da0</filename> as
+	      the target device where the image will be written.  Be
+	      <emphasis>very careful</emphasis> that the correct
+	      device is used as this command will destroy the existing
+	      data on the specified target device.</para>
+	  </warning>
+
+	  <step>
+	    <para>The <command>dd</command> command-line utility is
+	      included on BSD, Linux, and &macos; systems.  To burn
+	      the image using <command>dd</command>, insert the
+	      <acronym>USB</acronym> stick and determine its device
+	      name.  Then, specify the name of the downloaded
+	      installation file and the device name for the
+	      <acronym>USB</acronym> stick.  This example burns the
+	      &arch.amd64; installation image to the first
+	      <acronym>USB</acronym> device on an existing &os;
+	      system.</para>
+
+	    <screen>&prompt.root; <userinput>dd if=<replaceable>FreeBSD-10.0-RELEASE-amd64-memstick.img</replaceable> of=/dev/<replaceable>da0</replaceable> bs=64k</userinput></screen>
+
+	    <para>Should this command fail, verify that the
+	      <acronym>USB</acronym> stick is not mounted and that the
+	      device name is for the disk, not a partition.  Depending
+	      upon the operating system, this command may need to be
+	      issued using <command>sudo</command>.</para>
+	  </step>
+	</procedure>
+
+	<procedure>
+	  <title>Using &windows; to Write the Image</title>
+
+	  <warning>
+	    <para>Be sure to give the correct drive letter as the
+	      existing data on the specified drive will be overwritten
+	      and destroyed.</para>
+	  </warning>
+
+	  <step>
+	    <title>Obtaining <application>Image Writer for
+		&windows;</application></title>
+
+	    <para><application>Image Writer for
+		&windows;</application> is a free application that can
+	      correctly write an image file to a memory stick.
+	      Download it from <uri
+		xlink:href="https://launchpad.net/win32-image-writer/">https://launchpad.net/win32-image-writer/</uri>;
+	      and extract it into a folder.</para>
+	  </step>
+
+	  <step>
+	    <title>Writing the Image with Image Writer</title>
+
+	    <para>Double-click the
+	      <application>Win32DiskImager</application> icon to start
+	      the program.  Verify that the drive letter shown under
+	      <computeroutput>Device</computeroutput> is the drive
+	      with the memory stick.  Click the folder icon and select
+	      the image to be written to the memory stick.  Click
+	      <guibutton>[&nbsp;Save&nbsp;]</guibutton> to accept the
+	      image file name.  Verify that everything is correct, and
+	      that no folders on the memory stick are open in other
+	      windows.  When everything is ready, click
+	      <guibutton>[&nbsp;Write&nbsp;]</guibutton> to write the
+	      image file to the memory stick.</para>
+	  </step>
+	</procedure>
+
+	<para>You are now ready to start installing &os;.</para>
+      </sect3>
     </sect2>
   </sect1>
 
@@ -893,8 +890,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
       information that will be asked before the system is installed.
       Use the arrow keys to highlight a menu option, then the
       <keycap>Space</keycap> key to select or deselect that menu item.
-      When finished, use <keycap>Enter</keycap> to save the selection and move
-      onto the next screen.</para>
+      When finished, use <keycap>Enter</keycap> to save the selection
+      and move onto the next screen.</para>
 
     <sect2 xml:id="bsdinstall-keymap">
       <title>Selecting the Keymap Menu</title>
@@ -949,8 +946,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
       <para>In &os; 10.0-RELEASE and later, this menu has been
 	enhanced.  The full selection of keymaps is shown, with the
 	default preselected.  In addition, when selecting a different
-	keymap, a dialog is displayed that allows the user to try
-	the keymap and ensure it is correct before proceeding.</para>
+	keymap, a dialog is displayed that allows the user to try the
+	keymap and ensure it is correct before proceeding.</para>
 
       <figure xml:id="bsdinstall-keymap-10">
 	<title>Enhanced Keymap Menu</title>
@@ -1007,9 +1004,9 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
       <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 <firstterm>base system</firstterm>, are always installed.
-	Depending on the architecture, some of these components may
-	not appear:</para>
+	as the <firstterm>base system</firstterm>, are always
+	installed.  Depending on the architecture, some of these
+	components may not appear:</para>
 
       <itemizedlist>
 	<listitem>
@@ -1035,11 +1032,11 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	</listitem>
 
 	<listitem>
-	  <para><literal>ports</literal> - The &os; Ports
-	    Collection is a collection of files which automates the
-	    downloading, compiling and installation of third-party
-	    software packages.  <xref linkend="ports"/> discusses how
-	    to use the Ports Collection.</para>
+	  <para><literal>ports</literal> - The &os; Ports Collection
+	    is a collection of files which automates the downloading,
+	    compiling and installation of third-party software
+	    packages.  <xref linkend="ports"/> discusses how to use
+	    the Ports Collection.</para>
 
 	  <warning>
 	    <para>The installation program does not check for
@@ -1051,64 +1048,64 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	</listitem>
 
 	<listitem>
-	  <para><literal>src</literal> - The complete &os; source code for both the kernel
-	    and the userland.  Although not required for the majority
-	    of applications, it may be required to build
-	    device drivers, kernel modules, or some applications from
-	    the Ports Collection.  It is also used for developing &os;
-	    itself.  The full source tree requires 1&nbsp;GB of disk space
-	    and recompiling the entire &os; system requires an
-	    additional 5&nbsp;GB of space.</para>
+	  <para><literal>src</literal> - The complete &os; source code
+	    for both the kernel and the userland.  Although not
+	    required for the majority of applications, it may be
+	    required to build device drivers, kernel modules, or some
+	    applications from the Ports Collection.  It is also used
+	    for developing &os; itself.  The full source tree requires
+	    1&nbsp;GB of disk space and recompiling the entire &os;
+	    system requires an additional 5&nbsp;GB of space.</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
-  <sect2 xml:id="bsdinstall-netinstall">
-    <title>Installing from the Network</title>
+    <sect2 xml:id="bsdinstall-netinstall">
+      <title>Installing from the Network</title>
 
-    <para>The menu shown in <xref
-      linkend="bsdinstall-netinstall-notify"/> only appears when
-      installing from a <filename>-bootonly.iso</filename>
-      <acronym>CD</acronym> as this installation media does
-      not hold copies of the installation files.  Since the installation
-      files must be retrieved over a network connection, this menu
-      indicates that the network interface must be first
-      configured.</para>
+      <para>The menu shown in <xref
+	  linkend="bsdinstall-netinstall-notify"/> only appears when
+	installing from a <filename>-bootonly.iso</filename>
+	<acronym>CD</acronym> as this installation media does not hold
+	copies of the installation files.  Since the installation
+	files must be retrieved over a network connection, this menu
+	indicates that the network interface must be first
+	configured.</para>
 
-    <figure xml:id="bsdinstall-netinstall-notify">
-      <title>Installing from the Network</title>
+      <figure xml:id="bsdinstall-netinstall-notify">
+	<title>Installing from the Network</title>
 
-      <mediaobject>
-	<imageobject>
-	  <imagedata
-	    fileref="bsdinstall/bsdinstall-netinstall-files"/>
-	</imageobject>
-      </mediaobject>
-    </figure>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata
+	      fileref="bsdinstall/bsdinstall-netinstall-files"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
 
-    <para>To configure the network connection, press
-      <keycap>Enter</keycap> and follow the instructions in
-      <xref linkend="bsdinstall-config-network-dev"/>.  Once the
-      interface is configured, select a mirror site that is
-      located in the same region of the world as
-      the computer on which &os; is being installed.  Files can be
-      retrieved more quickly when the mirror is close to the target
-      computer, reducing installation time.</para>
+      <para>To configure the network connection, press
+	<keycap>Enter</keycap> and follow the instructions in <xref
+	  linkend="bsdinstall-config-network-dev"/>.  Once the
+	interface is configured, select a mirror site that is
+	located in the same region of the world as the computer on
+	which &os; is being installed.  Files can be retrieved more
+	quickly when the mirror is close to the target computer,
+	reducing installation time.</para>
 
-    <figure xml:id="bsdinstall-netinstall-mirror">
-      <title>Choosing a Mirror</title>
+      <figure xml:id="bsdinstall-netinstall-mirror">
+	<title>Choosing a Mirror</title>
 
-      <mediaobject>
-	<imageobject>
-	  <imagedata
-	    fileref="bsdinstall/bsdinstall-netinstall-mirrorselect"/>
-	</imageobject>
-      </mediaobject>
-    </figure>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata
+	      fileref="bsdinstall/bsdinstall-netinstall-mirrorselect"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
 
-    <para>Installation will then continue as if the installation files
-      were located on the local installation media.</para>
-  </sect2>
+      <para>Installation will then continue as if the installation
+	files were located on the local installation media.</para>
+    </sect2>
   </sect1>
 
   <sect1 xml:id="bsdinstall-partitioning">
@@ -1144,10 +1141,11 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
       allows advanced users to create customized partitions from menu
       options, and <literal>Shell</literal> opens a shell prompt where
       advanced users can create customized partitions using
-      command-line utilities like &man.gpart.8;, &man.fdisk.8;, and &man.bsdlabel.8;.
-      <literal>ZFS</literal> partitioning, only available in &os; 10 and
-      later, creates an optionally encrypted root-on-ZFS system
-      with support for <firstterm>boot environments</firstterm>.</para>
+      command-line utilities like &man.gpart.8;, &man.fdisk.8;, and
+      &man.bsdlabel.8;.  <literal>ZFS</literal> partitioning, only
+      available in &os; 10 and later, creates an optionally encrypted
+      root-on-ZFS system with support for <firstterm>boot
+	environments</firstterm>.</para>
 
     <para>This section describes what to consider when laying out the
       disk partitions.  It then demonstrates how to use the different
@@ -1251,8 +1249,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
       <title>Guided Partitioning</title>
 
       <para>When this method is selected, a menu will display the
-	available disk(s).  If multiple disks are connected, choose the one where &os;
-	is to be installed.</para>
+	available disk(s).  If multiple disks are connected, choose
+	the one where &os; is to be installed.</para>
 
       <figure xml:id="bsdinstall-part-guided-disk">
 	<title>Selecting from Multiple Disks</title>
@@ -1265,9 +1263,9 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	</mediaobject>
       </figure>
 
-      <para>Once the disk is selected, the next menu prompts to install
-	to either the entire disk or to create a partition using free space.
-	If
+      <para>Once the disk is selected, the next menu prompts to
+	install to either the entire disk or to create a partition
+	using free space.  If
 	<guibutton>[&nbsp;Entire&nbsp;Disk&nbsp;]</guibutton> is
 	chosen, a general partition layout filling the whole disk is
 	automatically created.  Selecting
@@ -1309,8 +1307,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
     <sect2 xml:id="bsdinstall-part-manual">
       <title>Manual Partitioning</title>
 
-      <para>Selecting this method opens the partition
-	editor:</para>
+      <para>Selecting this method opens the partition editor:</para>
 
       <figure xml:id="bsdinstall-part-manual-create">
 	<title>Manually Create Partitions</title>
@@ -1323,8 +1320,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	</mediaobject>
       </figure>
 
-      <para>Highlight the installation drive (<filename>ada0</filename> in this
-	example) and select
+      <para>Highlight the installation drive
+	(<filename>ada0</filename> in this example) and select
 	<guibutton>[&nbsp;Create&nbsp;]</guibutton> to display a menu
 	of available partition schemes:</para>
 
@@ -1339,11 +1336,10 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	</mediaobject>
       </figure>
 
-      <para><acronym>GPT</acronym> is usually the most
-	appropriate choice for &arch.amd64; computers.  Older computers
-	that are not compatible with
-	<acronym>GPT</acronym> should use <acronym>MBR</acronym>.
-	The other partition schemes are
+      <para><acronym>GPT</acronym> is usually the most appropriate
+	choice for &arch.amd64; computers.  Older computers that are
+	not compatible with <acronym>GPT</acronym> should use
+	<acronym>MBR</acronym>.  The other partition schemes are
 	generally used for uncommon or older computers.</para>
 
       <table frame="none" rowsep="1" pgwide="1">
@@ -1368,7 +1364,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	      <entry><acronym>BSD</acronym> label without an
 		<acronym>MBR</acronym>, sometimes called
 		<firstterm>dangerously dedicated mode</firstterm> as
-		non-<acronym>BSD</acronym> disk utilities may not recognize it.</entry>
+		non-<acronym>BSD</acronym> disk utilities may not
+		recognize it.</entry>
 	    </row>
 
 	    <row>
@@ -1385,7 +1382,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 
 	    <row>
 	      <entry>PC98</entry>
-	      <entry><acronym>MBR</acronym> variant used by NEC PC-98 computers (<link
+	      <entry><acronym>MBR</acronym> variant used by NEC PC-98
+		computers (<link
 		  xlink:href="http://en.wikipedia.org/wiki/Pc9801">http://en.wikipedia.org/wiki/Pc9801</link>).</entry>;
 	    </row>
 
@@ -1423,8 +1421,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	</listitem>
 
 	<listitem>
-	  <para><literal>freebsd-ufs</literal> - A &os; <acronym>UFS</acronym> file
-	    system.</para>
+	  <para><literal>freebsd-ufs</literal> - A &os;
+	    <acronym>UFS</acronym> file system.</para>
 	</listitem>
 
 	<listitem>
@@ -1436,20 +1434,22 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
       <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"/>).  Refer to &man.gpart.8; for descriptions of
-	the available <acronym>GPT</acronym> partition types.</para>
+	  linkend="filesystems-zfs"/>).  Refer to &man.gpart.8; for
+	descriptions of the available <acronym>GPT</acronym> partition
+	types.</para>
 
       <para>Multiple file system partitions can be created and some
-	people 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
+	people 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
 	example.</para>
 
-      <para>The <literal>Size</literal> may be entered with common abbreviations:
-	<emphasis>K</emphasis> for kilobytes, <emphasis>M</emphasis>
-	for megabytes, or <emphasis>G</emphasis> for gigabytes.</para>
+      <para>The <literal>Size</literal> may be entered with common
+	abbreviations: <emphasis>K</emphasis> for kilobytes,
+	<emphasis>M</emphasis> for megabytes, or
+	<emphasis>G</emphasis> for gigabytes.</para>
 
       <tip>
 	<para>Proper sector alignment provides the best performance,
@@ -1457,22 +1457,22 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	  to ensure alignment on drives with either 512-byte or
 	  4K-byte sectors.  Generally, using partition sizes that are
 	  even multiples of 1M or 1G is the easiest way to make sure
-	  every partition starts at an even multiple of 4K.  There is one
-	  exception: the <emphasis>freebsd-boot</emphasis>
-	  partition should be no larger than 512K due to current boot code
-	  limitations.</para>
+	  every partition starts at an even multiple of 4K.  There is
+	  one exception: the <emphasis>freebsd-boot</emphasis>
+	  partition should be no larger than 512K due to current boot
+	  code limitations.</para>
       </tip>
 
-      <para>A <literal>Mountpoint</literal> is needed if the partition will contain a
-	file system.  If only a single <acronym>UFS</acronym> partition will be created,
-	the mountpoint should be <filename>/</filename>.</para>
-
-      <para>The <literal>Label</literal> is
-	a name by which the partition will be known.  Drive
-	names or numbers can change if the drive is connected to
-	a different controller or port, but the partition label does
-	not change.  Referring to labels instead of drive names
-	and partition numbers in files like
+      <para>A <literal>Mountpoint</literal> is needed if the partition
+	will contain a file system.  If only a single
+	<acronym>UFS</acronym> partition will be created, the
+	mountpoint should be <filename>/</filename>.</para>
+
+      <para>The <literal>Label</literal> is a name by which the
+	partition will be known.  Drive names or numbers can change if
+	the drive is connected to a different controller or port, but
+	the partition label does not change.  Referring to labels
+	instead of drive names and partition numbers in files like
 	<filename>/etc/fstab</filename> makes the system more tolerant
 	to hardware changes.  <acronym>GPT</acronym> labels appear in
 	<filename>/dev/gpt/</filename> when a disk is attached.  Other
@@ -1485,8 +1485,9 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	  conflicts from identical labels.  A few letters from the
 	  computer's name, use, or location can be added to the label.
 	  For instance, use <literal>labroot</literal> or
-	  <literal>rootfs-lab</literal> for the <acronym>UFS</acronym> root partition on
-	  the computer named <literal>lab</literal>.</para>
+	  <literal>rootfs-lab</literal> for the <acronym>UFS</acronym>
+	  root partition on the computer named
+	  <literal>lab</literal>.</para>
       </tip>
 
       <example xml:id="bsdinstall-part-manual-splitfs">
@@ -1580,23 +1581,23 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	partitioning mode only works with whole disks and will erase
 	the contents of the entire disk.  The installer will
 	automatically create partitions aligned to 4k boundaries and
-	force <acronym>ZFS</acronym> to use 4k sectors.  This
-	is safe even with 512 byte sector disks, and has the added
-	benefit of ensuring that pools created on 512 byte disks will
-	be able to have 4k sector disks added in the future, either as
-	additional storage space or as replacements for failed
-	disks.  The installer can also optionally employ <acronym>GELI</acronym> disk
-	encryption as described in <xref
+	force <acronym>ZFS</acronym> to use 4k sectors.  This is safe
+	even with 512 byte sector disks, and has the added benefit of
+	ensuring that pools created on 512 byte disks will be able to
+	have 4k sector disks added in the future, either as additional
+	storage space or as replacements for failed disks.  The
+	installer can also optionally employ <acronym>GELI</acronym>
+	disk encryption as described in <xref
 	  linkend="disks-encrypting-geli"/>.
 	If encryption is enabled, a 2&nbsp;GB unencrypted boot pool
-	containing the <filename>/boot</filename>
-	directory is created.  It holds the kernel and other files necessary
-	to boot the system.  A swap partition of a user selectable
-	size is also created, and all remaining space is used for the
+	containing the <filename>/boot</filename> directory is
+	created.  It holds the kernel and other files necessary to
+	boot the system.  A swap partition of a user selectable size
+	is also created, and all remaining space is used for the
 	<acronym>ZFS</acronym> pool.</para>
 
-      <para>The main <acronym>ZFS</acronym> configuration menu
-	offers a number of options to control the creation of the
+      <para>The main <acronym>ZFS</acronym> configuration menu offers
+	a number of options to control the creation of the
 	pool.</para>
 
       <figure xml:id="bsdinstall-zfs-menu">
@@ -1610,21 +1611,19 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
       </figure>
 
       <para>Select <keycap>T</keycap> to configure the <literal>Pool
-	  Type</literal> and
-	the disk(s) 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
+	  Type</literal> and the disk(s) 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).  while selecting the pool type,
-	a tooltip is displayed across the bottom of
-	the screen with advice about
-	the number of required disks, and in the case of
+	a tooltip is displayed across the bottom of the screen with
+	advice about the number of required disks, and in the case of
 	RAID-Z, the optimal number of disks for each
 	configuration.</para>
 
@@ -1638,12 +1637,12 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	</mediaobject>
       </figure>
 
-      <para>Once a <literal>Pool Type</literal> has been selected, a list of available
-	disks is displayed, and the user is prompted to select one or
-	more disks to make up the pool.  The configuration is then
-	validated, to ensure enough disks are selected.  If not,
-	select <guibutton>&lt;Change Selection&gt;</guibutton> to
-	return to the list of disks, or
+      <para>Once a <literal>Pool Type</literal> has been selected, a
+	list of available disks is displayed, and the user is prompted
+	to select one or more disks to make up the pool.  The
+	configuration is then validated, to ensure enough disks are
+	selected.  If not, select <guibutton>&lt;Change
+	  Selection&gt;</guibutton> to return to the list of disks, or
 	<guibutton>&lt;Cancel&gt;</guibutton> to change the pool
 	type.</para>
 
@@ -1676,8 +1675,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	selected, so as not to accidently destroy the wrong disks, the
 	<guibutton>- Disk Info</guibutton> menu can be used to inspect
 	each disk, including its partition table and various other
-	information such as the device model number and serial
-	number, if available.</para>
+	information such as the device model number and serial number,
+	if available.</para>
 
       <figure xml:id="bsdinstall-zfs-disk_info">
 	<title>Analysing a Disk</title>
@@ -1690,18 +1689,18 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
       </figure>
 
       <para>The main <acronym>ZFS</acronym> configuration menu also
-	allows the user to enter a pool name,
-	disable forcing 4k sectors, enable or disable
-	encryption, switch between <acronym>GPT</acronym>
-	(recommended) and <acronym>MBR</acronym> partition table
-	types, and select the amount of swap space.  Once all
-	options have been set to the desired values, select the
+	allows the user to enter a pool name, disable forcing 4k
+	sectors, enable or disable encryption, switch between
+	<acronym>GPT</acronym> (recommended) and
+	<acronym>MBR</acronym> partition table types, and select the
+	amount of swap space.  Once all options have been set to the
+	desired values, select the
 	<guibutton>&gt;&gt;&gt;&nbsp;Install</guibutton> option at the
 	top of the menu.</para>
 
-      <para>If <acronym>GELI</acronym> disk encryption was enabled, the
-	installer will prompt twice for the passphrase to be used to
-	encrypt the disks.</para>
+      <para>If <acronym>GELI</acronym> disk encryption was enabled,
+	the installer will prompt twice for the passphrase to be used
+	to encrypt the disks.</para>
 
       <figure xml:id="bsdinstall-zfs-geli_password">
 	<title>Disk Encryption Password</title>
@@ -1737,15 +1736,15 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 
       <para>When creating advanced installations, the
 	<application>bsdinstall</application> paritioning menus may
-	not provide the level of flexibility
-	required.  Advanced users can select the <guibutton>Shell</guibutton> option
-	from the partitioning menu in order to
-	manually partition the drives, create the
-	file system(s), populate
+	not provide the level of flexibility required.  Advanced users
+	can select the <guibutton>Shell</guibutton> option from the
+	partitioning menu in order to manually partition the drives,
+	create the file system(s), populate
 	<filename>/tmp/bsdinstall_etc/fstab</filename>, and mount the
 	file systems under <filename>/mnt</filename>.  Once this is
 	done, type <command>exit</command> to return to
-	<application>bsdinstall</application> and continue the installation.</para>
+	<application>bsdinstall</application> and continue the
+	installation.</para>
     </sect2>
   </sect1>
 
@@ -1753,10 +1752,10 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
     <title>Committing to the Installation</title>
 
     <para>Once the disks are configured, the next menu provides the
-      last chance to make changes before the selected
-      hard drive(s) are formatted.  If changes need to be made,
-      select <guibutton>[&nbsp;Back&nbsp;]</guibutton> to return to
-      the main partitioning menu.
+      last chance to make changes before the selected hard drive(s)
+      are formatted.  If changes need to be made, select
+      <guibutton>[&nbsp;Back&nbsp;]</guibutton> to return to the main
+      partitioning menu.
       <guibutton>[&nbsp;Revert&nbsp;&amp;&nbsp;Exit&nbsp;]</guibutton>
       will exit the installer without making any changes to the hard
       drive.</para>
@@ -1777,9 +1776,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
       <keycap>Enter</keycap>.</para>
 
     <para>Installation time will vary depending on the distributions
-      chosen, installation media, and speed of the computer.  A
-      series of messages will indicate the
-      progress.</para>
+      chosen, installation media, and speed of the computer.  A series
+      of messages will indicate the progress.</para>
 
     <para>First, the installer formats the selected disk(s) and
       initializes the partitions.  Next, in the case of a bootonly
@@ -1828,8 +1826,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
     <para>Once all requested distribution files have been extracted,
       <application>bsdinstall</application> displays the first
       post-installation configuration screen.  The available
-      post-configuration options are described in
-      the next section.</para>
+      post-configuration options are described in the next
+      section.</para>
   </sect1>
 
   <sect1 xml:id="bsdinstall-post">
@@ -1839,7 +1837,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
       <application>bsdinstall</application> will prompt to configure
       several options before booting into the newly installed system.
       This section describes these configuration options.</para>
-      
+
     <tip>
       <para>Once the system has booted,
 	<command>bsdconfig</command> provides a menu-driven method for
@@ -1852,10 +1850,10 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	  class="username">root</systemitem> Password</title>
 
       <para>First, the <systemitem class="username">root</systemitem>
-	password must be set.  While entering the password,
-	the characters being typed are not displayed on the screen.
-	After the password has been entered, it must be entered again.
-	This helps prevent typing errors.</para>
+	password must be set.  While entering the password, the
+	characters being typed are not displayed on the screen.  After
+	the password has been entered, it must be entered again.  This
+	helps prevent typing errors.</para>
 
       <figure xml:id="bsdinstall-post-set-root-passwd">
 	<title>Setting the <systemitem
@@ -1873,13 +1871,13 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
     <sect2 xml:id="bsdinstall-config-network-dev">
       <title>Configuring Network Interfaces</title>
 
-      <para>Next, a list of the network interfaces found on the computer
-	is shown.  Select the interface to configure.</para>
+      <para>Next, a list of the network interfaces found on the
+	computer is shown.  Select the interface to configure.</para>
 
       <note>
-	<para>The network configuration menus will be skipped if the network was previously
-	  configured as part of a <emphasis>bootonly</emphasis>
-	  installation.</para>
+	<para>The network configuration menus will be skipped if the
+	  network was previously configured as part of a
+	  <emphasis>bootonly</emphasis> installation.</para>
       </note>
 
       <figure xml:id="bsdinstall-configure-net-interface">
@@ -1893,248 +1891,245 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	</mediaobject>
       </figure>
 
-	<para>If an Ethernet interface is selected, the installer will
-	  skip ahead to the menu shown in <xref
-	    linkend="bsdinstall-configure-net-ipv4"/>.  If a wireless
-	  network interface is chosen, the system will instead scan
-	  for wireless access points:</para>
-
-	<figure xml:id="bsdinstall-wireless-scan">
-	  <title>Scanning for Wireless Access Points</title>
-
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata
-		fileref="bsdinstall/bsdinstall-configure-wireless-scan"/>
-	    </imageobject>
-	  </mediaobject>
-	</figure>
-
-	<para>Wireless networks are identified by a Service Set
-	  Identifier (<acronym>SSID</acronym>), a short, unique name given to
-	  each network.  <acronym>SSIDs</acronym>
-	  found during the scan are listed, followed by a description
-	  of the encryption types available for that network.  If the
-	  desired <acronym>SSID</acronym> does not appear in the list,
-	  select <guibutton>[&nbsp;Rescan&nbsp;]</guibutton> to scan
-	  again.  If the desired network still does not appear, check
-	  for problems with antenna connections or try moving the
-	  computer closer to the access point.  Rescan after each
-	  change is made.</para>
-
-	<figure xml:id="bsdinstall-wireless-accesspoints">
-	  <title>Choosing a Wireless Network</title>
-
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata
-		fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"/>
-	    </imageobject>
-	  </mediaobject>
-	</figure>
-
-	<para>Next, enter the encryption information for connecting to the
-	  selected wireless network.
-	  <acronym>WPA2</acronym> encryption is strongly recommended as
-	  older encryption types, like <acronym>WEP</acronym>, offer
-	  little security.  If the network uses <acronym>WPA2</acronym>, input the password,
-	  also known as the Pre-Shared Key (<acronym>PSK</acronym>).
-	  For security reasons, the characters typed into
-	  the input box are displayed as asterisks.</para>
-
-	<figure xml:id="bsdinstall-wireless-wpa2">
-	  <title>WPA2 Setup</title>
-
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata
-		fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"/>
-	    </imageobject>
-	  </mediaobject>
-	</figure>
-
-	<para>Next, choose whether or not an <acronym>IPv4</acronym>
-	  address should be configured on the Ethernet or wireless
-	  interface:</para>
-
-	<figure xml:id="bsdinstall-configure-net-ipv4">
-	  <title>Choose <acronym>IPv4</acronym> Networking</title>
-
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata
-		fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4"/>
-	    </imageobject>
-	  </mediaobject>
-	</figure>
-
-	<para>There are two methods of <acronym>IPv4</acronym>
-	  configuration.
-	  <acronym>DHCP</acronym> will
-	  automatically configure the network interface correctly and
-	  should be used if the network provides a
-	  <acronym>DHCP</acronym> server.  Otherwise, the addressing
-	  information needs to be input manually as a static
-	  configuration.</para>
-
-	<note>
-	  <para>Do not enter random network information as it will
-	    not work.  If a <acronym>DHCP</acronym> server is not
-	    available, obtain the information listed in <xref
-	      linkend="bsdinstall-collect-network-information"/> from
-	    the network administrator or Internet service provider.</para>
-	</note>
-
-	  <para>If a <acronym>DHCP</acronym> server is available,
-	    select <guibutton>[&nbsp;Yes&nbsp;]</guibutton> in the next menu to
-	    automatically configure the network interface.  The
-	    installer will appear to pause for a minute or so as it
-	    finds the <acronym>DHCP</acronym> server and obtains the
-	    addressing information for the system.</para>
-
-	  <figure xml:id="bsdinstall-net-ipv4-dhcp">
-	    <title>Choose <acronym>IPv4</acronym>
-	      <acronym>DHCP</acronym> Configuration</title>
-
-	    <mediaobject>
-	      <imageobject>
-		<imagedata
-		  fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp"/>
-	      </imageobject>
-	    </mediaobject>
-	  </figure>
-
-	  <para>If a <acronym>DHCP</acronym> server is not available,
-	    select <guibutton>[&nbsp;No&nbsp;]</guibutton> and input
-	    the following addressing information in this menu:</para>
-
-	  <figure xml:id="bsdinstall-net-ipv4-static">
-	    <title><acronym>IPv4</acronym> Static
-	      Configuration</title>
-
-	    <mediaobject>
-	      <imageobject>
-		<imagedata
-		  fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static"/>
-	      </imageobject>
-	    </mediaobject>
-	  </figure>
-
-	  <itemizedlist>
-	    <listitem>
-	      <para><literal>IP Address</literal> - The
-		<acronym>IPv4</acronym> address
-		assigned to this computer.  The address must be
-		unique and not already in use by another piece of
-		equipment on the local network.</para>
-	    </listitem>
-
-	    <listitem>
-	      <para><literal>Subnet Mask</literal> - The subnet mask
-		for the network.</para>
-	    </listitem>
-
-	    <listitem>
-	      <para><literal>Default Router</literal> - The <acronym>IP</acronym> address
-		of the network's default gateway.</para>
-	    </listitem>
-	  </itemizedlist>
-
-	<para>The next screen will ask if the interface should be
-	  configured for <acronym>IPv6</acronym>.
-	  If <acronym>IPv6</acronym> is available and
-	  desired, choose <guibutton>[&nbsp;Yes&nbsp;]</guibutton> to
-	  select it.</para>
-
-	<figure xml:id="bsdinstall-net-ipv6">
-	  <title>Choose IPv6 Networking</title>
-
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata
-		fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6"/>
-	    </imageobject>
-	  </mediaobject>
-	</figure>
-
-	<para><acronym>IPv6</acronym> also has two methods of configuration.  
-	  StateLess Address AutoConfiguration (<acronym>SLAAC</acronym>)
-	  will automatically request the correct configuration
-	  information from a local router.  Refer to <link
-	    xlink:href="http://tools.ietf.org/html/rfc4862">http://tools.ietf.org/html/rfc4862</link>;
-	  for more information.  Static configuration
-	  requires manual entry of network information.</para>
-
-	  <para>If an <acronym>IPv6</acronym> router is available,
-	    select <guibutton>[&nbsp;Yes&nbsp;]</guibutton> in the
-	    next menu to automatically configure the network
-	    interface.  The installer will appear to pause for a
-	    minute or so as it finds the router and obtains the
-	    addressing information for the system.</para>
-
-	  <figure xml:id="bsdinstall-net-ipv6-slaac">
-	    <title>Choose IPv6 SLAAC Configuration</title>
-
-	    <mediaobject>
-	      <imageobject>
-		<imagedata
-		  fileref="bsdinstall/bsdinstall-configure-network-interface-slaac"/>
-	      </imageobject>
-	    </mediaobject>
-	  </figure>
-
-	<para>If an <acronym>IPv6</acronym> router is not available,
-	  select <guibutton>[&nbsp;No&nbsp;]</guibutton> and input the
-	  following addressing information in this menu:</para>
-
-	  <figure xml:id="bsdinstall-net-ipv6-static">
-	    <title>IPv6 Static Configuration</title>

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



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