From owner-svn-doc-head@FreeBSD.ORG  Tue May 20 14:35:01 2014
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 32C14822;
 Tue, 20 May 2014 14:35:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1EFD22C00;
 Tue, 20 May 2014 14:35:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4KEZ1fN082499;
 Tue, 20 May 2014 14:35:01 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4KEZ1ZT082498;
 Tue, 20 May 2014 14:35:01 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201405201435.s4KEZ1ZT082498@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 20 May 2014 14:35:01 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r44883 - head/en_US.ISO8859-1/books/handbook/bsdinstall
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 May 2014 14:35:01 -0000

Author: dru
Date: Tue May 20 14:35:00 2014
New Revision: 44883
URL: http://svnweb.freebsd.org/changeset/doc/44883

Log:
  Move graphical installer note earlier in the chapter.
  Clean up the booting from various architecture sections.
  Need to confirm that powerpc instructions are correct for all supported media.
  Prepare section to describe boot menu. Next commit will describe this menu in detail.
  Start to clean up initial install menus. Need to test the components section more
  as the existing descriptions are not correct.
  Many more commits to come.
  
  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	Tue May 20 09:43:33 2014	(r44882)
+++ head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml	Tue May 20 14:35:00 2014	(r44883)
@@ -80,6 +80,25 @@
       program used by &os;&nbsp;8.x, is covered in <xref
 	linkend="install"/>.</para>
 
+      <para>In general, the installation instructions in this chapter are written
+	for the &i386; and <acronym>AMD64</acronym> architectures.
+	Where applicable, instructions specific to other
+	platforms will be listed.  There may be minor differences
+	between the installer and what is shown here, so use this
+	chapter as a general guide rather than as a set of literal
+	instructions.</para>
+
+    <note>
+      <para>Users who prefer to install &os; using a graphical
+	installer may be interested in 
+	<application>pc-sysinstall</application>, the installer used
+	by the
+	PC-BSD Project.  It can be used to install either a graphical
+	desktop (PC-BSD) or a command line version of &os;.  Refer to
+	the PC-BSD Users Handbook for details (<link
+	  xlink:href="http://wiki.pcbsd.org/index.php/PC-BSD%C2%AE_Users_Handbook/10.1">http://wiki.pcbsd.org/index.php/PC-BSD%C2%AE_Users_Handbook/10.1</link>).</para>
+    </note>
+
     <para>After reading this chapter, you will know:</para>
 
     <itemizedlist>
@@ -87,6 +106,11 @@
 	<para>How to create the &os; installation media.</para>
       </listitem>
 
+      <listitem>
+	<para>The minimum hardware requirements and &os; supported
+	  architectures.</para>
+      </listitem>
+
 <!-- WB: verify this, including GPT partition notation (ada0p2)
       <listitem>
 	<para>How &os; subdivides and refers to hard disks.</para>
@@ -112,16 +136,6 @@
 	  hardware is supported.</para>
       </listitem>
     </itemizedlist>
-
-    <note>
-      <para>In general, these installation instructions are written
-	for &i386; (<quote>PC compatible</quote>) architecture
-	computers.  Where applicable, instructions specific to other
-	platforms will be listed.  There may be minor differences
-	between the installer and what is shown here, so use this
-	chapter as a general guide rather than as exact literal
-	instructions.</para>
-    </note>
   </sect1>
 
   <sect1 xml:id="bsdinstall-hardware">
@@ -632,128 +646,73 @@
       <para>By default, the installation will not make any changes to
 	the disk(s) before the following message:</para>
 
-      <literallayout class="monospaced">Your changes will now be written to disk.  If you
+      <programlisting>Your changes will now be written to disk.  If you
 have chosen to overwrite existing data, it will
 be PERMANENTLY ERASED. Are you sure you want to
-commit your changes?</literallayout>
+commit your changes?</programlisting>
 
       <para>The install can be exited at any time prior to this
-	warning without changing the contents of the hard drive.  If
+	warning.  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>
+	just turn the computer off before this point and no changes
+	will be made to the system's disks.</para>
     </important>
 
-    <sect2 xml:id="bsdinstall-starting">
-      <title>Booting</title>
+    <para>This section describes how to boot the system from the
+      installation media which was prepared using the instructions in
+      <xref linkend="bsdinstall-installation-media"/>.  When using a
+      bootable USB stick, plug in the <acronym>USB</acronym> stick
+      before turning on the computer.  When booting from
+      <acronym>CD</acronym> or <acronym>DVD</acronym>, turn on the
+      computer and insert the media at the first opportunity.  How to
+      configure the system to boot from the inserted media depends
+      upon the architecture.</para>
 
-      <sect3 xml:id="bsdinstall-starting-i386">
+      <sect2 xml:id="bsdinstall-starting-i386">
 	<title>Booting on &i386; and &arch.amd64;</title>
 
-	<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
-	      computer.</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>These architectures provide a
+	      <acronym>BIOS</acronym> menu for selecting the
+	      boot device.  Depending upon the installation media
+	      being used, select the
+	      <acronym>CD</acronym>/<acronym>DVD</acronym> or
+	      <acronym>USB</acronym> device as the first boot device.
+	      Most systems also
+	      provide a key for selecting the boot device during
+	      startup without having to enter the <acronym>BIOS</acronym>.
+	      Typically, the key is either <keycap>F10</keycap>,
 	      <keycap>F11</keycap>, <keycap>F12</keycap>, or
 	      <keycap>Escape</keycap>.</para>
-	  </step>
 
-	  <step>
-	    <para>If the computer starts up as normal and loads an
-	      existing operating system, then either:</para>
+	    <para>If the computer loads the
+	      existing operating system instead of the &os; installer, then either:</para>
 
 	    <orderedlist>
 	      <listitem>
-		<para>The disks were not inserted early enough in the
-		  boot process.  Leave them in, and try restarting the
+		<para>The installation media was not inserted early enough in the
+		  boot process.  Leave the media inserted 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>
+		<para>The <acronym>BIOS</acronym> changes were incorrect or not saved.
+		  Double-check that the right boot device
+		  is selected as the first boot device.</para>
 	      </listitem>
 
 	      <listitem>
-		<para>This particular <acronym>BIOS</acronym> does not
-		  support booting from the desired media.  The
+		<para>This system is too old to
+		  support booting from the chosen media.  In this case, 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>
+		  can be used to boot the system from the selected
 		  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>
-
-	    <screen>Booting from CD-ROM...
-645MB medium detected
-CD Loader 1.2
-
-Building the boot loader arguments
-Looking up /BOOT/LOADER... Found
-Relocating the loader and the BTX
-Starting the BTX loader
-
-BTX loader 1.00 BTX version is 1.02
-Consoles: internal video/keyboard
-BIOS CD is cd0
-BIOS drive C: is disk0
-BIOS drive D: is disk1
-BIOS 636kB/261056kB available memory
-
-FreeBSD/i386 bootstrap loader, Revision 1.1
-
-Loading /boot/defaults/loader.conf
-/boot/kernel/kernel text=0x64daa0 data=0xa4e80+0xa9e40 syms=[0x4+0x6cac0+0x4+0x88e9d]
-\</screen>
-	  </step>
+      </sect2>
 
-	  <step>
-	    <para>The &os; boot loader is displayed:</para>
-
-	    <figure xml:id="bsdinstall-boot-loader-menu">
-	      <title>&os; Boot Loader Menu</title>
-
-	      <mediaobject>
-		<imageobject>
-		  <imagedata
-		    fileref="bsdinstall/bsdinstall-boot-loader-menu"/>
-		</imageobject>
-	      </mediaobject>
-	    </figure>
-
-	    <para>Either wait ten seconds, or press
-	      <keycap>Enter</keycap>.</para>
-	  </step>
-	</procedure>
-      </sect3>
-
-      <sect3>
-	<title>Booting for &macintosh; &powerpc;</title>
+      <sect2>
+	<title>Booting on &powerpc;</title>
 
 	<para>On most machines, holding <keycap>C</keycap> on the
 	  keyboard during boot will boot from the
@@ -775,19 +734,19 @@ Loading /boot/defaults/loader.conf
 	  prompt, enter</para>
 
 	<screen><userinput>boot cd:,\ppc\loader cd:0</userinput></screen>
-      </sect3>
+      </sect2>
 
-      <sect3>
-	<title>Booting for &sparc64;</title>
+      <sect2>
+	<title>Booting on &sparc64;</title>
 
 	<para>Most &sparc64; systems are set up to boot automatically
-	  from disk.  To install &os;, booting over the network or
+	  from disk.  To install &os;
 	  from a <acronym>CD</acronym> requires a break into the
-	  <acronym>PROM</acronym> (OpenFirmware).</para>
+	  <acronym>PROM</acronym>.</para>
 
-	<para>To do this, reboot the system, and wait until the boot
-	  message appears.  It depends on the model, but should look
-	  about like:</para>
+	<para>To do this, reboot the system and wait until the boot
+	  message appears.  The message depends on the model, but should look
+	  something like this:</para>
 
 	<screen>Sun Blade 100 (UltraSPARC-IIe), Keyboard Present
 Copyright 1998-2001 Sun Microsystems, Inc.  All rights reserved.
@@ -800,35 +759,41 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	  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>
-
-	<screen><prompt>ok    </prompt><co xml:id="bsdinstall-prompt-single"/>
-<prompt>ok {0} </prompt><co xml:id="bsdinstall-prompt-smp"/></screen>
-
-	<calloutlist>
-	  <callout arearefs="bsdinstall-prompt-single">
-	    <para>This is the prompt used on systems with one
-	      CPU.</para>
-	  </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>
-	  </callout>
-	</calloutlist>
+	  serial console.  When using <application>tip</application>
+	  or <application>cu</application>, <command>~#</command> will
+	  issue a BREAK. The <acronym>PROM</acronym> prompt will be
+	  <prompt>ok</prompt> on systems with one
+	  <acronym>CPU</acronym> and <prompt>ok {0} </prompt> on <acronym>SMP</acronym>
+	  systems, where the digit indicates the number of the active
+	  <acronym>CPU</acronym>.</para>
 
 	<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>
+	  drive and type <command>boot cdrom</command> from the
+	  <acronym>PROM</acronym> prompt.</para>
     </sect2>
 
     <sect2 xml:id="bsdinstall-view-probe">
-      <title>Reviewing the Device Probe Results</title>
+      <title>&os; Boot Menu</title>
 
+	    <para>Once the system boots from the installation media,
+	      a menu similar to the following will be displayed:</para>
+
+	    <figure xml:id="bsdinstall-boot-loader-menu">
+	      <title>&os; Boot Loader Menu</title>
+
+	      <mediaobject>
+		<imageobject>
+		  <imagedata
+		    fileref="bsdinstall/bsdinstall-boot-loader-menu"/>
+		</imageobject>
+	      </mediaobject>
+	    </figure>
+
+      <para>By default, the menu will wait ten seconds for user
+	input before booting into the &os; installer or, if &os; is
+	already installed, before booting into &os;.  To pause the
+	boot timer, press <keycap>Space</keycap>.</para>
+    
       <para>The last few hundred lines that have been displayed on
 	screen are stored and can be reviewed.</para>
 
@@ -1027,34 +992,23 @@ Trying to mount root from cd9660:/dev/is
   </sect1>
 
   <sect1 xml:id="using-bsdinstall">
-    <title>Introducing <application>bsdinstall</application></title>
+    <title>Using <application>bsdinstall</application></title>
 
-    <para><application>bsdinstall</application> is a text-based &os;
-      installer program written by &a.nwhitehorn.email; and introduced
-      in 2011 for &os;&nbsp;9.0.</para>
-
-    <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
-	  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
-	related.</para>
-    </note>
-
-    <para>The <application>bsdinstall</application> menu system is
-      controlled by the arrow keys, <keycap>Enter</keycap>,
-      <keycap>Tab</keycap>, <keycap>Space</keycap>, and other
-      keys.</para>
+    <para>This section shows the order of the
+      <application>bsdinstall</application> menus and the type of
+      information that will be asked before the system is installed.
+      Use the up and down arrows to highlight a menu option, then the
+      <keycap>Space</keycap> key to select or deselect a
+      menu item.  Then, 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>
 
       <para>Depending on the system console being used,
-	<application>bsdinstall</application> may initially prompt to
-	select a non-default keyboard layout.</para>
+	<application>bsdinstall</application> may initially display
+	the menu shown in <xref
+	  linkend="bsdinstall-keymap-select-default"/>.</para>
 
       <figure xml:id="bsdinstall-keymap-select-default">
 	<title>Keymap Selection</title>
@@ -1067,10 +1021,14 @@ Trying to mount root from cd9660:/dev/is
 	</mediaobject>
       </figure>
 
-      <para>If <guibutton>[&nbsp;YES&nbsp;]</guibutton> is selected,
-	the following keyboard selection screen will be displayed.
-	Otherwise, this selection menu will not be displayed, and a
-	default keyboard mapping will be used.</para>
+      <para>To configure the keyboard layout, press
+	<keycap>Enter</keycap> with
+	<guibutton>[&nbsp;YES&nbsp;]</guibutton> selected, which will
+	display the menu shown in <xref
+	  linkend="bsdinstall-config-keymap"/>.  To instead use the
+	default layout, use the arrow key to select
+	<guibutton>[&nbsp;NO&nbsp;]</guibutton> and press
+	<keycap>Enter</keycap> to skip this menu screen.</para>
 
       <figure xml:id="bsdinstall-config-keymap">
 	<title>Selecting Keyboard Menu</title>
@@ -1082,15 +1040,16 @@ Trying to mount root from cd9660:/dev/is
 	</mediaobject>
       </figure>
 
-      <para>Select the keymap that most closely represents the mapping
-	of the keyboard attached to the system, using the up/down
-	arrow keys and pressing <keycap>Enter</keycap>.</para>
+      <para>When configuring the keyboard layout, use the up and down
+	arrows to select the keymap that most closely represents the
+	mapping of the keyboard attached to the system.  Press
+	<keycap>Enter</keycap> to save the selection.</para>
 
       <note>
-	<para>Pressing <keycap>Esc</keycap> will use the default
-	  keymap.  <guimenuitem>United States of America
-	    ISO-8859-1</guimenuitem> is also a safe option if the
-	  choice of keymap is not clear.</para>
+	<para>Pressing <keycap>Esc</keycap> will exit this menu and
+	  use the default keymap.  If the choice of keymap is not
+	  clear, <guimenuitem>United States of America
+	    ISO-8859-1</guimenuitem> is also a safe option.</para>
       </note>
 
       <para>In &os; 10.0-RELEASE and later, this menu has been
@@ -1114,8 +1073,8 @@ Trying to mount root from cd9660:/dev/is
     <sect2 xml:id="bsdinstall-hostname">
       <title>Setting the Hostname</title>
 
-      <para>Next, <application>bsdinstall</application> will prompt
-	for the hostname to be given to the newly installed
+      <para>The next <application>bsdinstall</application> menu is
+	used to set the hostname for the newly installed
 	system.</para>
 
       <figure xml:id="bsdinstall-config-hostname">
@@ -1129,9 +1088,9 @@ Trying to mount root from cd9660:/dev/is
 	</mediaobject>
       </figure>
 
-      <para>The entered hostname should be a fully-qualified hostname,
+      <para>Type in a hostname that is unique for the network.  It should be a fully-qualified hostname,
 	such as <systemitem
-	  class="fqdomainname">machine3.example.com</systemitem></para>
+	  class="fqdomainname">machine3.example.com</systemitem>.</para>
     </sect2>
 
     <sect2 xml:id="bsdinstall-components">
@@ -1155,19 +1114,17 @@ Trying to mount root from cd9660:/dev/is
 	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>
-
-      <para>Depending on the type of installation, some of these
-	components may not appear.</para>
+	installed.  Depending on the architecture, some of these
+	components may not appear:</para>
 
       <itemizedlist>
-	<title>Optional Components</title>
-
 	<listitem>
-	  <para><literal>doc</literal> - Additional documentation,
-	    mostly of historical interest.  Documentation provided by
-	    the &os; Documentation Project may be installed
-	    later.</para>
+	  <para><literal>doc</literal> - Installs the whole
+	    documentation set, including the &os; Handbook, FAQ, and
+	    articles.  If selected, another menu will prompt to select
+	    which language versions to install.  Installing the
+	    documentation requires a working connection to the
+	    Internet.</para>
 	</listitem>
 
 	<listitem>