svn commit: r42535 - in projects/db5: de_DE.ISO8859-1/htdocs de_DE.ISO8859-1/htdocs/releases de_DE.ISO8859-1/share/xml en_US.ISO8859-1/articles/committers-guide en_US.ISO8859-1/articles/releng en_U...

Gabor Kovesdan gabor at FreeBSD.org
Tue Aug 13 08:28:28 UTC 2013


Author: gabor
Date: Tue Aug 13 08:28:25 2013
New Revision: 42535
URL: http://svnweb.freebsd.org/changeset/doc/42535

Log:
  - MFH

Added:
  projects/db5/share/pgpkeys/markm.key
     - copied, changed from r42534, head/share/pgpkeys/markm.key
  projects/db5/share/security/advisories/FreeBSD-SA-13:07.bind.asc
     - copied unchanged from r42534, head/share/security/advisories/FreeBSD-SA-13:07.bind.asc
  projects/db5/share/security/advisories/FreeBSD-SA-13:08.nfsserver.asc
     - copied unchanged from r42534, head/share/security/advisories/FreeBSD-SA-13:08.nfsserver.asc
  projects/db5/share/security/patches/SA-13:07/
     - copied from r42534, head/share/security/patches/SA-13:07/
  projects/db5/share/security/patches/SA-13:08/
     - copied from r42534, head/share/security/patches/SA-13:08/
Modified:
  projects/db5/de_DE.ISO8859-1/htdocs/releases/index.xml
  projects/db5/de_DE.ISO8859-1/htdocs/where.xml
  projects/db5/de_DE.ISO8859-1/share/xml/news.xml
  projects/db5/de_DE.ISO8859-1/share/xml/press.xml
  projects/db5/de_DE.ISO8859-1/share/xml/release.l10n.ent
  projects/db5/en_US.ISO8859-1/articles/committers-guide/article.xml
  projects/db5/en_US.ISO8859-1/articles/releng/article.xml
  projects/db5/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
  projects/db5/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
  projects/db5/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml
  projects/db5/en_US.ISO8859-1/books/handbook/config/chapter.xml
  projects/db5/en_US.ISO8859-1/books/handbook/geom/chapter.xml
  projects/db5/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
  projects/db5/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
  projects/db5/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
  projects/db5/en_US.ISO8859-1/books/handbook/security/chapter.xml
  projects/db5/en_US.ISO8859-1/books/porters-handbook/book.xml
  projects/db5/en_US.ISO8859-1/books/porters-handbook/uses.xml
  projects/db5/en_US.ISO8859-1/htdocs/administration.xml
  projects/db5/en_US.ISO8859-1/htdocs/community/mailinglists.xml
  projects/db5/en_US.ISO8859-1/htdocs/donations/donors.xml
  projects/db5/en_US.ISO8859-1/htdocs/internal/machines.xml
  projects/db5/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml
  projects/db5/en_US.ISO8859-1/share/xml/release.l10n.ent
  projects/db5/ja_JP.eucJP/articles/contributing/article.xml
  projects/db5/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
  projects/db5/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
  projects/db5/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
  projects/db5/ja_JP.eucJP/htdocs/community/mailinglists.xml
  projects/db5/ja_JP.eucJP/htdocs/internal/machines.xml
  projects/db5/ja_JP.eucJP/share/xml/news.xml
  projects/db5/ja_JP.eucJP/share/xml/release.l10n.ent
  projects/db5/ru_RU.KOI8-R/articles/contributing/article.xml
  projects/db5/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
  projects/db5/ru_RU.KOI8-R/articles/hubs/article.xml
  projects/db5/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
  projects/db5/ru_RU.KOI8-R/books/handbook/install/chapter.xml
  projects/db5/ru_RU.KOI8-R/books/porters-handbook/Makefile
  projects/db5/share/pgpkeys/pgpkeys-developers.xml
  projects/db5/share/pgpkeys/pgpkeys.ent
  projects/db5/share/pgpkeys/tdb.key
  projects/db5/share/xml/advisories.xml
  projects/db5/share/xml/authors.ent
  projects/db5/share/xml/events2013.xml
  projects/db5/share/xml/news.xml
  projects/db5/share/xml/release.ent
  projects/db5/share/xsl/freebsd-common.xsl
Directory Properties:
  projects/db5/   (props changed)
  projects/db5/de_DE.ISO8859-1/   (props changed)
  projects/db5/en_US.ISO8859-1/   (props changed)
  projects/db5/ja_JP.eucJP/   (props changed)
  projects/db5/ru_RU.KOI8-R/   (props changed)
  projects/db5/share/   (props changed)

Modified: projects/db5/de_DE.ISO8859-1/htdocs/releases/index.xml
==============================================================================
--- projects/db5/de_DE.ISO8859-1/htdocs/releases/index.xml	Tue Aug 13 05:46:43 2013	(r42534)
+++ projects/db5/de_DE.ISO8859-1/htdocs/releases/index.xml	Tue Aug 13 08:28:25 2013	(r42535)
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY dedate "$FreeBSDde$">
-<!ENTITY reference "basiert auf: r40515">
+<!ENTITY reference "basiert auf: r41873">
 <!ENTITY title "Release Information">
 ]>
 
@@ -59,7 +59,9 @@
         <a href="&u.rel.errata;">Errata</a>
       </em></p>
 
-    <p><b>Release &rel2.current;</b> (Februar 2011) <!-- (&rel2.current.date;) -->
+    <h3>Produktion (alt)</h3>
+
+    <p><b>Release &rel2.current;</b> (Juni 2013) <!-- (&rel2.current.date;) -->
       <em>
 	<a href="&u.rel2.announce;">Announcement</a> :
 	<a href="&u.rel2.notes;">Release Notes</a> :
@@ -69,17 +71,6 @@
 	<a href="&u.rel2.errata;">Errata</a>
       </em></p>
 
-    <h3>Produktion (alt)</h3>
-
-    <p><b>Release &rel3.current;</b> (Februar 2011) <!-- (&rel3.current.date;) -->
-      <em>
-	<a href="&u.rel3.announce;">Announcement</a> :
-	<a href="&u.rel3.notes;">Release Notes</a> :
-	<a href="&u.rel3.hardware;">Hardware Notes</a> :
-	<a href="&u.rel3.readme;">Readme</a> :
-	<a href="&u.rel3.errata;">Errata</a>
-      </em></p>
-
     <a name="future"></a>
 
     <h2>Zukünftige Versionen</h2>
@@ -127,6 +118,18 @@
       </em>
     </li>
 
+      <li><b>8.3</b> (April 2012)
+	<em>
+	  <a href="&enbase;/releases/8.3R/announce.html">Announcement</a>:
+	  <a href="&enbase;/releases/8.3R/relnotes.html">Release Notes</a>:
+	  <a href="&enbase;/releases/8.3R/installation.html">Installation
+	    Instructions</a>:
+	  <a href="&enbase;/releases/8.3R/hardware.html">Hardware Notes</a>:
+	  <a href="&enbase;/releases/8.3R/readme.html">Readme</a>:
+	  <a href="&enbase;/releases/8.3R/errata.html">Errata</a>
+      </em>
+    </li>
+
       <li><b>8.2</b> (Februar 2011)
 	<em>
 	  <a href="&enbase;/releases/8.2R/announce.html">Announcement</a>:

Modified: projects/db5/de_DE.ISO8859-1/htdocs/where.xml
==============================================================================
--- projects/db5/de_DE.ISO8859-1/htdocs/where.xml	Tue Aug 13 05:46:43 2013	(r42534)
+++ projects/db5/de_DE.ISO8859-1/htdocs/where.xml	Tue Aug 13 08:28:25 2013	(r42535)
@@ -58,7 +58,7 @@
         <tr style="text-align: center;">
           <td colspan="2">Version & Plattform</td>
           <td>Distribution</td>
-          <td title="ISO9660 CD image"><a href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/install-diff-media.html#INSTALL-CDROM">ISO</a></td>
+          <td title="ISO9660 CD image"><a href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
           <td>Release<br/>Notes</td>
           <td>Hardware<br/>Notes</td>
           <td>Installation<br/>Notes</td>
@@ -139,14 +139,14 @@
           <td><a href="&url.rel;/pc98/&rel2.current;-RELEASE">[Distribution]</a></td>
           <td><a href="&url.rel;/pc98/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
         </tr>
-
+	<!--
         <tr>
           <td></td>
           <td>sparc64</td>
           <td><a href="&url.rel;/sparc64/&rel2.current;-RELEASE">[Distribution]</a></td>
           <td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
         </tr>
-	<!--
+
 	<tr>
 	  <td colspan="2">FreeBSD &rel3.current;-RELEASE</td>
 	  <td colspan="2"></td>
@@ -200,6 +200,13 @@
       enthält Informationen über
       frühere, aktuelle und künftige Releases.</p>
 
+    <a name="past"></a>
+      <h2>Alte (nicht mehr unterstützte) Versionen</h2>
+
+      <p>Alte (nicht mehr unterstützte Versionen können vom <a
+	href="http://ftp-archive.FreeBSD.org/pub/FreeBSD-Archive/old-releases/">
+	FTP-Archiv</a> herunterladen werden.</p>
+
     <a name="derived"></a>
       <h2>Auf FreeBSD basierende Betriebssysteme</h2>
 

Modified: projects/db5/de_DE.ISO8859-1/share/xml/news.xml
==============================================================================
--- projects/db5/de_DE.ISO8859-1/share/xml/news.xml	Tue Aug 13 05:46:43 2013	(r42534)
+++ projects/db5/de_DE.ISO8859-1/share/xml/news.xml	Tue Aug 13 08:28:25 2013	(r42535)
@@ -4,7 +4,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r41837
+     basiert auf: r42507
 -->
 
 <!-- Simple schema for FreeBSD Project news.
@@ -39,9 +39,195 @@
     <name>2013</name>
 
     <month>
+      <name>8</name>
+
+      <day>
+	<name>6</name>
+
+	<event>
+	  <title>Halbjahres-Newsletter der &os; Foundation
+	    verfügbar</title>
+
+	  <p>Wir freuen uns, bekanntgeben zu dürfen, dass wir unseren
+	    Newsletter für das erste Halbjahr 2013 veröffentlicht
+	    haben.  Lesen Sie den Newsletter, um sich darüber zu
+	    informieren, wie die Foundation dabei hilft, &os; zum
+	    besten verfügbaren Betriebssystem zu machen.</p>
+
+	  <p>Informieren Sie sich über von uns gesponserte
+	    Entwicklungsprojekte und Konferenzen sowie über
+	    Entwickler- und Verkäufertreffen zur direkten
+	    Kommunikation, über den Stand unserer Spendenkampagne
+	    und vieles andere mehr.</p>
+
+	  <p>Der Newsletter für das erste Halbjahr 2013 ist ab sofort
+	    <a
+	    href="http://www.freebsdfoundation.org/press/2013Jul-newsletter">hier</a>
+	    verfügbar.</p>
+	</event>
+      </day>
+
+      <day>
+	<name>5</name>
+
+	<event>
+	  <title>&os; 9.2-RC1 verfügbar</title>
+
+	  <p>Der erste Release Candidate aus dem &os;-9.2-Releasezyklus ist
+	    <a href="&lists.stable;/2013-August/074589.html">verfügbar</a>.
+	    ISO-Images für die Architekturen amd64, i386, ia64, powerpc,
+	    powerpc64 sowie sparc64 sind inzwischen auf den meisten <a
+            href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">&os;
+	    Spiegelservern</a> vorhanden.</p>
+	</event>
+      </day>
+    </month>
+
+    <month>
+      <name>7</name>
+
+      <day>
+	<name>29</name>
+
+	<event>
+	  <title>&os; 9.2-BETA2 verfügbar</title>
+
+	  <p>Die zweite Betaversion aus dem &os;-9.2-Releasezyklus ist
+	    <a href="&lists.stable;/2013-July/074440.html">verfügbar</a>.
+	    ISO-Images für die Architekturen amd64, i386, powerpc64
+	    sowie sparc64 sind inzwischen auf den meisten <a
+            href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">&os;
+	    Spiegelservern</a> vorhanden.</p>
+	</event>
+      </day>
+     
+      <day>
+	<name>22</name>
+
+	<event>
+	  <title>&os; 9.2-BETA1 verfügbar</title>
+
+	  <p>Die erste Betaversion aus dem &os;-9.2-Releasezyklus ist
+	    <a href="&lists.stable;/2013-July/074377.html">verfügbar</a>.
+	    ISO-Images für die Architekturen amd64, i386 sowie ia64
+	    sind inzwischen auf den meisten <a
+            href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">&os;
+	    Spiegelservern</a> vorhanden.</p>
+	</event>
+      </day>
+
+      <day>
+	<name>16</name>
+
+	<event>
+	  <title>Statusreport April-Juni 2013</title>
+
+	    <p>Der Statusreport für die Monate April bis Juni 2013 mit
+	      33 Einträgen ist <a
+	      href="&enbase;/news/status/report-2013-04-2013-06.html">verfügbar</a>.</p>
+	</event>
+      </day>
+
+      <day>
+	<name>4</name>
+
+	<event>
+	  <p>Neuer Committer: <a
+	    href="mailto:marino at FreeBSD.org">John Marino</a> (ports)</p>
+	</event>
+      </day>
+
+      <day>
+	<name>3</name>
+
+	<event>
+	  <p>Neuer Committer: <a
+	    href="mailto:loos at FreeBSD.org">Luiz Otavio O Souza</a> (src)</p>
+	</event>
+      </day>
+
+      <day>
+	<name>2</name>
+
+	<event>
+	  <title>Bericht:  BSDCan 2013 DevSummit</title>
+	  
+	  <p>Ein Statusreport mit den Ergebnissen des BSDCan 2013
+	    &os; Developer Summits mit 6 Einträgen ist <a
+	    href="&enbase;/news/status/report-2013-05-devsummit.html">verfügbar</a>.</p>
+	</event>
+      </day>
+    </month>
+
+    <month>
       <name>6</name>
 
       <day>
+	<name>25</name>
+
+	<event>
+	  <p>Neuer Committer: <a
+	    href="mailto:feld at FreeBSD.org">Mark Felder</a> (ports)</p>
+	</event>
+      </day>
+
+      <day>
+	<name>19</name>
+
+	<event>
+	  <title>Happy Birthday &os;!</title>
+
+	  <p>&os; ist seit heute <a
+	    href="http://FreeBSD.org/news/1993/freebsd-coined.html">20 Jahre alt</a>.
+	    Am 19. Juni 1993 kündigten Jordan Hubbard, Rod Grimes sowie
+	    and David Greenman die Entwicklung eines auf BSD 4.3
+	    basierenden Betriebssystems an.</p>
+
+	  <p>&os; 1.0 basiert auf 386BSD 0.1 von Bill und Lynne Jolitz
+	    und wurde im November 1993 veröffentlicht.  Als Projektziel
+	    wurde die Entwicklung eines schnellen, stabilen und
+	    zuverlässigen Serverbetriebssystems für i386-Systeme
+	    angegeben.</p>
+
+	  <p>Seit damals hat sich &os; zur Basis von unzähligen Produkten
+	    weiterentwickelt und unterstützt nun auch 64-Bit-Architekturen,
+	    eingebundene Geräte sowie Desktopbenutzer.</p>
+	</event>
+      </day>
+
+      <day>
+	<name>11</name>
+
+	<event>
+	  <p>Neuer Committer: <a
+	    href="mailto:vg at FreeBSD.org">Veniamin Gvozdikov</a> (ports)</p>
+	</event>
+      </day>
+
+      <day>
+	<name>7</name>
+
+	<event>
+	  <title>&os; 8.4-RELEASE verfügbar</title>
+
+	  <p><a href="&enbase;/releases/8.4R/announce.html">&os; 
+	    8.4-RELEASE</a> ist verfügbar.  Lesen Sie unbedingt
+	    die <a
+	    href="&enbase;/releases/8.4R/relnotes.html">Release Notes</a>
+	    (<a
+	    href="&enbase;/releases/8.4R/relnotes-detailed.html">ausführliche
+	    Version</a>) sowie die <a
+	    href="&enbase;/releases/8.4R/errata.html">Release Errata</a>,
+	    bevor Sie mit der Installation beginnen, um
+	    sich über aktuelle Neuigkeiten und/oder eventuelle
+	    Probleme im Umgang mit 8.4-RELEASE zu informieren.
+	    Weitere Informationen zu verschiedenen FreeBSD-Versionen
+	    finden Sie auf der Seite <a
+	    href="&base;/releases/index.html">Release Information</a>.</p>
+	</event>
+      </day>
+
+      <day>
 	<name>4</name>
 
 	<event>

Modified: projects/db5/de_DE.ISO8859-1/share/xml/press.xml
==============================================================================
--- projects/db5/de_DE.ISO8859-1/share/xml/press.xml	Tue Aug 13 05:46:43 2013	(r42534)
+++ projects/db5/de_DE.ISO8859-1/share/xml/press.xml	Tue Aug 13 08:28:25 2013	(r42535)
@@ -7,7 +7,7 @@
     "freefall:/c/www/bsddoc/press/".
     $FreeBSD$
     $FreeBSDde$
-    basiert auf: r41004
+    basiert auf: r42024
 -->
 
 <press>
@@ -17,6 +17,23 @@
 
   <year>
     <name>2013</name>
+    
+    <month>
+      <name>6</name>
+
+      <story>
+	<name>Fixing Network Attached Storage with commodity hardware
+	  and BSD</name>
+	<url>http://boingboing.net/2013/06/23/fixing-network-attached-storag.html</url>
+	<site-name>Boing Boing</site-name>
+	<site-url>http://boingboing.net/</site-url>
+	<date>23. Juni 2013</date>
+	<author>Ben Laurie</author>
+	<p>Ben Laurie beschreibt, warum er ein proprietäres NAS durch ein
+	  auf &os; basierendes NAS mit Standardhardware ersetzt hat.</p>
+      </story>
+    </month>
+
     <month>
       <name>2</name>
 

Modified: projects/db5/de_DE.ISO8859-1/share/xml/release.l10n.ent
==============================================================================
--- projects/db5/de_DE.ISO8859-1/share/xml/release.l10n.ent	Tue Aug 13 05:46:43 2013	(r42534)
+++ projects/db5/de_DE.ISO8859-1/share/xml/release.l10n.ent	Tue Aug 13 08:28:25 2013	(r42535)
@@ -2,7 +2,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r41400
+     basiert auf: r42493
 -->
 <![%beta2.testing;[
 <!ENTITY beta.plural 'en'>
@@ -102,35 +102,47 @@
         <tr>
           <td></td>
           <td>amd64<br/>(x86-64, x64)</td>
-          <td><a href="&url.rel;/amd64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-          <td><a href="&url.rel;/amd64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/amd64/amd64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+	  <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
         </tr>
         <tr>
           <td></td>
           <td>i386</td>
-          <td><a href="&url.rel;/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-          <td><a href="&url.rel;/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/i386/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+	  <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
         </tr>
+	<tr>
+	  <td></td>
+	  <td>ia64</td>
+	  <td><a href="&url.rel;/ia64/ia64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+	  <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	</tr>
+	<!--
         <tr>
           <td></td>
           <td>pc98</td>
-          <td><a href="&url.rel;/pc98/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-          <td><a href="&url.rel;/pc98/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/pc98/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+	  <td><a href="&url.rel;/pc98/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
         </tr>
-	<!--
+	-->
         <tr>
+	  <td></td>
+	  <td>powerpc</td>
+	  <td><a href="&url.rel;/powerpc/powerpc/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+	  <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	</tr>
+	<tr>
           <td></td>
-          <td>sparc64</td>
-          <td><a href="&url.rel;/sparc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-          <td><a href="&url.rel;/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+          <td>powerpc64</td>
+	  <td><a href="&url.rel;/powerpc/powerpc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+	  <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
         </tr>
         <tr>
           <td></td>
-          <td>powerpc64</td>
-          <td><a href="&url.rel;/powerpc/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-          <td><a href="&url.rel;/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+          <td>sparc64</td>
+	  <td><a href="&url.rel;/sparc64/sparc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+	  <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
         </tr>
-	-->
       </tbody>
     </table>
 

Modified: projects/db5/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/articles/committers-guide/article.xml	Tue Aug 13 05:46:43 2013	(r42534)
+++ projects/db5/en_US.ISO8859-1/articles/committers-guide/article.xml	Tue Aug 13 08:28:25 2013	(r42535)
@@ -379,7 +379,7 @@
       </itemizedlist>
 
       <para>Subversion can be installed from the &os; Ports
-	Collection, by issuing the following commands:</para>
+	Collection by issuing these commands:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/devel/subversion</userinput>
 &prompt.root; <userinput>make clean install</userinput></screen>
@@ -590,7 +590,7 @@
 	<title>&os; Ports Tree Branches and Layout</title>
 
 	<para>In <literal>svn+ssh://svn.freebsd.org/ports</literal>,
-	  <emphasis>ports</emphasis> refers repository root of the
+	  <emphasis>ports</emphasis> refers to the repository root of the
 	  ports tree.</para>
 
 	<para>In general, most &os; port work will be done within
@@ -710,8 +710,8 @@
 
 	<para>It is possible to anonymously check out the &os;
 	  repository with Subversion.  This will give access to a
-	  read-only tree that can be updated, but not committed
-	  to.  To do this, use the following command:</para>
+	  read-only tree that can be updated, but not committed back
+	  to the main repository.  To do this, use the following command:</para>
 
 	<screen>&prompt.user; <userinput>svn co <replaceable>https://svn0.us-west.FreeBSD.org</replaceable>/base/head /usr/src</userinput></screen>
 
@@ -801,8 +801,8 @@
 
 	<note>
 	  <para>Most new source files should include a
-	    <literal>$&os;$</literal> string in the
-	    new file.  On commit, <command>svn</command> will expand
+	    <literal>$&os;$</literal> string near the start of the
+	    file.  On commit, <command>svn</command> will expand
 	    the <literal>$&os;$</literal> string,
 	    adding the file path, revision number, date and time of
 	    commit, and the username of the committer.  Files which

Modified: projects/db5/en_US.ISO8859-1/articles/releng/article.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/articles/releng/article.xml	Tue Aug 13 05:46:43 2013	(r42534)
+++ projects/db5/en_US.ISO8859-1/articles/releng/article.xml	Tue Aug 13 08:28:25 2013	(r42535)
@@ -135,10 +135,10 @@
     including <emphasis>HEAD</emphasis>, assuming that the system
     management interfaces are not used.</para>
 
-  <para>In the interim period between releases, monthly snapshots are
+  <para>In the interim period between releases, weekly snapshots are
     built automatically by the &os; Project build machines and made
     available for download from <systemitem
-    class="resource">ftp://ftp.freebsd.org/pub/FreeBSD/snapshots/</systemitem>.
+    class="resource">ftp://ftp.FreeBSD.org/pub/FreeBSD/snapshots/</systemitem>.
     The widespread availability of binary release snapshots, and the
     tendency of our user community to keep up with -STABLE development
     with Subversion and <quote><command>make</command>
@@ -153,6 +153,18 @@
     quality assurance activities ramp up pending a major
     release.</para>
 
+  <para>In addition to installation ISO snapshots, weekly virtual
+    machine images are also provided for use with
+    <application>VirtualBox</application>,
+    <application>qemu</application>, or other popular emulation
+    software.  The virtual machine images can be downloaded from
+    <systemitem
+      class="resource">ftp://ftp.FreeBSD.org/pub/FreeBSD/snapshots/VM-IMAGES/</systemitem>.</para>
+
+  <para>The virtual machine images are approximately 150MB &man.xz.1;
+    compressed, and contain a 10GB sparse filesystem when attached to
+    a virtual machine.</para>
+
   <para>Bug reports and feature requests are continuously submitted by
     users throughout the release cycle.  Problems reports are entered into our
     <application class="software">GNATS</application> database
@@ -173,7 +185,7 @@
     security fixes and additions are merged onto the release branch.
     In addition to source updates via Subversion, binary patchkits are
     available to keep systems on the
-    <emphasis>RELENG_<replaceable>X</replaceable>_<replaceable>Y</replaceable></emphasis>
+    <emphasis>releng/<replaceable>X</replaceable>.<replaceable>Y</replaceable></emphasis>
     branches updated.</para>
  
   <sect2>
@@ -256,8 +268,8 @@
 
     <para>Sixty days before the anticipated release, the source
       repository enters a <quote>code freeze</quote>.  During this
-      time, all commits to the -STABLE branch must be approved by the
-      &a.re;, the approval process is technically enforced by the
+      time, all commits to the -STABLE branch must be approved by
+      &a.re;.  The approval process is technically enforced by a
       pre-commit hook.  The kinds of changes that are allowed during
       this period include:</para>
 
@@ -324,7 +336,7 @@
       <note>
         <para>In all examples below, <literal>$FSVN</literal>
           refers to the location of the &os; Subversion repository,
-          <literal>svn+ssh://svn.freebsd.org/base/</literal>.</para>
+          <literal>svn+ssh://svn.FreeBSD.org/base/</literal>.</para>
       </note>
 
       <para>The layout of &os; branches in Subversion is

Modified: projects/db5/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Tue Aug 13 05:46:43 2013	(r42534)
+++ projects/db5/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Tue Aug 13 08:28:25 2013	(r42535)
@@ -2551,7 +2551,7 @@ IMAGES=  chapter1/fig1.png
     url="&url.books.handbook;/svn.html#svn-intro"</sgmltag>SVN
     introduction<sgmltag class="endtag">ulink</sgmltag>, then pick the nearest mirror from
   the list of <sgmltag class="starttag">ulink
-    url="&url.books.handbook;/subversion-mirrors.html"</sgmltag>Subversion
+    url="&url.books.handbook;/svn-mirrors.html"</sgmltag>Subversion
     mirror sites<sgmltag class="endtag">ulink</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	  <para>Appearance:</para>
@@ -2560,7 +2560,7 @@ IMAGES=  chapter1/fig1.png
 	      url="&url.books.handbook;/svn.html#svn-intro">SVN
 	      introduction</ulink>, then pick the nearest mirror from
 	    the list of <ulink
-	      url="&url.books.handbook;/subversion-mirrors.html">Subversion
+	      url="&url.books.handbook;/svn-mirrors.html">Subversion
 	      mirror sites</ulink>.</para>
 
 	  <para>Usage for article links:</para>

Modified: projects/db5/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml	Tue Aug 13 05:46:43 2013	(r42534)
+++ projects/db5/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml	Tue Aug 13 08:28:25 2013	(r42535)
@@ -276,7 +276,7 @@
 	<literal><!doctype…></literal>.</para>
     </sect2>
 
-    <sect2>
+    <sect2 id="writing-style-acronyms">
       <title>Acronyms</title>
 
       <para>Acronyms should be defined the first time they appear in a
@@ -291,7 +291,7 @@
 	<sgmltag>acronym</sgmltag> tags.</para>
     </sect2>
 
-    <sect2>
+    <sect2 id="writing-style-indentation">
       <title>Indentation</title>
 
       <para>The first line in each file starts with no indentation,
@@ -332,10 +332,10 @@
 	<xref linkend="editor-config"/>.</para>
     </sect2>
 
-    <sect2>
+    <sect2 id="writing-style-tag-style">
       <title>Tag Style</title>
 
-      <sect3>
+      <sect3 id="writing-style-tag-style-spacing">
 	<title>Tag Spacing</title>
 
 	<para>Tags that start at the same indent as a previous tag
@@ -371,7 +371,7 @@
 	</informalexample>
       </sect3>
 
-      <sect3>
+      <sect3 id="writing-style-tag-style-separating">
 	<title>Separating Tags</title>
 
 	<para>Tags like <sgmltag>itemizedlist</sgmltag> which will
@@ -401,7 +401,7 @@
       </sect3>
     </sect2>
 
-    <sect2>
+    <sect2 id="writing-style-whitespace-changes">
       <title>Whitespace Changes</title>
 
       <para><emphasis>Do not commit changes
@@ -421,7 +421,7 @@
 	ignored by translators.</para>
     </sect2>
 
-    <sect2>
+    <sect2 id="writing-style-nonbreaking-space">
       <title>Non-Breaking Space</title>
 
       <para>Avoid line breaks in places where they look ugly or make

Modified: projects/db5/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml	Tue Aug 13 05:46:43 2013	(r42534)
+++ projects/db5/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml	Tue Aug 13 08:28:25 2013	(r42535)
@@ -75,7 +75,7 @@
       Consider this text:</para>
 
     <blockquote>
-      <para>To remove <filename>/tmp/foo</filename> use
+      <para>To remove <filename>/tmp/foo</filename>, use
 	&man.rm.1;.</para>
 
       <screen>&prompt.user; <userinput>rm /tmp/foo</userinput></screen>
@@ -108,9 +108,9 @@
     <para>The previous example is actually represented in this
       document like this:</para>
 
-    <programlisting><sgmltag class="starttag">para</sgmltag>To remove <sgmltag class="starttag">filename</sgmltag>/tmp/foo<sgmltag class="endtag">filename</sgmltag> use &man.rm.1;.<sgmltag class="endtag">para</sgmltag>
+    <programlisting><sgmltag class="starttag">para</sgmltag>To remove <sgmltag class="starttag">filename</sgmltag>/tmp/foo<sgmltag class="endtag">filename</sgmltag>, use &man.rm.1;.<sgmltag class="endtag">para</sgmltag>
 
-<sgmltag class="starttag">screen</sgmltag>&prompt.user; <sgmltag class="starttag">userinput</sgmltag>rm /tmp/foo<sgmltag class="endtag">userinput</sgmltag><sgmltag class="endtag">screen</sgmltag></programlisting>
+<sgmltag class="starttag">screen</sgmltag>&prompt.user; <sgmltag class="starttag">userinput</sgmltag>rm /tmp/foo<sgmltag class="endtag">userinput</sgmltag><sgmltag class="endtag">screen</sgmltag></programlisting>
 
     <para>The markup is clearly separate from the content.</para>
 

Modified: projects/db5/en_US.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/handbook/config/chapter.xml	Tue Aug 13 05:46:43 2013	(r42534)
+++ projects/db5/en_US.ISO8859-1/books/handbook/config/chapter.xml	Tue Aug 13 08:28:25 2013	(r42535)
@@ -270,7 +270,6 @@
 	<programlisting>sshd_enable="YES"
 keyrate="fast"
 defaultrouter="10.1.1.254"</programlisting>
-
       </listitem>
 
       <listitem>
@@ -278,7 +277,6 @@ defaultrouter="10.1.1.254"</programlisti
 
 	<programlisting>hostname="node1.example.org"
 ifconfig_fxp0="inet 10.1.1.1/8"</programlisting>
-
       </listitem>
     </itemizedlist>
 
@@ -608,9 +606,9 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin 
 
       <para>Users who wish to begin their own
 	<filename>crontab</filename> file from scratch, without the
-	use of a template, can use <command>crontab -e</command>.  This
-	will invoke the default editor with an empty file.  When this
-	file is saved, it will be automatically installed by
+	use of a template, can use <command>crontab -e</command>.
+	This will invoke the default editor with an empty file.  When
+	this file is saved, it will be automatically installed by
 	&man.crontab.1;.</para>
 
       <para>In order to remove a user &man.crontab.5; completely,
@@ -633,12 +631,13 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin 
     <title>Using &man.rc.8; Under &os;</title>
 
     <para>In 2002, &os; integrated the NetBSD &man.rc.8; system for
-      system initialization.  The files listed in <filename
-	class="directory">/etc/rc.d</filename> provide basic services
-      which can be controlled with the <option>start</option>,
-      <option>stop</option>, and <option>restart</option> options
-      to &man.service.8;.  For instance, &man.sshd.8; can be restarted
-      with the following command:</para>
+      system initialization.  The files listed in
+      <filename class="directory">/etc/rc.d</filename> provide basic
+      services which can be controlled with the
+      <option>start</option>, <option>stop</option>, and
+      <option>restart</option> options to &man.service.8;.  For
+      instance, &man.sshd.8; can be restarted with the following
+      command:</para>
 
     <screen>&prompt.root; <userinput>service sshd restart</userinput></screen>
 
@@ -682,7 +681,9 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin 
 
     <screen>&prompt.root; <userinput>service sshd rcvar</userinput>
 # sshd
-$sshd_enable=YES</screen>
+#
+sshd_enable="YES"
+#   (default: "")</screen>
 
     <note>
       <para>The <literal># sshd</literal> line is output from the
@@ -1260,15 +1261,15 @@ round-trip min/avg/max/stddev = 0.700/0.
 	  host.  This can happen if no default route is specified or
 	  if a cable is unplugged.  Check the output of
 	  <command>netstat -rn</command> and make sure there is a
-	  valid route to the host.  If there is not, read <xref
-	    linkend="advanced-networking"/>.</para>
+	  valid route to the host.  If there is not, read
+	  <xref linkend="advanced-networking"/>.</para>
 
 	<para><errorname>ping: sendto: Permission denied</errorname>
 	  error messages are often caused by a misconfigured firewall.
 	  If a firewall is enabled on &os; but no rules have been
 	  defined, the default policy is to deny all traffic, even
-	  &man.ping.8;.  Refer to <xref
-	    linkend="firewalls"/> for more information.</para>
+	  &man.ping.8;.  Refer to
+	  <xref linkend="firewalls"/> for more information.</para>
 
 	<para>Sometimes performance of the card is poor or below
 	  average.  In these cases, try setting the media
@@ -1312,9 +1313,9 @@ round-trip min/avg/max/stddev = 0.700/0.
       given interface, there must be one address which correctly
       represents the network's netmask.  Any other addresses which
       fall within this network must have a netmask of all
-      <literal>1</literal>s, expressed as either <hostid
-	role="netmask">255.255.255.255</hostid> or <hostid
-	role="netmask">0xffffffff</hostid>.</para>
+      <literal>1</literal>s, expressed as either
+      <hostid role="netmask">255.255.255.255</hostid> or
+      <hostid role="netmask">0xffffffff</hostid>.</para>
 
     <para>For example, consider the case where the
       <devicename>fxp0</devicename> interface is connected to two
@@ -1322,18 +1323,18 @@ round-trip min/avg/max/stddev = 0.700/0.
       netmask of <hostid role="netmask">255.255.255.0</hostid> and
       <hostid role="ipaddr">202.0.75.16</hostid> with a netmask of
       <hostid role="netmask">255.255.255.240</hostid>.  The system
-      is to be configured to appear in the ranges <hostid
-	role="ipaddr">10.1.1.1</hostid> through <hostid
-	role="ipaddr">10.1.1.5</hostid> and <hostid
-	role="ipaddr">202.0.75.17</hostid> through <hostid
-	role="ipaddr">202.0.75.20</hostid>.  Only the first address
-      in a given network range should have a real netmask.  All the
-      rest (<hostid role="ipaddr">10.1.1.2</hostid> through <hostid
-	role="ipaddr">10.1.1.5</hostid> and <hostid
-	role="ipaddr">202.0.75.18</hostid> through <hostid
-	role="ipaddr">202.0.75.20</hostid>) must be configured with
-      a netmask of <hostid
-	role="netmask">255.255.255.255</hostid>.</para>
+      is to be configured to appear in the ranges
+      <hostid role="ipaddr">10.1.1.1</hostid> through
+      <hostid role="ipaddr">10.1.1.5</hostid> and
+      <hostid role="ipaddr">202.0.75.17</hostid> through
+      <hostid role="ipaddr">202.0.75.20</hostid>.  Only the first
+      address in a given network range should have a real netmask.
+      All the rest (<hostid role="ipaddr">10.1.1.2</hostid> through
+      <hostid role="ipaddr">10.1.1.5</hostid> and
+      <hostid role="ipaddr">202.0.75.18</hostid> through
+      <hostid role="ipaddr">202.0.75.20</hostid>) must be configured
+      with a netmask of
+      <hostid role="netmask">255.255.255.255</hostid>.</para>
 
     <para>The following <filename>/etc/rc.conf</filename> entries
       configure the adapter correctly for this scenario:</para>
@@ -1347,7 +1348,6 @@ ifconfig_fxp0_alias4="inet 202.0.75.17 n
 ifconfig_fxp0_alias5="inet 202.0.75.18 netmask 255.255.255.255"
 ifconfig_fxp0_alias6="inet 202.0.75.19 netmask 255.255.255.255"
 ifconfig_fxp0_alias7="inet 202.0.75.20 netmask 255.255.255.255"</programlisting>
-
   </sect1>
 
   <sect1 id="configtuning-syslog">
@@ -1394,8 +1394,8 @@ ifconfig_fxp0_alias7="inet 202.0.75.20 n
 	<literal>syslogd_flags</literal> in
 	<filename>/etc/rc.conf</filename>.  Refer to &man.syslogd.8;
 	for more information on the arguments, and &man.rc.conf.5;,
-	<xref linkend="configtuning-core-configuration"/> and <xref
-	linkend="configtuning-rcd"/> for more information about
+	<xref linkend="configtuning-core-configuration"/> and
+	<xref linkend="configtuning-rcd"/> for more information about
 	<filename>/etc/rc.conf</filename> and the &man.rc.8;
 	subsystem.</para>
     </sect2>
@@ -1535,8 +1535,8 @@ cron.*                                  
 	facilities, refer to &man.syslog.3; and &man.syslogd.8;.
 	For more information about
 	<filename>/etc/syslog.conf</filename>, its syntax, and more
-	advanced usage examples, see &man.syslog.conf.5; and <xref
-	  linkend="network-syslogd"/>.</para>
+	advanced usage examples, see &man.syslog.conf.5; and
+	<xref linkend="network-syslogd"/>.</para>
     </sect2>
 
     <sect2>
@@ -1630,14 +1630,14 @@ cron.*                                  
 	  &man.newsyslog.8; further instructions, such as how to
 	  compress the rotated file or to create the log file if it
 	  is missing.  The last two fields are optional, and
-	  specify the <acronym
-	  role="Process Identifier">PID</acronym> file of a process
-	  and a signal number to send to that process when the file
-	  is rotated.  For more information on all fields, valid
+	  specify the
+	  <acronym role="Process Identifier">PID</acronym> file of a
+	  process and a signal number to send to that process when the
+	  file is rotated.  For more information on all fields, valid
 	  flags, and how to specify the rotation time, refer to
-	  &man.newsyslog.conf.5;.  Since &man.newsyslog.8; is run
-	  from &man.cron.8;, it can not rotate files more often than
-	  it is run from &man.cron.8;.</para>
+	  &man.newsyslog.conf.5;.  Since &man.newsyslog.8; is run from
+	  &man.cron.8;, it can not rotate files more often than it is
+	  run from &man.cron.8;.</para>
       </sect3>
     </sect2>
   </sect1>
@@ -1733,9 +1733,8 @@ cron.*                                  
 	  <primary><filename>resolv.conf</filename></primary>
 	</indexterm>
 
-	<para>How a
-	  &os; system accesses the Internet Domain Name System
-	  (<acronym>DNS</acronym>) is controlled by
+	<para>How a &os; system accesses the Internet Domain Name
+	  System (<acronym>DNS</acronym>) is controlled by
 	  &man.resolv.conf.5;.</para>
 
 	<para>The most common entries to
@@ -1889,13 +1888,13 @@ kern.maxproc: 1044</screen>
 kern.maxfiles: 2088 -> 5000</screen>
 
     <para>Settings of sysctl variables are usually either strings,
-      numbers, or booleans, where a a boolean is <literal>1</literal>
+      numbers, or booleans, where a boolean is <literal>1</literal>
       for yes or <literal>0</literal> for no.</para>
 
     <para>To automatically set some variables each time the machine
       boots, add them to <filename>/etc/sysctl.conf</filename>.  For
-      more information, refer to &man.sysctl.conf.5; and <xref
-	linkend="configtuning-sysctlconf"/>.</para>
+      more information, refer to &man.sysctl.conf.5; and
+      <xref linkend="configtuning-sysctlconf"/>.</para>
 
     <sect2 id="configtuning-sysctlconf">
       <title><filename>sysctl.conf</filename></title>
@@ -1921,7 +1920,6 @@ kern.logsigexit=0
 # Prevent users from seeing information about processes that
 # are being run under another UID.
 security.bsd.see_other_uids=0</programlisting>
-
     </sect2>
 
     <sect2 id="sysctl-readonly">
@@ -2187,16 +2185,16 @@ device_probe_and_attach: cbb0 attach ret
 	  data blocks of a file did not find their way out of the
 	  buffer cache onto the disk by the time of the crash,
 	  &man.fsck.8; recognizes this and repairs the file system
-	  by setting the file length to
-	  <literal>0</literal>.  Additionally, the implementation is
-	  clear and simple.  The disadvantage is that meta-data
-	  changes are slow.  For example, <command>rm -r</command>
-	  touches all the files in a directory sequentially, but each
-	  directory change will be written synchronously to the
-	  disk.  This includes updates to the directory itself, to
-	  the inode table, and possibly to indirect blocks allocated
-	  by the file.  Similar considerations apply for unrolling
-	  large hierarchies using <command>tar -x</command>.</para>
+	  by setting the file length to <literal>0</literal>.
+	  Additionally, the implementation is clear and simple.  The
+	  disadvantage is that meta-data changes are slow.  For
+	  example, <command>rm -r</command> touches all the files in a
+	  directory sequentially, but each directory change will be
+	  written synchronously to the disk.  This includes updates to
+	  the directory itself, to the inode table, and possibly to
+	  indirect blocks allocated by the file.  Similar
+	  considerations apply for unrolling large hierarchies using
+	  <command>tar -x</command>.</para>
 
 	<para>The second approach is to use asynchronous meta-data
 	  updates.  This is the default for a <acronym>UFS</acronym>
@@ -2264,7 +2262,7 @@ device_probe_and_attach: cbb0 attach ret
 	  in use are marked as such in their blocks and inodes.
 	  After a crash, the only resource allocation error that
 	  occurs is that resources are marked as <quote>used</quote>
-	  which are actually <quote>free</quote>. &man.fsck.8;
+	  which are actually <quote>free</quote>.  &man.fsck.8;
 	  recognizes this situation, and frees the resources that
 	  are no longer used.  It is safe to ignore the dirty state
 	  of the file system after a crash by forcibly mounting it
@@ -2379,7 +2377,7 @@ device_probe_and_attach: cbb0 attach ret
 	  compile software.  The most important table set by
 	  <literal>maxusers</literal> is the maximum number of
 	  processes, which is set to
-	  <literal>20 + 16 * maxusers</literal>. If
+	  <literal>20 + 16 * maxusers</literal>.  If
 	  <literal>maxusers</literal> is set to <literal>1</literal>,
 	  there can only be
 	  <literal>36</literal> simultaneous processes, including
@@ -2491,12 +2489,11 @@ device_probe_and_attach: cbb0 attach ret
 	</indexterm>
 
 	<para>The <varname>net.inet.ip.portrange.*</varname>
-	  &man.sysctl.8;
-	  variables control the port number ranges automatically bound
-	  to <literal>TCP</literal> and <literal>UDP</literal>
-	  sockets.  There are three ranges: a low range, a default
-	  range, and a high range.  Most network programs use the
-	  default range which is controlled by
+	  &man.sysctl.8; variables control the port number ranges
+	  automatically bound to <literal>TCP</literal> and
+	  <literal>UDP</literal> sockets.  There are three ranges: a
+	  low range, a default range, and a high range.  Most network
+	  programs use the default range which is controlled by
 	  <varname>net.inet.ip.portrange.first</varname> and
 	  <varname>net.inet.ip.portrange.last</varname>, which default
 	  to <literal>1024</literal> and <literal>5000</literal>,
@@ -2568,12 +2565,12 @@ device_probe_and_attach: cbb0 attach ret
 	  conditions, but it can also result in higher &man.ping.8;
 	  times over slow links, though still much lower than without
 	  the inflight algorithm.  In such cases, try reducing this
-	  parameter to <literal>15</literal>,
-	  <literal>10</literal>, or <literal>5</literal> and
-	  reducing <varname>net.inet.tcp.inflight.min</varname>
-	  to a value such as <literal>3500</literal> to get the
-	  desired effect.  Reducing these parameters should be done
-	  as a last resort only.</para>
+	  parameter to <literal>15</literal>, <literal>10</literal>,
+	  or <literal>5</literal> and reducing
+	  <varname>net.inet.tcp.inflight.min</varname> to a value such
+	  as <literal>3500</literal> to get the desired effect.
+	  Reducing these parameters should be done as a last resort
+	  only.</para>
       </sect3>
     </sect2>
 
@@ -2632,9 +2629,9 @@ kern.maxvnodes: 100000</screen>
 
       <para>Adding a new hard drive for swap gives better performance
 	than adding a partition on an existing drive.  Setting up
-	partitions and hard drives is explained in <xref
-	  linkend="disks-adding"/> while <xref
-	  linkend="configtuning-initial"/> discusses partition
+	partitions and hard drives is explained in
+	<xref linkend="disks-adding"/> while
+	<xref linkend="configtuning-initial"/> discusses partition
 	layouts and swap partition size considerations.</para>
 
       <para>Use &man.swapon.8; to add a swap partition to the system.
@@ -2643,7 +2640,6 @@ kern.maxvnodes: 100000</screen>
       <screen>&prompt.root; <userinput>swapon<replaceable> /dev/ada1s1b</replaceable></userinput></screen>
 
       <warning>
-
 	<para>It is possible to use any partition not currently
 	  mounted, even if it already contains data.  Using
 	  &man.swapon.8; on a partition that contains data will
@@ -2683,7 +2679,6 @@ kern.maxvnodes: 100000</screen>
 
 	<orderedlist>
 	  <listitem>
-
 	    <para>The <filename>GENERIC</filename> kernel already
 	      includes the memory disk driver (&man.md.4;) required
 	      for this operation.  When building a custom kernel,
@@ -2759,8 +2754,8 @@ kern.maxvnodes: 100000</screen>
       temperature increases unexpectedly.</para>
 
     <para>This section provides comprehensive information about
-      <acronym>ACPI</acronym>. References will be provided for further
-      reading.</para>
+      <acronym>ACPI</acronym>.  References will be provided for
+      further reading.</para>
 
     <sect2 id="acpi-intro">
       <title>What Is ACPI?</title>
@@ -2977,13 +2972,12 @@ kern.maxvnodes: 100000</screen>
       <para>Most &os; developers watch &a.current;, but one should
 	submit problems to &a.acpi.name; to be sure it is seen.  Be
 	patient when waiting for a response.  If the bug is not
-	immediately apparent, submit a
-	<acronym>PR</acronym> using &man.send-pr.1;.  When entering a
-	<acronym>PR</acronym>, include the same information as
-	requested above.  This helps developers to track the problem
-	and resolve it.  Do not send a <acronym>PR</acronym> without
-	emailing &a.acpi.name; first as it is likely that the problem
-	has been reported before.</para>
+	immediately apparent, submit a <acronym>PR</acronym> using
+	&man.send-pr.1;.  When entering a <acronym>PR</acronym>,
+	include the same information as requested above.  This helps
+	developers to track the problem and resolve it.  Do not send a
+	<acronym>PR</acronym> without emailing &a.acpi.name; first as
+	it is likely that the problem has been reported before.</para>
     </sect2>
 
     <sect2 id="ACPI-background">
@@ -3276,8 +3270,9 @@ hw.acpi.s4bios: 0</screen>
 	<acronym>ASL</acronym>, use &man.acpidump.8;.  Include both
 	<option>-t</option>, to show the contents of the fixed tables,
 	and <option>-d</option>, to disassemble the
-	<acronym>AML</acronym>. Refer to <xref
-	  linkend="ACPI-submitdebug"/> for an example syntax.</para>
+	<acronym>AML</acronym>.  Refer to
+	<xref linkend="ACPI-submitdebug"/> for an example
+	syntax.</para>
 
       <para>The simplest first check is to recompile the
 	<acronym>ASL</acronym> to check for errors.  Warnings can

Modified: projects/db5/en_US.ISO8859-1/books/handbook/geom/chapter.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/handbook/geom/chapter.xml	Tue Aug 13 05:46:43 2013	(r42534)
+++ projects/db5/en_US.ISO8859-1/books/handbook/geom/chapter.xml	Tue Aug 13 08:28:25 2013	(r42535)
@@ -824,6 +824,314 @@ mountroot></screen>
     </sect2>
   </sect1>
 
+  <sect1 id="geom-graid">

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


More information about the svn-doc-projects mailing list