svn commit: r43759 - head/en_US.ISO8859-1/books/handbook/cutting-edge

Tue Feb 4 15:05:55 UTC 2014

Author: dru
Date: Tue Feb  4 15:05:54 2014
New Revision: 43759
URL: http://svnweb.freebsd.org/changeset/doc/43759

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

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================

--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 14:56:36 2014	(r43758)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 15:05:54 2014	(r43759)
@@ -160,74 +160,71 @@
       <see>updating-upgrading</see>
     </indexterm>
 
-    <para>Applying security patches in a timely manner and
-      upgrading to a newer release of
-      an operating system are important aspects of
-      ongoing system administration.
-      &os; includes a utility
+    <para>Applying security patches in a timely manner and upgrading
+      to a newer release of an operating system are important aspects
+      of ongoing system administration.  &os; includes a utility
       called <command>freebsd-update</command> which can be used to
-	perform both these tasks.</para>
+      perform both these tasks.</para>
+
+    <para>This utility supports binary security and errata updates to
+      &os;, without the need to manually compile and install the patch
+      or a  new kernel.  Binary updates are available for all
+      architectures and releases currently supported by the security
+      team.  The list of supported releases and their estimated
+      end-of-life dates are listed at <uri
+	xlink:href="http://www.FreeBSD.org/security/">http://www.FreeBSD.org/security/</uri>.</para>
+
+    <para>This utility also supports operating system upgrades to
+      minor point releases as well as upgrades to another release
+      branch.  Before upgrading to a new release, review its release
+      announcement as it contains important information pertinent to
+      the release.  Release announcements are available from <uri
+	xlink:href="http://www.FreeBSD.org/releases/">http://www.FreeBSD.org/releases/</uri>.</para>
+
+      <note>
+	<para>If a <command>crontab</command> utilizing the features
+	  of &man.freebsd-update.8; exists, it must be disabled before
+	  upgrading the operating system.</para>
+      </note>
 
-    <para>This utility supports binary
-      security and errata updates to &os;,
-      without the need to manually compile and install the patch or a 
-      new kernel. Binary updates are available for all architectures and
-      releases currently supported by the security team.  The list of
-      supported releases and their estimated end-of-life dates are listed at <uri
-	  xlink:href="http://www.FreeBSD.org/security/">http://www.FreeBSD.org/security/</uri>.</para>   
-
-    <para>This utility also supports operating system upgrades to minor point
-	releases as well as upgrades to another release branch.  Before
-	upgrading to a new release, review its release announcement
-	as it contains important information pertinent to the
-	release.  Release announcements are available from <uri
-	  xlink:href="http://www.FreeBSD.org/releases/">http://www.FreeBSD.org/releases/</uri>.</para>
-    
-    <note>
-    <para>If a <command>crontab</command> utilizing the features
-      of &man.freebsd-update.8; exists, it must be
-      disabled before upgrading the operating system.</para>
-    </note>
-    
     <para>This section describes the configuration file used by
-      <command>freebsd-update</command>, demonstrates how to
-      apply a security patch and how to upgrade to a minor or major
-      operating system release, and discusses some of the considerations
-      when upgrading the operating system.</para>
+      <command>freebsd-update</command>, demonstrates how to apply a
+      security patch and how to upgrade to a minor or major operating
+      system release, and discusses some of the considerations when
+      upgrading the operating system.</para>
 
     <sect2 xml:id="freebsdupdate-config-file">
       <title>The Configuration File</title>
 
       <para>The default configuration file for
-	<command>freebsd-update</command> works as-is.  Some users may wish to tweak the default configuration
-	in <filename>/etc/freebsd-update.conf</filename>, allowing
-	better control of the process.  The comments in this file explain the available options,
-	but the following may require a bit more
-	explanation:</para>
+	<command>freebsd-update</command> works as-is.  Some users may
+	wish to tweak the default configuration in
+	<filename>/etc/freebsd-update.conf</filename>, allowing
+	better control of the process.  The comments in this file
+	explain the available options, but the following may require a
+	bit more explanation:</para>
 
       <programlisting># Components of the base system which should be kept updated.
 Components world kernel</programlisting>
 
       <para>This parameter controls which parts of &os; will be kept
-	up-to-date.  The default is to update the
-	entire base system and the kernel.  Individual components can
-	instead be specified, such as
-	<literal>src/base</literal> or
-	<literal>src/sys</literal>.  However, the best option is to leave this at the default as
-	changing it to include specific items requires
-	every needed item to be listed.  Over time, this could have disastrous
-	consequences as source code and binaries may become out of
-	sync.</para>
+	up-to-date.  The default is to update the entire base system
+	and the kernel.  Individual components can instead be
+	specified, such as <literal>src/base</literal> or
+	<literal>src/sys</literal>.  However, the best option is to
+	leave this at the default as changing it to include specific
+	items requires every needed item to be listed.  Over time,
+	this could have disastrous consequences as source code and
+	binaries may become out of sync.</para>
 
       <programlisting># Paths which start with anything matching an entry in an IgnorePaths
 # statement will be ignored.
 IgnorePaths /boot/kernel/linker.hints</programlisting>
 
       <para>To leave specified directories, such as
-	<filename>/bin</filename> or
-	<filename>/sbin</filename>, untouched during
-	the update process, add their paths to this statement.  This
-	option may be used to prevent
+	<filename>/bin</filename> or <filename>/sbin</filename>,
+	untouched during the update process, add their paths to this
+	statement.  This option may be used to prevent
 	<command>freebsd-update</command> from overwriting local
 	modifications.</para>
 
