Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 May 2013 20:54:52 +0000 (UTC)
From:      Dru Lavigne <dru@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject:   svn commit: r41583 - projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot
Message-ID:  <201305092054.r49Ksq3D036207@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dru
Date: Thu May  9 20:54:51 2013
New Revision: 41583
URL: http://svnweb.freebsd.org/changeset/doc/41583

Log:
  White space fix only. Translators can ignore.
  
  Approved by:  bcr (mentor)

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot/chapter.xml	Thu May  9 20:51:46 2013	(r41582)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot/chapter.xml	Thu May  9 20:54:51 2013	(r41583)
@@ -16,9 +16,9 @@
 
     <para>The process of starting a computer and loading the operating
       system is referred to as <quote>the bootstrap process</quote>,
-      or simply <quote>booting</quote>.  &os;'s boot process
-      provides a great deal of flexibility in customizing what happens
-      when the system starts, including the ability to select from
+      or simply <quote>booting</quote>.  &os;'s boot process provides
+      a great deal of flexibility in customizing what happens when
+      the system starts, including the ability to select from
       different operating systems installed on the same computer,
       different versions of the same operating system, or a different
       installed kernel.</para>
@@ -81,18 +81,15 @@
     </indexterm>
 
     <para>On x86 hardware the Basic Input/Output System
-      (<acronym>BIOS</acronym>) is
-      responsible for loading the operating system.  To do this, the
-      <acronym>BIOS</acronym> looks on the hard disk for the Master
-      Boot Record (<acronym>MBR</acronym>),
-      which must be located on a specific place on the disk.  The
-      <acronym>BIOS</acronym>
-      has enough knowledge to load and run the <acronym>MBR</acronym>,
-      and assumes that
-      the <acronym>MBR</acronym> can then carry out the rest of the
-      tasks involved in
-      loading the operating system, possibly with the help of the
-      <acronym>BIOS</acronym>.</para>
+      (<acronym>BIOS</acronym>) is responsible for loading the
+      operating system.  To do this, the <acronym>BIOS</acronym>
+      looks on the hard disk for the Master Boot Record
+      (<acronym>MBR</acronym>), which must be located on a specific
+      place on the disk.  The <acronym>BIOS</acronym> has enough
+      knowledge to load and run the <acronym>MBR</acronym>, and
+      assumes that the <acronym>MBR</acronym> can then carry out the
+      rest of the tasks involved in loading the operating system,
+      possibly with the help of the <acronym>BIOS</acronym>.</para>
 
     <indexterm><primary>Master Boot Record
 	<acronym>MBR</acronym>)</primary></indexterm>
@@ -102,14 +99,13 @@
     <indexterm><primary>Boot Loader</primary></indexterm>
 
     <para>The code within the <acronym>MBR</acronym> is usually
-      referred to as a
-      <emphasis>boot manager</emphasis>, especially when it interacts
-      with the user.  In this case, the boot manager usually has more
-      code in the first <emphasis>track</emphasis> of the disk or
-      within the file system of some operating systems.  A boot
-      manager is sometimes also
-      called a <emphasis>boot loader</emphasis>, but &os; uses that
-      term for a later stage of booting.  Popular boot managers
+      referred to as a <emphasis>boot manager</emphasis>, especially
+      when it interacts with the user.  In this case, the boot
+      manager usually has more code in the first
+      <emphasis>track</emphasis> of the disk or within the file
+      system of some operating systems.  A boot manager is sometimes
+      also called a <emphasis>boot loader</emphasis>, but &os; uses
+      that term for a later stage of booting.  Popular boot managers
       include <application>boot0</application>, also called
       <application>Boot Easy</application>, the standard &os; boot
       manager, <application>Grub</application>,
@@ -119,14 +115,12 @@
       <acronym>MBR</acronym>.</para>
 
     <para>If only one operating system is installed, a standard PC
-      <acronym>MBR</acronym>
-      will suffice.  This <acronym>MBR</acronym> searches for the
-      first bootable (active)
+      <acronym>MBR</acronym> will suffice.  This
+      <acronym>MBR</acronym> searches for the first bootable (active)
       slice on the disk, and then runs the code on that slice to load
       the remainder of the operating system.  By default, the
-      <acronym>MBR</acronym>
-      installed by &man.fdisk.8; is such an <acronym>MBR</acronym> and
-      is based on
+      <acronym>MBR</acronym> installed by &man.fdisk.8; is such an
+      <acronym>MBR</acronym> and is based on
       <filename>/boot/mbr</filename>.</para>
 
     <para>If multiple operating systems are present, a different boot
@@ -136,15 +130,14 @@
 
     <para>The remainder of the &os; bootstrap system is divided
       into three stages.  The first stage is run by the
-      <acronym>MBR</acronym>, which
-      knows just enough to get the computer into a specific state and
-      run the second stage.  The second stage can do a little bit
-      more, before running the third stage.  The third stage finishes
-      the task of loading the operating system.  The work is split
-      into three stages because PC standards put limits on the size of
-      the programs that can be run at stages one and two.  Chaining
-      the tasks together allows &os; to provide a more flexible
-      loader.</para>
+      <acronym>MBR</acronym>, which knows just enough to get the
+      computer into a specific state and run the second stage.  The
+      second stage can do a little bit more, before running the
+      third stage.  The third stage finishes the task of loading the
+      operating system.  The work is split into three stages because
+      PC standards put limits on the size of the programs that can
+      be run at stages one and two.  Chaining the tasks together
+      allows &os; to provide a more flexible loader.</para>
 
     <indexterm><primary>kernel</primary></indexterm>
     <indexterm><primary>&man.init.8;</primary></indexterm>
@@ -171,9 +164,8 @@
 	  (<acronym>MBR</acronym>)</primary></indexterm>
 
       <para>The code in the <acronym>MBR</acronym> or boot manager is
-	sometimes referred
-	to as <emphasis>stage zero</emphasis> of the boot process.
-	This section discusses two boot managers:
+	sometimes referred to as <emphasis>stage zero</emphasis> of
+	the boot process.  This section discusses two boot managers:
 	<application>boot0</application> and
 	<application>LILO</application>.</para>
 
@@ -182,8 +174,7 @@
 	  Manager:</title>
 
 	<para>The <acronym>MBR</acronym> installed by &os;'s installer
-	  or
-	  &man.boot0cfg.8; is based on
+	  or &man.boot0cfg.8; is based on
 	  <filename>/boot/boot0</filename>.  The size and capability
 	  of <application>boot0</application> is restricted to 446
 	  bytes due to the slice table and <literal>0x55AA</literal>
@@ -204,24 +195,21 @@ Default: F2</screen>
 
       <para>Other operating systems, in particular &windows;, will
 	overwrite an existing <acronym>MBR</acronym> if they are
-	installed after &os;.
-	If this happens, or to replace the existing
-	<acronym>MBR</acronym>
-	with the &os; <acronym>MBR</acronym>, use the following
-	command:</para>
+	installed after &os;.  If this happens, or to replace the
+	existing <acronym>MBR</acronym> with the &os;
+	<acronym>MBR</acronym>, use the following command:</para>
 
       <screen>&prompt.root; <userinput>fdisk -B -b /boot/boot0 <replaceable>device</replaceable></userinput></screen>
 
       <para>where <replaceable>device</replaceable> is the boot disk,
 	such as <devicename>ad0</devicename> for the first
-	<acronym>IDE</acronym> disk,
-	<devicename>ad2</devicename> for the first
-	<acronym>IDE</acronym> disk on a
-	second <acronym>IDE</acronym> controller, or
+	<acronym>IDE</acronym> disk, <devicename>ad2</devicename>
+	for the first <acronym>IDE</acronym> disk on a second
+	<acronym>IDE</acronym> controller, or
 	<devicename>da0</devicename>
 	for the first <acronym>SCSI</acronym> disk.  To create a
-	custom configuration of
-	the <acronym>MBR</acronym>, refer to &man.boot0cfg.8;.</para>
+	custom configuration of the <acronym>MBR</acronym>, refer to
+	&man.boot0cfg.8;.</para>
 
       <formalpara>
 	<title>The LILO Boot Manager:</title>
@@ -279,9 +267,9 @@ label=FreeBSD</programlisting>
 	can provide a simple interface to choose the kernel or loader
 	to run.</para>
 
-      <para>However, &man.loader.8; is much more
-	sophisticated and provides a boot configuration which is run
-	by <filename>boot2</filename>.</para>
+      <para>However, &man.loader.8; is much more sophisticated and
+	provides a boot configuration which is run by
+	<filename>boot2</filename>.</para>
 
       <example id="boot-boot2-example">
 	<title><filename>boot2</filename> Screenshot</title>
@@ -581,10 +569,10 @@ boot:</screen>
 	  first is the default legacy virtual console command line
 	  environment.  After the system finishes booting, a console
 	  login prompt is presented.  The second environment is the
-	  graphical environment as described in
-	  <xref linkend="x11"/>.  Refer to that chapter for
-	  more information on how to install and configure a graphical
-	  display manager and a graphical login manager.</para>
+	  graphical environment as described in <xref linkend="x11"/>.
+	  Refer to that chapter for more information on how to install
+	  and configure a graphical display manager and a graphical
+	  login manager.</para>
 
 	<sect4 id="boot-splash-function">
 	  <title>Splash Screen Function</title>
@@ -690,8 +678,8 @@ bitmap_name="<replaceable>/boot/splash.b
 	    or
 	    <filename><replaceable>bluewave</replaceable>.pcx</filename>.</para>
 
-	  <para>Other interesting
-	    <filename>loader.conf</filename> options include:</para>
+	  <para>Other interesting <filename>loader.conf</filename>
+	    options include:</para>
 
 	  <variablelist>
 	    <varlistentry>
@@ -736,8 +724,8 @@ bitmap_name="<replaceable>/boot/splash.b
 
     <para>Once the kernel is loaded by either the default loader
       (<xref linkend="boot-loader"/>) or by boot2 (<xref
-	linkend="boot-boot1"/>), which bypasses the loader,
-      it examines any boot flags and adjusts its behavior as
+	linkend="boot-boot1"/>), which bypasses the loader, it
+      examines any boot flags and adjusts its behavior as
       necessary.</para>
 
     <sect2 id="boot-kernel-bootflags">
@@ -923,9 +911,8 @@ bitmap_name="<replaceable>/boot/splash.b
 	systems available on the system are consistent.  If they are
 	not, and &man.fsck.8; cannot fix the inconsistencies of a UFS
 	file system, &man.init.8; drops the system into single-user
-	mode (<xref linkend="boot-singleuser"/>) so
-	that the system administrator can resolve the problem
-	directly.</para>
+	mode (<xref linkend="boot-singleuser"/>) so that the system
+	administrator can resolve the problem directly.</para>
     </sect2>
 
     <sect2 id="boot-singleuser">
@@ -935,10 +922,9 @@ bitmap_name="<replaceable>/boot/splash.b
       <indexterm><primary>console</primary></indexterm>
 
       <para>This mode can be reached through the automatic reboot
-	sequence (<xref linkend="boot-autoreboot"/>),
-	the user booting with <option>-s</option>, or by setting
-	the <envar>boot_single</envar> variable in
-	&man.loader.8;.</para>
+	sequence (<xref linkend="boot-autoreboot"/>), the user booting
+	with <option>-s</option>, or by setting the <envar>boot_
+	  single</envar> variable in &man.loader.8;.</para>
 
       <para>It can also be reached by calling &man.shutdown.8; from
 	multi-user mode (<xref linkend="boot-multiuser"/>) without
@@ -978,9 +964,9 @@ console none                            
 
       <para>If &man.init.8; finds the file systems to be in order, or
 	once the user has finished their commands in single-user
-	mode (<xref linkend="boot-singleuser"/>), the
-	system enters multi-user mode, in which it starts the
-	resource configuration of the system.</para>
+	mode (<xref linkend="boot-singleuser"/>), the system enters
+	multi-user mode, in which it starts the resource configuration
+	of the system.</para>
 
       <sect3 id="boot-rc">
 	<title>Resource Configuration (rc)</title>



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