Fix FDP style nits reported by igor(1).

Bump copyright year in readme/article.xml.

Sponsored by:	The FreeBSD Foundation

2 files changed, 276 insertions, 235 deletions

diff --git a/release/doc/en_US.ISO8859-1/hardware/article.xml b/release/doc/en_US.ISO8859-1/hardware/article.xml
index bd3b53d..4e51beb 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.xml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
-        "../../../share/xml/freebsd50.dtd" [
+	"../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
 %release;
 <!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "nonexistent">
 %devauto;
 ]>
-<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
-  <info><title>&os; &release.current; Hardware Notes</title>
-    
+<article xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
 
-    <author><orgname>The &os; Documentation Project</orgname></author>
+  <info>
+    <title>&os; &release.current; Hardware Notes</title>
+
+    <author>
+      <orgname>The &os; Documentation Project</orgname>
+    </author>
 
     <pubdate>$FreeBSD$</pubdate>
 
@@ -33,7 +37,8 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
-      <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
+      <holder role="mailto:doc@FreeBSD.org">The &os; Documentation
+	Project</holder>
     </copyright>
 
     <legalnotice xml:id="trademarks" role="trademarks">
@@ -112,8 +117,8 @@
 	</listitem>
 
 	<listitem>
-          <para>The single-core &intel; &xeon;
-            processors <quote>Nocona</quote>, <quote>Irwindale</quote>,
+	  <para>The single-core &intel; &xeon; processors
+	    <quote>Nocona</quote>, <quote>Irwindale</quote>,
 	    <quote>Potomac</quote>, and <quote>Cranford</quote> have
 	    EM64T support.</para>
 	</listitem>
@@ -132,7 +137,8 @@
 	</listitem>
 
 	<listitem>
-	  <para>All &intel; &centrino; Duo and &centrino; Pro platforms</para>
+	  <para>All &intel; &centrino; Duo and &centrino; Pro
+	    platforms</para>
 	</listitem>
 
 	<listitem>
@@ -142,11 +148,11 @@
 	</listitem>
 
 	<listitem>
-	  <para>Some &intel; &pentium; 4s and &celeron; Ds using
-	    the <quote>Prescott</quote> core have EM64T support.  See
-	    the <link xlink:href="http://processorfinder.intel.com">Intel
-	    Processor Spec Finder</link> for the definitive answer about
-	    EM64T support in Intel processors.</para>
+	  <para>Some &intel; &pentium; 4s and &celeron; Ds using the
+	    <quote>Prescott</quote> core have EM64T support.  See the
+	    <link xlink:href="http://processorfinder.intel.com">Intel
+	      Processor Spec Finder</link> for the definitive answer
+	    about EM64T support in Intel processors.</para>
 	</listitem>
 
       </itemizedlist>
@@ -171,14 +177,14 @@
       <title>i386</title>
 
       <para>&os;/&arch.i386; runs on a wide variety of <quote>IBM PC
-	  compatible</quote> machines. Due to the wide range of
+	  compatible</quote> machines.  Due to the wide range of
 	hardware available for this architecture, it is impossible
 	to exhaustively list all combinations of equipment supported
 	by &os;.  Nevertheless, some general guidelines are
 	presented here.</para>
 
       <para>Almost all &i386;-compatible processors with a floating
-	point unit are supported. All &intel; processors beginning
+	point unit are supported.  All &intel; processors beginning
 	with the 80486 are supported, including the 80486, &pentium;,
 	&pentium; Pro, &pentium; II, &pentium; III, &pentium; 4, and
 	variants thereof, such as the &xeon; and &celeron; processors.
@@ -248,11 +254,13 @@
 	(DSDT) provided by each machine's BIOS.  Some machines have
 	bad or incomplete DSDTs, which prevents ACPI from functioning
 	correctly.  Replacement DSDTs for some machines can be found
-	at the <link xlink:href="http://acpi.sourceforge.net/dsdt/index.php">DSDT</link>
-	section of the <link xlink:href="http://acpi.sourceforge.net/">ACPI4Linux</link> project
-	Web site.  &os; can use these DSDTs to override the DSDT
-	provided by the BIOS; see the &man.acpi.4; manual page for
-	more information.</para>
+	at the <link
+	  xlink:href="http://acpi.sourceforge.net/dsdt/index.php">DSDT</link>
+	section of the <link
+	  xlink:href="http://acpi.sourceforge.net/">ACPI4Linux</link>
+	project Web site.  &os; can use these DSDTs to override the
+	DSDT provided by the BIOS; see the &man.acpi.4; manual page
+	for more information.</para>
     </sect2>
 
     <sect2 xml:id="proc-pc98">
@@ -287,8 +295,8 @@
     <sect2 xml:id="proc-powerpc">
       <title>powerpc</title>
 
-      <para>All Apple PowerPC machines with built-in USB are supported,
-	as well a limited selection of non-Apple machines,
+      <para>All Apple PowerPC machines with built-in USB are
+	supported, as well a limited selection of non-Apple machines,
 	including KVM on POWER7</para>
 
       <para>SMP is supported on all systems with more than
@@ -299,8 +307,8 @@
       <title>sparc64</title>
 
       <para>This section describes the systems currently known to be
-	supported by &os; on the Fujitsu &sparc64; and Sun &ultrasparc;
-	platforms.</para>
+	supported by &os; on the Fujitsu &sparc64; and Sun
+	&ultrasparc; platforms.</para>
 
       <para>SMP is supported on all systems with more than 1
 	processor.</para>
@@ -310,8 +318,8 @@
 	supported by the &man.creator.4; (Sun Creator, Sun Creator3D
 	and Sun Elite3D) or &man.machfb.4; (Sun PGX and Sun PGX64
 	as well as the ATI Mach64 chips found onboard in for example
-	&sun.blade; 100, &sun.blade; 150, &sun.ultra; 5	and &sun.ultra; 10)
-	driver must use the serial console.</para>
+	&sun.blade; 100, &sun.blade; 150, &sun.ultra; 5 and
+	&sun.ultra; 10) driver must use the serial console.</para>
 
       <para>If you have a system that is not listed here, it may not
 	have been tested with &os; &release.current;.  We encourage
@@ -456,10 +464,11 @@
       </itemizedlist>
 
       <para>The following systems are partially supported by &os;.  In
-	particular the fiber channel controllers in SBus-based systems are not
-	supported.  However, it is possible to use these with a SCSI controller
-	supported by the &man.esp.4; driver (Sun ESP SCSI, Sun FAS Fast-SCSI
-	and Sun FAS366 Fast-Wide SCSI controllers).</para>
+	particular the fiber channel controllers in SBus-based systems
+	are not supported.  However, it is possible to use these with
+	a SCSI controller supported by the &man.esp.4; driver (Sun ESP
+	SCSI, Sun FAS Fast-SCSI and Sun FAS366 Fast-Wide SCSI
+	controllers).</para>
 
       <itemizedlist>
 	<listitem>
@@ -471,9 +480,9 @@
 	</listitem>
       </itemizedlist>
 
-      <para>Starting with 7.2-RELEASE, &arch.sparc64; systems based on Sun
-	&ultrasparc; III and beyond are also supported by &os;, which includes
-	the following known working systems:</para>
+      <para>Starting with 7.2-RELEASE, &arch.sparc64; systems based on
+	Sun &ultrasparc; III and beyond are also supported by &os;,
+	which includes the following known working systems:</para>
 
       <itemizedlist>
 	<listitem>
@@ -501,7 +510,8 @@
 	</listitem>
 
 	<listitem>
-	  <para>&sun.fire; V215 (support first appeared in 7.3-RELEASE and 8.1-RELEASE)</para>
+	  <para>&sun.fire; V215 (support first appeared in 7.3-RELEASE
+	    and 8.1-RELEASE)</para>
 	</listitem>
 
 	<listitem>
@@ -509,7 +519,8 @@
 	</listitem>
 
 	<listitem>
-	  <para>&sun.fire; V245 (support first appeared in 7.3-RELEASE and 8.1-RELEASE)</para>
+	  <para>&sun.fire; V245 (support first appeared in 7.3-RELEASE
+	    and 8.1-RELEASE)</para>
 	</listitem>
 
 	<listitem>
@@ -522,9 +533,10 @@
 	</listitem>
 
 	<listitem>
-	  <para>&sun.fire; V480 (501-6780 and 501-6790 centerplanes only, for
-	    which support first appeared in 7.3-RELEASE and 8.1-RELEASE,
-	    other centerplanes might work beginning with 8.3-RELEASE and 9.0-RELEASE)</para>
+	  <para>&sun.fire; V480 (501-6780 and 501-6790 centerplanes
+	    only, for which support first appeared in 7.3-RELEASE and
+	    8.1-RELEASE, other centerplanes might work beginning with
+	    8.3-RELEASE and 9.0-RELEASE)</para>
 	</listitem>
 
 	<listitem>
@@ -532,8 +544,9 @@
 	</listitem>
 
 	<listitem>
-	  <para>&sun.fire; V890 (support first appeared in 7.4-RELEASE and 8.1-RELEASE,
-	    non-mixed &ultrasparc; IV/IV+ CPU-configurations only)</para>
+	  <para>&sun.fire; V890 (support first appeared in 7.4-RELEASE
+	    and 8.1-RELEASE, non-mixed &ultrasparc; IV/IV+
+	    CPU-configurations only)</para>
 	</listitem>
 
 	<listitem>
@@ -550,14 +563,16 @@
 	</listitem>
 
 	<listitem>
-	  <para>&sun.fire; V490 (support first appeared in 7.4-RELEASE and 8.1-RELEASE,
-	    non-mixed &ultrasparc; IV/IV+ CPU-configurations only)</para>
+	  <para>&sun.fire; V490 (support first appeared in 7.4-RELEASE
+	    and 8.1-RELEASE, non-mixed &ultrasparc; IV/IV+
+	    CPU-configurations only)</para>
 	</listitem>
       </itemizedlist>
 
-      <para>Starting with 7.4-RELEASE and 8.1-RELEASE, &arch.sparc64; systems based on
-	Fujitsu &sparc64; V are also supported by &os;, which
-	includes the following known working systems:</para>
+      <para>Starting with 7.4-RELEASE and 8.1-RELEASE, &arch.sparc64;
+	systems based on Fujitsu &sparc64; V are also supported by
+	&os;, which includes the following known working
+	systems:</para>
 
       <itemizedlist>
 	<listitem>
@@ -565,8 +580,8 @@
 	</listitem>
       </itemizedlist>
 
-      <para>The following Fujitsu &primepower; systems are not tested but
-	believed to be also supported by &os;:</para>
+      <para>The following Fujitsu &primepower; systems are not tested
+	but believed to be also supported by &os;:</para>
 
       <itemizedlist>
 	<listitem>
@@ -682,7 +697,7 @@
 
       <note>
 	<para>[&arch.amd64;, &arch.i386;] Booting from these
-	  controllers is supported. EISA adapters are not
+	  controllers is supported.  EISA adapters are not
 	  supported.</para>
       </note>
 
@@ -712,7 +727,7 @@
 
       <note>
 	<para>[&arch.amd64;, &arch.i386;] Booting from these
-	  controllers is supported. EISA adapters are not
+	  controllers is supported.  EISA adapters are not
 	  supported.</para>
       </note>
 
@@ -765,8 +780,8 @@
 	support CD-ROM commands are supported for read-only access by
 	the CD-ROM drivers (such as &man.cd.4;).  WORM/CD-R/CD-RW
 	writing support is provided by &man.cdrecord.1;, which is a
-	part of the <package>sysutils/cdrtools</package> port in the Ports
-	Collection.</para>
+	part of the <package>sysutils/cdrtools</package> port in the
+	Ports Collection.</para>
 
       <para>The following CD-ROM type systems are supported at this
 	time:</para>
@@ -1020,8 +1035,8 @@
 	4965AGN IEEE 802.11n PCI network adapters
 	(&man.iwn.4; driver)</para>
 
-      <para>[&arch.i386;, &arch.amd64;] Marvell Libertas IEEE 802.11b/g
-        PCI network adapters (&man.malo.4; driver)</para>
+      <para>[&arch.i386;, &arch.amd64;] Marvell Libertas IEEE
+	802.11b/g PCI network adapters (&man.malo.4; driver)</para>
 
       <para>Marvell 88W8363 IEEE 802.11n wireless network
 	adapters (&man.mwl.4; driver)</para>
@@ -1032,8 +1047,8 @@
 
       &hwlist.rsu;
 
-      <para>Realtek RTL8188CE based PCIe IEEE 802.11b/g/n wireless network
-	adapters (&man.rtwn.4; driver)</para>
+      <para>Realtek RTL8188CE based PCIe IEEE 802.11b/g/n wireless
+	network adapters (&man.rtwn.4; driver)</para>
 
       &hwlist.rum;
 
@@ -1147,12 +1162,13 @@
 	</listitem>
 
 	<listitem>
-	  <para>[&arch.amd64;, &arch.i386;] Avlab Technology, PCI IO 2S
-	    and PCI IO 4S</para>
+	  <para>[&arch.amd64;, &arch.i386;] Avlab Technology, PCI IO
+	    2S and PCI IO 4S</para>
 	</listitem>
 
 	<listitem>
-	  <para>[&arch.amd64;, &arch.i386;] Comtrol RocketPort 550</para>
+	  <para>[&arch.amd64;, &arch.i386;] Comtrol RocketPort
+	    550</para>
 	</listitem>
 
 	<listitem>
@@ -1222,7 +1238,7 @@
 
 	<listitem>
 	  <para>[&arch.amd64;, &arch.i386;] SIIG Cyber 4S PCI
-	  16C550/16C650/16C850</para>
+	    16C550/16C650/16C850</para>
 	</listitem>
 
 	<listitem>
@@ -1305,7 +1321,7 @@
 
       <note>
 	<para>"flags 0x15000?01" is necessary in kernel
-	configuration.</para>
+	  configuration.</para>
       </note>
 
       <para>[&arch.pc98;] Media Intelligent RSB-384 (&man.sio.4;
@@ -1453,8 +1469,9 @@
       </note>
 
       <note>
-	<para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
-	  USB Bluetooth adapters can be found in <link linkend="bluetooth">Bluetooth</link> section.</para>
+	<para>[&arch.amd64;, &arch.i386;, &arch.pc98;] USB Bluetooth
+	  adapters can be found in <link
+	    linkend="bluetooth">Bluetooth</link> section.</para>
       </note>
 
       &hwlist.ohci;
@@ -1576,7 +1593,8 @@
       <note>
 	<para>Information regarding specific video cards and
 	  compatibility with <application>Xorg</application> can be
-	  found at <uri xlink:href="http://www.x.org/">http://www.x.org/</uri>.</para>
+	  found at <uri
+	    xlink:href="http://www.x.org/">http://www.x.org/</uri>.</para>
       </note>
 
       <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
@@ -1631,7 +1649,8 @@
       <note>
 	<para>&man.moused.8; has more information on using pointing
 	  devices with &os;.  Information on using pointing devices
-	  with <application>Xorg</application> can be found at <uri xlink:href="http://www.x.org/">http://www.x.org/</uri>.</para>
+	  with <application>Xorg</application> can be found at <uri
+	    xlink:href="http://www.x.org/">http://www.x.org/</uri>.</para>
       </note>
 
       <para>[&arch.amd64;, &arch.i386;] <quote>PC standard</quote>
@@ -1664,8 +1683,9 @@
       </itemizedlist>
 
       <para>[&arch.i386;] Xilinx XC6200-based reconfigurable hardware
-	cards compatible with the HOT1 from <link xlink:href="http://www.vcc.com/">Virtual Computers</link> (xrpu
-	driver).</para>
+	cards compatible with the HOT1 from <link
+	  xlink:href="http://www.vcc.com/">Virtual Computers</link>
+	(xrpu driver).</para>
 
       <para>[&arch.pc98;] Power Management Controller of NEC PC-98
 	Note (pmc driver)</para>
diff --git a/release/doc/en_US.ISO8859-1/readme/article.xml b/release/doc/en_US.ISO8859-1/readme/article.xml
index ffebcc3..53a58a9 100644
--- a/release/doc/en_US.ISO8859-1/readme/article.xml
+++ b/release/doc/en_US.ISO8859-1/readme/article.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
-        "../../../share/xml/freebsd50.dtd" [
+	"../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 ]>
-<!-- 
+<!--
      Local Variables:
      mode: sgml
      sgml-indent-data: t
@@ -12,9 +12,11 @@
      sgml-always-quote-attributes: t
      End:
 -->
-<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
-  <info><title>&os; &release.current; README</title>
-    
+<article xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+
+  <info>
+    <title>&os; &release.current; README</title>
 
     <author><orgname>The &os; Project</orgname></author>
 
@@ -37,7 +39,10 @@
       <year>2013</year>
       <year>2014</year>
       <year>2015</year>
-      <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
+      <year>2016</year>
+      <year>2017</year>
+      <holder role="mailto:doc@FreeBSD.org">The &os; Documentation
+	Project</holder>
     </copyright>
 
     <legalnotice xml:id="trademarks" role="trademarks">
@@ -48,35 +53,36 @@
       &tm-attrib.general;
     </legalnotice>
 
-  <abstract>
-    <para>This document gives a brief introduction to &os;
-      &release.current;.  It includes some information on how to
-      obtain &os;, a listing of various ways to contact the &os;
-      Project, and pointers to some other sources of
-      information.</para>
-  </abstract>
+    <abstract>
+      <para>This document gives a brief introduction to &os;
+	&release.current;.  It includes some information on how to
+	obtain &os;, a listing of various ways to contact the &os;
+	Project, and pointers to some other sources of
+	information.</para>
+    </abstract>
   </info>
 
   <sect1 xml:id="intro">
     <title>Introduction</title>
 
-    <para>This distribution is a &release.type; of &os; &release.current;, the
-      latest point along the &release.branch; branch.</para>
+    <para>This distribution is a &release.type; of &os;
+      &release.current;, the latest point along the &release.branch;
+      branch.</para>
 
     <sect2>
       <title>About &os;</title>
 
       <para>&os; is an operating system based on 4.4 BSD Lite for
 	AMD64 and Intel EM64T based PC hardware (&arch.amd64;),
-	Intel, AMD, Cyrix or NexGen <quote>x86</quote> based PC hardware (&arch.i386;),
-	NEC PC-9801/9821 series PCs and compatibles (&arch.pc98;),
-	and &ultrasparc; machines (&arch.sparc64;).  Versions
-	for the &arm; (&arch.arm;), &mips; (&arch.mips;), and
-	&powerpc; (&arch.powerpc;) architectures are currently under
-	development as well.  &os; works with a wide variety of
-	peripherals and configurations and can be used for everything
-	from software development to games to Internet Service
-	Provision.</para>
+	Intel, AMD, Cyrix or NexGen <quote>x86</quote> based PC
+	hardware (&arch.i386;), NEC PC-9801/9821 series PCs and
+	compatibles (&arch.pc98;), and &ultrasparc; machines
+	(&arch.sparc64;).  Versions for the &arm; (&arch.arm;), &mips;
+	(&arch.mips;), and &powerpc; (&arch.powerpc;) architectures
+	are currently under development as well.  &os; works with
+	a wide variety of peripherals and configurations and can be
+	used for everything from software development to games to
+	Internet Service Provision.</para>
 
       <para>This release of &os; contains everything you need to run
 	such a system, including full source code for the kernel and
@@ -88,61 +94,63 @@
 
       <para>A large collection of third-party ported software (the
 	<quote>Ports Collection</quote>) is also provided to make it
-	easy to obtain and install all your favorite traditional &unix;
-	utilities for &os;.  Each <quote>port</quote> consists of a
-	set of scripts to retrieve, configure, build, and install a
-	piece of software, with a single command.  Over &os.numports;
-	ports, from editors to programming languages to graphical
-	applications, make &os; a powerful and comprehensive operating
-	environment that extends far beyond what's provided by many
-	commercial versions of &unix;.  Most ports are also available as
-	pre-compiled <quote>packages</quote>, which can be quickly
-	installed from the installation program.</para>
+	easy to obtain and install all your favorite traditional
+	&unix; utilities for &os;.  Each <quote>port</quote> consists
+	of a set of scripts to retrieve, configure, build, and install
+	a piece of software, with a single command.  Over
+	&os.numports; ports, from editors to programming languages to
+	graphical applications, make &os; a powerful and comprehensive
+	operating environment that extends far beyond what's provided
+	by many commercial versions of &unix;.  Most ports are also
+	available as pre-compiled <quote>packages</quote>, which can
+	be quickly installed from the installation program.</para>
     </sect2>
 
     <sect2>
       <title>Target Audience</title>
 
-      <para releasetype="current">This &release.type; is aimed primarily at early adopters
-	and various other users who want to get involved with the
-	ongoing development of &os;.  While the &os; development team
-	tries its best to ensure that each &release.type; works as
-	advertised, &release.branch; is very much a
-	work-in-progress.</para>
-
-      <para releasetype="current">The basic requirements for using this &release.type; are
-	technical proficiency with &os; and an understanding of the
-	ongoing development process of &os; &release.branch; (as
-	discussed on the &a.current;).</para>
-
-      <para releasetype="current">For those more interested in doing business with &os; than
-	in experimenting with new &os; technology, formal releases
-	(such as &release.prev.stable;) are frequently more appropriate.
-	Releases undergo a period of testing and quality assurance
-	checking to ensure high reliability and dependability.</para>
-
-      <para releasetype="snapshot">This &release.type; is aimed primarily at early adopters
-	and various other users who want to get involved with the
-	ongoing development of &os;.  While the &os; development team
-	tries its best to ensure that each &release.type; works as
-	advertised, &release.branch; is very much a
-	work-in-progress.</para>
-
-      <para releasetype="snapshot">The basic requirements for using this &release.type; are
-	technical proficiency with &os; and an understanding of the
-	ongoing development process of &os; &release.branch; (as
-	discussed on the &a.current;).</para>
-
-      <para releasetype="snapshot">For those more interested in doing business with &os; than
-	in experimenting with new &os; technology, formal releases
-	(such as &release.prev.stable;) are frequently more appropriate.
-	Releases undergo a period of testing and quality assurance
-	checking to ensure high reliability and dependability.</para>
-
-      <para releasetype="release">This &release.type; of &os; is suitable for all users.  It
-	has undergone a period of testing and quality assurance
-	checking to ensure the highest reliability and
-	dependability.</para>
+      <para releasetype="current">This &release.type; is aimed
+	primarily at early adopters and various other users who want
+	to get involved with the ongoing development of &os;.  While
+	the &os; development team tries its best to ensure that each
+	&release.type; works as advertised, &release.branch; is very
+	much a work-in-progress.</para>
+
+      <para releasetype="current">The basic requirements for using
+	this &release.type; are technical proficiency with &os; and an
+	understanding of the ongoing development process of &os;
+	&release.branch; (as discussed on the &a.current;).</para>
+
+      <para releasetype="current">For those more interested in doing
+	business with &os; than in experimenting with new &os;
+	technology, formal releases (such as &release.prev.stable;)
+	are frequently more appropriate.  Releases undergo a period of
+	testing and quality assurance checking to ensure high
+	reliability and dependability.</para>
+
+      <para releasetype="snapshot">This &release.type; is aimed
+	primarily at early adopters and various other users who want
+	to get involved with the ongoing development of &os;.  While
+	the &os; development team tries its best to ensure that each
+	&release.type; works as advertised, &release.branch; is very
+	much a work-in-progress.</para>
+
+      <para releasetype="snapshot">The basic requirements for using
+	this &release.type; are technical proficiency with &os; and an
+	understanding of the ongoing development process of &os;
+	&release.branch; (as discussed on the &a.current;).</para>
+
+      <para releasetype="snapshot">For those more interested in doing
+	business with &os; than in experimenting with new &os;
+	technology, formal releases (such as &release.prev.stable;)
+	are frequently more appropriate.  Releases undergo a period of
+	testing and quality assurance checking to ensure high
+	reliability and dependability.</para>
+
+      <para releasetype="release">This &release.type; of &os; is
+	suitable for all users.  It has undergone a period of testing
+	and quality assurance checking to ensure the highest
+	reliability and dependability.</para>
     </sect2>
   </sect1>
 
@@ -166,16 +174,18 @@
 	Collection, or other extra material.</para>
 
       <para>A list of the CDROM and DVD publishers known to the
-	project are listed in the <link xlink:href="&url.books.handbook;/mirrors.html"><quote>Obtaining
-	&os;</quote></link> appendix to the Handbook.</para>
+	project are listed in the <link
+	  xlink:href="&url.books.handbook;/mirrors.html"><quote>Obtaining
+	    &os;</quote></link> appendix to the Handbook.</para>
     </sect2>
 
     <sect2>
       <title>FTP</title>
 
       <para>You can use FTP to retrieve &os; and any or all of its
-	optional packages from <uri xlink:href="ftp://ftp.FreeBSD.org/">ftp://ftp.FreeBSD.org/</uri>, which is the official
-	&os; release site, or any of its
+	optional packages from <uri
+	  xlink:href="ftp://ftp.FreeBSD.org/">ftp://ftp.FreeBSD.org/</uri>,
+	which is the official &os; release site, or any of its
 	<quote>mirrors</quote>.</para>
 
       <para>Lists of locations that mirror &os; can be found in the
@@ -187,8 +197,9 @@
       <para>Additional mirror sites are always welcome.  Contact
 	<email>freebsd-admin@FreeBSD.org</email> for more details on
 	becoming an official mirror site.  You can also find useful
-        information for mirror sites at the <link xlink:href="&url.articles.hubs;/">Mirroring
-        &os;</link> article.</para>
+	information for mirror sites at the <link
+	  xlink:href="&url.articles.hubs;/">Mirroring &os;</link>
+	article.</para>
 
       <para>Mirrors generally contain the ISO images generally used to
 	create a CDROM of a &os; release.  They usually also contain
@@ -208,16 +219,18 @@
       <para>For any questions or general technical support issues,
 	please send mail to the &a.questions;.</para>
 
-      <para>If you're tracking the &release.branch; development efforts, you
-	<emphasis>must</emphasis> join the &a.current;, in order to
-	keep abreast of recent developments and changes that may
-	affect the way you use and maintain the system.</para>
+      <para>If you're tracking the &release.branch; development
+	efforts, you <emphasis>must</emphasis> join the &a.current;,
+	in order to keep abreast of recent developments and changes
+	that may affect the way you use and maintain the
+	system.</para>
 
-      <para>Being a largely-volunteer effort, the &os;
-	Project is always happy to have extra hands willing to help&mdash;there are already far more desired enhancements than
-	there is time to implement them.  To contact the developers on
-	technical matters, or with offers of help, please send mail to
-	the &a.hackers;.</para>
+      <para>Being a largely-volunteer effort, the &os; Project is
+	always happy to have extra hands willing to help&mdash;there
+	are already far more desired enhancements than there is time
+	to implement them.  To contact the developers on technical
+	matters, or with offers of help, please send mail to the
+	&a.hackers;.</para>
 
       <para>Please note that these mailing lists can experience
 	<emphasis>significant</emphasis> amounts of traffic.  If you
@@ -226,13 +239,15 @@
 	preferable to subscribe instead to the &a.announce;.</para>
 
       <para>All of the mailing lists can be freely joined by anyone
-	wishing to do so.  Visit the <link xlink:href="&url.base;/mailman/listinfo">
-	&os; Mailman Info Page</link>.  This will give you more
-	information on joining the various lists, accessing archives,
-	etc.  There are a number of mailing lists targeted at special
-	interest groups not mentioned here; more information can be
-	obtained either from the Mailman pages or the <link xlink:href="&url.base;/support.html#mailing-list">mailing
-	lists section</link> of the &os; Web site.</para>
+	wishing to do so.  Visit the <link
+	  xlink:href="&url.base;/mailman/listinfo">&os; Mailman Info
+	  Page</link>.  This will give you more information on joining
+	the various lists, accessing archives, etc.  There are
+	a number of mailing lists targeted at special interest groups
+	not mentioned here; more information can be obtained either
+	from the Mailman pages or the <link
+	  xlink:href="&url.base;/support.html#mailing-list">mailing
+	  lists section</link> of the &os; Web site.</para>
 
       <important>
 	<para>Do <emphasis>not</emphasis> send email to the lists
@@ -286,48 +301,48 @@
 	provided in various formats.  Most distributions will include
 	both ASCII text (<filename>.TXT</filename>) and HTML
 	(<filename>.HTM</filename>) renditions.  Some distributions
-	may also include other formats such as Portable Document Format
-	(<filename>.PDF</filename>).
-
-	<itemizedlist>
-	  <listitem>
-	    <para><filename>README.TXT</filename>: This file, which
-	      gives some general information about &os; as well as
-	      some cursory notes about obtaining a
-	      distribution.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para><filename>RELNOTES.TXT</filename>: The release
-	      notes, showing what's new and different in &os;
-	      &release.current; compared to the previous release (&os;
-	      &release.prev;).</para>
-	  </listitem>
-
-	  <listitem>
-	    <para><filename>HARDWARE.TXT</filename>: The hardware
-	      compatibility list, showing devices with which &os; has
-	      been tested and is known to work.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para><filename>ERRATA.TXT</filename>: Release errata.
-	      Late-breaking, post-release information can be found in
-	      this file, which is principally applicable to releases
-	      (as opposed to snapshots).  It is important to consult
-	      this file before installing a release of &os;, as it
-	      contains the latest information on problems which have
-	      been found and fixed since the release was
-	      created.</para>
-	  </listitem>
-	</itemizedlist>
-      </para>
+	may also include other formats such as Portable Document
+	Format (<filename>.PDF</filename>).</para>
+
+      <itemizedlist>
+	<listitem>
+	  <para><filename>README.TXT</filename>: This file, which
+	    gives some general information about &os; as well as
+	    some cursory notes about obtaining a
+	    distribution.</para>
+	</listitem>
+
+	<listitem>
+	  <para><filename>RELNOTES.TXT</filename>: The release
+	    notes, showing what's new and different in &os;
+	    &release.current; compared to the previous release (&os;
+	    &release.prev;).</para>
+	</listitem>
+
+	<listitem>
+	  <para><filename>HARDWARE.TXT</filename>: The hardware
+	    compatibility list, showing devices with which &os; has
+	    been tested and is known to work.</para>
+	</listitem>
+
+	<listitem>
+	  <para><filename>ERRATA.TXT</filename>: Release errata.
+	    Late-breaking, post-release information can be found in
+	    this file, which is principally applicable to releases
+	    (as opposed to snapshots).  It is important to consult
+	    this file before installing a release of &os;, as it
+	    contains the latest information on problems which have
+	    been found and fixed since the release was
+	    created.</para>
+	</listitem>
+      </itemizedlist>
 
       <para>On platforms that support &man.bsdinstall.8; (currently
-	&arch.amd64;, &arch.i386;, &arch.pc98;, and &arch.sparc64;), these documents are generally available via the
-	Documentation menu during installation.  Once the system is
-	installed, you can revisit this menu by re-running the
-	&man.bsdinstall.8; utility.</para>
+	&arch.amd64;, &arch.i386;, &arch.pc98;, and &arch.sparc64;),
+	these documents are generally available via the Documentation
+	menu during installation.  Once the system is installed, you
+	can revisit this menu by re-running the &man.bsdinstall.8;
+	utility.</para>
 
       <note>
 	<para>It is extremely important to read the errata for any
@@ -338,8 +353,9 @@
 	  other copies are kept updated on the Internet and should be
 	  consulted as the <quote>current errata</quote> for this
 	  release.  These other copies of the errata are located at
-	  <uri xlink:href="&url.base;/releases/">&url.base;/releases/</uri> (as
-	  well as any sites which keep up-to-date mirrors of this
+	  <uri
+	    xlink:href="&url.base;/releases/">&url.base;/releases/</uri>
+	  (as well as any sites which keep up-to-date mirrors of this
 	  location).</para>
       </note>
     </sect2>
@@ -347,18 +363,19 @@
     <sect2>
       <title>Manual Pages</title>
 
-      <para>As with almost all &unix; like operating systems, &os; comes
-	with a set of on-line manual pages, accessed through the
-	&man.man.1; command or through the <link xlink:href="http://www.FreeBSD.org/cgi/man.cgi">hypertext manual
-	pages gateway</link> on the &os; Web site.  In general, the
-	manual pages provide information on the different commands and
-	APIs available to the &os; user.</para>
+      <para>As with almost all &unix; like operating systems, &os;
+	comes with a set of on-line manual pages, accessed through the
+	&man.man.1; command or through the <link
+	  xlink:href="http://www.FreeBSD.org/cgi/man.cgi">hypertext
+	  manual pages gateway</link> on the &os; Web site.  In
+	general, the manual pages provide information on the different
+	commands and APIs available to the &os; user.</para>
 
       <para>In some cases, manual pages are written to give
 	information on particular topics.  Notable examples of such
-	manual pages are &man.tuning.7; (a guide to performance tuning),
-	&man.security.7; (an introduction to &os; security), and
-	&man.style.9; (a style guide to kernel coding).</para>
+	manual pages are &man.tuning.7; (a guide to performance
+	tuning), &man.security.7; (an introduction to &os; security),
+	and &man.style.9; (a style guide to kernel coding).</para>
     </sect2>
 
     <sect2>
@@ -366,31 +383,34 @@
 
       <para>Two highly-useful collections of &os;-related information,
 	maintained by the &os; Project,
-	are the &os; Handbook and &os; FAQ (Frequently Asked
-	Questions document).  On-line versions of the <link xlink:href="&url.books.handbook;/">Handbook</link>
-	and <link xlink:href="&url.books.faq;/">FAQ</link>
-	are always available from the <link xlink:href="&url.base;/docs.html">&os; Documentation
-	page</link> or its mirrors.  If you install the
+	are the &os; Handbook and &os; FAQ (Frequently Asked Questions
+	document).  On-line versions of the <link
+	  xlink:href="&url.books.handbook;/">Handbook</link> and <link
+	  xlink:href="&url.books.faq;/">FAQ</link> are always
+	available from the <link
+	  xlink:href="&url.base;/docs.html">&os; Documentation
+	  page</link> or its mirrors.  If you install the
 	<filename>doc</filename> distribution set, you can use a Web
 	browser to read the Handbook and FAQ locally.  In particular,
 	note that the Handbook contains a step-by-step guide to
 	installing &os;.</para>
 
       <para>A number of on-line books and articles, also maintained by
-        the &os; Project, cover more-specialized, &os;-related topics.
-        This material spans a wide range of topics, from effective use
-        of the mailing lists, to dual-booting &os; with other
-        operating systems, to guidelines for new committers.  Like the
-        Handbook and FAQ, these documents are available from the &os;
-        Documentation Page or in the <filename>doc</filename>
-        distribution set.</para>
+	the &os; Project, cover more-specialized, &os;-related topics.
+	This material spans a wide range of topics, from effective use
+	of the mailing lists, to dual-booting &os; with other
+	operating systems, to guidelines for new committers.  Like the
+	Handbook and FAQ, these documents are available from the &os;
+	Documentation Page or in the <filename>doc</filename>
+	distribution set.</para>
 
       <para>A listing of other books and documents about &os; can be
-        found in the <link xlink:href="&url.books.handbook;/bibliography.html">bibliography</link>
-        of the &os; Handbook.  Because of &os;'s strong &unix; heritage,
-        many other articles and books written for &unix; systems are
-        applicable as well, some of which are also listed in the
-        bibliography.</para>
+	found in the <link
+	  xlink:href="&url.books.handbook;/bibliography.html">bibliography</link>
+	of the &os; Handbook.  Because of &os;'s strong &unix;
+	heritage, many other articles and books written for &unix;
+	systems are applicable as well, some of which are also listed
+	in the bibliography.</para>
     </sect2>
   </sect1>
 
@@ -399,10 +419,11 @@
 
     <para>&os; represents the cumulative work of many hundreds, if not
       thousands, of individuals from around the world who have worked
-      countless hours to bring about this &release.type;.  For a
-      complete list of &os; developers and contributors, please see
-      <link xlink:href="&url.articles.contributors;/"><quote>Contributors
-      to &os;</quote></link> on the &os; Web site or any of its
+      countless hours to bring about this &release.type;.  For
+      a complete list of &os; developers and contributors, please see
+      <link
+	xlink:href="&url.articles.contributors;/"><quote>Contributors
+	  to &os;</quote></link> on the &os; Web site or any of its
       mirrors.</para>
 
     <para>Special thanks also go to the many thousands of &os; users