From owner-svn-doc-projects@FreeBSD.ORG  Sun Jul  7 19:17:56 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id EF9DB1A9;
 Sun,  7 Jul 2013 19:17:56 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DF06D1129;
 Sun,  7 Jul 2013 19:17:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r67JHum1005201;
 Sun, 7 Jul 2013 19:17:56 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r67JHuwI005199;
 Sun, 7 Jul 2013 19:17:56 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201307071917.r67JHuwI005199@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 7 Jul 2013 19:17:56 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42190 - in projects/entities/share: xml xsl
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Jul 2013 19:17:57 -0000

Author: rene
Date: Sun Jul  7 19:17:56 2013
New Revision: 42190
URL: http://svnweb.freebsd.org/changeset/doc/42190

Log:
  Some further cleanups:
  - Leave the email element in the empty namespace instead of putting it in
    the XHTML namespace where it does not belong.
  - Instead of overwriting handling of the email element for DocBook, just
    add support for role='nolink' .
  
  Submitted by:	gabor

Modified:
  projects/entities/share/xml/authors.ent
  projects/entities/share/xml/xhtml.xsl
  projects/entities/share/xsl/freebsd-xhtml-common.xsl

Modified: projects/entities/share/xml/authors.ent
==============================================================================
--- projects/entities/share/xml/authors.ent	Sun Jul  7 18:44:18 2013	(r42189)
+++ projects/entities/share/xml/authors.ent	Sun Jul  7 19:17:56 2013	(r42190)
@@ -19,2218 +19,2218 @@
 <!-- FreeBSD Committers -->
 
 <!ENTITY a.aaron "Aaron Dalton">
-<!ENTITY a.aaron.email "&a.aaron; <email xmlns='http://www.w3.org/1999/xhtml'>aaron@FreeBSD.org</email>">
+<!ENTITY a.aaron.email "&a.aaron; <email xmlns=''>aaron@FreeBSD.org</email>">
 
 <!ENTITY a.abial "Andrzej Bialecki">
-<!ENTITY a.abial.email "&a.abial; <email xmlns='http://www.w3.org/1999/xhtml'>abial@FreeBSD.org</email>">
+<!ENTITY a.abial.email "&a.abial; <email xmlns=''>abial@FreeBSD.org</email>">
 
 <!ENTITY a.ache "Andrey A. Chernov">
-<!ENTITY a.ache.email "&a.ache; <email xmlns='http://www.w3.org/1999/xhtml'>ache@FreeBSD.org</email>">
+<!ENTITY a.ache.email "&a.ache; <email xmlns=''>ache@FreeBSD.org</email>">
 
 <!ENTITY a.achim "Achim Leubner">
-<!ENTITY a.achim.email "&a.achim; <email xmlns='http://www.w3.org/1999/xhtml'>achim@FreeBSD.org</email>">
+<!ENTITY a.achim.email "&a.achim; <email xmlns=''>achim@FreeBSD.org</email>">
 
 <!ENTITY a.acm "Jos&eacute; Alonso C&aacute;rdenas M&aacute;rquez">
-<!ENTITY a.acm.email "&a.acm; <email xmlns='http://www.w3.org/1999/xhtml'>acm@FreeBSD.org</email>">
+<!ENTITY a.acm.email "&a.acm; <email xmlns=''>acm@FreeBSD.org</email>">
 
 <!ENTITY a.adam "Adam David">
-<!ENTITY a.adam.email "&a.adam; <email xmlns='http://www.w3.org/1999/xhtml'>adam@FreeBSD.org</email>">
+<!ENTITY a.adam.email "&a.adam; <email xmlns=''>adam@FreeBSD.org</email>">
 
 <!ENTITY a.adamw "Adam Weinberger">
-<!ENTITY a.adamw.email "&a.adamw; <email xmlns='http://www.w3.org/1999/xhtml'>adamw@FreeBSD.org</email>">
+<!ENTITY a.adamw.email "&a.adamw; <email xmlns=''>adamw@FreeBSD.org</email>">
 
 <!ENTITY a.ade "Ade Lovett">
-<!ENTITY a.ade.email "&a.ade; <email xmlns='http://www.w3.org/1999/xhtml'>ade@FreeBSD.org</email>">
+<!ENTITY a.ade.email "&a.ade; <email xmlns=''>ade@FreeBSD.org</email>">
 
 <!ENTITY a.adrian "Adrian Chadd">
-<!ENTITY a.adrian.email "&a.adrian; <email xmlns='http://www.w3.org/1999/xhtml'>adrian@FreeBSD.org</email>">
+<!ENTITY a.adrian.email "&a.adrian; <email xmlns=''>adrian@FreeBSD.org</email>">
 
 <!ENTITY a.ae "Andrey V. Elsukov">
-<!ENTITY a.ae.email "&a.ae; <email xmlns='http://www.w3.org/1999/xhtml'>ae@FreeBSD.org</email>">
+<!ENTITY a.ae.email "&a.ae; <email xmlns=''>ae@FreeBSD.org</email>">
 
 <!ENTITY a.ahasty "Amancio Hasty">
-<!ENTITY a.ahasty.email "&a.ahasty; <email xmlns='http://www.w3.org/1999/xhtml'>ahasty@FreeBSD.org</email>">
+<!ENTITY a.ahasty.email "&a.ahasty; <email xmlns=''>ahasty@FreeBSD.org</email>">
 
 <!ENTITY a.ahd "Drew Derbyshire">
-<!ENTITY a.ahd.email "&a.ahd; <email xmlns='http://www.w3.org/1999/xhtml'>ahd@FreeBSD.org</email>">
+<!ENTITY a.ahd.email "&a.ahd; <email xmlns=''>ahd@FreeBSD.org</email>">
 
 <!ENTITY a.ahze "Michael Johnson">
-<!ENTITY a.ahze.email "&a.ahze; <email xmlns='http://www.w3.org/1999/xhtml'>ahze@FreeBSD.org</email>">
+<!ENTITY a.ahze.email "&a.ahze; <email xmlns=''>ahze@FreeBSD.org</email>">
 
 <!ENTITY a.ak "Alex Kozlov">
-<!ENTITY a.ak.email "&a.ak; <email xmlns='http://www.w3.org/1999/xhtml'>ak@FreeBSD.org</email>">
+<!ENTITY a.ak.email "&a.ak; <email xmlns=''>ak@FreeBSD.org</email>">
 
 <!ENTITY a.akiyama "Shunsuke Akiyama">
-<!ENTITY a.akiyama.email "&a.akiyama; <email xmlns='http://www.w3.org/1999/xhtml'>akiyama@FreeBSD.org</email>">
+<!ENTITY a.akiyama.email "&a.akiyama; <email xmlns=''>akiyama@FreeBSD.org</email>">
 
 <!ENTITY a.alane "Alan Eldridge">
-<!ENTITY a.alane.email "&a.alane; <email xmlns='http://www.w3.org/1999/xhtml' role='nolink'>alane@FreeBSD.org</email>">
+<!ENTITY a.alane.email "&a.alane; <email xmlns='' role='nolink'>alane@FreeBSD.org</email>">
 
 <!ENTITY a.alc "Alan L. Cox">
-<!ENTITY a.alc.email "&a.alc; <email xmlns='http://www.w3.org/1999/xhtml'>alc@FreeBSD.org</email>">
+<!ENTITY a.alc.email "&a.alc; <email xmlns=''>alc@FreeBSD.org</email>">
 
 <!ENTITY a.ale "Alex Dupre">
-<!ENTITY a.ale.email "&a.ale; <email xmlns='http://www.w3.org/1999/xhtml'>ale@FreeBSD.org</email>">
+<!ENTITY a.ale.email "&a.ale; <email xmlns=''>ale@FreeBSD.org</email>">
 
 <!ENTITY a.alepulver "Alejandro Pulver">
-<!ENTITY a.alepulver.email "&a.alepulver; <email xmlns='http://www.w3.org/1999/xhtml'>alepulver@FreeBSD.org</email>">
+<!ENTITY a.alepulver.email "&a.alepulver; <email xmlns=''>alepulver@FreeBSD.org</email>">
 
 <!ENTITY a.alex "Alexander Langer">
-<!ENTITY a.alex.email "&a.alex; <email xmlns='http://www.w3.org/1999/xhtml'>alex@FreeBSD.org</email>">
+<!ENTITY a.alex.email "&a.alex; <email xmlns=''>alex@FreeBSD.org</email>">
 
 <!ENTITY a.alexbl "Alexander Botero-Lowry">
-<!ENTITY a.alexbl.email "&a.alexbl; <email xmlns='http://www.w3.org/1999/xhtml'>alexbl@FreeBSD.org</email>">
+<!ENTITY a.alexbl.email "&a.alexbl; <email xmlns=''>alexbl@FreeBSD.org</email>">
 
 <!ENTITY a.alfred "Alfred Perlstein">
-<!ENTITY a.alfred.email "&a.alfred; <email xmlns='http://www.w3.org/1999/xhtml'>alfred@FreeBSD.org</email>">
+<!ENTITY a.alfred.email "&a.alfred; <email xmlns=''>alfred@FreeBSD.org</email>">
 
 <!ENTITY a.alm "Andrew Moore">
-<!ENTITY a.alm.email "&a.alm; <email xmlns='http://www.w3.org/1999/xhtml'>alm@FreeBSD.org</email>">
+<!ENTITY a.alm.email "&a.alm; <email xmlns=''>alm@FreeBSD.org</email>">
 
 <!ENTITY a.am "Atul Mukker">
-<!ENTITY a.am.email "&a.am; <email xmlns='http://www.w3.org/1999/xhtml'>am@FreeBSD.org</email>">
+<!ENTITY a.am.email "&a.am; <email xmlns=''>am@FreeBSD.org</email>">
 
 <!ENTITY a.ambrisko "Doug Ambrisko">
-<!ENTITY a.ambrisko.email "&a.ambrisko; <email xmlns='http://www.w3.org/1999/xhtml'>ambrisko@FreeBSD.org</email>">
+<!ENTITY a.ambrisko.email "&a.ambrisko; <email xmlns=''>ambrisko@FreeBSD.org</email>">
 
 <!ENTITY a.amdmi3 "Dmitry Marakasov">
-<!ENTITY a.amdmi3.email "&a.amdmi3; <email xmlns='http://www.w3.org/1999/xhtml'>amdmi3@FreeBSD.org</email>">
+<!ENTITY a.amdmi3.email "&a.amdmi3; <email xmlns=''>amdmi3@FreeBSD.org</email>">
 
 <!ENTITY a.amorita "Akio Morita">
-<!ENTITY a.amorita.email "&a.amorita; <email xmlns='http://www.w3.org/1999/xhtml'>amorita@FreeBSD.org</email>">
+<!ENTITY a.amorita.email "&a.amorita; <email xmlns=''>amorita@FreeBSD.org</email>">
 
 <!ENTITY a.amurai "Atsushi Murai">
-<!ENTITY a.amurai.email "&a.amurai; <email xmlns='http://www.w3.org/1999/xhtml'>amurai@FreeBSD.org</email>">
+<!ENTITY a.amurai.email "&a.amurai; <email xmlns=''>amurai@FreeBSD.org</email>">
 
 <!ENTITY a.anchie "Ana Kukec">
-<!ENTITY a.anchie.email "&a.anchie; <email xmlns='http://www.w3.org/1999/xhtml'>anchie@FreeBSD.org</email>">
+<!ENTITY a.anchie.email "&a.anchie; <email xmlns=''>anchie@FreeBSD.org</email>">
 
 <!ENTITY a.anders "Anders Nordby">
-<!ENTITY a.anders.email "&a.anders; <email xmlns='http://www.w3.org/1999/xhtml'>anders@FreeBSD.org</email>">
+<!ENTITY a.anders.email "&a.anders; <email xmlns=''>anders@FreeBSD.org</email>">
 
 <!ENTITY a.andre "Andre Oppermann">
-<!ENTITY a.andre.email "&a.andre; <email xmlns='http://www.w3.org/1999/xhtml'>andre@FreeBSD.org</email>">
+<!ENTITY a.andre.email "&a.andre; <email xmlns=''>andre@FreeBSD.org</email>">
 
 <!ENTITY a.andreas "Andreas Klemm">
-<!ENTITY a.andreas.email "&a.andreas; <email xmlns='http://www.w3.org/1999/xhtml'>andreas@FreeBSD.org</email>">
+<!ENTITY a.andreas.email "&a.andreas; <email xmlns=''>andreas@FreeBSD.org</email>">
 
 <!ENTITY a.andreast "Andreas Tobler">
-<!ENTITY a.andreast.email "&a.andreast; <email xmlns='http://www.w3.org/1999/xhtml'>andreast@FreeBSD.org</email>">
+<!ENTITY a.andreast.email "&a.andreast; <email xmlns=''>andreast@FreeBSD.org</email>">
 
 <!ENTITY a.andrew "Andrew Turner">
-<!ENTITY a.andrew.email "&a.andrew; <email xmlns='http://www.w3.org/1999/xhtml'>andrew@FreeBSD.org</email>">
+<!ENTITY a.andrew.email "&a.andrew; <email xmlns=''>andrew@FreeBSD.org</email>">
 
 <!ENTITY a.andy "Andrey Zakhvatov">
-<!ENTITY a.andy.email "&a.andy; <email xmlns='http://www.w3.org/1999/xhtml'>andy@FreeBSD.org</email>">
+<!ENTITY a.andy.email "&a.andy; <email xmlns=''>andy@FreeBSD.org</email>">
 
 <!ENTITY a.anholt "Eric Anholt">
-<!ENTITY a.anholt.email "&a.anholt; <email xmlns='http://www.w3.org/1999/xhtml'>anholt@FreeBSD.org</email>">
+<!ENTITY a.anholt.email "&a.anholt; <email xmlns=''>anholt@FreeBSD.org</email>">
 
 <!ENTITY a.anray "Andrey Slusar">
-<!ENTITY a.anray.email "&a.anray; <email xmlns='http://www.w3.org/1999/xhtml'>anray@FreeBSD.org</email>">
+<!ENTITY a.anray.email "&a.anray; <email xmlns=''>anray@FreeBSD.org</email>">
 
 <!ENTITY a.antoine "Antoine Brodin">
-<!ENTITY a.antoine.email "&a.antoine; <email xmlns='http://www.w3.org/1999/xhtml'>antoine@FreeBSD.org</email>">
+<!ENTITY a.antoine.email "&a.antoine; <email xmlns=''>antoine@FreeBSD.org</email>">
 
 <!ENTITY a.araujo "Marcelo Araujo">
-<!ENTITY a.araujo.email "&a.araujo; <email xmlns='http://www.w3.org/1999/xhtml'>araujo@FreeBSD.org</email>">
+<!ENTITY a.araujo.email "&a.araujo; <email xmlns=''>araujo@FreeBSD.org</email>">
 
 <!ENTITY a.archie "Archie Cobbs">
-<!ENTITY a.archie.email "&a.archie; <email xmlns='http://www.w3.org/1999/xhtml'>archie@FreeBSD.org</email>">
+<!ENTITY a.archie.email "&a.archie; <email xmlns=''>archie@FreeBSD.org</email>">
 
 <!ENTITY a.ariff "Ariff Abdullah">
-<!ENTITY a.ariff.email "&a.ariff; <email xmlns='http://www.w3.org/1999/xhtml'>ariff@FreeBSD.org</email>">
+<!ENTITY a.ariff.email "&a.ariff; <email xmlns=''>ariff@FreeBSD.org</email>">
 
 <!ENTITY a.arr "Andrew R. Reiter">
-<!ENTITY a.arr.email "&a.arr; <email xmlns='http://www.w3.org/1999/xhtml'>arr@FreeBSD.org</email>">
+<!ENTITY a.arr.email "&a.arr; <email xmlns=''>arr@FreeBSD.org</email>">
 
 <!ENTITY a.art "Artem Belevich">
-<!ENTITY a.art.email "&a.art; <email xmlns='http://www.w3.org/1999/xhtml'>art@FreeBSD.org</email>">
+<!ENTITY a.art.email "&a.art; <email xmlns=''>art@FreeBSD.org</email>">
 
 <!ENTITY a.arun "Arun Sharma">
-<!ENTITY a.arun.email "&a.arun; <email xmlns='http://www.w3.org/1999/xhtml'>arun@FreeBSD.org</email>">
+<!ENTITY a.arun.email "&a.arun; <email xmlns=''>arun@FreeBSD.org</email>">
 
 <!ENTITY a.arundel "Alexander Best">
-<!ENTITY a.arundel.email "&a.arundel; <email xmlns='http://www.w3.org/1999/xhtml'>arundel@FreeBSD.org</email>">
+<!ENTITY a.arundel.email "&a.arundel; <email xmlns=''>arundel@FreeBSD.org</email>">
 
 <!ENTITY a.arved "Tilman Keskin&ouml;z">
-<!ENTITY a.arved.email "&a.arved; <email xmlns='http://www.w3.org/1999/xhtml'>arved@FreeBSD.org</email>">
+<!ENTITY a.arved.email "&a.arved; <email xmlns=''>arved@FreeBSD.org</email>">
 
 <!ENTITY a.asami "Satoshi Asami">
-<!ENTITY a.asami.email "&a.asami; <email xmlns='http://www.w3.org/1999/xhtml'>asami@FreeBSD.org</email>">
+<!ENTITY a.asami.email "&a.asami; <email xmlns=''>asami@FreeBSD.org</email>">
 
 <!ENTITY a.ashish "Ashish SHUKLA">
-<!ENTITY a.ashish.email "&a.ashish; <email xmlns='http://www.w3.org/1999/xhtml'>ashish@FreeBSD.org</email>">
+<!ENTITY a.ashish.email "&a.ashish; <email xmlns=''>ashish@FreeBSD.org</email>">
 
 <!ENTITY a.asmodai "Jeroen Ruigrok/Asmodai">
-<!ENTITY a.asmodai.email "&a.asmodai; <email xmlns='http://www.w3.org/1999/xhtml'>asmodai@FreeBSD.org</email>">
+<!ENTITY a.asmodai.email "&a.asmodai; <email xmlns=''>asmodai@FreeBSD.org</email>">
 
 <!ENTITY a.assar "Assar Westerlund">
-<!ENTITY a.assar.email "&a.assar; <email xmlns='http://www.w3.org/1999/xhtml'>assar@FreeBSD.org</email>">
+<!ENTITY a.assar.email "&a.assar; <email xmlns=''>assar@FreeBSD.org</email>">
 
 <!ENTITY a.asomers "Alan Somers">
-<!ENTITY a.asomers.email "&a.asomers; <email xmlns='http://www.w3.org/1999/xhtml'>asomers@FreeBSD.org</email>">
+<!ENTITY a.asomers.email "&a.asomers; <email xmlns=''>asomers@FreeBSD.org</email>">
 
 <!ENTITY a.ats "Andreas Schulz">
-<!ENTITY a.ats.email "&a.ats; <email xmlns='http://www.w3.org/1999/xhtml'>ats@FreeBSD.org</email>">
+<!ENTITY a.ats.email "&a.ats; <email xmlns=''>ats@FreeBSD.org</email>">
 
 <!ENTITY a.attilio "Attilio Rao">
-<!ENTITY a.attilio.email "&a.attilio; <email xmlns='http://www.w3.org/1999/xhtml'>attilio@FreeBSD.org</email>">
+<!ENTITY a.attilio.email "&a.attilio; <email xmlns=''>attilio@FreeBSD.org</email>">
 
 <!ENTITY a.avatar "Tai-hwa Liang">
-<!ENTITY a.avatar.email "&a.avatar; <email xmlns='http://www.w3.org/1999/xhtml'>avatar@FreeBSD.org</email>">
+<!ENTITY a.avatar.email "&a.avatar; <email xmlns=''>avatar@FreeBSD.org</email>">
 
 <!ENTITY a.avg "Andriy Gapon">
-<!ENTITY a.avg.email "&a.avg; <email xmlns='http://www.w3.org/1999/xhtml'>avg@FreeBSD.org</email>">
+<!ENTITY a.avg.email "&a.avg; <email xmlns=''>avg@FreeBSD.org</email>">
 
 <!ENTITY a.avilla "Alberto Villa">
-<!ENTITY a.avilla.email "&a.avilla; <email xmlns='http://www.w3.org/1999/xhtml'>avilla@FreeBSD.org</email>">
+<!ENTITY a.avilla.email "&a.avilla; <email xmlns=''>avilla@FreeBSD.org</email>">
 
 <!ENTITY a.avl "Alexander Logvinov">
-<!ENTITY a.avl.email "&a.avl; <email xmlns='http://www.w3.org/1999/xhtml'>avl@FreeBSD.org</email>">
+<!ENTITY a.avl.email "&a.avl; <email xmlns=''>avl@FreeBSD.org</email>">
 
 <!ENTITY a.awebster "Andrew Webster">
-<!ENTITY a.awebster.email "&a.awebster; <email xmlns='http://www.w3.org/1999/xhtml'>awebster@pubnix.net</email>">
+<!ENTITY a.awebster.email "&a.awebster; <email xmlns=''>awebster@pubnix.net</email>">
 
 <!ENTITY a.az "Andrej Zverev">
-<!ENTITY a.az.email "&a.az; <email xmlns='http://www.w3.org/1999/xhtml'>az@FreeBSD.org</email>">
+<!ENTITY a.az.email "&a.az; <email xmlns=''>az@FreeBSD.org</email>">
 
 <!ENTITY a.babb "Jim Babb">
-<!ENTITY a.babb.email "&a.babb; <email xmlns='http://www.w3.org/1999/xhtml'>babb@FreeBSD.org</email>">
+<!ENTITY a.babb.email "&a.babb; <email xmlns=''>babb@FreeBSD.org</email>">
 
 <!ENTITY a.babkin "Sergey Babkin">
-<!ENTITY a.babkin.email "&a.babkin; <email xmlns='http://www.w3.org/1999/xhtml'>babkin@FreeBSD.org</email>">
+<!ENTITY a.babkin.email "&a.babkin; <email xmlns=''>babkin@FreeBSD.org</email>">
 
 <!ENTITY a.bakul "Bakul Shah">
-<!ENTITY a.bakul.email "&a.bakul; <email xmlns='http://www.w3.org/1999/xhtml'>bakul@FreeBSD.org</email>">
+<!ENTITY a.bakul.email "&a.bakul; <email xmlns=''>bakul@FreeBSD.org</email>">
 
 <!ENTITY a.bapt "Baptiste Daroussin">
-<!ENTITY a.bapt.email "&a.bapt; <email xmlns='http://www.w3.org/1999/xhtml'>bapt@FreeBSD.org</email>">
+<!ENTITY a.bapt.email "&a.bapt; <email xmlns=''>bapt@FreeBSD.org</email>">
 
 <!ENTITY a.bar "Barbara Guida">
-<!ENTITY a.bar.email "&a.bar; <email xmlns='http://www.w3.org/1999/xhtml'>bar@FreeBSD.org</email>">
+<!ENTITY a.bar.email "&a.bar; <email xmlns=''>bar@FreeBSD.org</email>">
 
 <!ENTITY a.barner "Simon Barner">
-<!ENTITY a.barner.email "&a.barner; <email xmlns='http://www.w3.org/1999/xhtml'>barner@FreeBSD.org</email>">
+<!ENTITY a.barner.email "&a.barner; <email xmlns=''>barner@FreeBSD.org</email>">
 
 <!ENTITY a.bbraun "Rob Braun">
-<!ENTITY a.bbraun.email "&a.bbraun; <email xmlns='http://www.w3.org/1999/xhtml'>bbraun@FreeBSD.org</email>">
+<!ENTITY a.bbraun.email "&a.bbraun; <email xmlns=''>bbraun@FreeBSD.org</email>">
 
 <!ENTITY a.bcr "Benedict Reuschling">
-<!ENTITY a.bcr.email "&a.bcr; <email xmlns='http://www.w3.org/1999/xhtml'>bcr@FreeBSD.org</email>">
+<!ENTITY a.bcr.email "&a.bcr; <email xmlns=''>bcr@FreeBSD.org</email>">
 
 <!ENTITY a.bde "Bruce Evans">
-<!ENTITY a.bde.email "&a.bde; <email xmlns='http://www.w3.org/1999/xhtml'>bde@FreeBSD.org</email>">
+<!ENTITY a.bde.email "&a.bde; <email xmlns=''>bde@FreeBSD.org</email>">
 
 <!ENTITY a.bdrewery "Bryan Drewery">
-<!ENTITY a.bdrewery.email "&a.bdrewery; <email xmlns='http://www.w3.org/1999/xhtml'>bdrewery@FreeBSD.org</email>">
+<!ENTITY a.bdrewery.email "&a.bdrewery; <email xmlns=''>bdrewery@FreeBSD.org</email>">
 
 <!ENTITY a.bean "Rebecca Visger">
-<!ENTITY a.bean.email "&a.bean; <email xmlns='http://www.w3.org/1999/xhtml'>bean@FreeBSD.org</email>">
+<!ENTITY a.bean.email "&a.bean; <email xmlns=''>bean@FreeBSD.org</email>">
 
 <!ENTITY a.beat "Beat G&auml;tzi">
-<!ENTITY a.beat.email "&a.beat; <email xmlns='http://www.w3.org/1999/xhtml'>beat@FreeBSD.org</email>">
+<!ENTITY a.beat.email "&a.beat; <email xmlns=''>beat@FreeBSD.org</email>">
 
 <!ENTITY a.beech "Beech Rintoul">
-<!ENTITY a.beech.email "&a.beech; <email xmlns='http://www.w3.org/1999/xhtml'>beech@FreeBSD.org</email>">
+<!ENTITY a.beech.email "&a.beech; <email xmlns=''>beech@FreeBSD.org</email>">
 
 <!ENTITY a.ben "Ben Smithurst">
-<!ENTITY a.ben.email "&a.ben; <email xmlns='http://www.w3.org/1999/xhtml'>ben@FreeBSD.org</email>">
+<!ENTITY a.ben.email "&a.ben; <email xmlns=''>ben@FreeBSD.org</email>">
 
 <!ENTITY a.benjsc "Benjamin Close">
-<!ENTITY a.benjsc.email "&a.benjsc; <email xmlns='http://www.w3.org/1999/xhtml'>benjsc@FreeBSD.org</email>">
+<!ENTITY a.benjsc.email "&a.benjsc; <email xmlns=''>benjsc@FreeBSD.org</email>">
 
 <!ENTITY a.benl "Ben Laurie">
-<!ENTITY a.benl.email "&a.benl; <email xmlns='http://www.w3.org/1999/xhtml'>benl@FreeBSD.org</email>">
+<!ENTITY a.benl.email "&a.benl; <email xmlns=''>benl@FreeBSD.org</email>">
 
 <!ENTITY a.benno "Benno Rice">
-<!ENTITY a.benno.email "&a.benno; <email xmlns='http://www.w3.org/1999/xhtml'>benno@FreeBSD.org</email>">
+<!ENTITY a.benno.email "&a.benno; <email xmlns=''>benno@FreeBSD.org</email>">
 
 <!ENTITY a.bf "Brendan Fabeny">
-<!ENTITY a.bf.email "&a.bf; <email xmlns='http://www.w3.org/1999/xhtml'>bf@FreeBSD.org</email>">
+<!ENTITY a.bf.email "&a.bf; <email xmlns=''>bf@FreeBSD.org</email>">
 
 <!ENTITY a.bgray "Ben Gray">
-<!ENTITY a.bgray.email "&a.bgray; <email xmlns='http://www.w3.org/1999/xhtml'>bgray@FreeBSD.org</email>">
+<!ENTITY a.bgray.email "&a.bgray; <email xmlns=''>bgray@FreeBSD.org</email>">
 
 <!ENTITY a.bhaga "Ben Haga">
-<!ENTITY a.bhaga.email "&a.bhaga; <email xmlns='http://www.w3.org/1999/xhtml'>bhaga@FreeBSD.org</email>">
+<!ENTITY a.bhaga.email "&a.bhaga; <email xmlns=''>bhaga@FreeBSD.org</email>">
 
 <!ENTITY a.billf "Bill Fumerola">
-<!ENTITY a.billf.email "&a.billf; <email xmlns='http://www.w3.org/1999/xhtml'>billf@FreeBSD.org</email>">
+<!ENTITY a.billf.email "&a.billf; <email xmlns=''>billf@FreeBSD.org</email>">
 
 <!ENTITY a.bjk "Benjamin Kaduk">
-<!ENTITY a.bjk.email "&a.bjk; <email xmlns='http://www.w3.org/1999/xhtml'>bjk@FreeBSD.org</email>">
+<!ENTITY a.bjk.email "&a.bjk; <email xmlns=''>bjk@FreeBSD.org</email>">
 
 <!ENTITY a.bk "Boris Kochergin">
-<!ENTITY a.bk.email "&a.bk; <email xmlns='http://www.w3.org/1999/xhtml'>bk@FreeBSD.org</email>">
+<!ENTITY a.bk.email "&a.bk; <email xmlns=''>bk@FreeBSD.org</email>">
 
 <!ENTITY a.blackend "Marc Fonvieille">
-<!ENTITY a.blackend.email "&a.blackend; <email xmlns='http://www.w3.org/1999/xhtml'>blackend@FreeBSD.org</email>">
+<!ENTITY a.blackend.email "&a.blackend; <email xmlns=''>blackend@FreeBSD.org</email>">
 
 <!ENTITY a.bland "Alexander Nedotsukov">
-<!ENTITY a.bland.email "&a.bland; <email xmlns='http://www.w3.org/1999/xhtml'>bland@FreeBSD.org</email>">
+<!ENTITY a.bland.email "&a.bland; <email xmlns=''>bland@FreeBSD.org</email>">
 
 <!ENTITY a.bmah "Bruce A. Mah">
-<!ENTITY a.bmah.email "&a.bmah; <email xmlns='http://www.w3.org/1999/xhtml'>bmah@FreeBSD.org</email>">
+<!ENTITY a.bmah.email "&a.bmah; <email xmlns=''>bmah@FreeBSD.org</email>">
 
 <!ENTITY a.bmilekic "Bosko Milekic">
-<!ENTITY a.bmilekic.email "&a.bmilekic; <email xmlns='http://www.w3.org/1999/xhtml'>bmilekic@FreeBSD.org</email>">
+<!ENTITY a.bmilekic.email "&a.bmilekic; <email xmlns=''>bmilekic@FreeBSD.org</email>">
 
 <!ENTITY a.bms "Bruce M. Simpson">
-<!ENTITY a.bms.email "&a.bms; <email xmlns='http://www.w3.org/1999/xhtml'>bms@FreeBSD.org</email>">
+<!ENTITY a.bms.email "&a.bms; <email xmlns=''>bms@FreeBSD.org</email>">
 
 <!ENTITY a.bp "Boris Popov">
-<!ENTITY a.bp.email "&a.bp; <email xmlns='http://www.w3.org/1999/xhtml'>bp@FreeBSD.org</email>">
+<!ENTITY a.bp.email "&a.bp; <email xmlns=''>bp@FreeBSD.org</email>">
 
 <!ENTITY a.brandon "Brandon Gillespie">
-<!ENTITY a.brandon.email "&a.brandon; <email xmlns='http://www.w3.org/1999/xhtml'>brandon@FreeBSD.org</email>">
+<!ENTITY a.brandon.email "&a.brandon; <email xmlns=''>brandon@FreeBSD.org</email>">
 
 <!ENTITY a.brd "Brad Davis">
-<!ENTITY a.brd.email "&a.brd; <email xmlns='http://www.w3.org/1999/xhtml'>brd@FreeBSD.org</email>">
+<!ENTITY a.brd.email "&a.brd; <email xmlns=''>brd@FreeBSD.org</email>">
 
 <!ENTITY a.brian "Brian Somers">
-<!ENTITY a.brian.email "&a.brian; <email xmlns='http://www.w3.org/1999/xhtml'>brian@FreeBSD.org</email>">
+<!ENTITY a.brian.email "&a.brian; <email xmlns=''>brian@FreeBSD.org</email>">
 
 <!ENTITY a.brix "Henrik Brix Andersen">
-<!ENTITY a.brix.email "&a.brix; <email xmlns='http://www.w3.org/1999/xhtml'>brix@FreeBSD.org</email>">
+<!ENTITY a.brix.email "&a.brix; <email xmlns=''>brix@FreeBSD.org</email>">
 
 <!ENTITY a.brooks "Brooks Davis">
-<!ENTITY a.brooks.email "&a.brooks; <email xmlns='http://www.w3.org/1999/xhtml'>brooks@FreeBSD.org</email>">
+<!ENTITY a.brooks.email "&a.brooks; <email xmlns=''>brooks@FreeBSD.org</email>">
 
 <!ENTITY a.brucec "Bruce Cran">
-<!ENTITY a.brucec.email "&a.brucec; <email xmlns='http://www.w3.org/1999/xhtml'>brucec@FreeBSD.org</email>">
+<!ENTITY a.brucec.email "&a.brucec; <email xmlns=''>brucec@FreeBSD.org</email>">
 
 <!ENTITY a.brueffer "Christian Br&uuml;ffer">
-<!ENTITY a.brueffer.email "&a.brueffer; <email xmlns='http://www.w3.org/1999/xhtml'>brueffer@FreeBSD.org</email>">
+<!ENTITY a.brueffer.email "&a.brueffer; <email xmlns=''>brueffer@FreeBSD.org</email>">
 
 <!ENTITY a.bruno "Bruno Ducrot">
-<!ENTITY a.bruno.email "&a.bruno; <email xmlns='http://www.w3.org/1999/xhtml'>bruno@FreeBSD.org</email>">
+<!ENTITY a.bruno.email "&a.bruno; <email xmlns=''>bruno@FreeBSD.org</email>">
 
 <!ENTITY a.bryanv "Bryan Venteicher">
-<!ENTITY a.bryanv.email "&a.bryanv; <email xmlns='http://www.w3.org/1999/xhtml'>bryanv@FreeBSD.org</email>">
+<!ENTITY a.bryanv.email "&a.bryanv; <email xmlns=''>bryanv@FreeBSD.org</email>">
 
 <!ENTITY a.bsam "Boris Samorodov">
-<!ENTITY a.bsam.email "&a.bsam; <email xmlns='http://www.w3.org/1999/xhtml'>bsam@FreeBSD.org</email>">
+<!ENTITY a.bsam.email "&a.bsam; <email xmlns=''>bsam@FreeBSD.org</email>">
 
 <!ENTITY a.bschmidt "Bernhard Schmidt">
-<!ENTITY a.bschmidt.email "&a.bschmidt; <email xmlns='http://www.w3.org/1999/xhtml'>bschmidt@FreeBSD.org</email>">
+<!ENTITY a.bschmidt.email "&a.bschmidt; <email xmlns=''>bschmidt@FreeBSD.org</email>">
 
 <!ENTITY a.bsd "Brian S. Dean">
-<!ENTITY a.bsd.email "&a.bsd; <email xmlns='http://www.w3.org/1999/xhtml'>bsd@FreeBSD.org</email>">
+<!ENTITY a.bsd.email "&a.bsd; <email xmlns=''>bsd@FreeBSD.org</email>">
 
 <!ENTITY a.bushman "Michael Bushkov">
-<!ENTITY a.bushman.email "&a.bushman; <email xmlns='http://www.w3.org/1999/xhtml'>bushman@FreeBSD.org</email>">
+<!ENTITY a.bushman.email "&a.bushman; <email xmlns=''>bushman@FreeBSD.org</email>">
 
 <!ENTITY a.bvs "Vitaly Bogdanov">
-<!ENTITY a.bvs.email "&a.bvs; <email xmlns='http://www.w3.org/1999/xhtml'>bvs@FreeBSD.org</email>">
+<!ENTITY a.bvs.email "&a.bvs; <email xmlns=''>bvs@FreeBSD.org</email>">
 
 <!ENTITY a.bz "Bjoern A. Zeeb">
-<!ENTITY a.bz.email "&a.bz; <email xmlns='http://www.w3.org/1999/xhtml'>bz@FreeBSD.org</email>">
+<!ENTITY a.bz.email "&a.bz; <email xmlns=''>bz@FreeBSD.org</email>">
 
 <!ENTITY a.carl "Carl Delsey"> 
-<!ENTITY a.carl.email "&a.carl; <email xmlns='http://www.w3.org/1999/xhtml'>carl@FreeBSD.org</email>">
+<!ENTITY a.carl.email "&a.carl; <email xmlns=''>carl@FreeBSD.org</email>">
 
 <!ENTITY a.carvay "J. Vicente Carrasco Vay&aacute;">
-<!ENTITY a.carvay.email "&a.carvay; <email xmlns='http://www.w3.org/1999/xhtml'>carvay@FreeBSD.org</email>">
+<!ENTITY a.carvay.email "&a.carvay; <email xmlns=''>carvay@FreeBSD.org</email>">
 
 <!ENTITY a.cawimm "Charles A. Wimmer">
-<!ENTITY a.cawimm.email "&a.cawimm; <email xmlns='http://www.w3.org/1999/xhtml'>cawimm@FreeBSD.org</email>">
+<!ENTITY a.cawimm.email "&a.cawimm; <email xmlns=''>cawimm@FreeBSD.org</email>">
 
 <!ENTITY a.cbzimmer "Chris Zimmernmann">
-<!ENTITY a.cbzimmer.email "&a.cbzimmer; <email xmlns='http://www.w3.org/1999/xhtml'>cbzimmer@FreeBSD.org</email>">
+<!ENTITY a.cbzimmer.email "&a.cbzimmer; <email xmlns=''>cbzimmer@FreeBSD.org</email>">
 
 <!ENTITY a.cel "Chuck Lever">
-<!ENTITY a.cel.email "&a.cel; <email xmlns='http://www.w3.org/1999/xhtml'>cel@FreeBSD.org</email>">
+<!ENTITY a.cel.email "&a.cel; <email xmlns=''>cel@FreeBSD.org</email>">
 
 <!ENTITY a.ceri "Ceri Davies">
-<!ENTITY a.ceri.email "&a.ceri; <email xmlns='http://www.w3.org/1999/xhtml'>ceri@FreeBSD.org</email>">
+<!ENTITY a.ceri.email "&a.ceri; <email xmlns=''>ceri@FreeBSD.org</email>">
 
 <!ENTITY a.cg "Cameron Grant">
-<!ENTITY a.cg.email "&a.cg; <email xmlns='http://www.w3.org/1999/xhtml' role='nolink'>cg@FreeBSD.org</email>">
+<!ENTITY a.cg.email "&a.cg; <email xmlns='' role='nolink'>cg@FreeBSD.org</email>">
 
 <!ENTITY a.charnier "Philippe Charnier">
-<!ENTITY a.charnier.email "&a.charnier; <email xmlns='http://www.w3.org/1999/xhtml'>charnier@FreeBSD.org</email>">
+<!ENTITY a.charnier.email "&a.charnier; <email xmlns=''>charnier@FreeBSD.org</email>">
 
 <!ENTITY a.chern "Chern Lee">
-<!ENTITY a.chern.email "&a.chern; <email xmlns='http://www.w3.org/1999/xhtml'>chern@FreeBSD.org</email>">
+<!ENTITY a.chern.email "&a.chern; <email xmlns=''>chern@FreeBSD.org</email>">
 
 <!ENTITY a.cherry "Cherry G. Mathew">
-<!ENTITY a.cherry.email "&a.cherry; <email xmlns='http://www.w3.org/1999/xhtml'>cherry@FreeBSD.org</email>">
+<!ENTITY a.cherry.email "&a.cherry; <email xmlns=''>cherry@FreeBSD.org</email>">
 
 <!ENTITY a.chinsan "Chin-San Huang">
-<!ENTITY a.chinsan.email "&a.chinsan; <email xmlns='http://www.w3.org/1999/xhtml'>chinsan@FreeBSD.org</email>">
+<!ENTITY a.chinsan.email "&a.chinsan; <email xmlns=''>chinsan@FreeBSD.org</email>">
 
 <!ENTITY a.chm "Christoph Herrmann">
-<!ENTITY a.chm.email "&a.chm; <email xmlns='http://www.w3.org/1999/xhtml'>chm@FreeBSD.org</email>">
+<!ENTITY a.chm.email "&a.chm; <email xmlns=''>chm@FreeBSD.org</email>">
 
 <!ENTITY a.chmr "Christoph Robitschko">
-<!ENTITY a.chmr.email "&a.chmr; <email xmlns='http://www.w3.org/1999/xhtml'>chmr@FreeBSD.org</email>">
+<!ENTITY a.chmr.email "&a.chmr; <email xmlns=''>chmr@FreeBSD.org</email>">
 
 <!ENTITY a.chris "Chris Costello">
-<!ENTITY a.chris.email "&a.chris; <email xmlns='http://www.w3.org/1999/xhtml'>chris@FreeBSD.org</email>">
+<!ENTITY a.chris.email "&a.chris; <email xmlns=''>chris@FreeBSD.org</email>">
 
 <!ENTITY a.chuckr "Chuck Robey">
-<!ENTITY a.chuckr.email "&a.chuckr; <email xmlns='http://www.w3.org/1999/xhtml'>chuckr@FreeBSD.org</email>">
+<!ENTITY a.chuckr.email "&a.chuckr; <email xmlns=''>chuckr@FreeBSD.org</email>">
 
 <!ENTITY a.cjc "Crist J. Clark">
-<!ENTITY a.cjc.email "&a.cjc; <email xmlns='http://www.w3.org/1999/xhtml'>cjc@FreeBSD.org</email>">
+<!ENTITY a.cjc.email "&a.cjc; <email xmlns=''>cjc@FreeBSD.org</email>">
 
 <!ENTITY a.cjh "Junho CHOI">
-<!ENTITY a.cjh.email "&a.cjh; <email xmlns='http://www.w3.org/1999/xhtml'>cjh@FreeBSD.org</email>">
+<!ENTITY a.cjh.email "&a.cjh; <email xmlns=''>cjh@FreeBSD.org</email>">
 
 <!ENTITY a.clement "Clement Laforet">
-<!ENTITY a.clement.email "&a.clement; <email xmlns='http://www.w3.org/1999/xhtml'>clement@FreeBSD.org</email>">
+<!ENTITY a.clement.email "&a.clement; <email xmlns=''>clement@FreeBSD.org</email>">
 
 <!ENTITY a.clive "Clive Lin">
-<!ENTITY a.clive.email "&a.clive; <email xmlns='http://www.w3.org/1999/xhtml'>clive@FreeBSD.org</email>">
+<!ENTITY a.clive.email "&a.clive; <email xmlns=''>clive@FreeBSD.org</email>">
 
 <!ENTITY a.clsung "Cheng-Lung Sung">
-<!ENTITY a.clsung.email "&a.clsung; <email xmlns='http://www.w3.org/1999/xhtml'>clsung@FreeBSD.org</email>">
+<!ENTITY a.clsung.email "&a.clsung; <email xmlns=''>clsung@FreeBSD.org</email>">
 
 <!ENTITY a.cognet "Olivier Houchard">
-<!ENTITY a.cognet.email "&a.cognet; <email xmlns='http://www.w3.org/1999/xhtml'>cognet@FreeBSD.org</email>">
+<!ENTITY a.cognet.email "&a.cognet; <email xmlns=''>cognet@FreeBSD.org</email>">
 
 <!ENTITY a.cokane "Coleman Kane">
-<!ENTITY a.cokane.email "&a.cokane; <email xmlns='http://www.w3.org/1999/xhtml'>cokane@FreeBSD.org</email>">
+<!ENTITY a.cokane.email "&a.cokane; <email xmlns=''>cokane@FreeBSD.org</email>">
 
 <!ENTITY a.conklin "Brian E. Conklin">
-<!ENTITY a.conklin.email "&a.conklin; <email xmlns='http://www.w3.org/1999/xhtml'>conklin@FreeBSD.org</email>">
+<!ENTITY a.conklin.email "&a.conklin; <email xmlns=''>conklin@FreeBSD.org</email>">
 
 <!ENTITY a.cp "Chuck Paterson">
-<!ENTITY a.cp.email "&a.cp; <email xmlns='http://www.w3.org/1999/xhtml'>cp@FreeBSD.org</email>">
+<!ENTITY a.cp.email "&a.cp; <email xmlns=''>cp@FreeBSD.org</email>">
 
 <!ENTITY a.cperciva "Colin Percival">
-<!ENTITY a.cperciva.email "&a.cperciva; <email xmlns='http://www.w3.org/1999/xhtml'>cperciva@FreeBSD.org</email>">
+<!ENTITY a.cperciva.email "&a.cperciva; <email xmlns=''>cperciva@FreeBSD.org</email>">
 
 <!ENTITY a.cpiazza "Chris Piazza">
-<!ENTITY a.cpiazza.email "&a.cpiazza; <email xmlns='http://www.w3.org/1999/xhtml'>cpiazza@FreeBSD.org</email>">
+<!ENTITY a.cpiazza.email "&a.cpiazza; <email xmlns=''>cpiazza@FreeBSD.org</email>">
 
 <!ENTITY a.cracauer "Martin Cracauer">
-<!ENTITY a.cracauer.email "&a.cracauer; <email xmlns='http://www.w3.org/1999/xhtml'>cracauer@FreeBSD.org</email>">
+<!ENTITY a.cracauer.email "&a.cracauer; <email xmlns=''>cracauer@FreeBSD.org</email>">
 
 <!ENTITY a.crees "Chris Rees">
-<!ENTITY a.crees.email "&a.crees; <email xmlns='http://www.w3.org/1999/xhtml'>crees@FreeBSD.org</email>">
+<!ENTITY a.crees.email "&a.crees; <email xmlns=''>crees@FreeBSD.org</email>">
 
 <!ENTITY a.cs "Carlo Strub">
-<!ENTITY a.cs.email "&a.cs; <email xmlns='http://www.w3.org/1999/xhtml'>cs@FreeBSD.org</email>">
+<!ENTITY a.cs.email "&a.cs; <email xmlns=''>cs@FreeBSD.org</email>">
 
 <!ENTITY a.csgr "Geoff Rehmet">
-<!ENTITY a.csgr.email "&a.csgr; <email xmlns='http://www.w3.org/1999/xhtml'>csgr@FreeBSD.org</email>">
+<!ENTITY a.csgr.email "&a.csgr; <email xmlns=''>csgr@FreeBSD.org</email>">
 
 <!ENTITY a.cshumway "Christopher Shumway">
-<!ENTITY a.cshumway.email "&a.cshumway; <email xmlns='http://www.w3.org/1999/xhtml'>cshumway@FreeBSD.org</email>">
+<!ENTITY a.cshumway.email "&a.cshumway; <email xmlns=''>cshumway@FreeBSD.org</email>">
 
 <!ENTITY a.csjp "Christian S.J. Peron">
-<!ENTITY a.csjp.email "&a.csjp; <email xmlns='http://www.w3.org/1999/xhtml'>csjp@FreeBSD.org</email>">
+<!ENTITY a.csjp.email "&a.csjp; <email xmlns=''>csjp@FreeBSD.org</email>">
 
 <!ENTITY a.culot "Frederic Culot">
-<!ENTITY a.culot.email "&a.culot; <email xmlns='http://www.w3.org/1999/xhtml'>culot@FreeBSD.org</email>">
+<!ENTITY a.culot.email "&a.culot; <email xmlns=''>culot@FreeBSD.org</email>">
 
 <!ENTITY a.cwt "Chris Timmons">
-<!ENTITY a.cwt.email "&a.cwt; <email xmlns='http://www.w3.org/1999/xhtml'>cwt@FreeBSD.org</email>">
+<!ENTITY a.cwt.email "&a.cwt; <email xmlns=''>cwt@FreeBSD.org</email>">
 
 <!ENTITY a.cy "Cy Schubert">
-<!ENTITY a.cy.email "&a.cy; <email xmlns='http://www.w3.org/1999/xhtml'>cy@FreeBSD.org</email>">
+<!ENTITY a.cy.email "&a.cy; <email xmlns=''>cy@FreeBSD.org</email>">
 
 <!ENTITY a.daichi "Daichi GOTO">
-<!ENTITY a.daichi.email "&a.daichi; <email xmlns='http://www.w3.org/1999/xhtml'>daichi@FreeBSD.org</email>">
+<!ENTITY a.daichi.email "&a.daichi; <email xmlns=''>daichi@FreeBSD.org</email>">
 
 <!ENTITY a.damien "Damien Bergamini">
-<!ENTITY a.damien.email "&a.damien; <email xmlns='http://www.w3.org/1999/xhtml'>damien@FreeBSD.org</email>">
+<!ENTITY a.damien.email "&a.damien; <email xmlns=''>damien@FreeBSD.org</email>">
 
 <!ENTITY a.dan "Dan Moschuk">
-<!ENTITY a.dan.email "&a.dan; <email xmlns='http://www.w3.org/1999/xhtml'>dan@FreeBSD.org</email>">
+<!ENTITY a.dan.email "&a.dan; <email xmlns=''>dan@FreeBSD.org</email>">
 
 <!ENTITY a.danfe "Alexey Dokuchaev">
-<!ENTITY a.danfe.email "&a.danfe; <email xmlns='http://www.w3.org/1999/xhtml'>danfe@FreeBSD.org</email>">
+<!ENTITY a.danfe.email "&a.danfe; <email xmlns=''>danfe@FreeBSD.org</email>">
 
 <!ENTITY a.danger "Daniel Ger&#382;o">
-<!ENTITY a.danger.email "&a.danger; <email xmlns='http://www.w3.org/1999/xhtml'>danger@FreeBSD.org</email>">
+<!ENTITY a.danger.email "&a.danger; <email xmlns=''>danger@FreeBSD.org</email>">
 
 <!ENTITY a.danny "Daniel O'Callaghan">
-<!ENTITY a.danny.email "&a.danny; <email xmlns='http://www.w3.org/1999/xhtml'>danny@FreeBSD.org</email>">
+<!ENTITY a.danny.email "&a.danny; <email xmlns=''>danny@FreeBSD.org</email>">
 
 <!ENTITY a.dannyboy "Daniel Harris">
-<!ENTITY a.dannyboy.email "&a.dannyboy; <email xmlns='http://www.w3.org/1999/xhtml'>dannyboy@FreeBSD.org</email>">
+<!ENTITY a.dannyboy.email "&a.dannyboy; <email xmlns=''>dannyboy@FreeBSD.org</email>">
 
 <!ENTITY a.darrenr "Darren Reed">
-<!ENTITY a.darrenr.email "&a.darrenr; <email xmlns='http://www.w3.org/1999/xhtml'>darrenr@FreeBSD.org</email>">
+<!ENTITY a.darrenr.email "&a.darrenr; <email xmlns=''>darrenr@FreeBSD.org</email>">
 
 <!ENTITY a.das "David Schultz">
-<!ENTITY a.das.email "&a.das; <email xmlns='http://www.w3.org/1999/xhtml'>das@FreeBSD.org</email>">
+<!ENTITY a.das.email "&a.das; <email xmlns=''>das@FreeBSD.org</email>">
 
 <!ENTITY a.davidc "Chad David">
-<!ENTITY a.davidc.email "&a.davidc; <email xmlns='http://www.w3.org/1999/xhtml'>davidc@FreeBSD.org</email>">
+<!ENTITY a.davidc.email "&a.davidc; <email xmlns=''>davidc@FreeBSD.org</email>">
 
 <!ENTITY a.davidch "David Christensen">
-<!ENTITY a.davidch.email "&a.davidch; <email xmlns='http://www.w3.org/1999/xhtml'>davidch@FreeBSD.org</email>">
+<!ENTITY a.davidch.email "&a.davidch; <email xmlns=''>davidch@FreeBSD.org</email>">
 
 <!ENTITY a.davide "Davide Italiano">
-<!ENTITY a.davide.email "&a.davide; <email xmlns='http://www.w3.org/1999/xhtml'>davide@FreeBSD.org</email>">
+<!ENTITY a.davide.email "&a.davide; <email xmlns=''>davide@FreeBSD.org</email>">
 
 <!ENTITY a.davidn "David Nugent">
-<!ENTITY a.davidn.email "&a.davidn; <email xmlns='http://www.w3.org/1999/xhtml'>davidn@FreeBSD.org</email>">
+<!ENTITY a.davidn.email "&a.davidn; <email xmlns=''>davidn@FreeBSD.org</email>">
 
 <!ENTITY a.davidxu "David Xu">
-<!ENTITY a.davidxu.email "&a.davidxu; <email xmlns='http://www.w3.org/1999/xhtml'>davidxu@FreeBSD.org</email>">
+<!ENTITY a.davidxu.email "&a.davidxu; <email xmlns=''>davidxu@FreeBSD.org</email>">
 
 <!ENTITY a.db "Diane Bruce">
-<!ENTITY a.db.email "&a.db; <email xmlns='http://www.w3.org/1999/xhtml'>db@FreeBSD.org</email>">
+<!ENTITY a.db.email "&a.db; <email xmlns=''>db@FreeBSD.org</email>">
 
 <!ENTITY a.dbaker "Daniel Baker">
-<!ENTITY a.dbaker.email "&a.dbaker; <email xmlns='http://www.w3.org/1999/xhtml'>dbaker@FreeBSD.org</email>">
+<!ENTITY a.dbaker.email "&a.dbaker; <email xmlns=''>dbaker@FreeBSD.org</email>">
 
 <!ENTITY a.dbn "David Naylor">
-<!ENTITY a.dbn.email "&a.dbn; <email xmlns='http://www.w3.org/1999/xhtml'>dbn@FreeBSD.org</email>">
+<!ENTITY a.dbn.email "&a.dbn; <email xmlns=''>dbn@FreeBSD.org</email>">
 
 <!ENTITY a.dburr "Donald Burr">
-<!ENTITY a.dburr.email "&a.dburr; <email xmlns='http://www.w3.org/1999/xhtml'>dburr@FreeBSD.org</email>">
+<!ENTITY a.dburr.email "&a.dburr; <email xmlns=''>dburr@FreeBSD.org</email>">
 
 <!ENTITY a.dchagin "Dmitry Chagin">
-<!ENTITY a.dchagin.email "&a.dchagin; <email xmlns='http://www.w3.org/1999/xhtml'>dchagin@FreeBSD.org</email>">
+<!ENTITY a.dchagin.email "&a.dchagin; <email xmlns=''>dchagin@FreeBSD.org</email>">
 
 <!ENTITY a.dcs "Daniel C. Sobral">
-<!ENTITY a.dcs.email "&a.dcs; <email xmlns='http://www.w3.org/1999/xhtml'>dcs@FreeBSD.org</email>">
+<!ENTITY a.dcs.email "&a.dcs; <email xmlns=''>dcs@FreeBSD.org</email>">
 
 <!ENTITY a.dd "Dima Dorfman">
-<!ENTITY a.dd.email "&a.dd; <email xmlns='http://www.w3.org/1999/xhtml'>dd@FreeBSD.org</email>">
+<!ENTITY a.dd.email "&a.dd; <email xmlns=''>dd@FreeBSD.org</email>">
 
 <!ENTITY a.dds "Diomidis D. Spinellis">
-<!ENTITY a.dds.email "&a.dds; <email xmlns='http://www.w3.org/1999/xhtml'>dds@FreeBSD.org</email>">
+<!ENTITY a.dds.email "&a.dds; <email xmlns=''>dds@FreeBSD.org</email>">
 
 <!ENTITY a.ds "Daniel Seuffert">
-<!ENTITY a.ds.email "&a.ds; <email xmlns='http://www.w3.org/1999/xhtml'>ds@FreeBSD.org</email>">
+<!ENTITY a.ds.email "&a.ds; <email xmlns=''>ds@FreeBSD.org</email>">
 
 <!ENTITY a.deb "Deb Goodkin">
-<!ENTITY a.deb.email "&a.deb; <email xmlns='http://www.w3.org/1999/xhtml'>deb@FreeBSD.org</email>">
+<!ENTITY a.deb.email "&a.deb; <email xmlns=''>deb@FreeBSD.org</email>">
 
 <!ENTITY a.dec "David E. Cross">
-<!ENTITY a.dec.email "&a.dec; <email xmlns='http://www.w3.org/1999/xhtml'>dec@FreeBSD.org</email>">
+<!ENTITY a.dec.email "&a.dec; <email xmlns=''>dec@FreeBSD.org</email>">
 
 <!ENTITY a.decke "Bernhard Fr&ouml;hlich">
-<!ENTITY a.decke.email "&a.decke; <email xmlns='http://www.w3.org/1999/xhtml'>decke@FreeBSD.org</email>">
+<!ENTITY a.decke.email "&a.decke; <email xmlns=''>decke@FreeBSD.org</email>">
 
 <!ENTITY a.deischen "Daniel Eischen">
-<!ENTITY a.deischen.email "&a.deischen; <email xmlns='http://www.w3.org/1999/xhtml'>deischen@FreeBSD.org</email>">
+<!ENTITY a.deischen.email "&a.deischen; <email xmlns=''>deischen@FreeBSD.org</email>">
 
 <!ENTITY a.delphij "Xin Li">
-<!ENTITY a.delphij.email "&a.delphij; <email xmlns='http://www.w3.org/1999/xhtml'>delphij@FreeBSD.org</email>">
+<!ENTITY a.delphij.email "&a.delphij; <email xmlns=''>delphij@FreeBSD.org</email>">
 
 <!ENTITY a.demon "Dmitry Sivachenko">
-<!ENTITY a.demon.email "&a.demon; <email xmlns='http://www.w3.org/1999/xhtml'>demon@FreeBSD.org</email>">
+<!ENTITY a.demon.email "&a.demon; <email xmlns=''>demon@FreeBSD.org</email>">
 
 <!ENTITY a.den "Denis Peplin">
-<!ENTITY a.den.email "&a.den; <email xmlns='http://www.w3.org/1999/xhtml'>den@FreeBSD.org</email>">
+<!ENTITY a.den.email "&a.den; <email xmlns=''>den@FreeBSD.org</email>">
 
 <!ENTITY a.des "Dag-Erling C. Sm&oslash;rgrav">
-<!ENTITY a.des.email "&a.des; <email xmlns='http://www.w3.org/1999/xhtml'>des@FreeBSD.org</email>">
+<!ENTITY a.des.email "&a.des; <email xmlns=''>des@FreeBSD.org</email>">
 
 <!ENTITY a.dfr "Doug Rabson">
-<!ENTITY a.dfr.email "&a.dfr; <email xmlns='http://www.w3.org/1999/xhtml'>dfr@FreeBSD.org</email>">
+<!ENTITY a.dfr.email "&a.dfr; <email xmlns=''>dfr@FreeBSD.org</email>">
 
 <!ENTITY a.dg "David Greenman">
-<!ENTITY a.dg.email "&a.dg; <email xmlns='http://www.w3.org/1999/xhtml'>dg@FreeBSD.org</email>">
+<!ENTITY a.dg.email "&a.dg; <email xmlns=''>dg@FreeBSD.org</email>">
 
 <!ENTITY a.dhartmei "Daniel Hartmeier">
-<!ENTITY a.dhartmei.email "&a.dhartmei; <email xmlns='http://www.w3.org/1999/xhtml'>dhartmei@FreeBSD.org</email>">
+<!ENTITY a.dhartmei.email "&a.dhartmei; <email xmlns=''>dhartmei@FreeBSD.org</email>">
 
 <!ENTITY a.dhn "Dennis Herrmann">
-<!ENTITY a.dhn.email "&a.dhn; <email xmlns='http://www.w3.org/1999/xhtml'>dhn@FreeBSD.org</email>">
+<!ENTITY a.dhn.email "&a.dhn; <email xmlns=''>dhn@FreeBSD.org</email>">
 
 <!ENTITY a.dhw "David Wolfskill">
-<!ENTITY a.dhw.email "&a.dhw; <email xmlns='http://www.w3.org/1999/xhtml'>dhw@FreeBSD.org</email>">
+<!ENTITY a.dhw.email "&a.dhw; <email xmlns=''>dhw@FreeBSD.org</email>">
 
 <!ENTITY a.dick "Richard Seaman Jr.">
-<!ENTITY a.dick.email "&a.dick; <email xmlns='http://www.w3.org/1999/xhtml'>dick@FreeBSD.org</email>">
+<!ENTITY a.dick.email "&a.dick; <email xmlns=''>dick@FreeBSD.org</email>">
 
 <!ENTITY a.dillon "Matthew Dillon">
-<!ENTITY a.dillon.email "&a.dillon; <email xmlns='http://www.w3.org/1999/xhtml'>dillon@FreeBSD.org</email>">
+<!ENTITY a.dillon.email "&a.dillon; <email xmlns=''>dillon@FreeBSD.org</email>">
 
 <!ENTITY a.dim "Dimitry Andric">
-<!ENTITY a.dim.email "&a.dim; <email xmlns='http://www.w3.org/1999/xhtml'>dim@FreeBSD.org</email>">
+<!ENTITY a.dim.email "&a.dim; <email xmlns=''>dim@FreeBSD.org</email>">
 
 <!ENTITY a.dima "Dima Ruban">
-<!ENTITY a.dima.email "&a.dima; <email xmlns='http://www.w3.org/1999/xhtml'>dima@FreeBSD.org</email>">
+<!ENTITY a.dima.email "&a.dima; <email xmlns=''>dima@FreeBSD.org</email>">
 
 <!ENTITY a.dinoex "Dirk Meyer">
-<!ENTITY a.dinoex.email "&a.dinoex; <email xmlns='http://www.w3.org/1999/xhtml'>dinoex@FreeBSD.org</email>">
+<!ENTITY a.dinoex.email "&a.dinoex; <email xmlns=''>dinoex@FreeBSD.org</email>">
 
 <!ENTITY a.dirk "Dirk Fr&ouml;mberg">
-<!ENTITY a.dirk.email "&a.dirk; <email xmlns='http://www.w3.org/1999/xhtml'>dirk@FreeBSD.org</email>">
+<!ENTITY a.dirk.email "&a.dirk; <email xmlns=''>dirk@FreeBSD.org</email>">
 
 <!ENTITY a.dmarion "Damjan Marion">
-<!ENTITY a.dmarion.email "&a.dmarion; <email xmlns='http://www.w3.org/1999/xhtml'>dmarion@FreeBSD.org</email>">
+<!ENTITY a.dmarion.email "&a.dmarion; <email xmlns=''>dmarion@FreeBSD.org</email>">
 
 <!ENTITY a.dmlb "Duncan Barclay">
-<!ENTITY a.dmlb.email "&a.dmlb; <email xmlns='http://www.w3.org/1999/xhtml'>dmlb@FreeBSD.org</email>">
+<!ENTITY a.dmlb.email "&a.dmlb; <email xmlns=''>dmlb@FreeBSD.org</email>">
 
 <!ENTITY a.don "Don Wilde">
-<!ENTITY a.don.email "&a.don; <email xmlns='http://www.w3.org/1999/xhtml'>don@FreeBSD.org</email>">
+<!ENTITY a.don.email "&a.don; <email xmlns=''>don@FreeBSD.org</email>">
 
 <!ENTITY a.dougb "Doug Barton">
-<!ENTITY a.dougb.email "&a.dougb; <email xmlns='http://www.w3.org/1999/xhtml'>dougb@FreeBSD.org</email>">
+<!ENTITY a.dougb.email "&a.dougb; <email xmlns=''>dougb@FreeBSD.org</email>">
 
 <!ENTITY a.dru "Dru Lavigne">
-<!ENTITY a.dru.email "&a.dru; <email xmlns='http://www.w3.org/1999/xhtml'>dru@FreeBSD.org</email>">
+<!ENTITY a.dru.email "&a.dru; <email xmlns=''>dru@FreeBSD.org</email>">
 
 <!ENTITY a.dryice "Dryice Liu">
-<!ENTITY a.dryice.email "&a.dryice; <email xmlns='http://www.w3.org/1999/xhtml'>dryice@FreeBSD.org</email>">
+<!ENTITY a.dryice.email "&a.dryice; <email xmlns=''>dryice@FreeBSD.org</email>">
 
 <!ENTITY a.dt "Dmitrij Tejblum">
-<!ENTITY a.dt.email "&a.dt; <email xmlns='http://www.w3.org/1999/xhtml'>dt@FreeBSD.org</email>">
+<!ENTITY a.dt.email "&a.dt; <email xmlns=''>dt@FreeBSD.org</email>">
 
 <!ENTITY a.dteske "Devin Teske">
-<!ENTITY a.dteske.email "&a.dteske; <email xmlns='http://www.w3.org/1999/xhtml'>dteske@FreeBSD.org</email>">
+<!ENTITY a.dteske.email "&a.dteske; <email xmlns=''>dteske@FreeBSD.org</email>">
 
 <!ENTITY a.dufault "Peter Dufault">
-<!ENTITY a.dufault.email "&a.dufault; <email xmlns='http://www.w3.org/1999/xhtml'>dufault@FreeBSD.org</email>">
+<!ENTITY a.dufault.email "&a.dufault; <email xmlns=''>dufault@FreeBSD.org</email>">
 
 <!ENTITY a.dumbbell "Jean-S&eacute;bastien P&eacute;dron">
-<!ENTITY a.dumbbell.email "&a.dumbbell; <email xmlns='http://www.w3.org/1999/xhtml'>dumbbell@FreeBSD.org</email>">
+<!ENTITY a.dumbbell.email "&a.dumbbell; <email xmlns=''>dumbbell@FreeBSD.org</email>">
 
 <!ENTITY a.dutchdaemon "Ben C. O. Grimm">
-<!ENTITY a.dutchdaemon.email "&a.dutchdaemon; <email xmlns='http://www.w3.org/1999/xhtml'>dutchdaemon@FreeBSD.org</email>">
+<!ENTITY a.dutchdaemon.email "&a.dutchdaemon; <email xmlns=''>dutchdaemon@FreeBSD.org</email>">
 
 <!ENTITY a.dvl "Dan Langille">
-<!ENTITY a.dvl.email "&a.dvl; <email xmlns='http://www.w3.org/1999/xhtml'>dvl@FreeBSD.org</email>">
+<!ENTITY a.dvl.email "&a.dvl; <email xmlns=''>dvl@FreeBSD.org</email>">
 
 <!ENTITY a.dwcjr "David W. Chapman Jr.">
-<!ENTITY a.dwcjr.email "&a.dwcjr; <email xmlns='http://www.w3.org/1999/xhtml'>dwcjr@FreeBSD.org</email>">
+<!ENTITY a.dwcjr.email "&a.dwcjr; <email xmlns=''>dwcjr@FreeBSD.org</email>">
 
 <!ENTITY a.dwhite "Doug White">
-<!ENTITY a.dwhite.email "&a.dwhite; <email xmlns='http://www.w3.org/1999/xhtml'>dwhite@FreeBSD.org</email>">
+<!ENTITY a.dwhite.email "&a.dwhite; <email xmlns=''>dwhite@FreeBSD.org</email>">
 
 <!ENTITY a.dwmalone "David Malone">
-<!ENTITY a.dwmalone.email "&a.dwmalone; <email xmlns='http://www.w3.org/1999/xhtml'>dwmalone@FreeBSD.org</email>">
+<!ENTITY a.dwmalone.email "&a.dwmalone; <email xmlns=''>dwmalone@FreeBSD.org</email>">
 
 <!ENTITY a.dyson "John Dyson">
-<!ENTITY a.dyson.email "&a.dyson; <email xmlns='http://www.w3.org/1999/xhtml'>dyson@FreeBSD.org</email>">
+<!ENTITY a.dyson.email "&a.dyson; <email xmlns=''>dyson@FreeBSD.org</email>">
 
 <!ENTITY a.eadler "Eitan Adler">
-<!ENTITY a.eadler.email "&a.eadler; <email xmlns='http://www.w3.org/1999/xhtml'>eadler@FreeBSD.org</email>">
+<!ENTITY a.eadler.email "&a.eadler; <email xmlns=''>eadler@FreeBSD.org</email>">
 
 <!ENTITY a.ebrandi "Edson Brandi">
-<!ENTITY a.ebrandi.email "&a.ebrandi; <email xmlns='http://www.w3.org/1999/xhtml'>ebrandi@FreeBSD.org</email>">
+<!ENTITY a.ebrandi.email "&a.ebrandi; <email xmlns=''>ebrandi@FreeBSD.org</email>">
 
 <!ENTITY a.ed "Ed Schouten">
-<!ENTITY a.ed.email "&a.ed; <email xmlns='http://www.w3.org/1999/xhtml'>ed@FreeBSD.org</email>">
+<!ENTITY a.ed.email "&a.ed; <email xmlns=''>ed@FreeBSD.org</email>">
 
 <!ENTITY a.edwin "Edwin Groothuis">
-<!ENTITY a.edwin.email "&a.edwin; <email xmlns='http://www.w3.org/1999/xhtml'>edwin@FreeBSD.org</email>">
+<!ENTITY a.edwin.email "&a.edwin; <email xmlns=''>edwin@FreeBSD.org</email>">
 
 <!ENTITY a.ehaupt "Emanuel Haupt">
-<!ENTITY a.ehaupt.email "&a.ehaupt; <email xmlns='http://www.w3.org/1999/xhtml'>ehaupt@FreeBSD.org</email>">
+<!ENTITY a.ehaupt.email "&a.ehaupt; <email xmlns=''>ehaupt@FreeBSD.org</email>">
 
 <!ENTITY a.eik "Oliver Eikemeier">
-<!ENTITY a.eik.email "&a.eik; <email xmlns='http://www.w3.org/1999/xhtml'>eik@FreeBSD.org</email>">
+<!ENTITY a.eik.email "&a.eik; <email xmlns=''>eik@FreeBSD.org</email>">
 
 <!ENTITY a.eivind "Eivind Eklund">
-<!ENTITY a.eivind.email "&a.eivind; <email xmlns='http://www.w3.org/1999/xhtml'>eivind@FreeBSD.org</email>">
+<!ENTITY a.eivind.email "&a.eivind; <email xmlns=''>eivind@FreeBSD.org</email>">
 
 <!ENTITY a.ejc "Eric J. Chet">
-<!ENTITY a.ejc.email "&a.ejc; <email xmlns='http://www.w3.org/1999/xhtml'>ejc@FreeBSD.org</email>">
+<!ENTITY a.ejc.email "&a.ejc; <email xmlns=''>ejc@FreeBSD.org</email>">
 
 <!ENTITY a.emaste "Ed Maste">
-<!ENTITY a.emaste.email "&a.emaste; <email xmlns='http://www.w3.org/1999/xhtml'>emaste@FreeBSD.org</email>">
+<!ENTITY a.emaste.email "&a.emaste; <email xmlns=''>emaste@FreeBSD.org</email>">
 
 <!ENTITY a.emax "Maksim Yevmenkin">
-<!ENTITY a.emax.email "&a.emax; <email xmlns='http://www.w3.org/1999/xhtml'>emax@FreeBSD.org</email>">
+<!ENTITY a.emax.email "&a.emax; <email xmlns=''>emax@FreeBSD.org</email>">
 
 <!ENTITY a.emoore "Eric Moore">
-<!ENTITY a.emoore.email "&a.emoore; <email xmlns='http://www.w3.org/1999/xhtml'>emoore@FreeBSD.org</email>">
+<!ENTITY a.emoore.email "&a.emoore; <email xmlns=''>emoore@FreeBSD.org</email>">
 
 <!ENTITY a.eri "Ermal Lu&#231;i">
-<!ENTITY a.eri.email "&a.eri; <email xmlns='http://www.w3.org/1999/xhtml'>eri@FreeBSD.org</email>">
+<!ENTITY a.eri.email "&a.eri; <email xmlns=''>eri@FreeBSD.org</email>">
 
 <!ENTITY a.eric "Eric Melville">
-<!ENTITY a.eric.email "&a.eric; <email xmlns='http://www.w3.org/1999/xhtml'>eric@FreeBSD.org</email>">
+<!ENTITY a.eric.email "&a.eric; <email xmlns=''>eric@FreeBSD.org</email>">
 
 <!ENTITY a.erich "Eric L. Hernes">
-<!ENTITY a.erich.email "&a.erich; <email xmlns='http://www.w3.org/1999/xhtml'>erich@FreeBSD.org</email>">
+<!ENTITY a.erich.email "&a.erich; <email xmlns=''>erich@FreeBSD.org</email>">
 
 <!ENTITY a.erik "Erik Cederstrand">
-<!ENTITY a.erik.email "&a.erik; <email xmlns='http://www.w3.org/1999/xhtml'>erik@FreeBSD.org</email>">
+<!ENTITY a.erik.email "&a.erik; <email xmlns=''>erik@FreeBSD.org</email>">
 
 <!ENTITY a.erwin "Erwin Lansing">
-<!ENTITY a.erwin.email "&a.erwin; <email xmlns='http://www.w3.org/1999/xhtml'>erwin@FreeBSD.org</email>">
+<!ENTITY a.erwin.email "&a.erwin; <email xmlns=''>erwin@FreeBSD.org</email>">
 
 <!ENTITY a.fabient "Fabien Thomas">
-<!ENTITY a.fabient.email "&a.fabient; <email xmlns='http://www.w3.org/1999/xhtml'>fabient@FreeBSD.org</email>">
+<!ENTITY a.fabient.email "&a.fabient; <email xmlns=''>fabient@FreeBSD.org</email>">
 
 <!ENTITY a.fanf "Tony Finch">
-<!ENTITY a.fanf.email "&a.fanf; <email xmlns='http://www.w3.org/1999/xhtml'>fanf@FreeBSD.org</email>">
+<!ENTITY a.fanf.email "&a.fanf; <email xmlns=''>fanf@FreeBSD.org</email>">
 
 <!ENTITY a.farrokhi "Babak Farrokhi">
-<!ENTITY a.farrokhi.email "&a.farrokhi; <email xmlns='http://www.w3.org/1999/xhtml'>farrokhi@FreeBSD.org</email>">
+<!ENTITY a.farrokhi.email "&a.farrokhi; <email xmlns=''>farrokhi@FreeBSD.org</email>">
 
 <!ENTITY a.feld "Mark Felder">
-<!ENTITY a.feld.email "&a.feld; <email xmlns='http://www.w3.org/1999/xhtml'>feld@FreeBSD.org</email>">
+<!ENTITY a.feld.email "&a.feld; <email xmlns=''>feld@FreeBSD.org</email>">
 
 <!ENTITY a.fenner "Bill Fenner">
-<!ENTITY a.fenner.email "&a.fenner; <email xmlns='http://www.w3.org/1999/xhtml'>fenner@FreeBSD.org</email>">
+<!ENTITY a.fenner.email "&a.fenner; <email xmlns=''>fenner@FreeBSD.org</email>">
 
 <!ENTITY a.fjoe "Max Khon">
-<!ENTITY a.fjoe.email "&a.fjoe; <email xmlns='http://www.w3.org/1999/xhtml'>fjoe@FreeBSD.org</email>">
+<!ENTITY a.fjoe.email "&a.fjoe; <email xmlns=''>fjoe@FreeBSD.org</email>">
 
 <!ENTITY a.flathill "Seiichirou Hiraoka">
-<!ENTITY a.flathill.email "&a.flathill; <email xmlns='http://www.w3.org/1999/xhtml'>flathill@FreeBSD.org</email>">
+<!ENTITY a.flathill.email "&a.flathill; <email xmlns=''>flathill@FreeBSD.org</email>">
 
 <!ENTITY a.flo "Florian Smeets">
-<!ENTITY a.flo.email "&a.flo; <email xmlns='http://www.w3.org/1999/xhtml'>flo@FreeBSD.org</email>">
+<!ENTITY a.flo.email "&a.flo; <email xmlns=''>flo@FreeBSD.org</email>">
 
 <!ENTITY a.fluffy "Dima Panov">
-<!ENTITY a.fluffy.email "&a.fluffy; <email xmlns='http://www.w3.org/1999/xhtml'>fluffy@FreeBSD.org</email>">
+<!ENTITY a.fluffy.email "&a.fluffy; <email xmlns=''>fluffy@FreeBSD.org</email>">
 
 <!ENTITY a.flz "Florent Thoumie">
-<!ENTITY a.flz.email "&a.flz; <email xmlns='http://www.w3.org/1999/xhtml'>flz@FreeBSD.org</email>">
+<!ENTITY a.flz.email "&a.flz; <email xmlns=''>flz@FreeBSD.org</email>">
 
 <!ENTITY a.foxfair "Howard F. Hu">
-<!ENTITY a.foxfair.email "&a.foxfair; <email xmlns='http://www.w3.org/1999/xhtml'>foxfair@FreeBSD.org</email>">
+<!ENTITY a.foxfair.email "&a.foxfair; <email xmlns=''>foxfair@FreeBSD.org</email>">
 
 <!ENTITY a.fsmp "Steve Passe">
-<!ENTITY a.fsmp.email "&a.fsmp; <email xmlns='http://www.w3.org/1999/xhtml'>fsmp@FreeBSD.org</email>">
+<!ENTITY a.fsmp.email "&a.fsmp; <email xmlns=''>fsmp@FreeBSD.org</email>">
 
 <!ENTITY a.furuta "Atsushi Furuta">
-<!ENTITY a.furuta.email "&a.furuta; <email xmlns='http://www.w3.org/1999/xhtml'>furuta@FreeBSD.org</email>">
+<!ENTITY a.furuta.email "&a.furuta; <email xmlns=''>furuta@FreeBSD.org</email>">
 
 <!ENTITY a.gabor "G&aacute;bor K&ouml;vesd&aacute;n">
-<!ENTITY a.gabor.email "&a.gabor; <email xmlns='http://www.w3.org/1999/xhtml'>gabor@FreeBSD.org</email>">
+<!ENTITY a.gabor.email "&a.gabor; <email xmlns=''>gabor@FreeBSD.org</email>">
 
 <!ENTITY a.gad "Garance A Drosehn">
-<!ENTITY a.gad.email "&a.gad; <email xmlns='http://www.w3.org/1999/xhtml'>gad@FreeBSD.org</email>">
+<!ENTITY a.gad.email "&a.gad; <email xmlns=''>gad@FreeBSD.org</email>">
 
 <!ENTITY a.gahr "Pietro Cerutti">
-<!ENTITY a.gahr.email "&a.gahr; <email xmlns='http://www.w3.org/1999/xhtml'>gahr@FreeBSD.org</email>">
+<!ENTITY a.gahr.email "&a.gahr; <email xmlns=''>gahr@FreeBSD.org</email>">
 
 <!ENTITY a.gallatin "Andrew Gallatin">
-<!ENTITY a.gallatin.email "&a.gallatin; <email xmlns='http://www.w3.org/1999/xhtml'>gallatin@FreeBSD.org</email>">
+<!ENTITY a.gallatin.email "&a.gallatin; <email xmlns=''>gallatin@FreeBSD.org</email>">
 
 <!ENTITY a.ganbold "Ganbold Tsagaankhuu">
-<!ENTITY a.ganbold.email "&a.ganbold; <email xmlns='http://www.w3.org/1999/xhtml'>ganbold@FreeBSD.org</email>">
+<!ENTITY a.ganbold.email "&a.ganbold; <email xmlns=''>ganbold@FreeBSD.org</email>">
 
 <!ENTITY a.garga "Renato Botelho">
-<!ENTITY a.garga.email "&a.garga; <email xmlns='http://www.w3.org/1999/xhtml'>garga@FreeBSD.org</email>">
+<!ENTITY a.garga.email "&a.garga; <email xmlns=''>garga@FreeBSD.org</email>">
 
 <!ENTITY a.garys "Gary W. Swearingen">
-<!ENTITY a.garys.email "&a.garys; <email xmlns='http://www.w3.org/1999/xhtml'>garys@FreeBSD.org</email>">
+<!ENTITY a.garys.email "&a.garys; <email xmlns=''>garys@FreeBSD.org</email>">
 
 <!ENTITY a.gavin "Gavin Atkinson">
-<!ENTITY a.gavin.email "&a.gavin; <email xmlns='http://www.w3.org/1999/xhtml'>gavin@FreeBSD.org</email>">
+<!ENTITY a.gavin.email "&a.gavin; <email xmlns=''>gavin@FreeBSD.org</email>">
 
 <!ENTITY a.gber "Grzegorz Bernacki">
-<!ENTITY a.gber.email "&a.gber; <email xmlns='http://www.w3.org/1999/xhtml'>gber@FreeBSD.org</email>">
+<!ENTITY a.gber.email "&a.gber; <email xmlns=''>gber@FreeBSD.org</email>">
 
 <!ENTITY a.gblach "Grzegorz Blach">
-<!ENTITY a.gblach.email "&a.gblach; <email xmlns='http://www.w3.org/1999/xhtml'>gblach@FreeBSD.org</email>">
+<!ENTITY a.gblach.email "&a.gblach; <email xmlns=''>gblach@FreeBSD.org</email>">
 
 <!ENTITY a.gclarkii "Gary Clark II">
-<!ENTITY a.gclarkii.email "&a.gclarkii; <email xmlns='http://www.w3.org/1999/xhtml'>gclarkii@FreeBSD.org</email>">
+<!ENTITY a.gclarkii.email "&a.gclarkii; <email xmlns=''>gclarkii@FreeBSD.org</email>">
 
 <!ENTITY a.gehenna "MAEKAWA Masahide">
-<!ENTITY a.gehenna.email "&a.gehenna; <email xmlns='http://www.w3.org/1999/xhtml'>gehenna@FreeBSD.org</email>">
+<!ENTITY a.gehenna.email "&a.gehenna; <email xmlns=''>gehenna@FreeBSD.org</email>">
 
 <!ENTITY a.gerald "Gerald Pfeifer">
-<!ENTITY a.gerald.email "&a.gerald; <email xmlns='http://www.w3.org/1999/xhtml'>gerald@FreeBSD.org</email>">
+<!ENTITY a.gerald.email "&a.gerald; <email xmlns=''>gerald@FreeBSD.org</email>">
 
 <!ENTITY a.ghelmer "Guy Helmer">
-<!ENTITY a.ghelmer.email "&a.ghelmer; <email xmlns='http://www.w3.org/1999/xhtml'>ghelmer@FreeBSD.org</email>">
+<!ENTITY a.ghelmer.email "&a.ghelmer; <email xmlns=''>ghelmer@FreeBSD.org</email>">
 
 <!ENTITY a.gibbs "Justin T. Gibbs">
-<!ENTITY a.gibbs.email "&a.gibbs; <email xmlns='http://www.w3.org/1999/xhtml'>gibbs@FreeBSD.org</email>">
+<!ENTITY a.gibbs.email "&a.gibbs; <email xmlns=''>gibbs@FreeBSD.org</email>">
 
 <!ENTITY a.gioria "Sebastien Gioria">
-<!ENTITY a.gioria.email "&a.gioria; <email xmlns='http://www.w3.org/1999/xhtml'>gioria@FreeBSD.org</email>">
+<!ENTITY a.gioria.email "&a.gioria; <email xmlns=''>gioria@FreeBSD.org</email>">
 
 <!ENTITY a.girgen "Palle Girgensohn">
-<!ENTITY a.girgen.email "&a.girgen; <email xmlns='http://www.w3.org/1999/xhtml'>girgen@FreeBSD.org</email>">
+<!ENTITY a.girgen.email "&a.girgen; <email xmlns=''>girgen@FreeBSD.org</email>">
 
 <!ENTITY a.gj "Gary Jennejohn">
-<!ENTITY a.gj.email "&a.gj; <email xmlns='http://www.w3.org/1999/xhtml'>gj@FreeBSD.org</email>">
+<!ENTITY a.gj.email "&a.gj; <email xmlns=''>gj@FreeBSD.org</email>">
 
 <!ENTITY a.gjb "Glen Barber">
-<!ENTITY a.gjb.email "&a.gjb; <email xmlns='http://www.w3.org/1999/xhtml'>gjb@FreeBSD.org</email>">
+<!ENTITY a.gjb.email "&a.gjb; <email xmlns=''>gjb@FreeBSD.org</email>">
 
 <!ENTITY a.glarkin "Greg Larkin">
-<!ENTITY a.glarkin.email "&a.glarkin; <email xmlns='http://www.w3.org/1999/xhtml'>glarkin@FreeBSD.org</email>">
+<!ENTITY a.glarkin.email "&a.glarkin; <email xmlns=''>glarkin@FreeBSD.org</email>">
 
 <!ENTITY a.gleb "Gleb Kurtsou">
-<!ENTITY a.gleb.email "&a.gleb; <email xmlns='http://www.w3.org/1999/xhtml'>gleb@FreeBSD.org</email>">
+<!ENTITY a.gleb.email "&a.gleb; <email xmlns=''>gleb@FreeBSD.org</email>">
 
 <!ENTITY a.glebius "Gleb Smirnoff">
-<!ENTITY a.glebius.email "&a.glebius; <email xmlns='http://www.w3.org/1999/xhtml'>glebius@FreeBSD.org</email>">
+<!ENTITY a.glebius.email "&a.glebius; <email xmlns=''>glebius@FreeBSD.org</email>">
 
 <!ENTITY a.glewis "Greg Lewis">
-<!ENTITY a.glewis.email "&a.glewis; <email xmlns='http://www.w3.org/1999/xhtml'>glewis@FreeBSD.org</email>">
+<!ENTITY a.glewis.email "&a.glewis; <email xmlns=''>glewis@FreeBSD.org</email>">
 
 <!ENTITY a.gnn "George V. Neville-Neil">
-<!ENTITY a.gnn.email "&a.gnn; <email xmlns='http://www.w3.org/1999/xhtml'>gnn@FreeBSD.org</email>">
+<!ENTITY a.gnn.email "&a.gnn; <email xmlns=''>gnn@FreeBSD.org</email>">

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

From owner-svn-doc-projects@FreeBSD.ORG  Sun Jul  7 22:18:00 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id EFB94B18;
 Sun,  7 Jul 2013 22:18:00 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E1CBE1922;
 Sun,  7 Jul 2013 22:18:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r67MI09W058271;
 Sun, 7 Jul 2013 22:18:00 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r67MI0ew058270;
 Sun, 7 Jul 2013 22:18:00 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201307072218.r67MI0ew058270@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 7 Jul 2013 22:18:00 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42192 - projects/entities/share/xml
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Jul 2013 22:18:01 -0000

Author: rene
Date: Sun Jul  7 22:18:00 2013
New Revision: 42192
URL: http://svnweb.freebsd.org/changeset/doc/42192

Log:
  Resolve some unintended non-whitespace changes against head/ which crept in.

Modified:
  projects/entities/share/xml/catalog.xml

Modified: projects/entities/share/xml/catalog.xml
==============================================================================
--- projects/entities/share/xml/catalog.xml	Sun Jul  7 22:15:36 2013	(r42191)
+++ projects/entities/share/xml/catalog.xml	Sun Jul  7 22:18:00 2013	(r42192)
@@ -29,17 +29,14 @@
 	publicId="-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"
 	uri="authors.ent" />
   <public
-	publicId="-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"
-	uri="authors.ent" />
-  <public
 	publicId="-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
 	uri="iso8859.ent" />
   <public
-        publicId="-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        uri="l10n-common.ent" />
+        publicId="-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
+        uri="common.ent" />
   <public
 	publicId="-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-	uri="l10n.ent" />
+	uri="l10n-common.ent" />
   <public
 	publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
 	uri="l10n.ent" />

From owner-svn-doc-projects@FreeBSD.ORG  Mon Jul  8 20:46:28 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 2F1667DB;
 Mon,  8 Jul 2013 20:46:28 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1EC5A186E;
 Mon,  8 Jul 2013 20:46:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r68KkSOV011708;
 Mon, 8 Jul 2013 20:46:28 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r68KkRUN011702;
 Mon, 8 Jul 2013 20:46:27 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201307082046.r68KkRUN011702@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Mon, 8 Jul 2013 20:46:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42196 - in projects/entities:
 en_US.ISO8859-1/books/fdp-primer/docbook-markup
 en_US.ISO8859-1/books/handbook/introduction
 en_US.ISO8859-1/books/porters-handbook en_US.ISO8859-1/htdocs/...
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jul 2013 20:46:28 -0000

Author: rene
Date: Mon Jul  8 20:46:26 2013
New Revision: 42196
URL: http://svnweb.freebsd.org/changeset/doc/42196

Log:
  MFH updated directories up to r42195.

Modified:
  projects/entities/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
  projects/entities/en_US.ISO8859-1/books/porters-handbook/book.xml
  projects/entities/en_US.ISO8859-1/books/porters-handbook/uses.xml
  projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml
  projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2013-05-devsummit.xml
  projects/entities/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
  projects/entities/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
  projects/entities/it_IT.ISO8859-15/books/handbook/install/chapter.xml
  projects/entities/ja_JP.eucJP/books/faq/book.xml
  projects/entities/ja_JP.eucJP/books/handbook/disks/chapter.xml
  projects/entities/ja_JP.eucJP/books/handbook/introduction/chapter.xml
  projects/entities/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
  projects/entities/share/xml/freebsd.sch
Directory Properties:
  projects/entities/en_US.ISO8859-1/   (props changed)
  projects/entities/es_ES.ISO8859-1/   (props changed)
  projects/entities/hu_HU.ISO8859-2/   (props changed)
  projects/entities/it_IT.ISO8859-15/   (props changed)
  projects/entities/ja_JP.eucJP/   (props changed)
  projects/entities/pl_PL.ISO8859-2/   (props changed)
  projects/entities/share/   (props changed)

Modified: projects/entities/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Mon Jul  8 19:21:13 2013	(r42195)
+++ projects/entities/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Mon Jul  8 20:46:26 2013	(r42196)
@@ -1742,8 +1742,8 @@ This is the file called 'foo2'</screen>
     <title>Images</title>
 
     <important>
-      <para>Image support in the documentation is currently
-	extremely experimental.  The mechanisms described here are
+      <para>Image support in the documentation is somewhat
+	experimental.  The mechanisms described here are
 	unlikely to change, but that is not guaranteed.</para>
 
       <para>Installation of the
@@ -1751,11 +1751,11 @@ This is the file called 'foo2'</screen>
 	port is required.  It is used to convert between the different
 	image formats.  This port is <emphasis>not</emphasis> in
 	the <filename role="package">textproc/docproj</filename> meta
-	port, it must be installed by hand.</para>
+	port, it must be installed separately.</para>
 
       <para>The best example of what follows in practice is the
 	<filename>doc/en_US.ISO8859-1/articles/vm-design/</filename>
-	document.  If the description that follows is unclear, take a
+	document.  If the description that follows is unclear,
 	look at the files in that directory to see how everything
 	hangs together.  Experiment with creating different formatted
 	versions of the document to see how the image markup appears
@@ -1766,7 +1766,7 @@ This is the file called 'foo2'</screen>
       <title>Image Formats</title>
 
       <para>Two image formats are currently supported.  Which to
-	choose will depend on the nature of the image.</para>
+	use depends on the nature of the image.</para>
 
       <para>Images that are primarily vector based, such as network
 	diagrams, time lines, and similar, should be in
@@ -1787,8 +1787,8 @@ This is the file called 'foo2'</screen>
 	expected that documentation will have a mix of
 	<acronym>EPS</acronym> and <acronym>PNG</acronym> images.  The
 	<filename>Makefile</filename>s ensure that the correct format
-	image is chosen depending on the output format that you use
-	for your documentation.  <emphasis>Do not commit the same
+	image is chosen depending on the output format used.
+	<emphasis>Do not commit the same
 	image to the repository in two different
 	  formats</emphasis>.</para>
 
@@ -1801,11 +1801,49 @@ This is the file called 'foo2'</screen>
       </important>
     </sect2>
 
+    <sect2 id="docbook-markup-image-file-locations">
+      <title>Image File Locations</title>
+
+      <para>Image files can be stored in one of several
+	locations, depending on the document and image:</para>
+
+      <itemizedlist>
+	<listitem>
+	  <para>In the same directory as the document itself, usually
+	    done for articles and small books that keep all their
+	    files in a single directory.</para>
+	</listitem>
+
+	<listitem>
+	  <para>In a subdirectory of the main document.  Typically
+	    done when a large book uses separate subdirectories to
+	    organize individual chapters.</para>
+
+	  <para>When images are stored in a subdirectory of the
+	    main document directory, the subdirectory name must be
+	    included in their paths in the
+	    <filename>Makefile</filename> and the
+	    <sgmltag>imagedata</sgmltag> element.</para>
+	</listitem>
+
+	<listitem>
+	  <para>In a subdirectory of
+	    <filename class="directory">doc/share/images</filename>
+	    named after the document.  For example, images for the
+	    Handbook are stored in <filename
+	      class="directory">doc/share/images/books/handbook</filename>.
+	    Images that work for multiple translations are stored in
+	    this upper level of the documentation file tree.
+	    Generally, these are images that can be used unchanged in
+	    non-English translations of the document.</para>
+	</listitem>
+      </itemizedlist>
+    </sect2>
+
     <sect2 id="docbook-markup-image-markup">
       <title>Image Markup</title>
 
-      <para>The markup for an image is relatively simple.  First,
-	markup a <sgmltag>mediaobject</sgmltag>.  The
+      <para>Images are included as part of a <sgmltag>mediaobject</sgmltag>.  The
 	<sgmltag>mediaobject</sgmltag> can contain other, more
 	specific objects.  We are concerned with two, the
 	<sgmltag>imageobject</sgmltag> and the
@@ -1814,7 +1852,7 @@ This is the file called 'foo2'</screen>
       <para>Include one <sgmltag>imageobject</sgmltag>,
 	and two <sgmltag>textobject</sgmltag> elements.  The
 	<sgmltag>imageobject</sgmltag> will point to the name of the
-	image file (without the extension).  The
+	image file without the extension.  The
 	<sgmltag>textobject</sgmltag> elements contain information
 	that will be presented to the user as well as, or instead of,
 	the image itself.</para>
@@ -1825,10 +1863,10 @@ This is the file called 'foo2'</screen>
       <itemizedlist>
 	<listitem>
 	  <para>When the reader is viewing the documentation in
-	    <acronym>HTML</acronym>.  In this case, each image will
-	    need associated alternate text to show the user, typically
-	    while the image is loading, or if they hover the mouse
-	    pointer over the image.</para>
+	    <acronym>HTML</acronym>.  In this case, each image
+	    needs associated alternate text to show the user, typically
+	    while the image is loading, or if the mouse
+	    pointer is hovered over the image.</para>
 	</listitem>
 
 	<listitem>
@@ -1843,24 +1881,23 @@ This is the file called 'foo2'</screen>
       <para>An example will make things easier to understand.  Suppose
 	there is an image called <filename>fig1.png</filename> that is
 	to be included in the document.  This image is of a rectangle
-	with an A inside it.  The markup for this would be as
-	follows.</para>
+	with an A inside it:</para>
 
-      <programlisting>&lt;mediaobject>
-  &lt;imageobject>
-    &lt;imagedata fileref="fig1"> <co id="co-image-ext"/>
-  &lt;/imageobject>
+      <programlisting><sgmltag class="starttag">mediaobject</sgmltag>
+  <sgmltag class="starttag">imageobject</sgmltag>
+    <sgmltag class="starttag">imagedata fileref="fig1"</sgmltag> <co id="co-image-ext"/>
+  <sgmltag class="endtag">imageobject</sgmltag>
 
-  &lt;textobject>
-    &lt;literallayout class="monospaced">+---------------+ <co id="co-image-literal"/>
+  <sgmltag class="starttag">textobject</sgmltag>
+    <sgmltag class="starttag">literallayout class="monospaced"</sgmltag>+---------------+ <co id="co-image-literal"/>
 |       A       |
-+---------------+&lt;/literallayout>
-  &lt;/textobject>
++---------------+<sgmltag class="endtag">literallayout</sgmltag>
+  <sgmltag class="endtag">textobject</sgmltag>
 
-  &lt;textobject>
-    &lt;phrase>A picture&lt;/phrase> <co id="co-image-phrase"/>
-  &lt;/textobject>
-&lt;/mediaobject></programlisting>
+  <sgmltag class="starttag">textobject</sgmltag>
+    <sgmltag class="starttag">phrase</sgmltag>A picture<sgmltag class="endtag">phrase</sgmltag> <co id="co-image-phrase"/>
+  <sgmltag class="endtag">textobject</sgmltag>
+<sgmltag class="endtag">mediaobject</sgmltag></programlisting>
 
       <calloutlist>
 	<callout arearefs="co-image-ext">
@@ -1940,7 +1977,7 @@ IMAGES+= fig3.png
 	<filename>chapter1/chapter.xml</filename>,
 	<filename>chapter2/chapter.xml</filename>, and
 	<filename>chapter3/chapter.xml</filename>.  If each chapter
-	has images associated with it, it is suggested to place
+	has images associated with it, place
 	those images in each chapter's subdirectory
 	(<filename>chapter1/</filename>,
 	<filename>chapter2/</filename>, and
@@ -1958,14 +1995,14 @@ IMAGES+= fig3.png
 	<filename>chapter1/chapter.xml</filename> should
 	contain:</para>
 
-      <programlisting>&lt;mediaobject>
-  &lt;imageobject>
-    &lt;imagedata fileref="chapter1/fig1"> <co id="co-image-dir"/>
-  &lt;/imageobject>
+      <programlisting><sgmltag class="starttag">mediaobject</sgmltag>
+  <sgmltag class="starttag">imageobject</sgmltag>
+    <sgmltag class="emptytag">imagedata fileref="chapter1/fig1"</sgmltag> <co id="co-image-dir"/>
+  <sgmltag class="endtag">imageobject</sgmltag>
 
   &hellip;
 
-&lt;/mediaobject></programlisting>
+<sgmltag class="endtag">mediaobject</sgmltag></programlisting>
 
       <calloutlist>
 	<callout arearefs="co-image-dir">
@@ -2011,18 +2048,18 @@ IMAGES=  chapter1/fig1.png
 	<title><literal>id</literal> on Chapters and
 	  Sections</title>
 
-	<programlisting><![CDATA[<chapter id="introduction">
-  <title>Introduction</title>
+	<programlisting><sgmltag class="starttag">chapter id="introduction"</sgmltag>
+  <sgmltag class="starttag">title</sgmltag>Introduction<sgmltag class="endtag">title</sgmltag>
 
-  <para>This is the introduction.  It contains a subsection,
-    which is identified as well.</para>
+  <sgmltag class="starttag">para</sgmltag>This is the introduction.  It contains a subsection,
+    which is identified as well.<sgmltag class="endtag">para</sgmltag>
 
-  <sect1 id="introduction-moredetails">
-    <title>More Details</title>
+  <sgmltag class="starttag">sect1 id="introduction-moredetails"</sgmltag>
+    <sgmltag class="starttag">title</sgmltag>More Details<sgmltag class="endtag">title</sgmltag>
 
-    <para>This is a subsection.</para>
-  </sect1>
-</chapter>]]></programlisting>
+    <sgmltag class="starttag">para</sgmltag>This is a subsection.<sgmltag class="endtag">para</sgmltag>
+  <sgmltag class="endtag">sect1</sgmltag>
+<sgmltag class="endtag">chapter</sgmltag></programlisting>
       </example>
 
       <para>Use descriptive values for <literal>id</literal> names.
@@ -2043,9 +2080,9 @@ IMAGES=  chapter1/fig1.png
       <example>
 	<title><sgmltag>anchor</sgmltag></title>
 
-	<programlisting><![CDATA[<para>This paragraph has an embedded
-  <anchor id="para1">link target in it.  It will not
-  show up in the document.</para>]]></programlisting>
+	<programlisting><sgmltag class="starttag">para</sgmltag>This paragraph has an embedded
+  <sgmltag class="emptytag">anchor id="para1"</sgmltag>link target in it.  It will not
+  show up in the document.<sgmltag class="endtag">para</sgmltag></programlisting>
       </example>
     </sect2>
 
@@ -2066,11 +2103,11 @@ IMAGES=  chapter1/fig1.png
 	  document that includes the <literal>id</literal>
 	  example shown above:</para>
 
-	<programlisting><![CDATA[<para>More information can be found
-  in <xref linkend="introduction"/>.</para>
+	<programlisting><sgmltag class="starttag">para</sgmltag>More information can be found
+  in <sgmltag class="emptytag">xref linkend="introduction"</sgmltag>.<sgmltag class="endtag">para</sgmltag>
 
-<para>More specific information can be found
-  in <xref linkend="introduction-moredetails"/>.</para>]]></programlisting>
+<sgmltag class="starttag">para</sgmltag>More specific information can be found
+  in <sgmltag class="emptytag">xref linkend="introduction-moredetails"</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	<para>The link text will be generated automatically, looking
 	  like (<emphasis>emphasized</emphasis> text indicates the
@@ -2129,11 +2166,12 @@ IMAGES=  chapter1/fig1.png
 	    document that includes the <literal>id</literal>
 	    example.</para>
 
-	  <programlisting><![CDATA[<para>More information can be found in the
-  <link linkend="introduction">sample introduction</link>.</para>
+	  <programlisting><sgmltag class="starttag">para</sgmltag>More information can be found in the
+  <sgmltag class="starttag">link linkend="introduction"</sgmltag>sample introduction<sgmltag class="endtag">link</sgmltag>.<sgmltag class="endtag">para</sgmltag>
 
-<para>More specific information can be found in the
-  <link linkend="introduction-moredetails">sample introduction with more details</link> section.</para>]]></programlisting>
+<sgmltag class="starttag">para</sgmltag>More specific information can be found in the
+  <sgmltag class="starttag">link linkend="introduction-moredetails"</sgmltag>sample introduction with
+    more details<sgmltag class="endtag">link</sgmltag> section.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	  <para>This output will be generated
 	    (<emphasis>emphasized</emphasis> text is used to show the
@@ -2181,12 +2219,12 @@ IMAGES=  chapter1/fig1.png
 
 	  <para>Usage for book links:</para>
 
-	  <programlisting><![CDATA[<para>Read the <ulink
-    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
-    mirror sites</ulink>.</para>]]></programlisting>
+	  <programlisting><sgmltag class="starttag">para</sgmltag>Read the <sgmltag class="starttag">ulink
+    url="&amp;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="&amp;url.books.handbook;/subversion-mirrors.html"</sgmltag>Subversion
+    mirror sites<sgmltag class="endtag">ulink</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	  <para>Appearance:</para>
 
@@ -2199,9 +2237,10 @@ IMAGES=  chapter1/fig1.png
 
 	  <para>Usage for article links:</para>
 
-	  <programlisting><![CDATA[<para>Read this <ulink url="&url.articles.bsdl-gpl;">article
-    about the BSD license</ulink>, or just the <ulink
-    url="&url.articles.bsdl-gpl;#intro">introduction</ulink>.</para>]]></programlisting>
+	  <programlisting><sgmltag class="starttag">para</sgmltag>Read this
+  <sgmltag class="starttag">ulink url="&amp;url.articles.bsdl-gpl;"</sgmltag>article
+    about the BSD license<sgmltag class="endtag">ulink</sgmltag>, or just the
+  <sgmltag class="starttag">ulink url="&amp;url.articles.bsdl-gpl;#intro"</sgmltag>introduction<sgmltag class="endtag">ulink</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	  <para>Appearance:</para>
 
@@ -2215,9 +2254,8 @@ IMAGES=  chapter1/fig1.png
 
 	  <para>Usage:</para>
 
-	  <programlisting><![CDATA[<para>Of course, you could stop reading this document and
-  go to the <ulink url="&url.base;/index.html">FreeBSD
-  home page</ulink> instead.</para>]]></programlisting>
+	  <programlisting><sgmltag class="starttag">para</sgmltag>Of course, you could stop reading this document and go to the
+  <sgmltag class="starttag">ulink url="&amp;url.base;/index.html"</sgmltag>FreeBSD home page<sgmltag class="endtag">ulink</sgmltag> instead.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	  <para>Appearance:</para>
 
@@ -2232,10 +2270,10 @@ IMAGES=  chapter1/fig1.png
 
 	  <para>Usage:</para>
 
-	  <programlisting><![CDATA[<para>Wikipedia has an excellent reference on
-  <ulink
-    url="http://en.wikipedia.org/wiki/GUID_Partition_Table">GUID
-    Partition Tables</ulink>.</para>]]></programlisting>
+	  <programlisting><sgmltag class="starttag">para</sgmltag>Wikipedia has an excellent reference on
+  <sgmltag class="starttag">ulink
+    url="http://en.wikipedia.org/wiki/GUID_Partition_Table"</sgmltag>GUID
+    Partition Tables<sgmltag class="endtag">ulink</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	  <para>Appearance:</para>
 
@@ -2247,9 +2285,9 @@ IMAGES=  chapter1/fig1.png
 	  <para>The link text can be omitted to show the actual
 	    URL:</para>
 
-	  <programlisting><![CDATA[<para>Wikipedia has an excellent reference on
-  GUID Partition Tables: <ulink
-    url="http://en.wikipedia.org/wiki/GUID_Partition_Table"></ulink>.</para>]]></programlisting>
+	  <programlisting><sgmltag class="starttag">para</sgmltag>Wikipedia has an excellent reference on
+  GUID Partition Tables: <sgmltag class="starttag">ulink
+    url="http://en.wikipedia.org/wiki/GUID_Partition_Table"</sgmltag><sgmltag class="endtag">ulink</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	  <para>Appearance:</para>
 

Modified: projects/entities/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/books/handbook/introduction/chapter.xml	Mon Jul  8 19:21:13 2013	(r42195)
+++ projects/entities/en_US.ISO8859-1/books/handbook/introduction/chapter.xml	Mon Jul  8 20:46:26 2013	(r42196)
@@ -123,13 +123,6 @@
 	</listitem>
 
 	<listitem>
-	  <para>&os; is a <emphasis>32-bit</emphasis> operating
-	    system (<emphasis>64-bit</emphasis> on the &itanium;,
-	    AMD64, and &ultrasparc;) and was designed as such from
-	    the ground up.</para>
-	</listitem>
-
-	<listitem>
 	  <indexterm>
 	    <primary>X Window System</primary>
 	  </indexterm>

Modified: projects/entities/en_US.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/books/porters-handbook/book.xml	Mon Jul  8 19:21:13 2013	(r42195)
+++ projects/entities/en_US.ISO8859-1/books/porters-handbook/book.xml	Mon Jul  8 20:46:26 2013	(r42196)
@@ -5768,11 +5768,11 @@ CMAKE_SOURCE_PATH=	&dollar;{WRKSRC}/subp
 	<title>Basic Usage</title>
 
 	<para>If your port requires <literal>gettext</literal>, set
-	  <literal>USES= gettext</literal>, and your
-	  port will inherit a dependency on <filename
-	    role="package">devel/gettext</filename>. Other values for
-	  <literal>gettext</literal> usage are listed in <xref
-	  linkend="uses-values"/>.</para>
+	  <literal>USES= gettext</literal>, and your port will inherit
+	  a dependency on
+	  <filename role="package">devel/gettext</filename>.  Other
+	  values for <literal>gettext</literal> usage are listed in
+	  <xref linkend="uses-values"/>.</para>
 
 	<para>A rather common case is a port using
 	  <literal>gettext</literal> and <command>configure</command>.
@@ -6297,7 +6297,7 @@ USE_XORG=	x11 xpm</programlisting>
 	</sect3>
 
 	<sect3 id="updating-desktop-database">
-	  <title>Updating desktop database</title>
+	  <title>Updating Desktop Database</title>
 
 	  <para>If a port has a MimeType entry in its
 	    <filename><replaceable>portname</replaceable>.desktop</filename>,
@@ -15743,8 +15743,8 @@ Reference: &lt;http://www.freebsd.org/po
 	      <entry>901501</entry>
 	      <entry>November 11, 2012</entry>
 	      <entry>9.1-STABLE after LIST_PREV() added to queue.h
-	      (rev <svnref>242893</svnref>) and KBI change in USB
-	      serial devices (rev <svnref>240659</svnref>).</entry>
+		(rev <svnref>242893</svnref>) and KBI change in USB
+		serial devices (rev <svnref>240659</svnref>).</entry>
 	    </row>
 
 	    <row>
@@ -16011,8 +16011,8 @@ Reference: &lt;http://www.freebsd.org/po
 	    <row>
 	      <entry>1000028</entry>
 	      <entry>February 13, 2013</entry>
-	      <entry>10-CURRENT after USB moved to the driver structure
-		requiring a rebuild of all USB modules (rev
+	      <entry>10-CURRENT after USB moved to the driver
+		structure requiring a rebuild of all USB modules (rev
 		<svnref>246759</svnref>).</entry>
 	    </row>
 

Modified: projects/entities/en_US.ISO8859-1/books/porters-handbook/uses.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/books/porters-handbook/uses.xml	Mon Jul  8 19:21:13 2013	(r42195)
+++ projects/entities/en_US.ISO8859-1/books/porters-handbook/uses.xml	Mon Jul  8 20:46:26 2013	(r42196)
@@ -19,8 +19,9 @@
 <row>
   <entry><literal>ada</literal></entry>
   <entry>(none)</entry>
-  <entry>Depends on an <application>Ada</application>-capable compiler, and
-    sets <makevar>CC</makevar> accordingly.</entry>
+
+  <entry>Depends on an <application>Ada</application>-capable
+    compiler, and sets <makevar>CC</makevar> accordingly.</entry>
 </row>
 
 <row>
@@ -39,12 +40,12 @@
 <row>
   <entry><literal>charsetfix</literal></entry>
   <entry>(none)</entry>
-  <entry>Prevents the port from installing <filename>charset.alias</filename>.
-    This should be installed only by
-    <filename role="package">converters/libiconv</filename>.
-    <makevar>CHARSETFIX_MAKEFILEIN</makevar> can be set to a path relative
-    to <makevar>WRKSRC</makevar> if <filename>charset.alias</filename> is
-    not installed by
+  <entry>Prevents the port from installing
+    <filename>charset.alias</filename>.  This should be installed only
+    by <filename role="package">converters/libiconv</filename>.
+    <makevar>CHARSETFIX_MAKEFILEIN</makevar> can be set to a path
+    relative to <makevar>WRKSRC</makevar> if
+    <filename>charset.alias</filename> is not installed by
     <makevar>WRKSRC</makevar>/<filename>Makefile.in</filename>.</entry>
 </row>
 
@@ -64,12 +65,12 @@
 
   <entry>Implies that the port uses the
     <application>update-desktop-database</application> from
-    <filename role="package">devel/desktop-file-utils</filename>.
-    This uses will automatically add a post-install step in such a way
-    that the port itself still can specify there own post-install step
-    if needed.  It also insert lines into the plist for package
-    install and removal to run
-    <application>update-desktop-database</application>.</entry>
+    <filename role="package">devel/desktop-file-utils</filename>.  An
+    extra post-install step will be run without interfering with any
+    post-install steps already in the port
+    <filename>Makefile</filename>.  Lines will be inserted into the
+    plist to run <application>update-desktop-database</application> on
+    package install or removal.</entry>
 </row>
 
 <row>
@@ -85,11 +86,12 @@
   <entry><literal>gettext</literal></entry>
   <entry>(none), <literal>lib</literal>, <literal>build</literal>,
     <literal>run</literal></entry>
-  <entry>Implies that the port uses <filename
-      role="package">devel/gettext</filename> in one way or another.  By
-    default, with no arguments or with the <literal>lib</literal>
-    argument, implies <command>gettext</command> with build-time and 
-    run-time dependencies, <literal>build</literal> implies a build-time
+  <entry>Implies that the port uses
+    <filename role="package">devel/gettext</filename> in one way or
+    another.  By default, with no arguments or with the
+    <literal>lib</literal> argument, implies
+    <command>gettext</command> with build-time and run-time
+    dependencies, <literal>build</literal> implies a build-time
     dependency, and <literal>run</literal> implies a run-time
     dependency.</entry>
 </row>
@@ -99,15 +101,16 @@
   <entry>(none)</entry>
   <entry>Implies that the port uses <filename
       role="package">converters/libiconv</filename> as build-time and
-    run-time dependency.
-  </entry>
+    run-time dependency.</entry>
 </row>
 
 <row>
   <entry><literal>ncurses</literal></entry>
-  <entry>(none), <literal>base</literal>, <literal>port</literal></entry>
-  <entry>Implies that the port uses <application>ncurses</application>, and
-    causes some useful variables to be set.</entry>
+  <entry>(none), <literal>base</literal>,
+    <literal>port</literal></entry>
+  <entry>Implies that the port uses
+    <application>ncurses</application>, and causes some useful
+    variables to be set.</entry>
 </row>
 
 <row>
@@ -151,9 +154,10 @@
 <row>
   <entry><literal>readline</literal></entry>
   <entry>(none), port</entry>
-  <entry>Implies that the port uses <application>readline</application> as
-    library dependency, and sets <makevar>CPPFLAGS</makevar> and
-    <makevar>LDFLAGS</makevar> as necessary.</entry>
+  <entry>Implies that the port uses
+    <application>readline</application> as library dependency, and
+    sets <makevar>CPPFLAGS</makevar> and <makevar>LDFLAGS</makevar> as
+    necessary.</entry>
 </row>
 
 <row>
@@ -174,23 +178,26 @@
 <row>
   <entry><literal>shebangfix</literal></entry>
   <entry>(none)</entry>
-  <entry>A lot of software uses incorrect locations for script interpreters,
-    most notably <filename>/usr/bin/perl</filename> and
-    <filename>/bin/bash</filename>.  This fixes shebang lines in scripts
-    listed in <makevar>SHEBANG_FILES</makevar>.  Currently
-    <application>Perl</application>, <application>Python</application>,
+  <entry>A lot of software uses incorrect locations for script
+    interpreters, most notably <filename>/usr/bin/perl</filename> and
+    <filename>/bin/bash</filename>.  This fixes shebang lines in
+    scripts listed in <makevar>SHEBANG_FILES</makevar>.  Currently
+    <application>Perl</application>,
+    <application>Python</application>,
     <application>Bash</application>, <application>Ruby</application>,
-    and <application>PHP</application> are supported by default.
-    To support another interpreter, set <makevar>SHEBANG_LANG</makevar>
-    (for example <literal><makevar>SHEBANG_LANG</makevar>=lua</literal>), then
-    <makevar>lua_OLD_CMD</makevar> and <makevar>lua_CMD</makevar>.</entry>
+    and <application>PHP</application> are supported by default.  To
+    support another interpreter, set <makevar>SHEBANG_LANG</makevar>
+    (for example
+    <literal><makevar>SHEBANG_LANG</makevar>=lua</literal>), then
+    <makevar>lua_OLD_CMD</makevar> and
+    <makevar>lua_CMD</makevar>.</entry>
 </row>
 
 <row>
   <entry><literal>zenoss</literal></entry>
   <entry>(none)</entry>
-  <entry>Implies the port uses <filename
-      role="package">net-mgmt/zenoss</filename> in one way or another,
-    but largely is used for building zenoss related zenpack
+  <entry>Implies the port uses
+    <filename role="package">net-mgmt/zenoss</filename> in one way or
+    another, but largely is used for building zenoss related zenpack
     ports.</entry>
 </row>

Modified: projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml	Mon Jul  8 19:21:13 2013	(r42195)
+++ projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml	Mon Jul  8 20:46:26 2013	(r42196)
@@ -18,7 +18,7 @@
 
     <!-- XXX: keep updating the number of entries -->
     <p>Thanks to all the reporters for the excellent work!  This report
-      contains 14 entries and we hope you enjoy reading it.</p>
+      contains 21 entries and we hope you enjoy reading it.</p>
 
     <!-- XXX: set date for the next set of submissions -->
     <p>The deadline for submissions covering between July and September 2013
@@ -67,6 +67,12 @@
     <description>Documentation</description>
   </category>
 
+  <category>
+    <name>event</name>
+
+    <description>Events</description>
+  </category>
+
   <project cat='proj'>
     <title>PC-BSD</title>
 
@@ -699,7 +705,7 @@
     </help>
   </project>
 
-  <project cat='proj'>
+  <project cat='bin'>
     <title>LLDB Debugger Port</title>
 
     <contact>
@@ -751,4 +757,464 @@
 	system.</task>
     </help>
   </project>
+
+  <project cat='kern'>
+    <title>Native iSCSI Stack</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Edward Tomasz</given>
+	  <common>Napiera&#322;a</common>
+	</name>
+	<email>trasz@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="https://wiki.freebsd.org/Native%20iSCSI%20target"/>
+    </links>
+
+    <body>
+      <p>The native kernel iSCSI target and initiator project progressed
+	well over the April to June period.  The primary focus was to
+	introduce support for iSER (iSCSI over RDMA) in both the
+	initiator and the target.  Prerequisite for this was merging
+	some common parts together and implementing a workaround for the
+	lack of iSER support in userspace.  Apart from that, there were
+	a myriad of smaller improvements.  Such as creating more
+	user-friendly administration utilities, for example
+	<tt>iscsictl(8)</tt> which displays SCSI device nodes for each
+	iSCSI session.  This frees the user from getting the same
+	information through <tt>camcontrol(8)</tt>.  But there are
+	improvements in logging and manual pages as well.</p>
+
+      <p>Once the iSER support becomes stable, the work will focus on
+	performance optimizations.  The plan is to commit both the new
+	initiator and target in August to allow shipping them in 10.0.
+	The project will continue with implementing support for software
+	iWARP stack (useful mostly for testing and development), SCSI
+	passthrough and various other improvements.</p>
+
+	<p>This project is being sponsored by the &os; Foundation.</p>
+    </body>
+
+    <help>
+      <task>Performance optimization.</task>
+      <task>Merge to &os; <tt>head</tt>.</task>
+    </help>
+  </project>
+
+  <project cat='team'>
+    <title>&os; Postmaster Team</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>&os;</given>
+	  <common>Postmaster Team</common>
+	</name>
+	<email>postmaster@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links/>
+
+    <body>
+      <p>In the second quarter of 2013, the &os; Postmaster Team has
+	implemented the following items that may be interest of the
+	general public:</p>
+
+      <ul>
+	<li>With help from <tt>clusteradm</tt>, found that
+	  <tt>unbound</tt> (the resolver used on <tt>mx1</tt> and
+	  <tt>mx2</tt>) is configured to perform DNSSEC validation which
+	  implies that if a signed zone fails validation,
+	  <tt>unbound</tt> refuses to use the information.  This had
+	  caused one person to be unable to exchange email with
+	  <tt>&os;.org</tt> until the zone signatures were
+	  refreshed.</li>
+
+	<li>Created the <tt>freebsd-dtrace</tt> mailing list per George
+	  Neville-Neil.</li>
+
+	<li>Resurrected the <tt>freebsd-testing</tt> mailing list per
+	  Garrett Cooper.</li>
+
+	<li>Created the <tt>freebsd-tex</tt> mailing list per Hiroki
+	  Sato.</li>
+
+	<li>In response to another comment that our message rejection
+	  message was unclear in the case that greylisting was the
+	  reason, re-worded that message.</li>
+
+	<li>Augmented the allowable MIME types for <tt>secteam</tt> with
+	  the following to permit sending encrypted messages:
+
+	  <ul>
+	    <li><tt>application/pgp-encrypted</tt></li>
+	    <li><tt>application/pkcs7-encrypted</tt></li>
+	    <li><tt>application/x-pkcs7-encrypted</tt></li>
+	    <li><tt>multipart/encrypted</tt></li>
+	  </ul>
+	</li>
+
+	<li>Initiated de-orbit for <tt>freebsd-mozilla</tt> in favor of
+	  <tt>freebsd-gecko</tt>.</li>
+      </ul>
+    </body>
+  </project>
+
+  <project cat='bin'>
+    <title>Capsicum</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Pawel Jakub</given>
+	  <common>Dawidek</common>
+	</name>
+	<email>pjd@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Capsicum</given>
+	  <common>Mailing List</common>
+	</name>
+	<email>cl-capsicum-discuss@lists.cam.ac.uk</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://www.cl.cam.ac.uk/research/security/capsicum/"/>
+      <url href="https://lists.cam.ac.uk/mailman/listinfo/cl-capsicum-discuss"/>
+    </links>
+
+    <body>
+      <p>Capsicum (lightweight OS capability and sandbox framework) is
+	being actively worked on.  In the last few months the following
+	tasks have been completed:</p>
+
+      <ul>
+	<li>Committed Capsicum overhaul to &os; <tt>head</tt> (r247602).
+	  This allows to use capability rights in more places, simplifies
+	  kernel code and implements ability to limit <tt>ioctl(2)</tt>
+	  and <tt>fcntl(2)</tt> system calls.</li>
+
+	<li><tt>hastd(8)</tt> is now using Capsicum for sandboxing, as
+	  whitelisting ioctls is possible (r248297).</li>
+
+	<li><tt>auditdistd(8)</tt> is now using Capsicum for sandboxing,
+	  as it is now possible to setup append-only restriction on file
+	  descriptor (available in Perforce).</li>
+
+	<li>Implemented <tt>connectat(2)</tt> and <tt>bindat(2)</tt>
+	  system calls for UNIX domain sockets that are allowed in
+	  capability mode (r247667).</li>
+
+	<li>Implemented <tt>chflagsat(2)</tt> system call
+	  (r248599).</li>
+
+	<li>Revised the Casper daemon for application capabilities.</li>
+
+	<li>Implemented <tt>libcapsicum</tt> for application
+	  capabilities.</li>
+
+	<li>Implemented various Casper services to be able to use more
+	  functionality within a sandbox: <tt>system.dns</tt>,
+	  <tt>system.pwd</tt>, <tt>system.grp</tt>,
+	  <tt>system.random</tt>, <tt>system.filesystem</tt>,
+	  <tt>system.socket</tt>, <tt>system.sysctl</tt>.</li>
+
+	<li>Implemented Capsicum sandboxing for <tt>kdump(1)</tt> (from
+	  r251073 to r251167).  The version in Perforce also supports
+	  sandboxing for the <tt>-r</tt> flag, using Casper
+	  services.</li>
+
+	<li>Implemented Capsicum sandboxing for <tt>dhclient(8)</tt>
+	  (from r252612 to r252697).</li>
+
+	<li>Implemented Capsicum sandboxing for <tt>tcpdump(8)</tt>
+	  (available in Perforce).</li>
+
+	<li>Implemented Capsicum sandboxing for <tt>libmagic(3)</tt>
+	  (available in Perforce).</li>
+
+	<li>Implemented the <tt>libnv</tt> library for name/value pairs
+	  handling in the hope of wider adaptation across &os;.</li>
+      </ul>
+
+      <p>For Capsicum-based sandboxing in the &os; base system, the
+	commits referenced above and the provided code aim to serve as
+	examples.  We would like to see more &os; tools to be sandboxed
+	&mdash; every tool that can parse data from untrusted sources,
+	for example.  This requires deep understanding of how the tool
+	in question works, not necessarily only Capsicum.</p>
+
+      <p>This work is being sponsored by the &os; Foundation.</p>
+    </body>
+
+    <help>
+      <task>Get involved, make the Internet finally(!) a secure place.
+	Contact us at the <tt>cl-capsicum-discuss</tt> mailing list,
+	where we can provide guidelines on how to do sandboxing
+	properly.  The fame is there, waiting.</task>
+    </help>
+  </project>
+
+  <project cat='ports'>
+    <title>Xfce/&os;</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>&os; Xfce Team</given>
+	</name>
+	<email>xfce@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="https://wiki.freebsd.org/Xfce"/>
+    </links>
+
+    <body>
+      <p>The &os; Xfce Team has updated its ports to the latest stable
+	releases, especially:</p>
+
+      <ul>
+	<li>Core (mostly bugfixes and translation updates):</li>
+
+	<ul>
+	  <li><tt>deskutils/xfce4-tumbler</tt> (0.1.29)</li>
+	  <li><tt>x11-wm/xfce4-panel</tt> (4.10.1)</li>
+	  <li><tt>sysutils/xfce4-settings</tt> (4.10.1)</li>
+	  <li><tt>x11-wm/xfce4-session</tt> (4.10.1)</li>
+	  <li><tt>sysutils/garcon</tt> (0.2.1)</li>
+	  <li><tt>x11/libxfce4util</tt> (4.10.1)</li>
+	  <li><tt>x11-wm/xfce4-wm</tt> (4.10.1)</li>
+	</ul>
+
+	<li>Applications:</li>
+
+	<ul>
+	  <li><tt>multimedia/xfce4-parole</tt> (0.5.1)</li>
+	  <li><tt>www/midori</tt> (0.5.2)</li>
+	  <li><tt>deskutils/xfce4-notifyd</tt> (0.2.4)</li>
+	  <li><tt>misc/xfce4-appfinder</tt> (4.10.1)</li>
+	  <li><tt>x11/xfce4-terminal</tt> (0.6.2)</li>
+	  <li><tt>x11-fm/thunar</tt> (1.6.3)</li>
+	</ul>
+
+	<li>Panel plugins:</li>
+
+	<ul>
+	  <li><tt>deskutils/xfce4-xkb-plugin</tt> (0.5.6)</li>
+	  <li><tt>textproc/xfce4-dict-plugin</tt> (0.7.0)</li>
+	  <li><tt>x11-clocks/xfce4-timer-plugin</tt> (1.5.0)</li>
+	  <li><tt>x11/xfce4-embed-plugin</tt> (new)</li>
+	</ul>
+
+	<li>Thunar plugins:</li>
+
+	<ul>
+	  <li><tt>audio/thunar-media-tags-plugin</tt> (0.2.1)</li>
+	  <li><tt>archivers/thunar-archive-plugin</tt> (0.3.1)</li>
+	</ul>
+
+	<li><tt>x11/xfce4-embed-plugin</tt> can integrate any
+	  application window into the Xfce panel.</li>
+
+	<li>A new plugin is also available which monitors and displays earthquakes,
+	  it is called <a
+	    href="http://people.freebsd.org/~olivierd/xfce4-equake-plugin.shar">xfce4-equake-plugin</a>.</li>
+      </ul>
+    </body>
+
+    <help>
+      <task>Fix CPU issue with <tt>textproc/xfce4-dict-plugin</tt> (<a
+	  href="https://bugzilla.xfce.org/show_bug.cgi?id=10103">bug #10103</a>).</task>
+
+      <task>Investigate why <tt>midori-gtk3</tt> crashes too often.
+	(The port is finished, but some libraries are not present by
+	default in ports tree).</task>
+
+      <task>Fix <tt>x11-themes/gtk-xfce-engine</tt> with Gtk+ >=3.6.</task>
+    </help>
+  </project>
+
+  <project cat='team'>
+    <title>&os; Security Team</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>&os; Security Team</given>
+	</name>
+	<email>secteam@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links/>
+
+    <body>
+      <p>On April 15th Dag-Erling Sm&oslash;rgrav and Xin Li took over
+	as security officers for the &os; Project, and the team welcomed
+	Qing Li back in the team in June.  This report briefly
+	summarizes the work of the Security Team from April until the
+	end of June.</p>
+
+      <p>The Security Team has released the following advisories:</p>
+
+      <ul>
+	<li><tt>FreeBSD-SA-13:05.nfsserver</tt>: Insufficient input
+	  validation in the NFS server (<tt>nfsd(8)</tt>), reported by
+	  Adam Nowacki.</li>
+
+	<li><tt>FreeBSD-SA-13:06.mmap</tt>: Privilege escalation via
+	  <tt>mmap()</tt>, reported by Konstantin Belousov.</li>
+
+	<li><tt>FreeBSD-EN-13:02.vtnet</tt>: <tt>vtnet(4)</tt>
+	  network interface issue on QEMU 1.4.0 and later in 8.4-RELEASE,
+	  reported by Julian Stecklina.</li>
+
+	<li><tt>FreeBSD-EN-13:01.fxp</tt>: <tt>dhclient(8)</tt> utility
+	  issue on <tt>fxp(4)</tt> network interface in 8.4-RELEASE,
+	  reported by Michael L. Squires.</li>
+      </ul>
+
+      <p>Per request of Baptiste Daroussin, the Security Team has also
+	reviewed the source code of Poudriere, the port build and test
+	system which is planned to be used for producing <tt>pkg(8)</tt>
+	("new-style") packages on the &os; cluster.</p>
+    </body>
+  </project>
+
+  <project cat='event'>
+    <title>BSD-Day 2013</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>G&aacute;bor</given>
+	  <common>P&aacute;li</common>
+	</name>
+	<email>pgj@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://bsdday.eu/2013">BSD-Day 2013 web site</url>
+      <url
+	href="http://www.youtube.com/playlist?list=PLJJHfhjb5TOjB-sHRwJBGWd8XA7nc1gk_">YouTube playlist of talks</url>
+      <url
+	href="https://picasaweb.google.com/116452848880746560170/BSDDay2013?authkey=Gv1sRgCNvIoMWoxNTRYw">Event photo album</url>
+    </links>
+
+    <body>
+      <p>The BSD-Day is a now recurring excuse for BSD developers and
+	users to meet up in person, share some beers and talk about what
+	they are working on these days.  There was a detour this year to
+	visit the beautiful city of Naples of Italy, the home of pizza.
+	Fortunately, the event has again gained support from numerous
+	and generous sponsors, such as the &os; Foundation, the EMC
+	Corporation, iXsystems, FreeBSDMall, BSD Magazine, and many
+	others which enabled us to cover the costs of travel and
+	accommodation for the speakers.  We are really grateful for
+	this!</p>
+
+      <p>Similarly to the previous years, the whole event started with a
+	common dinner in the downtown (somewhere around the Ireland
+	Irish Pub) on Friday which suddenly turned into a do-it-yourself
+	pizza-fest.  Then it was followed by the Saturday event at the
+	Institute of Biostructures and Bioimaging.  There we had a lot
+	of attendees for the associated BSDA exam in the morning &mdash;
+	8 persons!  The event itself had many interesting topics as
+	well, for example moving MCLinker into the BSD world,
+	organization and culture of the &os; Project, the new
+	<tt>callout(9)</tt> framework, building and testing ports with
+	Poudriere and Tinderbox, &os; in the embedded space, or building
+	reliable VPN networks with OpenBSD.  See the links in the report
+	for more.</p>
+    </body>
+  </project>
+
+  <project cat='ports'>
+    <title>xorg on &os;</title>
+
+    <contact>
+      <person>
+	<email>x11@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Niclas</given>
+	  <common>Zeising</common>
+	</name>
+	<email>zeising@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Koop</given>
+	  <common>Mast</common>
+	</name>
+	<email>kwm@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://wiki.freebsd.org/Xorg"/>
+      <url href="http://trillian.chruetertee.ch/ports/browser/trunk"/>
+    </links>
+
+    <body>
+      <p>During the beginning of this quarter, work focused on making

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

From owner-svn-doc-projects@FreeBSD.ORG  Tue Jul  9 19:06:20 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 9842D8BE;
 Tue,  9 Jul 2013 19:06:20 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 889AF15C6;
 Tue,  9 Jul 2013 19:06:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r69J6Ktw004416;
 Tue, 9 Jul 2013 19:06:20 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r69J6Klv004414;
 Tue, 9 Jul 2013 19:06:20 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201307091906.r69J6Klv004414@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Tue, 9 Jul 2013 19:06:20 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42225 - in projects/entities:
 en_US.ISO8859-1/books/fdp-primer/docbook-markup
 en_US.ISO8859-1/books/handbook/eresources en_US.ISO8859-1/htdocs/news/status
 en_US.ISO8859-1/share/xml sha...
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jul 2013 19:06:20 -0000

Author: rene
Date: Tue Jul  9 19:06:20 2013
New Revision: 42225
URL: http://svnweb.freebsd.org/changeset/doc/42225

Log:
  MFH up to r42224.

Modified:
  projects/entities/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
  projects/entities/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
  projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml
  projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2013-05-devsummit.xml
  projects/entities/en_US.ISO8859-1/share/xml/mailing-lists.ent
  projects/entities/share/xml/events2013.xml
  projects/entities/share/xml/templates.events.xsl
Directory Properties:
  projects/entities/bn_BD.ISO10646-1/   (props changed)
  projects/entities/da_DK.ISO8859-1/   (props changed)
  projects/entities/de_DE.ISO8859-1/   (props changed)
  projects/entities/el_GR.ISO8859-7/   (props changed)
  projects/entities/en_US.ISO8859-1/   (props changed)
  projects/entities/es_ES.ISO8859-1/   (props changed)
  projects/entities/fr_FR.ISO8859-1/   (props changed)
  projects/entities/hu_HU.ISO8859-2/   (props changed)
  projects/entities/it_IT.ISO8859-15/   (props changed)
  projects/entities/ja_JP.eucJP/   (props changed)
  projects/entities/mn_MN.UTF-8/   (props changed)
  projects/entities/nl_NL.ISO8859-1/   (props changed)
  projects/entities/no_NO.ISO8859-1/   (props changed)
  projects/entities/pl_PL.ISO8859-2/   (props changed)
  projects/entities/pt_BR.ISO8859-1/   (props changed)
  projects/entities/release/   (props changed)
  projects/entities/ru_RU.KOI8-R/   (props changed)
  projects/entities/share/   (props changed)
  projects/entities/sr_YU.ISO8859-2/   (props changed)
  projects/entities/tr_TR.ISO8859-9/   (props changed)
  projects/entities/zh_CN.GB2312/   (props changed)
  projects/entities/zh_TW.Big5/   (props changed)

Modified: projects/entities/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Tue Jul  9 18:18:06 2013	(r42224)
+++ projects/entities/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Tue Jul  9 19:06:20 2013	(r42225)
@@ -60,7 +60,7 @@
       should be presented.</para>
 
     <para>The DocBook <acronym>DTD</acronym> is available from the
-      Ports&nbsp;Collection in the
+      Ports Collection in the
       <filename role="package">textproc/docbook-xml-450</filename>
       port.  It is automatically installed as part of the
       <filename role="package">textproc/docproj</filename>
@@ -114,7 +114,7 @@
     </note>
 
     <para>The &os; extensions are not (currently) in the
-      Ports&nbsp;Collection.  They are stored in the &os; Subversion
+      Ports Collection.  They are stored in the &os; Subversion
       tree, as <ulink
 	url="http://svnweb.FreeBSD.org/doc/head/share/xml/freebsd.dtd">head/share/xml/freebsd.dtd</ulink>.</para>
   </sect1>
@@ -195,33 +195,33 @@
 	<!-- Cannot put this in a marked section because of the
 	  replaceable elements -->
 
-	<programlisting>&lt;book&gt;
-  &lt;bookinfo&gt;
-    &lt;title&gt;<replaceable>Your Title Here</replaceable>&lt;/title&gt;
-
-    &lt;author&gt;
-      &lt;firstname><replaceable>Your first name</replaceable>&lt;/firstname&gt;
-      &lt;surname&gt;<replaceable>Your surname</replaceable>&lt;/surname&gt;
-      &lt;affiliation&gt;
-        &lt;address&gt;&lt;email&gt;<replaceable>Your email address</replaceable>&lt;/email&gt;&lt;/address&gt;
-      &lt;/affiliation&gt;
-    &lt;/author&gt;
-
-    &lt;copyright&gt;
-      &lt;year&gt;<replaceable>1998</replaceable>&lt;/year&gt;
-      &lt;holder role="mailto:<replaceable>your email address</replaceable>"&gt;<replaceable>Your name</replaceable>&lt;/holder&gt;
-    &lt;/copyright&gt;
-
-    &lt;releaseinfo&gt;&#36;FreeBSD&#36;&lt;/releaseinfo&gt;
-
-    &lt;abstract&gt;
-      &lt;para&gt;<replaceable>Include an abstract of the book's contents here.</replaceable>&lt;/para&gt;
-    &lt;/abstract&gt;
-  &lt;/bookinfo&gt;
+	<programlisting><sgmltag class="starttag">book</sgmltag>
+  <sgmltag class="starttag">bookinfo</sgmltag>
+    <sgmltag class="starttag">title</sgmltag><replaceable>Your Title Here</replaceable><sgmltag class="endtag">title</sgmltag>
+
+    <sgmltag class="starttag">author</sgmltag>
+      <sgmltag class="starttag">firstname</sgmltag><replaceable>Your first name</replaceable><sgmltag class="endtag">firstname</sgmltag>
+      <sgmltag class="starttag">surname</sgmltag><replaceable>Your surname</replaceable><sgmltag class="endtag">surname</sgmltag>
+      <sgmltag class="starttag">affiliation</sgmltag>
+        <sgmltag class="starttag">address</sgmltag><sgmltag class="starttag">email</sgmltag><replaceable>Your email address</replaceable><sgmltag class="endtag">email</sgmltag><sgmltag class="endtag">address</sgmltag>
+      <sgmltag class="endtag">affiliation</sgmltag>
+    <sgmltag class="endtag">author</sgmltag>
+
+    <sgmltag class="starttag">copyright</sgmltag>
+      <sgmltag class="starttag">year</sgmltag><replaceable>1998</replaceable><sgmltag class="endtag">year</sgmltag>
+      <sgmltag class="starttag">holder role="mailto:<replaceable>your email address</replaceable>"</sgmltag><replaceable>Your name</replaceable><sgmltag class="endtag">holder</sgmltag>
+    <sgmltag class="endtag">copyright</sgmltag>
+
+    <sgmltag class="starttag">releaseinfo</sgmltag>&dollar;&os;&dollar;<sgmltag class="endtag">releaseinfo</sgmltag>
+
+    <sgmltag class="starttag">abstract</sgmltag>
+      <sgmltag class="starttag">para</sgmltag><replaceable>Include an abstract of the book's contents here.</replaceable><sgmltag class="endtag">para</sgmltag>
+    <sgmltag class="endtag">abstract</sgmltag>
+  <sgmltag class="endtag">bookinfo</sgmltag>
 
   &hellip;
 
-&lt;/book&gt;</programlisting>
+<sgmltag class="endtag">book</sgmltag></programlisting>
       </example>
     </sect2>
 
@@ -245,33 +245,33 @@
 	<!-- Cannot put this in a marked section because of the
 	  replaceable elements -->
 
-	<programlisting>&lt;article&gt;
-  &lt;articleinfo&gt;
-    &lt;title&gt;<replaceable>Your title here</replaceable>&lt;/title&gt;
-
-    &lt;author&gt;
-      &lt;firstname&gt;<replaceable>Your first name</replaceable>&lt;/firstname&gt;
-      &lt;surname&gt;<replaceable>Your surname</replaceable>&lt;/surname&gt;
-      &lt;affiliation&gt;
-        &lt;address&gt;&lt;email&gt;<replaceable>Your email address</replaceable>&lt;/email&gt;&lt;/address&gt;
-      &lt;/affiliation&gt;
-    &lt;/author&gt;
-
-    &lt;copyright&gt;
-      &lt;year&gt;<replaceable>1998</replaceable>&lt;/year&gt;
-      &lt;holder role="mailto:<replaceable>your email address</replaceable>"&gt;<replaceable>Your name</replaceable>&lt;/holder&gt;
-    &lt;/copyright&gt;
-
-    &lt;releaseinfo&gt;&#36;FreeBSD&#36;&lt;/releaseinfo&gt;
-
-    &lt;abstract&gt;
-      &lt;para&gt;<replaceable>Include an abstract of the article's contents here.</replaceable>&lt;/para&gt;
-    &lt;/abstract&gt;
-  &lt;/articleinfo&gt;
+	<programlisting><sgmltag class="starttag">article</sgmltag>
+  <sgmltag class="starttag">articleinfo</sgmltag>
+    <sgmltag class="starttag">title</sgmltag><replaceable>Your title here</replaceable><sgmltag class="endtag">title</sgmltag>
+
+    <sgmltag class="starttag">author</sgmltag>
+      <sgmltag class="starttag">firstname</sgmltag><replaceable>Your first name</replaceable><sgmltag class="endtag">firstname</sgmltag>
+      <sgmltag class="starttag">surname</sgmltag><replaceable>Your surname</replaceable><sgmltag class="endtag">surname</sgmltag>
+      <sgmltag class="starttag">affiliation</sgmltag>
+        <sgmltag class="starttag">address</sgmltag><sgmltag class="starttag">email</sgmltag><replaceable>Your email address</replaceable><sgmltag class="endtag">email</sgmltag><sgmltag class="endtag">address</sgmltag>
+      <sgmltag class="endtag">affiliation</sgmltag>
+    <sgmltag class="endtag">author</sgmltag>
+
+    <sgmltag class="starttag">copyright</sgmltag>
+      <sgmltag class="starttag">year</sgmltag><replaceable>1998</replaceable><sgmltag class="endtag">year</sgmltag>
+      <sgmltag class="starttag">holder role="mailto:<replaceable>your email address</replaceable>"</sgmltag><replaceable>Your name</replaceable><sgmltag class="endtag">holder</sgmltag>
+    <sgmltag class="endtag">copyright</sgmltag>
+
+    <sgmltag class="starttag">releaseinfo</sgmltag>&dollar;&os;&dollar;<sgmltag class="endtag">releaseinfo</sgmltag>
+
+    <sgmltag class="starttag">abstract</sgmltag>
+      <sgmltag class="starttag">para</sgmltag><replaceable>Include an abstract of the article's contents here.</replaceable><sgmltag class="endtag">para</sgmltag>
+    <sgmltag class="endtag">abstract</sgmltag>
+  <sgmltag class="endtag">articleinfo</sgmltag>
 
   &hellip;
 
-&lt;/article&gt;</programlisting>
+<sgmltag class="endtag">article</sgmltag></programlisting>
       </example>
     </sect2>
 
@@ -286,11 +286,11 @@
       <example>
 	<title>A Simple Chapter</title>
 
-	<programlisting><![CDATA[<chapter>
-  <title>The Chapter's Title</title>
+	<programlisting><sgmltag class="starttag">chapter</sgmltag>
+  <sgmltag class="starttag">title</sgmltag>The Chapter's Title<sgmltag class="endtag">title</sgmltag>
 
   ...
-</chapter>]]></programlisting>
+<sgmltag class="endtag">chapter</sgmltag></programlisting>
 	</example>
 
 	<para>A chapter cannot be empty; it must contain elements in
@@ -301,11 +301,11 @@
 	<example>
 	  <title>Empty Chapters</title>
 
-	  <programlisting><![CDATA[<chapter>
-  <title>This is An Empty Chapter</title>
+	  <programlisting><sgmltag class="starttag">chapter</sgmltag>
+  <sgmltag class="starttag">title</sgmltag>This is An Empty Chapter<sgmltag class="endtag">title</sgmltag>
 
-  <para></para>
-</chapter>]]></programlisting>
+  <sgmltag class="starttag">para</sgmltag><sgmltag class="endtag">para</sgmltag>
+<sgmltag class="endtag">chapter</sgmltag></programlisting>
       </example>
     </sect2>
 
@@ -330,45 +330,66 @@
       <example>
 	<title>Sections in Chapters</title>
 
-	<programlisting><![CDATA[<chapter>
-  <title>A Sample Chapter</title>
+	<programlisting><sgmltag class="starttag">chapter</sgmltag>
+  <sgmltag class="starttag">title</sgmltag>A Sample Chapter<sgmltag class="endtag">title</sgmltag>
 
-  <para>Some text in the chapter.</para>
+  <sgmltag class="starttag">para</sgmltag>Some text in the chapter.<sgmltag class="endtag">para</sgmltag>
 
-  <sect1>
-    <title>First Section (1.1)</title>
+  <sgmltag class="starttag">sect1</sgmltag>
+    <sgmltag class="starttag">title</sgmltag>First Section<sgmltag class="endtag">title</sgmltag>
 
     &hellip;
-  </sect1>
+  <sgmltag class="endtag">sect1</sgmltag>
 
-  <sect1>
-    <title>Second Section (1.2)</title>
+  <sgmltag class="starttag">sect1</sgmltag>
+    <sgmltag class="starttag">title</sgmltag>Second Section<sgmltag class="endtag">title</sgmltag>
 
-    <sect2>
-      <title>First Sub-Section (1.2.1)</title>
+    <sgmltag class="starttag">sect2</sgmltag>
+      <sgmltag class="starttag">title</sgmltag>First Sub-Section<sgmltag class="endtag">title</sgmltag>
 
-      <sect3>
-        <title>First Sub-Sub-Section (1.2.1.1)</title>
+      <sgmltag class="starttag">sect3</sgmltag>
+	<sgmltag class="starttag">title</sgmltag>First Sub-Sub-Section<sgmltag class="endtag">title</sgmltag>
 
-        &hellip;
-      </sect3>
-    </sect2>
+	&hellip;
+      <sgmltag class="endtag">sect3</sgmltag>
+    <sgmltag class="endtag">sect2</sgmltag>
 
-    <sect2>
-      <title>Second Sub-Section (1.2.2)</title>
+    <sgmltag class="starttag">sect2</sgmltag>
+      <sgmltag class="starttag">title</sgmltag>Second Sub-Section (1.2.2)<sgmltag class="endtag">title</sgmltag>
 
       &hellip;
-    </sect2>
-  </sect1>
-</chapter>]]></programlisting>
+    <sgmltag class="endtag">sect2</sgmltag>
+  <sgmltag class="endtag">sect1</sgmltag>
+<sgmltag class="endtag">chapter</sgmltag></programlisting>
       </example>
 
       <note>
-	<para>This example includes section numbers in the section
-	  titles.  You should not do this in your documents.  Adding
-	  the section numbers is carried out by the stylesheets (of
-	  which more later), and you do not need to manage them
-	  yourself.</para>
+	<para>Section numbers are automatically generated and
+	  prepended to titles when the document is rendered to an
+	  output format.  The generated section numbers and titles
+	  from the example above will be:</para>
+
+	<itemizedlist>
+	  <listitem>
+	    <para>1.1. First Section</para>
+	  </listitem>
+
+	  <listitem>
+	    <para>1.2. Second Section</para>
+	  </listitem>
+
+	  <listitem>
+	    <para>1.2.1. First Sub-Section</para>
+	  </listitem>
+
+	  <listitem>
+	    <para>1.2.1.1. First Sub-Sub-Section</para>
+	  </listitem>
+
+	  <listitem>
+	    <para>1.2.2. Second Sub-Section</para>
+	  </listitem>
+	</itemizedlist>
       </note>
     </sect2>
 
@@ -382,27 +403,27 @@
 	<sgmltag>part</sgmltag>s.  This cannot be done in an
 	<sgmltag>article</sgmltag>.</para>
 
-      <programlisting><![CDATA[<part>
-  <title>Introduction</title>
+      <programlisting><sgmltag class="starttag">part</sgmltag>
+  <sgmltag class="starttag">title</sgmltag>Introduction<sgmltag class="endtag">title</sgmltag>
 
-  <chapter>
-    <title>Overview</title>
+  <sgmltag class="starttag">chapter</sgmltag>
+    <sgmltag class="starttag">title</sgmltag>Overview<sgmltag class="endtag">title</sgmltag>
 
     ...
-  </chapter>
+  <sgmltag class="endtag">chapter</sgmltag>
 
-  <chapter>
-    <title>What is FreeBSD?</title>
+  <sgmltag class="starttag">chapter</sgmltag>
+    <sgmltag class="starttag">title</sgmltag>What is FreeBSD?<sgmltag class="endtag">title</sgmltag>
 
     ...
-  </chapter>
+  <sgmltag class="endtag">chapter</sgmltag>
 
-  <chapter>
-    <title>History</title>
+  <sgmltag class="starttag">chapter</sgmltag>
+    <sgmltag class="starttag">title</sgmltag>History<sgmltag class="endtag">title</sgmltag>
 
     ...
-  </chapter>
-</part>]]></programlisting>
+  <sgmltag class="endtag">chapter</sgmltag>
+<sgmltag class="endtag">part</sgmltag></programlisting>
     </sect2>
   </sect1>
 
@@ -428,8 +449,8 @@
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<para>This is a paragraph.  It can contain just about any
-  other element.</para> ]]></programlisting>
+	<programlisting><sgmltag class="starttag">para</sgmltag>This is a paragraph.  It can contain just about any
+  other element.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -442,8 +463,8 @@
       <title>Block Quotations</title>
 
       <para>A block quotation is an extended quotation from another
-	document that should not appear within the current
-	paragraph.  These are rarely needed.</para>
+	document that should not appear within the current paragraph.
+	These are rarely needed.</para>
 
       <para>Blockquotes can optionally contain a title and an
 	attribution (or they can be left untitled and
@@ -454,20 +475,20 @@
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<para>A small excerpt from the US Constitution:</para>
+	<programlisting><sgmltag class="starttag">para</sgmltag>A small excerpt from the US Constitution:<sgmltag class="endtag">para</sgmltag>
 
-<blockquote>
-  <title>Preamble to the Constitution of the United States</title>
+<sgmltag class="starttag">blockquote</sgmltag>
+  <sgmltag class="starttag">title</sgmltag>Preamble to the Constitution of the United States<sgmltag class="endtag">title</sgmltag>
 
-  <attribution>Copied from a web site somewhere</attribution>
+  <sgmltag class="starttag">attribution</sgmltag>Copied from a web site somewhere<sgmltag class="endtag">attribution</sgmltag>
 
-  <para>We the People of the United States, in Order to form a more
+  <sgmltag class="starttag">para</sgmltag>We the People of the United States, in Order to form a more
     perfect Union, establish Justice, insure domestic Tranquility,
     provide for the common defence, promote the general Welfare, and
     secure the Blessings of Liberty to ourselves and our Posterity, do
     ordain and establish this Constitution for the United States of
-    America.</para>
-</blockquote>]]></programlisting>
+    America.<sgmltag class="endtag">para</sgmltag>
+<sgmltag class="endtag">blockquote</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -537,10 +558,10 @@
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<warning>
-  <para>Installing FreeBSD may make you want to delete Windows from your
-    hard disk.</para>
-</warning>]]></programlisting>
+	<programlisting><sgmltag class="starttag">warning</sgmltag>
+  <sgmltag class="starttag">para</sgmltag>Installing FreeBSD may make you want to delete Windows from your
+    hard disk.<sgmltag class="endtag">para</sgmltag>
+<sgmltag class="endtag">warning</sgmltag></programlisting>
       </example>
 
       <para>Appearance:</para>
@@ -588,39 +609,39 @@
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<itemizedlist>
-  <listitem>
-    <para>This is the first itemized item.</para>
-  </listitem>
-
-  <listitem>
-    <para>This is the second itemized item.</para>
-  </listitem>
-</itemizedlist>
-
-<orderedlist>
-  <listitem>
-    <para>This is the first ordered item.</para>
-  </listitem>
-
-  <listitem>
-    <para>This is the second ordered item.</para>
-  </listitem>
-</orderedlist>
-
-<procedure>
-  <step>
-    <para>Do this.</para>
-  </step>
-
-  <step>
-    <para>Then do this.</para>
-  </step>
-
-  <step>
-    <para>And now do this.</para>
-  </step>
-</procedure>]]></programlisting>
+	<programlisting><sgmltag class="starttag">itemizedlist</sgmltag>
+  <sgmltag class="starttag">listitem</sgmltag>
+    <sgmltag class="starttag">para</sgmltag>This is the first itemized item.<sgmltag class="endtag">para</sgmltag>
+  <sgmltag class="endtag">listitem</sgmltag>
+
+  <sgmltag class="starttag">listitem</sgmltag>
+    <sgmltag class="starttag">para</sgmltag>This is the second itemized item.<sgmltag class="endtag">para</sgmltag>
+  <sgmltag class="endtag">listitem</sgmltag>
+<sgmltag class="endtag">itemizedlist</sgmltag>
+
+<sgmltag class="starttag">orderedlist</sgmltag>
+  <sgmltag class="starttag">listitem</sgmltag>
+    <sgmltag class="starttag">para</sgmltag>This is the first ordered item.<sgmltag class="endtag">para</sgmltag>
+  <sgmltag class="endtag">listitem</sgmltag>
+
+  <sgmltag class="starttag">listitem</sgmltag>
+    <sgmltag class="starttag">para</sgmltag>This is the second ordered item.<sgmltag class="endtag">para</sgmltag>
+  <sgmltag class="endtag">listitem</sgmltag>
+<sgmltag class="endtag">orderedlist</sgmltag>
+
+<sgmltag class="starttag">procedure</sgmltag>
+  <sgmltag class="starttag">step</sgmltag>
+    <sgmltag class="starttag">para</sgmltag>Do this.<sgmltag class="endtag">para</sgmltag>
+  <sgmltag class="endtag">step</sgmltag>
+
+  <sgmltag class="starttag">step</sgmltag>
+    <sgmltag class="starttag">para</sgmltag>Then do this.<sgmltag class="endtag">para</sgmltag>
+  <sgmltag class="endtag">step</sgmltag>
+
+  <sgmltag class="starttag">step</sgmltag>
+    <sgmltag class="starttag">para</sgmltag>And now do this.<sgmltag class="endtag">para</sgmltag>
+  <sgmltag class="endtag">step</sgmltag>
+<sgmltag class="endtag">procedure</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -683,16 +704,16 @@
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<para>When finished, the program will look like
-  this:</para>
+	<programlisting><sgmltag class="starttag">para</sgmltag>When finished, the program will look like
+  this:<sgmltag class="endtag">para</sgmltag>
 
-<programlisting>#include &lt;stdio.h&gt;
+<sgmltag class="starttag">programlisting</sgmltag>#include &amp;lt;stdio.h&amp;gt;
 
 int
 main(void)
 {
     printf("hello, world\n");
-}</programlisting>]]></programlisting>
+}<sgmltag class="endtag">programlisting</sgmltag></programlisting>
 
 	<para>Notice how the angle brackets in the
 	  <literal>#include</literal> line need to be referenced by
@@ -715,49 +736,46 @@ main(void)
     <sect2 id="docbook-markup-callouts">
       <title>Callouts</title>
 
-      <para>A callout is a mechanism for referring back to an
-	earlier piece of text or specific position within an earlier
-	example without linking to it within the text.</para>
-
-      <para>To do this, mark areas of interest in the example
-	(<sgmltag>programlisting</sgmltag>,
-	<sgmltag>literallayout</sgmltag>, or whatever) with the
-	<sgmltag>co</sgmltag> element.  Each element must have a
-	unique <literal>id</literal> assigned to it.  After the
-	example include a <sgmltag>calloutlist</sgmltag> that refers
-	back to the example and provides additional
-	commentary.</para>
+      <para>A callout is a visual marker for referring to a
+	piece of text or specific position within an
+	example.</para>
+
+      <para>Callouts are marked with the <sgmltag>co</sgmltag>
+	element.  Each element must have a unique
+	<literal>id</literal> assigned to it.  After the example,
+	include a <sgmltag>calloutlist</sgmltag> that describes each
+	callout.</para>
 
       <example>
 	<title><sgmltag>co</sgmltag> and
 	  <sgmltag>calloutlist</sgmltag></title>
 
-	<programlisting><![CDATA[<para>When finished, the program will look like
-  this:</para>
+	<programlisting><sgmltag class="starttag">para</sgmltag>When finished, the program will look like
+  this:<sgmltag class="endtag">para</sgmltag>
 
-<programlisting>#include &lt;stdio.h&gt; <co id="co-ex-include"/>
+<sgmltag class="starttag">programlisting</sgmltag>#include &amp;lt;stdio.h&amp;gt; <sgmltag class="emptytag">co id="co-ex-include"</sgmltag>
 
-int <co id="co-ex-return"/>
+int <sgmltag class="emptytag">co id="co-ex-return"</sgmltag>
 main(void)
 {
-    printf("hello, world\n"); <co id="co-ex-printf"/>
-}</programlisting>
+    printf("hello, world\n"); <sgmltag class="emptytag">co id="co-ex-printf"</sgmltag>
+}<sgmltag class="endtag">programlisting</sgmltag>
 
-<calloutlist>
-  <callout arearefs="co-ex-include">
-    <para>Includes the standard IO header file.</para>
-  </callout>
-
-  <callout arearefs="co-ex-return">
-    <para>Specifies that <function>main()</function> returns an
-      int.</para>
-  </callout>
-
-  <callout arearefs="co-ex-printf">
-    <para>The <function>printf()</function> call that writes
-      <literal>hello, world</literal> to standard output.</para>
-  </callout>
-</calloutlist>]]></programlisting>
+<sgmltag class="starttag">calloutlist</sgmltag>
+  <sgmltag class="starttag">callout arearefs="co-ex-include"</sgmltag>
+    <sgmltag class="starttag">para</sgmltag>Includes the standard IO header file.<sgmltag class="endtag">para</sgmltag>
+  <sgmltag class="endtag">callout</sgmltag>
+
+  <sgmltag class="starttag">callout arearefs="co-ex-return"</sgmltag>
+    <sgmltag class="starttag">para</sgmltag>Specifies that <sgmltag class="starttag">function</sgmltag>main()<sgmltag class="endtag">function</sgmltag> returns an
+      int.<sgmltag class="endtag">para</sgmltag>
+  <sgmltag class="endtag">callout</sgmltag>
+
+  <sgmltag class="starttag">callout arearefs="co-ex-printf"</sgmltag>
+    <sgmltag class="starttag">para</sgmltag>The <sgmltag class="starttag">function</sgmltag>printf()<sgmltag class="endtag">function</sgmltag> call that writes
+      <sgmltag class="starttag">literal</sgmltag>hello, world<sgmltag class="endtag">literal</sgmltag> to standard output.<sgmltag class="endtag">para</sgmltag>
+  <sgmltag class="endtag">callout</sgmltag>
+<sgmltag class="endtag">calloutlist</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -820,28 +838,28 @@ main(void)
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<informaltable pgwide="1">
-  <tgroup cols="2">
-    <thead>
-      <row>
-        <entry>This is Column Head 1</entry>
-        <entry>This is Column Head 2</entry>
-      </row>
-    </thead>
-
-    <tbody>
-      <row>
-        <entry>Row 1, column 1</entry>
-        <entry>Row 1, column 2</entry>
-      </row>
-
-      <row>
-        <entry>Row 2, column 1</entry>
-        <entry>Row 2, column 2</entry>
-      </row>
-    </tbody>
-  </tgroup>
-</informaltable>]]></programlisting>
+	<programlisting><sgmltag class="starttag">informaltable pgwide="1"</sgmltag>
+  <sgmltag class="starttag">tgroup cols="2"</sgmltag>
+    <sgmltag class="starttag">thead</sgmltag>
+      <sgmltag class="starttag">row</sgmltag>
+        <sgmltag class="starttag">entry</sgmltag>This is Column Head 1<sgmltag class="endtag">entry</sgmltag>
+        <sgmltag class="starttag">entry</sgmltag>This is Column Head 2<sgmltag class="endtag">entry</sgmltag>
+      <sgmltag class="endtag">row</sgmltag>
+    <sgmltag class="endtag">thead</sgmltag>
+
+    <sgmltag class="starttag">tbody</sgmltag>
+      <sgmltag class="starttag">row</sgmltag>
+	<sgmltag class="starttag">entry</sgmltag>Row 1, column 1<sgmltag class="endtag">entry</sgmltag>
+	<sgmltag class="starttag">entry</sgmltag>Row 1, column 2<sgmltag class="endtag">entry</sgmltag>
+      <sgmltag class="endtag">row</sgmltag>
+
+      <sgmltag class="starttag">row</sgmltag>
+	<sgmltag class="starttag">entry</sgmltag>Row 2, column 1<sgmltag class="endtag">entry</sgmltag>
+	<sgmltag class="starttag">entry</sgmltag>Row 2, column 2<sgmltag class="endtag">entry</sgmltag>
+      <sgmltag class="endtag">row</sgmltag>
+    <sgmltag class="endtag">tbody</sgmltag>
+  <sgmltag class="endtag">tgroup</sgmltag>
+<sgmltag class="endtag">informaltable</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -878,7 +896,8 @@ main(void)
       <para>Table borders can be suppressed by setting the
 	<literal>frame</literal> attribute to <literal>none</literal>
 	in the <sgmltag>informaltable</sgmltag> element.  For example,
-	<literal>&lt;informaltable frame="none"&gt;</literal>.</para>
+	<literal><sgmltag class="starttag">informaltable
+	    frame="none"</sgmltag></literal>.</para>
 
       <example>
 	<title>Tables Where <literal>frame="none"</literal></title>
@@ -981,16 +1000,16 @@ main(void)
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<screen>&prompt.user; <userinput>ls -1</userinput>
+	<programlisting><sgmltag class="starttag">screen</sgmltag>&amp;prompt.user; <sgmltag class="starttag">userinput</sgmltag>ls -1<sgmltag class="endtag">userinput</sgmltag>
 foo1
 foo2
 foo3
-&prompt.user; <userinput>ls -1 | grep foo2</userinput>
+&amp;prompt.user; <sgmltag class="starttag">userinput</sgmltag>ls -1 | grep foo2<sgmltag class="endtag">userinput</sgmltag>
 foo2
-&prompt.user; <userinput>su</userinput>
-<prompt>Password: </prompt>
-&prompt.root; <userinput>cat foo2</userinput>
-This is the file called 'foo2'</screen>]]></programlisting>
+&amp;prompt.user; <sgmltag class="starttag">userinput</sgmltag>su<sgmltag class="endtag">userinput</sgmltag>
+<sgmltag class="starttag">prompt</sgmltag>Password: <sgmltag class="endtag">prompt</sgmltag>
+&amp;prompt.root; <sgmltag class="starttag">userinput</sgmltag>cat foo2<sgmltag class="endtag">userinput</sgmltag>
+This is the file called 'foo2'<sgmltag class="endtag">screen</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -1040,8 +1059,8 @@ This is the file called 'foo2'</screen>
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<para>FreeBSD is without doubt <emphasis>the</emphasis>
-  premiere Unix like operating system for the Intel architecture.</para>]]></programlisting>
+	<programlisting><sgmltag class="starttag">para</sgmltag>FreeBSD is without doubt <sgmltag class="starttag">emphasis</sgmltag>the<sgmltag class="endtag">emphasis</sgmltag>
+  premiere Unix like operating system for the Intel architecture.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -1065,9 +1084,9 @@ This is the file called 'foo2'</screen>
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<para>However, make sure that the search does not go beyond the
-  <quote>boundary between local and public administration</quote>,
-  as RFC 1535 calls it.</para>]]></programlisting>
+	<programlisting><sgmltag class="starttag">para</sgmltag>However, make sure that the search does not go beyond the
+  <sgmltag class="starttag">quote</sgmltag>boundary between local and public administration<sgmltag class="endtag">quote</sgmltag>,
+  as RFC 1535 calls it.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -1103,18 +1122,18 @@ This is the file called 'foo2'</screen>
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<para>To switch to the second virtual terminal, press
-  <keycombo action="simul"><keycap>Alt</keycap>
-    <keycap>F1</keycap></keycombo>.</para>
-
-<para>To exit <command>vi</command> without saving changes, type
-  <keycombo action="seq"><keycap>Esc</keycap><keycap>:</keycap>
-    <keycap>q</keycap><keycap>!</keycap></keycombo>.</para>
-
-<para>My window manager is configured so that
-  <keycombo action="simul"><keycap>Alt</keycap>
-    <mousebutton>right</mousebutton>
-  </keycombo> mouse button is used to move windows.</para>]]></programlisting>
+	<programlisting><sgmltag class="starttag">para</sgmltag>To switch to the second virtual terminal, press
+  <sgmltag class="starttag">keycombo action="simul"</sgmltag><sgmltag class="starttag">keycap</sgmltag>Alt<sgmltag class="endtag">keycap</sgmltag>
+    <sgmltag class="starttag">keycap</sgmltag>F1<sgmltag class="endtag">keycap</sgmltag><sgmltag class="endtag">keycombo</sgmltag>.<sgmltag class="endtag">para</sgmltag>
+
+<sgmltag class="starttag">para</sgmltag>To exit <sgmltag class="starttag">command</sgmltag>vi<sgmltag class="endtag">command</sgmltag> without saving changes, type
+  <sgmltag class="starttag">keycombo action="seq"</sgmltag><sgmltag class="starttag">keycap</sgmltag>Esc<sgmltag class="endtag">keycap</sgmltag><sgmltag class="starttag">keycap</sgmltag>:<sgmltag class="endtag">keycap</sgmltag>
+    <sgmltag class="starttag">keycap</sgmltag>q<sgmltag class="endtag">keycap</sgmltag><sgmltag class="starttag">keycap</sgmltag>!<sgmltag class="endtag">keycap</sgmltag><sgmltag class="endtag">keycombo</sgmltag>.<sgmltag class="endtag">para</sgmltag>
+
+<sgmltag class="starttag">para</sgmltag>My window manager is configured so that
+  <sgmltag class="starttag">keycombo action="simul"</sgmltag><sgmltag class="starttag">keycap</sgmltag>Alt<sgmltag class="endtag">keycap</sgmltag>
+    <sgmltag class="starttag">mousebutton</sgmltag>right<sgmltag class="endtag">mousebutton</sgmltag>
+  <sgmltag class="endtag">keycombo</sgmltag> mouse button is used to move windows.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -1206,31 +1225,27 @@ This is the file called 'foo2'</screen>
 	This makes the generated output, especially
 	<acronym>HTML</acronym>, appear visually better.</para>
 
-      <para>This can be confusing, and sometimes the choice is not
-	always clear.  Hopefully this example makes it
-	clearer.</para>
-
       <example>
 	<title>Applications, Commands, and Options</title>
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<para><application>Sendmail</application> is the most
-  widely used Unix mail application.</para>
+	<programlisting><sgmltag class="starttag">para</sgmltag><sgmltag class="starttag">application</sgmltag>Sendmail<sgmltag class="endtag">application</sgmltag> is the most
+  widely used Unix mail application.<sgmltag class="starttag">para</sgmltag>
 
-<para><application>Sendmail</application> includes the
-  <citerefentry>
-    <refentrytitle>sendmail</refentrytitle>
-    <manvolnum>8</manvolnum>
-  </citerefentry>, &man.mailq.1;, and &man.newaliases.1;
-  programs.</para>
-
-<para>One of the command line parameters to <citerefentry>
-    <refentrytitle>sendmail</refentrytitle>
-    <manvolnum>8</manvolnum>
-  </citerefentry>, <option>-bp</option>, will display the current
+<sgmltag class="starttag">para</sgmltag><sgmltag class="starttag">application</sgmltag>Sendmail<sgmltag class="endtag">application</sgmltag> includes the
+  <sgmltag class="starttag">citerefentry</sgmltag>
+    <sgmltag class="starttag">refentrytitle</sgmltag>sendmail<sgmltag class="endtag">refentrytitle</sgmltag>
+    <sgmltag class="starttag">manvolnum</sgmltag>8<sgmltag class="endtag">manvolnum</sgmltag>
+  <sgmltag class="endtag">citerefentry</sgmltag>, &amp;man.mailq.1;, and &amp;man.newaliases.1;
+  programs.<sgmltag class="endtag">para</sgmltag>
+
+<sgmltag class="starttag">para</sgmltag>One of the command line parameters to <sgmltag class="starttag">citerefentry</sgmltag>
+    <sgmltag class="starttag">refentrytitle</sgmltag>sendmail<sgmltag class="endtag">refentrytitle</sgmltag>
+    <sgmltag class="starttag">manvolnum</sgmltag>8<sgmltag class="endtag">manvolnum</sgmltag>
+  <sgmltag class="endtag">citerefentry</sgmltag>, <sgmltag class="starttag">option</sgmltag>-bp<sgmltag class="endtag">option</sgmltag>, will display the current
   status of messages in the mail queue.  Check this on the command
-  line by running <command>sendmail -bp</command>.</para>]]></programlisting>
+  line by running <sgmltag class="starttag">command</sgmltag>sendmail -bp<sgmltag class="endtag">command</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -1272,12 +1287,12 @@ This is the file called 'foo2'</screen>
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<para>The XML source for the Handbook in English is
-  found in <filename class="directory">/usr/doc/en_US.ISO8859-1/books/handbook/</filename>.  The first
-  file is called <filename>book.xml</filename> in that
-  directory.  There is also a <filename>Makefile</filename>
-  and a number of files with a <filename>.ent</filename>
-  extension.</para>]]></programlisting>
+	<programlisting><sgmltag class="starttag">para</sgmltag>The XML source for the Handbook in English is
+  found in <sgmltag class="starttag">filename class="directory"</sgmltag>/usr/doc/en_US.ISO8859-1/books/handbook/<sgmltag class="endtag">filename</sgmltag>.  The first
+  file is called <sgmltag class="starttag">filename</sgmltag>book.xml<sgmltag class="endtag">filename</sgmltag> in that
+  directory.  There is also a <sgmltag class="starttag">filename</sgmltag>Makefile<sgmltag class="endtag">filename</sgmltag>
+  and a number of files with a <sgmltag class="starttag">filename</sgmltag>.ent<sgmltag class="endtag">filename</sgmltag>
+  extension.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -1302,7 +1317,7 @@ This is the file called 'foo2'</screen>
       </note>
 
       <para>To include the name of a program from the &os;
-	Ports&nbsp;Collection in the document, use the
+	Ports Collection in the document, use the
 	<sgmltag>filename</sgmltag> tag with the
 	<literal>role</literal> attribute set to
 	<literal>package</literal>.  Since ports can be installed in
@@ -1316,7 +1331,7 @@ This is the file called 'foo2'</screen>
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<para>Install the <filename role="package">net/wireshark</filename> port to view network traffic.</para>]]></programlisting>
+	<programlisting><sgmltag class="starttag">para</sgmltag>Install the <sgmltag class="starttag">filename role="package"</sgmltag>net/wireshark<sgmltag class="endtag">filename</sgmltag> port to view network traffic.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -1352,17 +1367,17 @@ This is the file called 'foo2'</screen>
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<para><devicename>sio</devicename> is used for serial
-  communication in FreeBSD.  <devicename>sio</devicename> manifests
-  through a number of entries in <filename>/dev</filename>, including
-  <filename>/dev/ttyd0</filename> and <filename>/dev/cuaa0</filename>.</para>
-
-<para>By contrast, network devices such as
-  <devicename>ed0</devicename> do not appear in <filename>/dev</filename>.</para>
-
-<para>In MS-DOS, the first floppy drive is referred to as
-  <devicename>a:</devicename>.  In FreeBSD it is
-  <filename>/dev/fd0</filename>.</para>]]></programlisting>
+	<programlisting><sgmltag class="starttag">para</sgmltag><sgmltag class="starttag">devicename</sgmltag>sio<sgmltag class="endtag">devicename</sgmltag> is used for serial
+  communication in FreeBSD.  <sgmltag class="starttag">devicename</sgmltag>sio<sgmltag class="endtag">devicename</sgmltag> manifests
+  through a number of entries in <sgmltag class="starttag">filename</sgmltag>/dev<sgmltag class="endtag">filename</sgmltag>, including
+  <sgmltag class="starttag">filename</sgmltag>/dev/ttyd0<sgmltag class="endtag">filename</sgmltag> and <sgmltag class="starttag">filename</sgmltag>/dev/cuaa0<sgmltag class="endtag">filename</sgmltag>.<sgmltag class="endtag">para</sgmltag>
+
+<sgmltag class="starttag">para</sgmltag>By contrast, network devices such as
+  <sgmltag class="starttag">devicename</sgmltag>ed0<sgmltag class="endtag">devicename</sgmltag> do not appear in <sgmltag class="starttag">filename</sgmltag>/dev<sgmltag class="endtag">filename</sgmltag>.<sgmltag class="endtag">para</sgmltag>
+
+<sgmltag class="starttag">para</sgmltag>In MS-DOS, the first floppy drive is referred to as
+  <sgmltag class="starttag">devicename</sgmltag>a:<sgmltag class="endtag">devicename</sgmltag>.  In FreeBSD it is
+  <sgmltag class="starttag">filename</sgmltag>/dev/fd0<sgmltag class="endtag">filename</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -1481,26 +1496,26 @@ This is the file called 'foo2'</screen>
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<para>The local machine can always be referred to by the
-  name <hostid>localhost</hostid>, which will have the IP
-  address <hostid role="ipaddr">127.0.0.1</hostid>.</para>
+	<programlisting><sgmltag class="starttag">para</sgmltag>The local machine can always be referred to by the
+  name <sgmltag class="starttag">hostid</sgmltag>localhost<sgmltag class="endtag">hostid</sgmltag>, which will have the IP
+  address <sgmltag class="starttag">hostid role="ipaddr"</sgmltag>127.0.0.1<sgmltag class="endtag">hostid</sgmltag>.<sgmltag class="endtag">para</sgmltag>
 
-<para>The <hostid role="domainname">FreeBSD.org</hostid>
+<sgmltag class="starttag">para</sgmltag>The <sgmltag class="starttag">hostid role="domainname"</sgmltag>FreeBSD.org<sgmltag class="endtag">hostid</sgmltag>
   domain contains a number of different hosts, including
-  <hostid role="fqdn">freefall.FreeBSD.org</hostid> and
-  <hostid role="fqdn">bento.FreeBSD.org</hostid>.</para>
+  <sgmltag class="starttag">hostid role="fqdn"</sgmltag>freefall.FreeBSD.org<sgmltag class="endtag">hostid</sgmltag> and
+  <sgmltag class="starttag">hostid role="fqdn"</sgmltag>bento.FreeBSD.org<sgmltag class="endtag">hostid</sgmltag>.<sgmltag class="endtag">para</sgmltag>
 
-<para>When adding an <acronym>IP</acronym> alias to an
-  interface (using <command>ifconfig</command>)
-  <emphasis>always</emphasis> use a netmask of
-  <hostid role="netmask">255.255.255.255</hostid> (which can
+<sgmltag class="starttag">para</sgmltag>When adding an <sgmltag class="starttag">acronym</sgmltag>IP<sgmltag class="endtag">acronym</sgmltag> alias to an
+  interface (using <sgmltag class="starttag">command</sgmltag>ifconfig<sgmltag class="endtag">command</sgmltag>)
+  <sgmltag class="starttag">emphasis</sgmltag>always<sgmltag class="endtag">emphasis</sgmltag> use a netmask of
+  <sgmltag class="starttag">hostid role="netmask"</sgmltag>255.255.255.255<sgmltag class="endtag">hostid</sgmltag> (which can
   also be expressed as
-  <hostid role="netmask">0xffffffff</hostid>).</para>
+  <sgmltag class="starttag">hostid role="netmask"</sgmltag>0xffffffff<sgmltag class="endtag">hostid</sgmltag>).<sgmltag class="endtag">para</sgmltag>
 
-<para>The <acronym>MAC</acronym> address uniquely identifies
+<sgmltag class="starttag">para</sgmltag>The <sgmltag class="starttag">acronym</sgmltag>MAC<sgmltag class="endtag">acronym</sgmltag> address uniquely identifies
   every network card in existence.  A typical
-  <acronym>MAC</acronym> address looks like
-  <hostid role="mac">08:00:20:87:ef:d0</hostid>.</para>]]></programlisting>
+  <sgmltag class="starttag">acronym</sgmltag>MAC<sgmltag class="endtag">acronym</sgmltag> address looks like
+  <sgmltag class="starttag">hostid role="mac"</sgmltag>08:00:20:87:ef:d0<sgmltag class="endtag">hostid</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -1547,8 +1562,8 @@ This is the file called 'foo2'</screen>
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<para>To carry out most system administration functions
-  requires logging in as <username>root</username>.</para>]]></programlisting>
+	<programlisting><sgmltag class="starttag">para</sgmltag>To carry out most system administration functions
+  requires logging in as <sgmltag class="starttag">username</sgmltag>root<sgmltag class="endtag">username</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -1569,9 +1584,8 @@ This is the file called 'foo2'</screen>
       </note>
 
       <para>Two elements exist to describe parts of
-	<filename>Makefile</filename>s,
-	<sgmltag>maketarget</sgmltag> and
-	<sgmltag>makevar</sgmltag>.</para>
+	<filename>Makefile</filename>s, <sgmltag>maketarget</sgmltag>
+	and <sgmltag>makevar</sgmltag>.</para>
 
       <para><sgmltag>maketarget</sgmltag> identifies a build target
 	exported by a <filename>Makefile</filename> that can be
@@ -1587,19 +1601,19 @@ This is the file called 'foo2'</screen>
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<para>Two common targets in a <filename>Makefile</filename>
-  are <maketarget>all</maketarget> and
-  <maketarget>clean</maketarget>.</para>
+	<programlisting><sgmltag class="starttag">para</sgmltag>Two common targets in a <sgmltag class="starttag">filename</sgmltag>Makefile<sgmltag class="endtag">filename</sgmltag>
+  are <sgmltag class="starttag">maketarget</sgmltag>all<sgmltag class="endtag">maketarget</sgmltag> and
+  <sgmltag class="starttag">maketarget</sgmltag>clean<sgmltag class="endtag">maketarget</sgmltag>.<sgmltag class="endtag">para</sgmltag>
 
-<para>Typically, invoking <maketarget>all</maketarget> will
+<sgmltag class="starttag">para</sgmltag>Typically, invoking <sgmltag class="starttag">maketarget</sgmltag>all<sgmltag class="endtag">maketarget</sgmltag> will
   rebuild the application, and invoking
-  <maketarget>clean</maketarget> will remove the temporary
-  files (<filename>.o</filename> for example) created by the
-  build process.</para>
-
-<para><maketarget>clean</maketarget> may be controlled by a
-  number of variables, including <makevar>CLOBBER</makevar>
-  and <makevar>RECURSE</makevar>.</para>]]></programlisting>
+  <sgmltag class="starttag">maketarget</sgmltag>clean<sgmltag class="endtag">maketarget</sgmltag> will remove the temporary
+  files (<sgmltag class="starttag">filename</sgmltag>.o<sgmltag class="endtag">filename</sgmltag> for example) created by the
+  build process.<sgmltag class="endtag">para</sgmltag>
+
+<sgmltag class="starttag">para</sgmltag><sgmltag class="starttag">maketarget</sgmltag>clean<sgmltag class="endtag">maketarget</sgmltag> may be controlled by a
+  number of variables, including <sgmltag class="starttag">makevar</sgmltag>CLOBBER<sgmltag class="endtag">makevar</sgmltag>
+  and <sgmltag class="starttag">makevar</sgmltag>RECURSE<sgmltag class="endtag">makevar</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -1642,10 +1656,10 @@ This is the file called 'foo2'</screen>
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<para>The <literal>maxusers 10</literal> line in the kernel
+	<programlisting><sgmltag class="starttag">para</sgmltag>The <sgmltag class="starttag">literal</sgmltag>maxusers 10<sgmltag class="endtag">literal</sgmltag> line in the kernel
   configuration file determines the size of many system tables, and is
   a rough guide to how many simultaneous logins the system will
-  support.</para>]]></programlisting>
+  support.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -1675,7 +1689,7 @@ This is the file called 'foo2'</screen>
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<screen>&prompt.user; <userinput>man <replaceable>command</replaceable></userinput></screen>]]></programlisting>
+	<programlisting><sgmltag class="starttag">screen</sgmltag>&amp;prompt.user; <sgmltag class="starttag">userinput</sgmltag>man <sgmltag class="starttag">replaceable</sgmltag>command<sgmltag class="endtag">replaceable</sgmltag><sgmltag class="endtag">userinput</sgmltag><sgmltag class="endtag">screen</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -1685,21 +1699,20 @@ This is the file called 'foo2'</screen>
 
 	<para><sgmltag>replaceable</sgmltag> can be used in many
 	  different elements, including <sgmltag>literal</sgmltag>.
-	  This example also shows that
-	  <sgmltag>replaceable</sgmltag> should only be wrapped
-	  around the content that the user <emphasis>is</emphasis>
-	  meant to provide.  The other content should be left
-	  alone.</para>
+	  This example also shows that <sgmltag>replaceable</sgmltag>
+	  should only be wrapped around the content that the user
+	  <emphasis>is</emphasis> meant to provide.  The other content
+	  should be left alone.</para>
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<para>The <literal>maxusers <replaceable>n</replaceable></literal>
+	<programlisting><sgmltag class="starttag">para</sgmltag>The <sgmltag class="starttag">literal</sgmltag>maxusers <sgmltag class="starttag">replaceable</sgmltag>n<sgmltag class="endtag">replaceable</sgmltag><sgmltag class="endtag">literal</sgmltag>
   line in the kernel configuration file determines the size of many system
   tables, and is a rough guide to how many simultaneous logins the system will
-  support.</para>
+  support.<sgmltag class="endtag">para</sgmltag>
 
-<para>For a desktop workstation, <literal>32</literal> is a good value
-  for <replaceable>n</replaceable>.</para>]]></programlisting>
+<sgmltag class="starttag">para</sgmltag>For a desktop workstation, <sgmltag class="starttag">literal</sgmltag>32<sgmltag class="endtag">literal</sgmltag> is a good value
+  for <sgmltag class="starttag">replaceable</sgmltag>n<sgmltag class="endtag">replaceable</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -1726,8 +1739,7 @@ This is the file called 'foo2'</screen>
 
 	<para>Usage:</para>
 
-	<programlisting><![CDATA[<screen><errorname>Panic: cannot mount root</errorname></screen>]]></programlisting>
-
+	<programlisting><sgmltag class="starttag">screen</sgmltag><sgmltag class="starttag">errorname</sgmltag>Panic: cannot mount root<sgmltag class="endtag">errorname</sgmltag><sgmltag class="endtag">screen</sgmltag></programlisting>
 
 	<para>Appearance:</para>
 
@@ -1743,30 +1755,28 @@ This is the file called 'foo2'</screen>
 
     <important>
       <para>Image support in the documentation is somewhat
-	experimental.  The mechanisms described here are
-	unlikely to change, but that is not guaranteed.</para>
+	experimental.  The mechanisms described here are unlikely to
+	change, but that is not guaranteed.</para>
 
-      <para>Installation of the
+      <para>To provide conversion between different image formats, the
 	<filename role="package">graphics/ImageMagick</filename>
-	port is required.  It is used to convert between the different
-	image formats.  This port is <emphasis>not</emphasis> in
-	the <filename role="package">textproc/docproj</filename> meta
-	port, it must be installed separately.</para>
+	port must be installed.  This port is not included in the
+	<filename role="package">textproc/docproj</filename> meta
+	port, and must be installed separately.</para>
 
-      <para>The best example of what follows in practice is the
+      <para>A good example of the use of images is the
 	<filename>doc/en_US.ISO8859-1/articles/vm-design/</filename>
-	document.  If the description that follows is unclear,
-	look at the files in that directory to see how everything
-	hangs together.  Experiment with creating different formatted
-	versions of the document to see how the image markup appears
-	in the formatted output.</para>
+	document.  Examine the files in that directory to see how
+	these elements are used together.  Build different output
+	formats to see how the format determines what images are shown
+	in the rendered document.</para>
     </important>
 
     <sect2 id="docbook-markup-image-formats">
       <title>Image Formats</title>
 
-      <para>Two image formats are currently supported.  Which to
-	use depends on the nature of the image.</para>
+      <para>Two image formats are currently supported.  The type of
+	image determines which format to use.</para>
 
       <para>Images that are primarily vector based, such as network
 	diagrams, time lines, and similar, should be in
@@ -1780,32 +1790,31 @@ This is the file called 'foo2'</screen>
 	extension.</para>
 
       <para>These are the <emphasis>only</emphasis> formats in which
-	images should be committed to the Subversion
+	images should be committed to the documentation
 	repository.</para>
 
-      <para>Use the appropriate format for each image.  It is to be
-	expected that documentation will have a mix of

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

From owner-svn-doc-projects@FreeBSD.ORG  Wed Jul 10 10:38:06 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E9861656;
 Wed, 10 Jul 2013 10:38:06 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C173B1235;
 Wed, 10 Jul 2013 10:38:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6AAc6Pk092042;
 Wed, 10 Jul 2013 10:38:06 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6AAc6sb092038;
 Wed, 10 Jul 2013 10:38:06 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201307101038.r6AAc6sb092038@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 10 Jul 2013 10:38:06 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42234 - in projects/db5/share: mk xsl
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jul 2013 10:38:07 -0000

Author: gabor
Date: Wed Jul 10 10:38:06 2013
New Revision: 42234
URL: http://svnweb.freebsd.org/changeset/doc/42234

Log:
  - Workaround for dblatex escaping in <filename>

Added:
  projects/db5/share/xsl/freebsd-dblatex.xsl   (contents, props changed)
Modified:
  projects/db5/share/mk/doc.docbook.mk

Modified: projects/db5/share/mk/doc.docbook.mk
==============================================================================
--- projects/db5/share/mk/doc.docbook.mk	Wed Jul 10 10:05:37 2013	(r42233)
+++ projects/db5/share/mk/doc.docbook.mk	Wed Jul 10 10:38:06 2013	(r42234)
@@ -75,7 +75,7 @@ IMAGES_LIB?=
 SCHEMATRONS?=	${DOC_PREFIX}/share/xml/freebsd.sch
 XSLTPROCOPTS?=	--nonet
 
-DBLATEXOPTS?=	-I ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -T simple -d
+DBLATEXOPTS?=	-I ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -p ${DOC_PREFIX}/share/xsl/freebsd-dblatex.xsl -T simple -d
 
 KNOWN_FORMATS=	html html.tar html-split html-split.tar \
 		epub txt rtf ps pdf tex dvi tar pdb

Added: projects/db5/share/xsl/freebsd-dblatex.xsl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/db5/share/xsl/freebsd-dblatex.xsl	Wed Jul 10 10:38:06 2013	(r42234)
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding="iso-8859-1"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		xmlns:str="http://exslt.org/strings"
+		extension-element-prefixes="str"
+		version='1.0'>
+
+  <!-- $FreeBSD$ -->
+
+  <xsl:template match="filename">
+    <xsl:choose>
+    <!-- \Url cannot stand in a section heading -->
+    <xsl:when test="$filename.as.url='1' and
+      not(ancestor::title or ancestor::refentrytitle)">
+    <xsl:text>\nolinkurl{</xsl:text><xsl:apply-templates mode="tex.escape"/><xsl:text>}</xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:call-template name="inline.monoseq"/>
+    </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+ 
+  <xsl:template match="text()" mode="tex.escape">
+    <xsl:variable name="t1" select="str:replace(., '\', '\\')"/>
+    <xsl:variable name="t2" select="str:replace($t1, '^', '\^')"/>
+    <xsl:variable name="t3" select="str:replace($t2, '~', '\~')"/>
+    <xsl:variable name="t4" select="str:replace($t3, '{', '\{')"/>
+    <xsl:variable name="t5" select="str:replace($t4, '}', '\}')"/>
+    <xsl:variable name="t6" select="str:replace($t5, '%', '\%')"/>
+    <xsl:variable name="t7" select="str:replace($t6, '$', '\$')"/>
+    <xsl:variable name="t8" select="str:replace($t7, '&amp;', '\&amp;')"/>
+    <xsl:variable name="t9" select="str:replace($t8, '#', '\#')"/>
+    <xsl:variable name="t10" select="str:replace($t9, '_', '\_')"/>
+
+    <xsl:value-of select="$t10"/>
+  </xsl:template>
+</xsl:stylesheet>

From owner-svn-doc-projects@FreeBSD.ORG  Wed Jul 10 11:57:13 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BCC2F831;
 Wed, 10 Jul 2013 11:57:13 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AFD1A18BC;
 Wed, 10 Jul 2013 11:57:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6ABvD2R017955;
 Wed, 10 Jul 2013 11:57:13 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6ABvDdZ017954;
 Wed, 10 Jul 2013 11:57:13 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201307101157.r6ABvDdZ017954@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 10 Jul 2013 11:57:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42237 - projects/db5/share/xsl
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jul 2013 11:57:13 -0000

Author: gabor
Date: Wed Jul 10 11:57:13 2013
New Revision: 42237
URL: http://svnweb.freebsd.org/changeset/doc/42237

Log:
  - Use UTF-8 in the LaTeX file so that we render all of the languages
  - Render all links in blue

Modified:
  projects/db5/share/xsl/freebsd-dblatex.xsl

Modified: projects/db5/share/xsl/freebsd-dblatex.xsl
==============================================================================
--- projects/db5/share/xsl/freebsd-dblatex.xsl	Wed Jul 10 11:40:36 2013	(r42236)
+++ projects/db5/share/xsl/freebsd-dblatex.xsl	Wed Jul 10 11:57:13 2013	(r42237)
@@ -6,6 +6,9 @@
 
   <!-- $FreeBSD$ -->
 
+  <xsl:param name="latex.encoding">utf8</xsl:param>
+  <xsl:param name="latex.hyperparam">linktocpage,colorlinks,linkcolor=blue,citecolor=blue,urlcolor=blue</xsl:param>
+
   <xsl:template match="filename">
     <xsl:choose>
     <!-- \Url cannot stand in a section heading -->

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jul 11 03:05:08 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1407F1A6;
 Thu, 11 Jul 2013 03:05:08 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 039511C9E;
 Thu, 11 Jul 2013 03:05:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6B357nK095231;
 Thu, 11 Jul 2013 03:05:07 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6B356vt095222;
 Thu, 11 Jul 2013 03:05:06 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201307110305.r6B356vt095222@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 11 Jul 2013 03:05:06 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42243 - in projects/ISBN_1-57176-407-0: .
 de_DE.ISO8859-1/books/handbook/firewalls
 de_DE.ISO8859-1/books/porters-handbook
 el_GR.ISO8859-7/books/handbook/firewalls el_GR.ISO8859-7/share...
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jul 2013 03:05:08 -0000

Author: gjb
Date: Thu Jul 11 03:05:05 2013
New Revision: 42243
URL: http://svnweb.freebsd.org/changeset/doc/42243

Log:
  MFH:
     Merged /head/Makefile:r40693-42242
     Merged /head/README:r40693-42242
     Merged /head/bn_BD.ISO10646-1:r41735-42242
     Merged /head/da_DK.ISO8859-1:r41735-42242
     Merged /head/de_DE.ISO8859-1:r41947-42242
     Merged /head/el_GR.ISO8859-7:r41735-42242
     Merged /head/en_US.ISO8859-1:r42011-42242
     Merged /head/es_ES.ISO8859-1:r41735-42242
     Merged /head/fr_FR.ISO8859-1:r41947-42242
     Merged /head/hu_HU.ISO8859-2:r41735-42242
     Merged /head/it_IT.ISO8859-15:r41947-42242
     Merged /head/ja_JP.eucJP:r42005-42242
     Merged /head/mn_MN.UTF-8:r41947-42242
     Merged /head/nl_NL.ISO8859-1/share/xml/entities.ent:r41735-42242
     Merged /head/nl_NL.ISO8859-1:r41947-42242
     Merged /head/no_NO.ISO8859-1:r41735-42242
     Merged /head/pl_PL.ISO8859-2:r41735-42242
     Merged /head/pt_BR.ISO8859-1:r41735-42242
     Merged /head/release:r41735-42242
     Merged /head/ru_RU.KOI8-R:r41947-42242
     Merged /head/share:r42005-42242
     Merged /head/sr_YU.ISO8859-2:r41735-42242
     Merged /head/tr_TR.ISO8859-9:r41735-42242
     Merged /head/zh_CN.GB2312:r41947-42242
     Merged /head/zh_TW.Big5:r41735-42242
     Merged /projects/entities/bn_BD.ISO10646-1:r40180-42225
     Merged /projects/entities/da_DK.ISO8859-1:r40180-42225
     Merged /projects/entities/de_DE.ISO8859-1:r40180-42225
     Merged /projects/entities/el_GR.ISO8859-7:r40180-42225
     Merged /projects/entities/en_US.ISO8859-1:r40180-42225
     Merged /projects/entities/es_ES.ISO8859-1:r40180-42225
     Merged /projects/entities/fr_FR.ISO8859-1:r40180-42225
     Merged /projects/entities/hu_HU.ISO8859-2:r40180-42225
     Merged /projects/entities/it_IT.ISO8859-15:r40180-42225
     Merged /projects/entities/ja_JP.eucJP:r40180-42225
     Merged /projects/entities/mn_MN.UTF-8:r40180-42225
     Merged /projects/entities/nl_NL.ISO8859-1/share/xml/entities.ent:r40180-42225
     Merged /projects/entities/nl_NL.ISO8859-1:r40180-42225
     Merged /projects/entities/no_NO.ISO8859-1:r40180-42225
     Merged /projects/entities/pl_PL.ISO8859-2:r40180-42225
     Merged /projects/entities/pt_BR.ISO8859-1:r40180-42225
     Merged /projects/entities/release:r40180-42225
     Merged /projects/entities/ru_RU.KOI8-R:r40180-42225
     Merged /projects/entities/share:r40180-42225
     Merged /projects/entities/sr_YU.ISO8859-2:r40180-42225
     Merged /projects/entities/tr_TR.ISO8859-9:r40180-42225
     Merged /projects/entities/zh_CN.GB2312:r40180-42225
     Merged /projects/entities/zh_TW.Big5:r40180-42225
  
  Approved by:	doceng (implicit)

Added:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/fdp-primer/xml-primer/
     - copied from r42242, head/en_US.ISO8859-1/books/fdp-primer/xml-primer/
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/java/links.xml
     - copied unchanged from r42242, head/en_US.ISO8859-1/htdocs/java/links.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml
     - copied unchanged from r42242, head/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/news/status/report-2013-05-devsummit.xml
     - copied unchanged from r42242, head/en_US.ISO8859-1/htdocs/news/status/report-2013-05-devsummit.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releases/9.2R/
     - copied from r42242, head/en_US.ISO8859-1/htdocs/releases/9.2R/
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/java/links.xml
     - copied unchanged from r42242, head/ja_JP.eucJP/htdocs/java/links.xml
  projects/ISBN_1-57176-407-0/share/pgpkeys/feld.key
     - copied unchanged from r42242, head/share/pgpkeys/feld.key
  projects/ISBN_1-57176-407-0/share/pgpkeys/loos.key
     - copied unchanged from r42242, head/share/pgpkeys/loos.key
  projects/ISBN_1-57176-407-0/share/pgpkeys/marino.key
     - copied unchanged from r42242, head/share/pgpkeys/marino.key
  projects/ISBN_1-57176-407-0/share/security/advisories/FreeBSD-EN-13:01.fxp.asc
     - copied unchanged from r42242, head/share/security/advisories/FreeBSD-EN-13:01.fxp.asc
  projects/ISBN_1-57176-407-0/share/security/advisories/FreeBSD-EN-13:02.vtnet.asc
     - copied unchanged from r42242, head/share/security/advisories/FreeBSD-EN-13:02.vtnet.asc
  projects/ISBN_1-57176-407-0/share/security/patches/EN-13:01/
     - copied from r42242, head/share/security/patches/EN-13:01/
  projects/ISBN_1-57176-407-0/share/security/patches/EN-13:02/
     - copied from r42242, head/share/security/patches/EN-13:02/
Deleted:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/fdp-primer/sgml-primer/
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/vinum/
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/docproj/todo.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/java/advocacy.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/java/dists/15.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/search/opensearch/cvsweb.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/java/advocacy.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/java/dists/15.xml
  projects/ISBN_1-57176-407-0/share/xml/developers.ent
Modified:
  projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
  projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/books/porters-handbook/book.xml
  projects/ISBN_1-57176-407-0/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
  projects/ISBN_1-57176-407-0/el_GR.ISO8859-7/share/xml/trademarks.ent
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/committers-guide/article.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/console-server/article.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/article.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/hubs/article.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/linux-emulation/article.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/nanobsd/article.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/pam/article.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/releng-packages/article.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/releng/article.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/remote-install/article.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/serial-uart/article.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/vm-design/article.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/dev-model/book.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/faq/book.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/fdp-primer/Makefile
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/fdp-primer/book.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/fdp-primer/chapters.ent
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/Makefile
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/book.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/chapters.ent
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/jails/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/preface/preface.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/pmake/gods/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/porters-handbook/book.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/porters-handbook/uses.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/administration.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/cgi/cgi-style.pl
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/cgi/monthly.cgi
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/docproj/Makefile
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/docproj/current.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/docs/books.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/internal/doceng.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/java/Makefile
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/java/dists/Makefile
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/java/dists/index.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/java/howhelp.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/java/index.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/java/install.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/news/status/Makefile
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/news/status/status.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/platforms/arm.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/platforms/sparc.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/platforms/xbox.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/portmgr/index.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/ports/references.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/projects/Makefile
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/projects/projects.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/projects/summerofcode-2005.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/projects/summerofcode-2006.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releases/Makefile
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releng/index.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/search/opensearch/Makefile
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/search/opensearch/opensearch.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/security/reporting.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/share/xml/mailing-lists.ent
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/share/xml/teams.ent
  projects/ISBN_1-57176-407-0/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
  projects/ISBN_1-57176-407-0/es_ES.ISO8859-1/share/xml/trademarks.ent
  projects/ISBN_1-57176-407-0/fr_FR.ISO8859-1/articles/pam/article.xml
  projects/ISBN_1-57176-407-0/fr_FR.ISO8859-1/books/fdp-primer/book.xml
  projects/ISBN_1-57176-407-0/fr_FR.ISO8859-1/htdocs/releng/index.xml
  projects/ISBN_1-57176-407-0/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
  projects/ISBN_1-57176-407-0/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
  projects/ISBN_1-57176-407-0/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml
  projects/ISBN_1-57176-407-0/it_IT.ISO8859-15/articles/vm-design/article.xml
  projects/ISBN_1-57176-407-0/it_IT.ISO8859-15/books/handbook/install/chapter.xml
  projects/ISBN_1-57176-407-0/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml
  projects/ISBN_1-57176-407-0/it_IT.ISO8859-15/books/unix-introduction/book.xml
  projects/ISBN_1-57176-407-0/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/articles/contributors/article.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/books/faq/book.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/books/handbook/Makefile
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/books/handbook/book.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/books/handbook/chapters.ent
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/books/handbook/desktop/chapter.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/books/handbook/disks/chapter.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/books/handbook/introduction/chapter.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/books/handbook/preface/preface.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/books/porters-handbook/book.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/docproj/Makefile
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/docproj/current.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/docs/books.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/java/Makefile
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/java/dists/Makefile
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/java/dists/index.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/java/howhelp.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/java/index.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/java/install.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/platforms/arm.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/platforms/sparc.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/ports/references.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/ports/updating.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/releases/Makefile
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/relnotes.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/security/reporting.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/share/xml/mailing-lists.ent
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/share/xml/navibar.l10n.ent
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/share/xml/news.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/share/xml/teams.ent
  projects/ISBN_1-57176-407-0/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/htdocs/administration.xml
  projects/ISBN_1-57176-407-0/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml
  projects/ISBN_1-57176-407-0/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
  projects/ISBN_1-57176-407-0/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
  projects/ISBN_1-57176-407-0/ru_RU.KOI8-R/articles/pam/article.xml
  projects/ISBN_1-57176-407-0/ru_RU.KOI8-R/articles/vm-design/article.xml
  projects/ISBN_1-57176-407-0/ru_RU.KOI8-R/books/handbook/book.xml
  projects/ISBN_1-57176-407-0/ru_RU.KOI8-R/books/porters-handbook/book.xml
  projects/ISBN_1-57176-407-0/ru_RU.KOI8-R/htdocs/portmgr/index.xml
  projects/ISBN_1-57176-407-0/ru_RU.KOI8-R/htdocs/releng/index.xml
  projects/ISBN_1-57176-407-0/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl
  projects/ISBN_1-57176-407-0/share/misc/docbook.css
  projects/ISBN_1-57176-407-0/share/mk/doc.docbook.mk
  projects/ISBN_1-57176-407-0/share/pgpkeys/README
  projects/ISBN_1-57176-407-0/share/pgpkeys/addkey.sh
  projects/ISBN_1-57176-407-0/share/pgpkeys/gavin.key
  projects/ISBN_1-57176-407-0/share/pgpkeys/pgpkeys-core.xml
  projects/ISBN_1-57176-407-0/share/pgpkeys/pgpkeys-developers.xml
  projects/ISBN_1-57176-407-0/share/pgpkeys/pgpkeys.ent
  projects/ISBN_1-57176-407-0/share/xml/authors.ent
  projects/ISBN_1-57176-407-0/share/xml/catalog.xml
  projects/ISBN_1-57176-407-0/share/xml/events2013.xml
  projects/ISBN_1-57176-407-0/share/xml/freebsd.ent
  projects/ISBN_1-57176-407-0/share/xml/freebsd.sch
  projects/ISBN_1-57176-407-0/share/xml/header.ent
  projects/ISBN_1-57176-407-0/share/xml/mirrors.xml
  projects/ISBN_1-57176-407-0/share/xml/navibar.ent
  projects/ISBN_1-57176-407-0/share/xml/news.xml
  projects/ISBN_1-57176-407-0/share/xml/notices.xml
  projects/ISBN_1-57176-407-0/share/xml/press.xml
  projects/ISBN_1-57176-407-0/share/xml/templates.events.xsl
  projects/ISBN_1-57176-407-0/share/xml/xhtml.xsl
  projects/ISBN_1-57176-407-0/share/xml/xhtml10-freebsd.dtd
  projects/ISBN_1-57176-407-0/share/xml/xslt10-freebsd.dtd
  projects/ISBN_1-57176-407-0/share/xsl/freebsd-xhtml-common.xsl
  projects/ISBN_1-57176-407-0/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
  projects/ISBN_1-57176-407-0/zh_CN.GB2312/books/porters-handbook/book.xml
  projects/ISBN_1-57176-407-0/zh_TW.Big5/books/handbook/firewalls/chapter.xml
  projects/ISBN_1-57176-407-0/zh_TW.Big5/books/handbook/serialcomms/chapter.xml
  projects/ISBN_1-57176-407-0/zh_TW.Big5/books/porters-handbook/book.xml
Directory Properties:
  projects/ISBN_1-57176-407-0/Makefile   (props changed)
  projects/ISBN_1-57176-407-0/README   (props changed)
  projects/ISBN_1-57176-407-0/bn_BD.ISO10646-1/   (props changed)
  projects/ISBN_1-57176-407-0/da_DK.ISO8859-1/   (props changed)
  projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/   (props changed)
  projects/ISBN_1-57176-407-0/el_GR.ISO8859-7/   (props changed)
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/   (props changed)
  projects/ISBN_1-57176-407-0/es_ES.ISO8859-1/   (props changed)
  projects/ISBN_1-57176-407-0/fr_FR.ISO8859-1/   (props changed)
  projects/ISBN_1-57176-407-0/hu_HU.ISO8859-2/   (props changed)
  projects/ISBN_1-57176-407-0/it_IT.ISO8859-15/   (props changed)
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/   (props changed)
  projects/ISBN_1-57176-407-0/mn_MN.UTF-8/   (props changed)
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/   (props changed)
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/share/xml/entities.ent   (props changed)
  projects/ISBN_1-57176-407-0/no_NO.ISO8859-1/   (props changed)
  projects/ISBN_1-57176-407-0/pl_PL.ISO8859-2/   (props changed)
  projects/ISBN_1-57176-407-0/pt_BR.ISO8859-1/   (props changed)
  projects/ISBN_1-57176-407-0/release/   (props changed)
  projects/ISBN_1-57176-407-0/ru_RU.KOI8-R/   (props changed)
  projects/ISBN_1-57176-407-0/share/   (props changed)
  projects/ISBN_1-57176-407-0/sr_YU.ISO8859-2/   (props changed)
  projects/ISBN_1-57176-407-0/tr_TR.ISO8859-9/   (props changed)
  projects/ISBN_1-57176-407-0/zh_CN.GB2312/   (props changed)
  projects/ISBN_1-57176-407-0/zh_TW.Big5/   (props changed)

Modified: projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml	Thu Jul 11 02:16:22 2013	(r42242)
+++ projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml	Thu Jul 11 03:05:05 2013	(r42243)
@@ -1834,7 +1834,7 @@ block in log first quick on dc0 all
 	Internet:</para>
 
       <informaltable frame="none" pgwide="1">
-	<tgroup cols="2">
+	<tgroup cols="3">
 	  <colspec colwidth="1*"/>
 
 	  <colspec colwidth="1*"/>

Modified: projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/books/porters-handbook/book.xml	Thu Jul 11 02:16:22 2013	(r42242)
+++ projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/books/porters-handbook/book.xml	Thu Jul 11 03:05:05 2013	(r42243)
@@ -6050,6 +6050,7 @@ PLIST_SUB+=             NLS="@comment "
 	    <thead>
 	      <row>
 		<entry>Nur lesbare Variablen</entry>
+		<entry>Bedeutung</entry>
 	      </row>
 	    </thead>
 

Modified: projects/ISBN_1-57176-407-0/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml	Thu Jul 11 02:16:22 2013	(r42242)
+++ projects/ISBN_1-57176-407-0/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml	Thu Jul 11 03:05:05 2013	(r42243)
@@ -1823,7 +1823,7 @@ block in log first quick on dc0 all
 	Internet:</para>
 
       <informaltable frame="none" pgwide="1">
-	<tgroup cols="2">
+	<tgroup cols="3">
 	  <colspec colwidth="1*"/>
 
 	  <colspec colwidth="1*"/>

Modified: projects/ISBN_1-57176-407-0/el_GR.ISO8859-7/share/xml/trademarks.ent
==============================================================================
--- projects/ISBN_1-57176-407-0/el_GR.ISO8859-7/share/xml/trademarks.ent	Thu Jul 11 02:16:22 2013	(r42242)
+++ projects/ISBN_1-57176-407-0/el_GR.ISO8859-7/share/xml/trademarks.ent	Thu Jul 11 03:05:05 2013	(r42243)
@@ -438,7 +438,7 @@ Coverity, Inc.</para>">
   ένα από τα σύμβολα: <quote>&trade;</quote> ή <quote>&reg;</quote>.</para>">
 
 <!ENTITY legalnotice '
-<legalnotice>
+<legalnotice id="legalnotice">
   <para>Η διανομή και χρήση σε μορφή πηγαίου κώδικα (SGML DocBook) ή
     σε "μεταγλωττισμένη" μορφή (SGML, HTML, PDF, PostScript, RTF κοκ)
     με ή χωρίς αλλαγές, επιτρέπεται εφόσον οι παρακάτω προϋποθέσεις

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/committers-guide/article.xml	Thu Jul 11 02:16:22 2013	(r42242)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/committers-guide/article.xml	Thu Jul 11 03:05:05 2013	(r42243)
@@ -26,7 +26,7 @@
       <year>2011</year>
       <year>2012</year>
       <year>2013</year>
-      <holder>The FreeBSD Documentation Project</holder>
+      <holder>The &os; Documentation Project</holder>
     </copyright>
 
     <legalnotice id="trademarks" role="trademarks">
@@ -43,12 +43,12 @@
     <releaseinfo>$FreeBSD$</releaseinfo>
 
     <abstract>
-      <para>This document provides information for the FreeBSD
+      <para>This document provides information for the &os;
 	committer community.  All new committers should read this
 	document before they start, and existing committers are
 	strongly encouraged to review it from time to time.</para>
 
-      <para>Almost all FreeBSD developers have commit rights to one or
+      <para>Almost all &os; developers have commit rights to one or
 	more repositories.  However, a few developers do not, and some
 	of the information here applies to them as well.  (For
 	instance, some people only have rights to work with the
@@ -56,7 +56,7 @@
 	  linkend="non-committers"/> for more information.</para>
 
       <para>This document may also be of interest to members of the
-	FreeBSD community who want to learn more about how the project
+	&os; community who want to learn more about how the project
 	works.</para>
     </abstract>
   </articleinfo>
@@ -83,32 +83,32 @@
 	  <row>
 	    <entry><emphasis><literal>src/</literal> Subversion
 		Root</emphasis></entry>
-	    <entry>
-	      <literal>svn+ssh://</literal><hostid
+	    <entry><literal>svn+ssh://</literal><hostid
 		role="fqdn">svn.FreeBSD.org</hostid><filename>/base</filename>
-	      (see also <xref linkend="subversion-primer"/>).</entry>
+	      (see also <xref
+		linkend="svn-getting-started-base-layout"/>).</entry>
 	  </row>
+
 	  <row>
 	    <entry><emphasis><literal>doc/</literal> Subversion
 		Root</emphasis></entry>
-	    <entry>
-	      <literal>svn+ssh://</literal><hostid
+	    <entry><literal>svn+ssh://</literal><hostid
 		role="fqdn">svn.FreeBSD.org</hostid><filename>/doc</filename>
-	      (see also <xref linkend="subversion-primer"/>).</entry>
+	      (see also <xref
+		linkend="svn-getting-started-doc-layout"/>).</entry>
 	  </row>
 
 	  <row>
 	    <entry><emphasis><literal>ports/</literal> Subversion
 		Root</emphasis></entry>
-	    <entry>
-	      <literal>svn+ssh://</literal><hostid
+	    <entry><literal>svn+ssh://</literal><hostid
 		role="fqdn">svn.FreeBSD.org</hostid><filename>/ports</filename>
-	      (see also <xref linkend="subversion-primer"/>).</entry>
+	      (see also <xref
+		linkend="svn-getting-started-ports-layout"/>).</entry>
 	  </row>
 
 	  <row>
 	    <entry><emphasis>Internal Mailing Lists</emphasis></entry>
-
 	    <entry>developers (technically called all-developers),
 	      doc-developers, doc-committers, ports-developers,
 	      ports-committers, src-developers, src-committers.  (Each
@@ -128,8 +128,7 @@
 		reports</emphasis></entry>
 	    <entry><filename>/home/core/public/monthly-reports</filename>
 	      on the <hostid role="domainname">FreeBSD.org</hostid>
-	      cluster.
-	    </entry>
+	      cluster.</entry>
 	  </row>
 
 	  <row>
@@ -143,46 +142,47 @@
 	  <row>
 	    <entry><emphasis>Noteworthy <literal>src/</literal> SVN
 		Branches</emphasis></entry>
-
 	    <entry>
 	      <literal>stable/8</literal> (8.X-STABLE),
 	      <literal>stable/9</literal> (9.X-STABLE),
-	      <literal>head</literal> (-CURRENT)
-	    </entry>
+	      <literal>head</literal> (-CURRENT)</entry>
 	  </row>
 	</tbody>
       </tgroup>
     </informaltable>
 
-    <para>It is required that you use &man.ssh.1;
-      to connect to the project hosts.
-      If you do
-      not know anything about &man.ssh.1;, please see
-      <xref linkend="ssh.guide"/>.</para>
+    <para>&man.ssh.1; is required to connect to the project hosts.
+      For more information, see <xref linkend="ssh.guide"/>.</para>
 
     <para>Useful links:</para>
 
     <itemizedlist>
-      <listitem><para><ulink url="&url.base;/internal/">FreeBSD
-	    Project Internal Pages</ulink></para></listitem>
+      <listitem>
+	<para><ulink url="&url.base;/internal/">&os;
+	    Project Internal Pages</ulink></para>
+      </listitem>
 
-      <listitem><para><ulink
-	    url="&url.base;/internal/machines.html">FreeBSD Project
-	  Hosts</ulink></para></listitem>
-
-      <listitem><para><ulink
-	    url="&url.base;/administration.html">FreeBSD Project
-	  Administrative Groups</ulink></para></listitem>
+      <listitem>
+	<para><ulink
+	    url="&url.base;/internal/machines.html">&os; Project
+	    Hosts</ulink></para>
+      </listitem>
+
+      <listitem>
+	<para><ulink
+	    url="&url.base;/administration.html">&os; Project
+	    Administrative Groups</ulink></para>
+      </listitem>
     </itemizedlist>
   </sect1>
 
   <sect1 id="committer.types">
     <title>Commit Bit Types</title>
 
-    <para>The FreeBSD repository has a number of components which,
+    <para>The &os; repository has a number of components which,
       when combined, support the basic operating system source,
       documentation, third party application ports infrastructure, and
-      various maintained utilities.  When FreeBSD commit bits are
+      various maintained utilities.  When &os; commit bits are
       allocated, the areas of the tree where the bit may be used are
       specified.  Generally, the areas associated with a bit reflect
       who authorized the allocation of the commit bit.  Additional
@@ -237,34 +237,40 @@
       of the tree where the work is occurring.</para>
 
     <sect2>
-      <title>Policy for <filename>doc/</filename> committer activity
-        in <filename>src/</filename></title>
+      <title>Policy for <filename>doc/</filename> Committer Activity
+	in <filename>src/</filename></title>
 
       <itemizedlist>
-	<listitem><para>doc committers may commit documentation
-	  changes to src files, such as man pages, READMEs, fortune
-	  databases, calendar files, and comment fixes without
-	  approval from a src committer, subject to the normal care
-	  and tending of commits.</para></listitem>
-
-	<listitem><para>doc committers may commit minor src changes
-	  and fixes, such as build fixes, small features, etc, with an
-	  "Approved by" from a src committer.</para></listitem>
-
-	<listitem><para>doc committers may seek an upgrade to a src
-	  commit bit by acquiring a mentor, who will propose the doc
-	  committer to core.  When approved, they will be added to
-	  'access' and the normal mentoring period will ensue, which
-	  will involve a continuing of <quote>Approved by</quote> for
-	  some period.</para></listitem>
-
-	<listitem><para>"Approved by" is only acceptable from
-	  non-mentored src committers -- mentored committers can
-	  provide a "Reviewed by" but not an "Approved
-	  by".</para></listitem>
+	<listitem>
+	  <para>doc committers may commit documentation changes to src
+	    files, such as man pages, READMEs, fortune databases,
+	    calendar files, and comment fixes without approval from a
+	    src committer, subject to the normal care and tending of
+	    commits.</para>
+	</listitem>
+
+	<listitem>
+	  <para>doc committers may commit minor src changes and fixes,
+	    such as build fixes, small features, etc, with an
+	    "Approved by" from a src committer.</para>
+	</listitem>
+
+	<listitem>
+	  <para>doc committers may seek an upgrade to a src commit bit
+	    by acquiring a mentor, who will propose the doc committer
+	    to core.  When approved, they will be added to 'access'
+	    and the normal mentoring period will ensue, which will
+	    involve a continuing of <quote>Approved by</quote> for
+	    some period.</para>
+	</listitem>
+
+	<listitem>
+	  <para>"Approved by" is only acceptable from non-mentored src
+	    committers -- mentored committers can provide a "Reviewed
+	    by" but not an "Approved by".</para>
+	</listitem>
       </itemizedlist>
     </sect2>
-
   </sect1>
 
   <sect1 id="subversion-primer">
@@ -274,13 +280,13 @@
       operation of the version control systems in use.  Traditionally
       this was CVS.  Subversion is used for the <literal>src</literal>
       tree as of May 2008, the <literal>doc/www</literal> tree as of
-      May 2012 and the <literal>ports</literal> tree as of July 2012.
-      </para>
+      May 2012 and the <literal>ports</literal> tree as of July
+      2012.</para>
 
     <para><ulink url="http://wiki.freebsd.org/SubversionMissing">There
-      is a list of things missing in Subversion when compared to CVS
-      </ulink>.  The notes at <ulink
-      url="http://people.freebsd.org/~peter/svn_notes.txt"></ulink>
+	is a list of things missing in Subversion when compared to
+	CVS</ulink>.  The notes at <ulink
+	url="http://people.freebsd.org/~peter/svn_notes.txt"></ulink>
       might also be useful.</para>
 
     <sect2 id="svn-intro">
@@ -336,30 +342,37 @@
 	<listitem>
 	  <para>Commits are atomic.</para>
 	</listitem>
+
 	<listitem>
 	  <para>Revision numbers apply across the repository&mdash;all
 	    files that were modified in the same commit have the same
 	    revision number.</para>
 	</listitem>
+
 	<listitem>
 	  <para>Branching and tagging are namespace operations.</para>
 	</listitem>
+
 	<listitem>
 	  <para>Directories are versioned.</para>
 	</listitem>
+
 	<listitem>
 	  <para>Files and directories can have arbitrary, versioned
 	    metadata attached to them.</para>
 	</listitem>
+
 	<listitem>
 	  <para>Files and directories can be copied, with full history
 	    tracking.</para>
 	</listitem>
+
 	<listitem>
 	  <para>No more contortions due to <acronym>CVS</acronym>
 	    weakness such as applying &man.patch.1; files at compile
 	    time in order to avoid touching vendor branch code.</para>
 	</listitem>
+
 	<listitem>
 	  <para>No more repo-copies.</para>
 	</listitem>
@@ -378,7 +391,7 @@
       <para>There are a few ways to obtain a working copy of the tree
 	from Subversion.  This section will explain them.</para>
 
-      <sect3>
+      <sect3 id="svn-getting-started-direct-checkout">
 	<title>Direct Checkout</title>
 
 	<para>The first is to check out directly from the main
@@ -445,7 +458,7 @@
 	</note>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-getting-started-checkout-from-a-mirror">
 	<title>Checkout from a Mirror</title>
 
 	<para>Check out a working copy from a mirror by
@@ -455,13 +468,14 @@
 	  using <command>svnsync</command>.</para>
 
 	<para>There is a serious disadvantage to this method: every
-	  time something is to be committed, a <command>svn switch
-	    --relocate</command> to the master repository has to be
-	  done, remembering to <command>svn switch</command> back to
-	  the mirror after the commit.  Also, since <command>svn
-	    switch</command> only works between repositories that have
-	  the same UUID, some hacking of the local repository's UUID
-	  has to occur before it is possible to start using it.</para>
+	  time something is to be committed, a
+	  <command>svn relocate</command> to the master repository has
+	  to be done, remembering to <command>svn relocate</command>
+	  back to the mirror after the commit.  Also, since
+	  <command>svn relocate</command> only works between
+	  repositories that have the same UUID, some hacking of the
+	  local repository's UUID has to occur before it is possible
+	  to start using it.</para>
 
 	<para>Unlike with <acronym>CVS</acronym>,
 	  the hassle of a local
@@ -471,7 +485,7 @@
 	  information on how to set one up.</para>
       </sect3>
 
-      <sect3 id="subversion-primer-base-layout">
+      <sect3 id="svn-getting-started-base-layout">
 	<title><literal>RELENG_*</literal> Branches and General
 	  Layout</title>
 
@@ -489,26 +503,29 @@
 
 	<itemizedlist>
 	  <listitem>
-	    <para><emphasis>/head/</emphasis>
-	      which corresponds to <literal>HEAD</literal>, also known as
-	      <literal>-CURRENT</literal>.
-	    </para>
+	    <para><emphasis>/head/</emphasis> which corresponds to
+	      <literal>HEAD</literal>, also known as
+	      <literal>-CURRENT</literal>.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/stable/<replaceable>n</replaceable></emphasis>
 	      which corresponds to
 	      <literal>RELENG_<replaceable>n</replaceable></literal>.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/releng/<replaceable>n.n</replaceable></emphasis>
 	      which corresponds to
 	      <literal>RELENG_<replaceable>n_n</replaceable></literal>.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/release/<replaceable>n.n.n</replaceable></emphasis>
 	      which corresponds to
 	      <literal>RELENG_<replaceable>n_n_n</replaceable>_RELEASE</literal>.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/vendor*</emphasis> is the vendor branch
 	      import work area.  This directory itself does not
@@ -517,6 +534,7 @@
 	      <emphasis>releng</emphasis> and
 	      <emphasis>release</emphasis> directories.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/projects</emphasis> and
 	      <emphasis>/user</emphasis> feature a branch work area,
@@ -527,21 +545,21 @@
 	</itemizedlist>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-getting-started-doc-layout">
 	<title>&os; Documentation Project Branches and
 	  Layout</title>
 
 	<para>In <literal>svn+ssh://svn.freebsd.org/doc</literal>,
-	  <emphasis>doc</emphasis> refers repository root of the
-	  source tree.</para>
+	  <emphasis>doc</emphasis> refers to the repository root of
+	  the source tree.</para>
 
 	<para>In general, most &os; Documentation Project work will be
 	  done within the <filename>head/</filename> branch of the
-	  source tree.</para>
+	  documentation source tree.</para>
 
 	<para>&os; documentation is written and/or translated to
-	  various languages, each of which within a separate
-	  directory within the <filename>head/</filename>
+	  various languages, each in a separate
+	  directory in the <filename>head/</filename>
 	  branch.</para>
 
 	<para>Each translation set contains several subdirectories for
@@ -554,11 +572,13 @@
 	      code for articles written by various &os;
 	      contributors.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/books/</emphasis> contains the source
 	      code for the different books, such as the
 	      &os;&nbsp;Handbook.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/htdocs/</emphasis> contains the source
 	      code for the &os;&nbsp;website.</para>
@@ -566,7 +586,7 @@
 	</itemizedlist>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-getting-started-ports-layout">
 	<title>&os; Ports Tree Branches and Layout</title>
 
 	<para>In <literal>svn+ssh://svn.freebsd.org/ports</literal>,
@@ -580,17 +600,20 @@
 
 	<itemizedlist>
 	  <listitem>
-	    <para><emphasis>/branches/RELENG_<replaceable>n_n_n
-		</replaceable></emphasis> which corresponds to
-		<literal>RELENG_<replaceable>n_n_n</replaceable></literal>
+	    <para><emphasis>/branches/RELENG_<replaceable>n_n_n</replaceable></emphasis>
+	      which corresponds to
+	      <literal>RELENG_<replaceable>n_n_n</replaceable></literal>
 	      is used to merge back security updates in preparation
 	      for a release.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/tags/RELEASE_<replaceable>n_n_n</replaceable></emphasis>
-	      which corresponds to <literal>RELEASE_<replaceable>n_n_n</replaceable></literal>
+	      which corresponds to
+	      <literal>RELEASE_<replaceable>n_n_n</replaceable></literal>
 	      represents a release tag of the ports tree.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/tags/RELEASE_<replaceable>n</replaceable>_EOL</emphasis>
 	      represents the end of life tag of a specific &os;
@@ -606,21 +629,20 @@
       <para>This section will explain how to perform common day-to-day
 	operations with Subversion.</para>
 
-      <sect3>
+      <sect3 id="svn-daily-use-help">
 	<title>Help</title>
 
-	<para><acronym>SVN</acronym>
-	  has built in help documentation.  It can be accessed by
-	  typing the following command:</para>
+	<para><acronym>SVN</acronym> has built in help documentation.
+	  It can be accessed by typing the following command:</para>
 
 	<screen>&prompt.user; <userinput>svn help</userinput></screen>
 
-	<para>Additional information can be found in the <ulink
-	    url="http://svnbook.red-bean.com/">
-	      Subversion Book</ulink>.</para>
+	<para>Additional information can be found in the
+	  <ulink url="http://svnbook.red-bean.com/">Subversion
+	    Book</ulink>.</para>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-checkout">
 	<title>Checkout</title>
 
 	<para>As seen earlier, to check out the &os; head
@@ -683,7 +705,7 @@
 	</note>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-anonymous-checkout">
 	<title>Anonymous Checkout</title>
 
 	<para>It is possible to anonymously check out the &os;
@@ -699,7 +721,7 @@
 	    mirror sites</ulink>.</para>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-updating-the-tree">
 	<title>Updating the Tree</title>
 
 	<para>To update a working copy to either the latest revision,
@@ -709,7 +731,7 @@
 &prompt.user; <userinput>svn update -<replaceable>r12345</replaceable></userinput></screen>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-status">
 	<title>Status</title>
 
 	<para>To view the local changes that have been made to the
@@ -717,17 +739,17 @@
 
 	<screen>&prompt.user; <userinput>svn status</userinput></screen>
 
-	<para>To show local changes and files that are out-of-date do:</para>
+	<para>To show local changes and files that are out-of-date
+	  do:</para>
 
 	<screen>&prompt.user; <userinput>svn status --show-updates</userinput></screen>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-editing-and-committing">
 	<title>Editing and Committing</title>
 
-	<para>Unlike Perforce,
-	  <acronym>SVN</acronym> does not
-	  need to be told in advance about file editing.</para>
+	<para>Unlike Perforce, <acronym>SVN</acronym> does not need to
+	  be told in advance about file editing.</para>
 
 	<para><command>svn commit</command> works like the equivalent
 	  <acronym>CVS</acronym> command.  To commit all changes in
@@ -743,15 +765,15 @@
 
 	<screen>&prompt.user; <userinput>svn commit <replaceable>lib/libfetch</replaceable> <replaceable>usr/bin/fetch</replaceable></userinput></screen>
 
-	<para>There is also a commit wrapper for the ports tree
-	  to handle the properties and sanity checking your
+	<para>There is also a commit wrapper for the ports tree to
+	  handle the properties and sanity checking your
 	  changes:</para>
 
 	<screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/psvn commit
 	  </userinput></screen>
       </sect3>
 
-      <sect3 id="subversion-primer-add-remove">
+      <sect3 id="svn-daily-use-adding-and-removing">
 	<title>Adding and Removing Files</title>
 
 	<note>
@@ -762,13 +784,12 @@
 	      ports tree specific version</ulink>)
 	    and add it to <filename>~/.subversion/config</filename>
 	    according to the instructions in the file.  If you added
-	    something before you've read this, you may use
+	    something before reading this, use
 	    <command>svn rm --keep-local</command> for just added
 	    files, fix your config file and re-add them again.  The
 	    initial config file is created when you first run a svn
-	    command, even something as simple as <command>svn
-	      help</command>.
-	    </para>
+	    command, even something as simple as
+	    <command>svn help</command>.</para>
 	</note>
 
 	<para>Files are added to a
@@ -778,85 +799,88 @@
 
 	<screen>&prompt.user; <userinput>svn add <replaceable>foo</replaceable></userinput></screen>
 
+	<note>
+	  <para>Most new source files should include a
+	    <literal>&dollar;&os;&dollar;</literal> string in the
+	    new file.  On commit, <command>svn</command> will expand
+	    the <literal>&dollar;&os;&dollar;</literal> string,
+	    adding the file path, revision number, date and time of
+	    commit, and the username of the committer.  Files which
+	    cannot be modified may be committed without the
+	    <literal>&dollar;&os;&dollar;</literal> string.</para>
+	</note>
+
 	<para>Files can be removed with <command>svn
 	    remove</command>:</para>
 
 	<screen>&prompt.user; <userinput>svn remove <replaceable>foo</replaceable></userinput></screen>
 
-	<para>Subversion does not require <command>rm</command>ing the
-	  file before <command>svn rm</command>ing it, and indeed
-	  complains if that happens.</para>
+	<para>Subversion does not require deleting the file before
+	  using <command>svn rm</command>, and indeed complains if
+	  that happens.</para>
 
-	<para>It is possible to add directories with <command>svn
-	    add</command>:</para>
+	<para>It is possible to add directories with
+	  <command>svn add</command>:</para>
 
 	<screen>&prompt.user; <userinput>mkdir <replaceable>bar</replaceable></userinput>
 &prompt.user; <userinput>svn add <replaceable>bar</replaceable></userinput></screen>
 
-	<para>Although <command>svn mkdir</command> makes this
-	  easier by combining the creation of the directory and the
-	  adding of it:</para>
+	<para>Although <command>svn mkdir</command> makes this easier
+	  by combining the creation of the directory and the adding of
+	  it:</para>
 
 	<screen>&prompt.user; <userinput>svn mkdir <replaceable>bar</replaceable></userinput></screen>
 
-	<para>The directory is not immediately
-	  created in the repository when you use <command>svn
-	    mkdir</command>.  Subversion
-	  allows directories to be removed using <command>svn
-	    rm</command>, however there is no <command>svn
-	    rmdir</command>:</para>
+	<para>Like files, directories are removed with
+	  <command>svn rm</command>.  There is no separate command
+	  specifically for removing directories.</para>
 
 	<screen>&prompt.user; <userinput>svn rm <replaceable>bar</replaceable></userinput></screen>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-copying-and-moving">
 	<title>Copying and Moving Files</title>
 
-	<para>The following (obviously) creates a copy of
-	  <filename>foo.c</filename>, named
-	  <filename>bar.c</filename>:</para>
+	<para>This command creates a copy of
+	  <filename>foo.c</filename> named <filename>bar.c</filename>,
+	  with the new file also under version control:</para>
 
 	<screen>&prompt.user; <userinput>svn copy <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput></screen>
 
-	<para>To move and rename a file:</para>
+	<para>The example above is equivalent to:</para>
 
-	<screen>&prompt.user; <userinput>svn move <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput></screen>
+	<screen>&prompt.user; <userinput>cp foo.c bar.c</userinput>
+&prompt.user; <userinput>svn add bar.c</userinput></screen>
 
-	<para>The above command is the exact equivalent of:</para>
+	<para>To move and rename a file:</para>
 
-	<screen>&prompt.user; <userinput>svn copy <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput>
-&prompt.user; <userinput>svn remove <replaceable>foo.c</replaceable></userinput></screen>
+	<screen>&prompt.user; <userinput>svn move <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput></screen>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-log-and-annotate">
 	<title>Log and Annotate</title>
 
-	<para><command>svn log</command> will show all the
-	  revisions that affect a directory and files within that
-	  directory in reverse chronological order, if run on a
-	  directory.  This contrasts with <command>cvs log</command>
-	  in that <acronym>CVS</acronym> shows the complete log for
-	  each file in the directory, including duplicate entries for
-	  revisions that affect multiple files.</para>
+	<para><command>svn log</command> shows revisions and commit
+	  messages, most recent first, for files or directories.  When
+	  used on a directory, all revisions that affected the
+	  directory and files within that directory are shown.</para>
 
 	<para><command>svn annotate</command>, or equally <command>svn
-	    praise</command> or <command>svn blame</command>, is
-	  equivalent to <command>cvs annotate</command> in everything
-	  but output format.</para>
+	    praise</command> or <command>svn blame</command>, shows
+	  the most recent revision number and who committed that
+	  revision for each line of a file.</para>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-diffs">
 	<title>Diffs</title>
 
 	<para><command>svn diff</command> displays changes to the
-	  working copy of the repository.  Diffs generated by
-	  <acronym>SVN</acronym> are unified
-	  and include new files by default
-	  in the diff output.</para>
-
-	<para><command>svn
-	    diff</command> can show the changes between two revisions
-	  of the same file:</para>
+	  working copy.  Diffs generated by <acronym>SVN</acronym> are
+	  unified and include new files by default in the diff
+	  output.</para>
+
+	<para><command>svn diff</command> can show the changes between
+	  two revisions of the same file:</para>
 
 	<screen>&prompt.user; <userinput>svn diff -r179453:179454 ROADMAP.txt</userinput></screen>
 
@@ -868,20 +892,19 @@
 	<screen>&prompt.user; <userinput>svn diff -c179454 .</userinput></screen>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-reverting">
 	<title>Reverting</title>
 
 	<para>Local changes (including additions and deletions) can be
-	  reverted using <command>svn revert</command>.
-	  It does not update out-of-date
-	  files&mdash;it just replaces them with pristine copies of
-	  the original version.</para>
+	  reverted using <command>svn revert</command>.  It does not
+	  update out-of-date files, but just replaces them with
+	  pristine copies of the original version.</para>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-conflicts">
 	<title>Conflicts</title>
 
-	<para>If a <command>svn update</command> resulted in a merge
+	<para>If an <command>svn update</command> resulted in a merge
 	  conflict, Subversion will remember which files have
 	  conflicts and refuse to commit any changes to those files
 	  until explicitly told that the conflicts have been resolved.
@@ -903,22 +926,26 @@
 	      working directory (which one presumes has been edited to
 	      resolve the conflicts).</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><literal>base</literal>: use a pristine copy of the
 	      version you had before <command>svn update</command>,
 	      discarding your own changes, the conflicting changes,
 	      and possibly other intervening changes as well.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><literal>mine-full</literal>: use what you had
 	      before <command>svn update</command>, including your own
 	      changes, but discarding the conflicting changes, and
 	      possibly other intervening changes as well.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><literal>theirs-full</literal>: use the version that
-	      was retrieved when you did <command>svn
-		update</command>, discarding your own changes.</para>
+	      was retrieved when you did
+	      <command>svn update</command>, discarding your own
+	      changes.</para>
 	  </listitem>
 	</itemizedlist>
       </sect3>
@@ -927,27 +954,15 @@
     <sect2>
       <title>Advanced Use</title>
 
-      <sect3>
+      <sect3 id="svn-advanced-use-sparse-checkouts">
 	<title>Sparse Checkouts</title>
 
-	<para>The equivalent to <command>cvs checkout -l</command>,
-	  which checks out a directory without its subdirectories, is
-	  <command>svn checkout -N</command>.  Unlike
-	  <acronym>CVS</acronym>, <acronym>SVN</acronym> remembers the
-	  <literal>-N</literal> so that a <command>svn
-	    update</command> does not end up pulling down the
-	  subdirectories.  In Subversion 1.5 and newer,
-	  <literal>-N</literal> has been deprecated in favour of the
-	  <literal>--depth</literal> option which allows for precise
-	  control.  Therefore:</para>
-
-	<screen>&prompt.user; <userinput>svn checkout -N svn+ssh://svn.freebsd.org/base ~/freebsd</userinput></screen>
-
-	<para>is equivalent to:</para>
+	<para><acronym>SVN</acronym> allows
+	  <emphasis>sparse</emphasis>, or partial checkouts of a
+	  directory by adding <option>--depth</option> to a
+	  <command>svn checkout</command>.</para>
 
-	<screen>&prompt.user; <userinput>svn checkout --depth=empty svn+ssh://svn.freebsd.org/base ~/freebsd</userinput></screen>
-
-	<para>Valid arguments to <literal>--depth</literal>
+	<para>Valid arguments to <option>--depth</option>
 	  are:</para>
 
 	<itemizedlist>
@@ -955,15 +970,18 @@
 	    <para><literal>empty</literal>: the directory itself
 	      without any of its contents.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><literal>files</literal>: the directory and any
 	      files it contains.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><literal>immediates</literal>: the directory and any
 	      files and directories it contains, but none of the
 	      subdirectories' contents.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><literal>infinity</literal>: anything.</para>
 	  </listitem>
@@ -988,39 +1006,44 @@
 	  <filename>ROADMAP.txt</filename> and empty subdirectories,
 	  and nothing will happen when <command>svn update</command>
 	  is executed on the subdirectories.  However, the following
-	  command will set the depth for head (in this case) to
-	  infinity, and fully populate it:</para>
+	  command will set the depth for
+	  <replaceable>head</replaceable> (in this case) to infinity,
+	  and fully populate it:</para>
 
 	<screen>&prompt.user; <userinput>svn update --set-depth=infinity <replaceable>head</replaceable></userinput></screen>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-advanced-use-direct-operation">
 	<title>Direct Operation</title>
 
 	<para>Certain operations can be performed directly on the
-	  repository, without touching the working copy.
-	  Specifically, this applies to any operation that does not
-	  require editing a file, including:</para>
+	  repository without touching the working copy.  Specifically,
+	  this applies to any operation that does not require editing
+	  a file, including:</para>
 
 	<itemizedlist>
 	  <listitem>
 	    <para><literal>log</literal>,
-	      <literal>diff</literal>.</para>
+	      <literal>diff</literal></para>
 	  </listitem>
+
 	  <listitem>
-	    <para><literal>mkdir</literal>.</para>
+	    <para><literal>mkdir</literal></para>
 	  </listitem>
+
 	  <listitem>
 	    <para><literal>remove</literal>, <literal>copy</literal>,
-	      <literal>rename</literal>.</para>
+	      <literal>rename</literal></para>
 	  </listitem>
+
 	  <listitem>
 	    <para><literal>propset</literal>,
 	      <literal>propedit</literal>,
-	      <literal>propdel</literal>.</para>
+	      <literal>propdel</literal></para>
 	  </listitem>
+
 	  <listitem>
-	    <para><literal>merge</literal>.</para>
+	    <para><literal>merge</literal></para>
 	  </listitem>
 	</itemizedlist>
 
@@ -1029,8 +1052,8 @@
 
 	<screen>&prompt.user; <userinput>svn copy svn+ssh://svn.freebsd.org/base/head svn+ssh://svn.freebsd.org/base/stable/8</userinput></screen>
 
-	<para>This is equivalent to the following set of
-	  commands which take minutes and hours as opposed to seconds,
+	<para>This is equivalent to the following set of commands
+	  which take minutes and hours as opposed to seconds,
 	  depending on your network connection:</para>
 
 	<screen>&prompt.user; <userinput>svn checkout --depth=immediates svn+ssh://svn.freebsd.org/base</userinput>
@@ -1040,7 +1063,7 @@
 &prompt.user; <userinput>svn commit stable/8</userinput></screen>
       </sect3>
 
-      <sect3 id="subversion-primer-merge">
+      <sect3 id="svn-advanced-use-merging">
 	<title>Merging with <acronym>SVN</acronym></title>
 
 	<para>This section deals with merging code from one branch to
@@ -1067,37 +1090,39 @@
 
 	  <para>It is <emphasis>not</emphasis> inherited.  For
 	    instance, <filename
-	      class="directory">stable/6/contrib/openpam/</filename>
-	    does not implicitly inherit mergeinfo from <filename
-	      class="directory">stable/6/</filename>, or <filename
-	      class="directory">stable/6/contrib/</filename>.  Doing
-	    so would make partial checkouts very hard to manage.
+	    class="directory">stable/6/contrib/openpam/</filename>
+	    does not implicitly inherit mergeinfo from
+	    <filename class="directory">stable/6/</filename>, or
+	    <filename class="directory">stable/6/contrib/</filename>.
+	    Doing so would make partial checkouts very hard to manage.
 	    Instead, mergeinfo is explicitly propagated down the tree.
-	    For merging something into <filename
-	      class="directory">branch/foo/bar/</filename>, the
-	    following rules apply:</para>
+	    For merging something into
+	    <filename class="directory">branch/foo/bar/</filename>,
+	    the following rules apply:</para>
 
 	  <orderedlist>
 	    <listitem>
-	      <para>If <filename
-		  class="directory">branch/foo/bar/</filename> doesn't
-		already have a mergeinfo record, but a direct ancestor
-		(for instance, <filename
-		  class="directory">branch/foo/</filename>) does,
-		then that record will be propagated down to
+	      <para>If
+		<filename class="directory">branch/foo/bar/</filename>
+		does not already have a mergeinfo record, but a direct
+		ancestor (for instance,
+		<filename class="directory">branch/foo/</filename>)
+		does, then that record will be propagated down to
 		<filename class="directory">branch/foo/bar/</filename>
-		before information
-		about the current merge is recorded.</para>
+		before information about the current merge is
+		recorded.</para>
 	    </listitem>
+
 	    <listitem>
 	      <para>Information about the current merge will
 		<emphasis>not</emphasis> be propagated back up that
 		ancestor.</para>
 	    </listitem>
+
 	    <listitem>
-	      <para>If a direct descendant of <filename
-		  class="directory">branch/foo/bar/</filename> (for
-		instance, <filename
+	      <para>If a direct descendant of
+		<filename class="directory">branch/foo/bar/</filename>
+		(for instance, <filename
 		  class="directory">branch/foo/bar/baz/</filename>)
 		already has a mergeinfo record, information about the
 		current merge will be propagated down to it.</para>
@@ -1132,43 +1157,51 @@
 	    <listitem>
 	      <para>Never merge directly to a file.</para>
 	    </listitem>
+
 	    <listitem>
 	      <para>Never, ever merge directly to a file.</para>
 	    </listitem>
+
 	    <listitem>
 	      <para><emphasis>Never, ever, ever</emphasis> merge
 		directly to a file.</para>
 	    </listitem>
+
 	    <listitem>
 	      <para>Changes to kernel code should be merged to
 		<filename class="directory">sys/</filename>.  For
 		instance, a change to the &man.ichwd.4; driver should
-		be merged to <filename
-		  class="directory">sys/</filename>, not <filename
-		  class="directory">sys/dev/ichwd/</filename>.
+		be merged to

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

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jul 11 03:06:46 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 20253313;
 Thu, 11 Jul 2013 03:06:46 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1057C1CC8;
 Thu, 11 Jul 2013 03:06:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6B36jfD095506;
 Thu, 11 Jul 2013 03:06:45 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6B36iNP095497;
 Thu, 11 Jul 2013 03:06:44 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201307110306.r6B36iNP095497@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 11 Jul 2013 03:06:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42244 - in projects/sysctl: .
 de_DE.ISO8859-1/books/handbook/firewalls
 de_DE.ISO8859-1/books/porters-handbook
 el_GR.ISO8859-7/books/handbook/firewalls el_GR.ISO8859-7/share/xml en_US.I...
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jul 2013 03:06:46 -0000

Author: gjb
Date: Thu Jul 11 03:06:43 2013
New Revision: 42244
URL: http://svnweb.freebsd.org/changeset/doc/42244

Log:
  MFH:
     Merged /head/Makefile:r41729-42242
     Merged /head/README:r41729-42242
     Merged /head/bn_BD.ISO10646-1:r41730-42242
     Merged /head/da_DK.ISO8859-1:r41730-42242
     Merged /head/de_DE.ISO8859-1:r41947-42242
     Merged /head/el_GR.ISO8859-7:r41730-42242
     Merged /head/en_US.ISO8859-1:r42010-42242
     Merged /head/es_ES.ISO8859-1:r41730-42242
     Merged /head/fr_FR.ISO8859-1:r41947-42242
     Merged /head/hu_HU.ISO8859-2:r41730-42242
     Merged /head/it_IT.ISO8859-15:r41947-42242
     Merged /head/ja_JP.eucJP:r42010-42242
     Merged /head/mn_MN.UTF-8:r41947-42242
     Merged /head/nl_NL.ISO8859-1/share/xml/entities.ent:r41724-42242
     Merged /head/nl_NL.ISO8859-1:r41947-42242
     Merged /head/no_NO.ISO8859-1:r41730-42242
     Merged /head/pl_PL.ISO8859-2:r41730-42242
     Merged /head/pt_BR.ISO8859-1:r41730-42242
     Merged /head/release:r41730-42242
     Merged /head/ru_RU.KOI8-R:r41947-42242
     Merged /head/share:r42010-42242
     Merged /head/sr_YU.ISO8859-2:r41730-42242
     Merged /head/tr_TR.ISO8859-9:r41730-42242
     Merged /head/zh_CN.GB2312:r41947-42242
     Merged /head/zh_TW.Big5:r41730-42242
     Merged /projects/ISBN_1-57176-407-0/en_US.ISO8859-1:r40727-41455,
  	41457-41469,41472-41477,41479-41513,41515-41521,41523-41577,
  	41579-41581,41583-42013
     Merged /projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/share/xml/entities.ent:r40727-42011
     Merged /projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1:r40727-42011
     Merged /projects/ISBN_1-57176-407-0/share:r40727-42011
     Merged /projects/entities/bn_BD.ISO10646-1:r40180-42225
     Merged /projects/entities/da_DK.ISO8859-1:r40180-42225
     Merged /projects/entities/de_DE.ISO8859-1:r40180-42225
     Merged /projects/entities/el_GR.ISO8859-7:r40180-42225
     Merged /projects/entities/en_US.ISO8859-1:r40180-42225
     Merged /projects/entities/es_ES.ISO8859-1:r40180-42225
     Merged /projects/entities/fr_FR.ISO8859-1:r40180-42225
     Merged /projects/entities/hu_HU.ISO8859-2:r40180-42225
     Merged /projects/entities/it_IT.ISO8859-15:r40180-42225
     Merged /projects/entities/ja_JP.eucJP:r40180-42225
     Merged /projects/entities/mn_MN.UTF-8:r40180-42225
     Merged /projects/entities/nl_NL.ISO8859-1/share/xml/entities.ent:r40180-42225
     Merged /projects/entities/nl_NL.ISO8859-1:r40180-42225
     Merged /projects/entities/no_NO.ISO8859-1:r40180-42225
     Merged /projects/entities/pl_PL.ISO8859-2:r40180-42225
     Merged /projects/entities/pt_BR.ISO8859-1:r40180-42225
     Merged /projects/entities/release:r40180-42225
     Merged /projects/entities/ru_RU.KOI8-R:r40180-42225
     Merged /projects/entities/share:r40180-42225
     Merged /projects/entities/sr_YU.ISO8859-2:r40180-42225
     Merged /projects/entities/tr_TR.ISO8859-9:r40180-42225
     Merged /projects/entities/zh_CN.GB2312:r40180-42225
     Merged /projects/entities/zh_TW.Big5:r40180-42225
     Merged /projects/print2013/en_US.ISO8859-1:r40693-40726
     Merged /projects/print2013/nl_NL.ISO8859-1/share/xml/entities.ent:r40693-40726
     Merged /projects/print2013/nl_NL.ISO8859-1:r40693-40726
     Merged /projects/print2013/share:r40693-40726
  
  Approved by:	doceng (implicit)

Added:
  projects/sysctl/en_US.ISO8859-1/books/fdp-primer/xml-primer/
     - copied from r42242, head/en_US.ISO8859-1/books/fdp-primer/xml-primer/
  projects/sysctl/en_US.ISO8859-1/htdocs/java/links.xml
     - copied unchanged from r42242, head/en_US.ISO8859-1/htdocs/java/links.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml
     - copied unchanged from r42242, head/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/news/status/report-2013-05-devsummit.xml
     - copied unchanged from r42242, head/en_US.ISO8859-1/htdocs/news/status/report-2013-05-devsummit.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/releases/9.2R/
     - copied from r42242, head/en_US.ISO8859-1/htdocs/releases/9.2R/
  projects/sysctl/ja_JP.eucJP/htdocs/java/links.xml
     - copied unchanged from r42242, head/ja_JP.eucJP/htdocs/java/links.xml
  projects/sysctl/share/pgpkeys/feld.key
     - copied unchanged from r42242, head/share/pgpkeys/feld.key
  projects/sysctl/share/pgpkeys/loos.key
     - copied unchanged from r42242, head/share/pgpkeys/loos.key
  projects/sysctl/share/pgpkeys/marino.key
     - copied unchanged from r42242, head/share/pgpkeys/marino.key
  projects/sysctl/share/security/advisories/FreeBSD-EN-13:01.fxp.asc
     - copied unchanged from r42242, head/share/security/advisories/FreeBSD-EN-13:01.fxp.asc
  projects/sysctl/share/security/advisories/FreeBSD-EN-13:02.vtnet.asc
     - copied unchanged from r42242, head/share/security/advisories/FreeBSD-EN-13:02.vtnet.asc
  projects/sysctl/share/security/patches/EN-13:01/
     - copied from r42242, head/share/security/patches/EN-13:01/
  projects/sysctl/share/security/patches/EN-13:02/
     - copied from r42242, head/share/security/patches/EN-13:02/
Deleted:
  projects/sysctl/en_US.ISO8859-1/books/fdp-primer/sgml-primer/
  projects/sysctl/en_US.ISO8859-1/books/handbook/vinum/
  projects/sysctl/en_US.ISO8859-1/htdocs/docproj/todo.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/java/advocacy.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/java/dists/15.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/search/opensearch/cvsweb.xml
  projects/sysctl/ja_JP.eucJP/htdocs/java/advocacy.xml
  projects/sysctl/ja_JP.eucJP/htdocs/java/dists/15.xml
  projects/sysctl/ja_JP.eucJP/htdocs/java/links/
  projects/sysctl/share/xml/developers.ent
Modified:
  projects/sysctl/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
  projects/sysctl/de_DE.ISO8859-1/books/porters-handbook/book.xml
  projects/sysctl/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
  projects/sysctl/el_GR.ISO8859-7/share/xml/trademarks.ent
  projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml
  projects/sysctl/en_US.ISO8859-1/articles/console-server/article.xml
  projects/sysctl/en_US.ISO8859-1/articles/contributors/article.xml
  projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
  projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
  projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
  projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
  projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
  projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
  projects/sysctl/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
  projects/sysctl/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
  projects/sysctl/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
  projects/sysctl/en_US.ISO8859-1/articles/hubs/article.xml
  projects/sysctl/en_US.ISO8859-1/articles/linux-emulation/article.xml
  projects/sysctl/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
  projects/sysctl/en_US.ISO8859-1/articles/nanobsd/article.xml
  projects/sysctl/en_US.ISO8859-1/articles/pam/article.xml
  projects/sysctl/en_US.ISO8859-1/articles/releng-packages/article.xml
  projects/sysctl/en_US.ISO8859-1/articles/releng/article.xml
  projects/sysctl/en_US.ISO8859-1/articles/remote-install/article.xml
  projects/sysctl/en_US.ISO8859-1/articles/serial-uart/article.xml
  projects/sysctl/en_US.ISO8859-1/articles/vm-design/article.xml
  projects/sysctl/en_US.ISO8859-1/books/dev-model/book.xml
  projects/sysctl/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/faq/book.xml
  projects/sysctl/en_US.ISO8859-1/books/fdp-primer/Makefile
  projects/sysctl/en_US.ISO8859-1/books/fdp-primer/book.xml
  projects/sysctl/en_US.ISO8859-1/books/fdp-primer/chapters.ent
  projects/sysctl/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/Makefile
  projects/sysctl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/audit/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/basics/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/book.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/boot/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/chapters.ent
  projects/sysctl/en_US.ISO8859-1/books/handbook/config/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/disks/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/install/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/jails/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/mac/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/mail/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/ports/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/preface/preface.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/security/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/users/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/pmake/gods/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/porters-handbook/book.xml
  projects/sysctl/en_US.ISO8859-1/books/porters-handbook/uses.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/administration.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/cgi/cgi-style.pl
  projects/sysctl/en_US.ISO8859-1/htdocs/cgi/monthly.cgi
  projects/sysctl/en_US.ISO8859-1/htdocs/docproj/Makefile
  projects/sysctl/en_US.ISO8859-1/htdocs/docproj/current.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/docs/books.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/internal/doceng.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/java/Makefile
  projects/sysctl/en_US.ISO8859-1/htdocs/java/dists/Makefile
  projects/sysctl/en_US.ISO8859-1/htdocs/java/dists/index.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/java/howhelp.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/java/index.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/java/install.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/news/status/Makefile
  projects/sysctl/en_US.ISO8859-1/htdocs/news/status/status.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/platforms/arm.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/platforms/sparc.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/platforms/xbox.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/portmgr/index.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/ports/references.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/projects/Makefile
  projects/sysctl/en_US.ISO8859-1/htdocs/projects/projects.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/projects/summerofcode-2005.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/projects/summerofcode-2006.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/releases/Makefile
  projects/sysctl/en_US.ISO8859-1/htdocs/releng/index.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/search/opensearch/Makefile
  projects/sysctl/en_US.ISO8859-1/htdocs/search/opensearch/opensearch.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/security/reporting.xml
  projects/sysctl/en_US.ISO8859-1/share/xml/mailing-lists.ent
  projects/sysctl/en_US.ISO8859-1/share/xml/teams.ent
  projects/sysctl/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
  projects/sysctl/es_ES.ISO8859-1/share/xml/trademarks.ent
  projects/sysctl/fr_FR.ISO8859-1/articles/pam/article.xml
  projects/sysctl/fr_FR.ISO8859-1/books/fdp-primer/book.xml
  projects/sysctl/fr_FR.ISO8859-1/htdocs/releng/index.xml
  projects/sysctl/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
  projects/sysctl/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
  projects/sysctl/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml
  projects/sysctl/it_IT.ISO8859-15/articles/vm-design/article.xml
  projects/sysctl/it_IT.ISO8859-15/books/handbook/install/chapter.xml
  projects/sysctl/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml
  projects/sysctl/it_IT.ISO8859-15/books/unix-introduction/book.xml
  projects/sysctl/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml
  projects/sysctl/ja_JP.eucJP/articles/contributors/article.xml
  projects/sysctl/ja_JP.eucJP/books/faq/book.xml
  projects/sysctl/ja_JP.eucJP/books/handbook/Makefile
  projects/sysctl/ja_JP.eucJP/books/handbook/book.xml
  projects/sysctl/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
  projects/sysctl/ja_JP.eucJP/books/handbook/chapters.ent
  projects/sysctl/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
  projects/sysctl/ja_JP.eucJP/books/handbook/desktop/chapter.xml
  projects/sysctl/ja_JP.eucJP/books/handbook/disks/chapter.xml
  projects/sysctl/ja_JP.eucJP/books/handbook/introduction/chapter.xml
  projects/sysctl/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
  projects/sysctl/ja_JP.eucJP/books/handbook/preface/preface.xml
  projects/sysctl/ja_JP.eucJP/books/porters-handbook/book.xml
  projects/sysctl/ja_JP.eucJP/htdocs/docproj/Makefile
  projects/sysctl/ja_JP.eucJP/htdocs/docproj/current.xml
  projects/sysctl/ja_JP.eucJP/htdocs/docs/books.xml
  projects/sysctl/ja_JP.eucJP/htdocs/java/Makefile
  projects/sysctl/ja_JP.eucJP/htdocs/java/dists/Makefile
  projects/sysctl/ja_JP.eucJP/htdocs/java/dists/index.xml
  projects/sysctl/ja_JP.eucJP/htdocs/java/howhelp.xml
  projects/sysctl/ja_JP.eucJP/htdocs/java/index.xml
  projects/sysctl/ja_JP.eucJP/htdocs/java/install.xml
  projects/sysctl/ja_JP.eucJP/htdocs/platforms/arm.xml
  projects/sysctl/ja_JP.eucJP/htdocs/platforms/sparc.xml
  projects/sysctl/ja_JP.eucJP/htdocs/ports/references.xml
  projects/sysctl/ja_JP.eucJP/htdocs/ports/updating.xml
  projects/sysctl/ja_JP.eucJP/htdocs/releases/Makefile
  projects/sysctl/ja_JP.eucJP/htdocs/relnotes.xml
  projects/sysctl/ja_JP.eucJP/htdocs/security/reporting.xml
  projects/sysctl/ja_JP.eucJP/share/xml/mailing-lists.ent
  projects/sysctl/ja_JP.eucJP/share/xml/navibar.l10n.ent
  projects/sysctl/ja_JP.eucJP/share/xml/news.xml
  projects/sysctl/ja_JP.eucJP/share/xml/teams.ent
  projects/sysctl/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml
  projects/sysctl/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
  projects/sysctl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
  projects/sysctl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml
  projects/sysctl/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
  projects/sysctl/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml
  projects/sysctl/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml
  projects/sysctl/nl_NL.ISO8859-1/htdocs/administration.xml
  projects/sysctl/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml
  projects/sysctl/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
  projects/sysctl/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
  projects/sysctl/ru_RU.KOI8-R/articles/pam/article.xml
  projects/sysctl/ru_RU.KOI8-R/articles/vm-design/article.xml
  projects/sysctl/ru_RU.KOI8-R/books/handbook/book.xml
  projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/book.xml
  projects/sysctl/ru_RU.KOI8-R/htdocs/portmgr/index.xml
  projects/sysctl/ru_RU.KOI8-R/htdocs/releng/index.xml
  projects/sysctl/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl
  projects/sysctl/share/mk/doc.docbook.mk
  projects/sysctl/share/pgpkeys/README
  projects/sysctl/share/pgpkeys/addkey.sh
  projects/sysctl/share/pgpkeys/gavin.key
  projects/sysctl/share/pgpkeys/pgpkeys-core.xml
  projects/sysctl/share/pgpkeys/pgpkeys-developers.xml
  projects/sysctl/share/pgpkeys/pgpkeys.ent
  projects/sysctl/share/xml/authors.ent
  projects/sysctl/share/xml/catalog.xml
  projects/sysctl/share/xml/events2013.xml
  projects/sysctl/share/xml/freebsd.ent
  projects/sysctl/share/xml/freebsd.sch
  projects/sysctl/share/xml/header.ent
  projects/sysctl/share/xml/man-refs.ent
  projects/sysctl/share/xml/mirrors.xml
  projects/sysctl/share/xml/navibar.ent
  projects/sysctl/share/xml/news.xml
  projects/sysctl/share/xml/notices.xml
  projects/sysctl/share/xml/press.xml
  projects/sysctl/share/xml/templates.events.xsl
  projects/sysctl/share/xml/xhtml.xsl
  projects/sysctl/share/xml/xhtml10-freebsd.dtd
  projects/sysctl/share/xml/xslt10-freebsd.dtd
  projects/sysctl/share/xsl/freebsd-xhtml-common.xsl
  projects/sysctl/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
  projects/sysctl/zh_CN.GB2312/books/porters-handbook/book.xml
  projects/sysctl/zh_TW.Big5/books/handbook/firewalls/chapter.xml
  projects/sysctl/zh_TW.Big5/books/handbook/serialcomms/chapter.xml
  projects/sysctl/zh_TW.Big5/books/porters-handbook/book.xml
Directory Properties:
  projects/sysctl/Makefile   (props changed)
  projects/sysctl/README   (props changed)
  projects/sysctl/bn_BD.ISO10646-1/   (props changed)
  projects/sysctl/da_DK.ISO8859-1/   (props changed)
  projects/sysctl/de_DE.ISO8859-1/   (props changed)
  projects/sysctl/el_GR.ISO8859-7/   (props changed)
  projects/sysctl/en_US.ISO8859-1/   (props changed)
  projects/sysctl/es_ES.ISO8859-1/   (props changed)
  projects/sysctl/fr_FR.ISO8859-1/   (props changed)
  projects/sysctl/hu_HU.ISO8859-2/   (props changed)
  projects/sysctl/it_IT.ISO8859-15/   (props changed)
  projects/sysctl/ja_JP.eucJP/   (props changed)
  projects/sysctl/mn_MN.UTF-8/   (props changed)
  projects/sysctl/nl_NL.ISO8859-1/   (props changed)
  projects/sysctl/nl_NL.ISO8859-1/share/xml/entities.ent   (props changed)
  projects/sysctl/no_NO.ISO8859-1/   (props changed)
  projects/sysctl/pl_PL.ISO8859-2/   (props changed)
  projects/sysctl/pt_BR.ISO8859-1/   (props changed)
  projects/sysctl/release/   (props changed)
  projects/sysctl/ru_RU.KOI8-R/   (props changed)
  projects/sysctl/share/   (props changed)
  projects/sysctl/sr_YU.ISO8859-2/   (props changed)
  projects/sysctl/tr_TR.ISO8859-9/   (props changed)
  projects/sysctl/zh_CN.GB2312/   (props changed)
  projects/sysctl/zh_TW.Big5/   (props changed)

Modified: projects/sysctl/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
==============================================================================
--- projects/sysctl/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml	Thu Jul 11 03:05:05 2013	(r42243)
+++ projects/sysctl/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml	Thu Jul 11 03:06:43 2013	(r42244)
@@ -1834,7 +1834,7 @@ block in log first quick on dc0 all
 	Internet:</para>
 
       <informaltable frame="none" pgwide="1">
-	<tgroup cols="2">
+	<tgroup cols="3">
 	  <colspec colwidth="1*"/>
 
 	  <colspec colwidth="1*"/>

Modified: projects/sysctl/de_DE.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- projects/sysctl/de_DE.ISO8859-1/books/porters-handbook/book.xml	Thu Jul 11 03:05:05 2013	(r42243)
+++ projects/sysctl/de_DE.ISO8859-1/books/porters-handbook/book.xml	Thu Jul 11 03:06:43 2013	(r42244)
@@ -6050,6 +6050,7 @@ PLIST_SUB+=             NLS="@comment "
 	    <thead>
 	      <row>
 		<entry>Nur lesbare Variablen</entry>
+		<entry>Bedeutung</entry>
 	      </row>
 	    </thead>
 

Modified: projects/sysctl/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
==============================================================================
--- projects/sysctl/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml	Thu Jul 11 03:05:05 2013	(r42243)
+++ projects/sysctl/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml	Thu Jul 11 03:06:43 2013	(r42244)
@@ -1823,7 +1823,7 @@ block in log first quick on dc0 all
 	Internet:</para>
 
       <informaltable frame="none" pgwide="1">
-	<tgroup cols="2">
+	<tgroup cols="3">
 	  <colspec colwidth="1*"/>
 
 	  <colspec colwidth="1*"/>

Modified: projects/sysctl/el_GR.ISO8859-7/share/xml/trademarks.ent
==============================================================================
--- projects/sysctl/el_GR.ISO8859-7/share/xml/trademarks.ent	Thu Jul 11 03:05:05 2013	(r42243)
+++ projects/sysctl/el_GR.ISO8859-7/share/xml/trademarks.ent	Thu Jul 11 03:06:43 2013	(r42244)
@@ -438,7 +438,7 @@ Coverity, Inc.</para>">
   ένα από τα σύμβολα: <quote>&trade;</quote> ή <quote>&reg;</quote>.</para>">
 
 <!ENTITY legalnotice '
-<legalnotice>
+<legalnotice id="legalnotice">
   <para>Η διανομή και χρήση σε μορφή πηγαίου κώδικα (SGML DocBook) ή
     σε "μεταγλωττισμένη" μορφή (SGML, HTML, PDF, PostScript, RTF κοκ)
     με ή χωρίς αλλαγές, επιτρέπεται εφόσον οι παρακάτω προϋποθέσεις

Modified: projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml	Thu Jul 11 03:05:05 2013	(r42243)
+++ projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml	Thu Jul 11 03:06:43 2013	(r42244)
@@ -26,7 +26,7 @@
       <year>2011</year>
       <year>2012</year>
       <year>2013</year>
-      <holder>The FreeBSD Documentation Project</holder>
+      <holder>The &os; Documentation Project</holder>
     </copyright>
 
     <legalnotice id="trademarks" role="trademarks">
@@ -43,12 +43,12 @@
     <releaseinfo>$FreeBSD$</releaseinfo>
 
     <abstract>
-      <para>This document provides information for the FreeBSD
+      <para>This document provides information for the &os;
 	committer community.  All new committers should read this
 	document before they start, and existing committers are
 	strongly encouraged to review it from time to time.</para>
 
-      <para>Almost all FreeBSD developers have commit rights to one or
+      <para>Almost all &os; developers have commit rights to one or
 	more repositories.  However, a few developers do not, and some
 	of the information here applies to them as well.  (For
 	instance, some people only have rights to work with the
@@ -56,7 +56,7 @@
 	  linkend="non-committers"/> for more information.</para>
 
       <para>This document may also be of interest to members of the
-	FreeBSD community who want to learn more about how the project
+	&os; community who want to learn more about how the project
 	works.</para>
     </abstract>
   </articleinfo>
@@ -83,32 +83,32 @@
 	  <row>
 	    <entry><emphasis><literal>src/</literal> Subversion
 		Root</emphasis></entry>
-	    <entry>
-	      <literal>svn+ssh://</literal><hostid
+	    <entry><literal>svn+ssh://</literal><hostid
 		role="fqdn">svn.FreeBSD.org</hostid><filename>/base</filename>
-	      (see also <xref linkend="subversion-primer"/>).</entry>
+	      (see also <xref
+		linkend="svn-getting-started-base-layout"/>).</entry>
 	  </row>
+
 	  <row>
 	    <entry><emphasis><literal>doc/</literal> Subversion
 		Root</emphasis></entry>
-	    <entry>
-	      <literal>svn+ssh://</literal><hostid
+	    <entry><literal>svn+ssh://</literal><hostid
 		role="fqdn">svn.FreeBSD.org</hostid><filename>/doc</filename>
-	      (see also <xref linkend="subversion-primer"/>).</entry>
+	      (see also <xref
+		linkend="svn-getting-started-doc-layout"/>).</entry>
 	  </row>
 
 	  <row>
 	    <entry><emphasis><literal>ports/</literal> Subversion
 		Root</emphasis></entry>
-	    <entry>
-	      <literal>svn+ssh://</literal><hostid
+	    <entry><literal>svn+ssh://</literal><hostid
 		role="fqdn">svn.FreeBSD.org</hostid><filename>/ports</filename>
-	      (see also <xref linkend="subversion-primer"/>).</entry>
+	      (see also <xref
+		linkend="svn-getting-started-ports-layout"/>).</entry>
 	  </row>
 
 	  <row>
 	    <entry><emphasis>Internal Mailing Lists</emphasis></entry>
-
 	    <entry>developers (technically called all-developers),
 	      doc-developers, doc-committers, ports-developers,
 	      ports-committers, src-developers, src-committers.  (Each
@@ -128,8 +128,7 @@
 		reports</emphasis></entry>
 	    <entry><filename>/home/core/public/monthly-reports</filename>
 	      on the <hostid role="domainname">FreeBSD.org</hostid>
-	      cluster.
-	    </entry>
+	      cluster.</entry>
 	  </row>
 
 	  <row>
@@ -143,46 +142,47 @@
 	  <row>
 	    <entry><emphasis>Noteworthy <literal>src/</literal> SVN
 		Branches</emphasis></entry>
-
 	    <entry>
 	      <literal>stable/8</literal> (8.X-STABLE),
 	      <literal>stable/9</literal> (9.X-STABLE),
-	      <literal>head</literal> (-CURRENT)
-	    </entry>
+	      <literal>head</literal> (-CURRENT)</entry>
 	  </row>
 	</tbody>
       </tgroup>
     </informaltable>
 
-    <para>It is required that you use &man.ssh.1;
-      to connect to the project hosts.
-      If you do
-      not know anything about &man.ssh.1;, please see
-      <xref linkend="ssh.guide"/>.</para>
+    <para>&man.ssh.1; is required to connect to the project hosts.
+      For more information, see <xref linkend="ssh.guide"/>.</para>
 
     <para>Useful links:</para>
 
     <itemizedlist>
-      <listitem><para><ulink url="&url.base;/internal/">FreeBSD
-	    Project Internal Pages</ulink></para></listitem>
+      <listitem>
+	<para><ulink url="&url.base;/internal/">&os;
+	    Project Internal Pages</ulink></para>
+      </listitem>
 
-      <listitem><para><ulink
-	    url="&url.base;/internal/machines.html">FreeBSD Project
-	  Hosts</ulink></para></listitem>
-
-      <listitem><para><ulink
-	    url="&url.base;/administration.html">FreeBSD Project
-	  Administrative Groups</ulink></para></listitem>
+      <listitem>
+	<para><ulink
+	    url="&url.base;/internal/machines.html">&os; Project
+	    Hosts</ulink></para>
+      </listitem>
+
+      <listitem>
+	<para><ulink
+	    url="&url.base;/administration.html">&os; Project
+	    Administrative Groups</ulink></para>
+      </listitem>
     </itemizedlist>
   </sect1>
 
   <sect1 id="committer.types">
     <title>Commit Bit Types</title>
 
-    <para>The FreeBSD repository has a number of components which,
+    <para>The &os; repository has a number of components which,
       when combined, support the basic operating system source,
       documentation, third party application ports infrastructure, and
-      various maintained utilities.  When FreeBSD commit bits are
+      various maintained utilities.  When &os; commit bits are
       allocated, the areas of the tree where the bit may be used are
       specified.  Generally, the areas associated with a bit reflect
       who authorized the allocation of the commit bit.  Additional
@@ -237,34 +237,40 @@
       of the tree where the work is occurring.</para>
 
     <sect2>
-      <title>Policy for <filename>doc/</filename> committer activity
-        in <filename>src/</filename></title>
+      <title>Policy for <filename>doc/</filename> Committer Activity
+	in <filename>src/</filename></title>
 
       <itemizedlist>
-	<listitem><para>doc committers may commit documentation
-	  changes to src files, such as man pages, READMEs, fortune
-	  databases, calendar files, and comment fixes without
-	  approval from a src committer, subject to the normal care
-	  and tending of commits.</para></listitem>
-
-	<listitem><para>doc committers may commit minor src changes
-	  and fixes, such as build fixes, small features, etc, with an
-	  "Approved by" from a src committer.</para></listitem>
-
-	<listitem><para>doc committers may seek an upgrade to a src
-	  commit bit by acquiring a mentor, who will propose the doc
-	  committer to core.  When approved, they will be added to
-	  'access' and the normal mentoring period will ensue, which
-	  will involve a continuing of <quote>Approved by</quote> for
-	  some period.</para></listitem>
-
-	<listitem><para>"Approved by" is only acceptable from
-	  non-mentored src committers -- mentored committers can
-	  provide a "Reviewed by" but not an "Approved
-	  by".</para></listitem>
+	<listitem>
+	  <para>doc committers may commit documentation changes to src
+	    files, such as man pages, READMEs, fortune databases,
+	    calendar files, and comment fixes without approval from a
+	    src committer, subject to the normal care and tending of
+	    commits.</para>
+	</listitem>
+
+	<listitem>
+	  <para>doc committers may commit minor src changes and fixes,
+	    such as build fixes, small features, etc, with an
+	    "Approved by" from a src committer.</para>
+	</listitem>
+
+	<listitem>
+	  <para>doc committers may seek an upgrade to a src commit bit
+	    by acquiring a mentor, who will propose the doc committer
+	    to core.  When approved, they will be added to 'access'
+	    and the normal mentoring period will ensue, which will
+	    involve a continuing of <quote>Approved by</quote> for
+	    some period.</para>
+	</listitem>
+
+	<listitem>
+	  <para>"Approved by" is only acceptable from non-mentored src
+	    committers -- mentored committers can provide a "Reviewed
+	    by" but not an "Approved by".</para>
+	</listitem>
       </itemizedlist>
     </sect2>
-
   </sect1>
 
   <sect1 id="subversion-primer">
@@ -274,13 +280,13 @@
       operation of the version control systems in use.  Traditionally
       this was CVS.  Subversion is used for the <literal>src</literal>
       tree as of May 2008, the <literal>doc/www</literal> tree as of
-      May 2012 and the <literal>ports</literal> tree as of July 2012.
-      </para>
+      May 2012 and the <literal>ports</literal> tree as of July
+      2012.</para>
 
     <para><ulink url="http://wiki.freebsd.org/SubversionMissing">There
-      is a list of things missing in Subversion when compared to CVS
-      </ulink>.  The notes at <ulink
-      url="http://people.freebsd.org/~peter/svn_notes.txt"></ulink>
+	is a list of things missing in Subversion when compared to
+	CVS</ulink>.  The notes at <ulink
+	url="http://people.freebsd.org/~peter/svn_notes.txt"></ulink>
       might also be useful.</para>
 
     <sect2 id="svn-intro">
@@ -336,30 +342,37 @@
 	<listitem>
 	  <para>Commits are atomic.</para>
 	</listitem>
+
 	<listitem>
 	  <para>Revision numbers apply across the repository&mdash;all
 	    files that were modified in the same commit have the same
 	    revision number.</para>
 	</listitem>
+
 	<listitem>
 	  <para>Branching and tagging are namespace operations.</para>
 	</listitem>
+
 	<listitem>
 	  <para>Directories are versioned.</para>
 	</listitem>
+
 	<listitem>
 	  <para>Files and directories can have arbitrary, versioned
 	    metadata attached to them.</para>
 	</listitem>
+
 	<listitem>
 	  <para>Files and directories can be copied, with full history
 	    tracking.</para>
 	</listitem>
+
 	<listitem>
 	  <para>No more contortions due to <acronym>CVS</acronym>
 	    weakness such as applying &man.patch.1; files at compile
 	    time in order to avoid touching vendor branch code.</para>
 	</listitem>
+
 	<listitem>
 	  <para>No more repo-copies.</para>
 	</listitem>
@@ -378,7 +391,7 @@
       <para>There are a few ways to obtain a working copy of the tree
 	from Subversion.  This section will explain them.</para>
 
-      <sect3>
+      <sect3 id="svn-getting-started-direct-checkout">
 	<title>Direct Checkout</title>
 
 	<para>The first is to check out directly from the main
@@ -445,7 +458,7 @@
 	</note>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-getting-started-checkout-from-a-mirror">
 	<title>Checkout from a Mirror</title>
 
 	<para>Check out a working copy from a mirror by
@@ -455,13 +468,14 @@
 	  using <command>svnsync</command>.</para>
 
 	<para>There is a serious disadvantage to this method: every
-	  time something is to be committed, a <command>svn switch
-	    --relocate</command> to the master repository has to be
-	  done, remembering to <command>svn switch</command> back to
-	  the mirror after the commit.  Also, since <command>svn
-	    switch</command> only works between repositories that have
-	  the same UUID, some hacking of the local repository's UUID
-	  has to occur before it is possible to start using it.</para>
+	  time something is to be committed, a
+	  <command>svn relocate</command> to the master repository has
+	  to be done, remembering to <command>svn relocate</command>
+	  back to the mirror after the commit.  Also, since
+	  <command>svn relocate</command> only works between
+	  repositories that have the same UUID, some hacking of the
+	  local repository's UUID has to occur before it is possible
+	  to start using it.</para>
 
 	<para>Unlike with <acronym>CVS</acronym>,
 	  the hassle of a local
@@ -471,7 +485,7 @@
 	  information on how to set one up.</para>
       </sect3>
 
-      <sect3 id="subversion-primer-base-layout">
+      <sect3 id="svn-getting-started-base-layout">
 	<title><literal>RELENG_*</literal> Branches and General
 	  Layout</title>
 
@@ -489,26 +503,29 @@
 
 	<itemizedlist>
 	  <listitem>
-	    <para><emphasis>/head/</emphasis>
-	      which corresponds to <literal>HEAD</literal>, also known as
-	      <literal>-CURRENT</literal>.
-	    </para>
+	    <para><emphasis>/head/</emphasis> which corresponds to
+	      <literal>HEAD</literal>, also known as
+	      <literal>-CURRENT</literal>.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/stable/<replaceable>n</replaceable></emphasis>
 	      which corresponds to
 	      <literal>RELENG_<replaceable>n</replaceable></literal>.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/releng/<replaceable>n.n</replaceable></emphasis>
 	      which corresponds to
 	      <literal>RELENG_<replaceable>n_n</replaceable></literal>.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/release/<replaceable>n.n.n</replaceable></emphasis>
 	      which corresponds to
 	      <literal>RELENG_<replaceable>n_n_n</replaceable>_RELEASE</literal>.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/vendor*</emphasis> is the vendor branch
 	      import work area.  This directory itself does not
@@ -517,6 +534,7 @@
 	      <emphasis>releng</emphasis> and
 	      <emphasis>release</emphasis> directories.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/projects</emphasis> and
 	      <emphasis>/user</emphasis> feature a branch work area,
@@ -527,21 +545,21 @@
 	</itemizedlist>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-getting-started-doc-layout">
 	<title>&os; Documentation Project Branches and
 	  Layout</title>
 
 	<para>In <literal>svn+ssh://svn.freebsd.org/doc</literal>,
-	  <emphasis>doc</emphasis> refers repository root of the
-	  source tree.</para>
+	  <emphasis>doc</emphasis> refers to the repository root of
+	  the source tree.</para>
 
 	<para>In general, most &os; Documentation Project work will be
 	  done within the <filename>head/</filename> branch of the
-	  source tree.</para>
+	  documentation source tree.</para>
 
 	<para>&os; documentation is written and/or translated to
-	  various languages, each of which within a separate
-	  directory within the <filename>head/</filename>
+	  various languages, each in a separate
+	  directory in the <filename>head/</filename>
 	  branch.</para>
 
 	<para>Each translation set contains several subdirectories for
@@ -554,11 +572,13 @@
 	      code for articles written by various &os;
 	      contributors.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/books/</emphasis> contains the source
 	      code for the different books, such as the
 	      &os;&nbsp;Handbook.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/htdocs/</emphasis> contains the source
 	      code for the &os;&nbsp;website.</para>
@@ -566,7 +586,7 @@
 	</itemizedlist>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-getting-started-ports-layout">
 	<title>&os; Ports Tree Branches and Layout</title>
 
 	<para>In <literal>svn+ssh://svn.freebsd.org/ports</literal>,
@@ -580,17 +600,20 @@
 
 	<itemizedlist>
 	  <listitem>
-	    <para><emphasis>/branches/RELENG_<replaceable>n_n_n
-		</replaceable></emphasis> which corresponds to
-		<literal>RELENG_<replaceable>n_n_n</replaceable></literal>
+	    <para><emphasis>/branches/RELENG_<replaceable>n_n_n</replaceable></emphasis>
+	      which corresponds to
+	      <literal>RELENG_<replaceable>n_n_n</replaceable></literal>
 	      is used to merge back security updates in preparation
 	      for a release.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/tags/RELEASE_<replaceable>n_n_n</replaceable></emphasis>
-	      which corresponds to <literal>RELEASE_<replaceable>n_n_n</replaceable></literal>
+	      which corresponds to
+	      <literal>RELEASE_<replaceable>n_n_n</replaceable></literal>
 	      represents a release tag of the ports tree.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><emphasis>/tags/RELEASE_<replaceable>n</replaceable>_EOL</emphasis>
 	      represents the end of life tag of a specific &os;
@@ -606,21 +629,20 @@
       <para>This section will explain how to perform common day-to-day
 	operations with Subversion.</para>
 
-      <sect3>
+      <sect3 id="svn-daily-use-help">
 	<title>Help</title>
 
-	<para><acronym>SVN</acronym>
-	  has built in help documentation.  It can be accessed by
-	  typing the following command:</para>
+	<para><acronym>SVN</acronym> has built in help documentation.
+	  It can be accessed by typing the following command:</para>
 
 	<screen>&prompt.user; <userinput>svn help</userinput></screen>
 
-	<para>Additional information can be found in the <ulink
-	    url="http://svnbook.red-bean.com/">
-	      Subversion Book</ulink>.</para>
+	<para>Additional information can be found in the
+	  <ulink url="http://svnbook.red-bean.com/">Subversion
+	    Book</ulink>.</para>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-checkout">
 	<title>Checkout</title>
 
 	<para>As seen earlier, to check out the &os; head
@@ -683,7 +705,7 @@
 	</note>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-anonymous-checkout">
 	<title>Anonymous Checkout</title>
 
 	<para>It is possible to anonymously check out the &os;
@@ -699,7 +721,7 @@
 	    mirror sites</ulink>.</para>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-updating-the-tree">
 	<title>Updating the Tree</title>
 
 	<para>To update a working copy to either the latest revision,
@@ -709,7 +731,7 @@
 &prompt.user; <userinput>svn update -<replaceable>r12345</replaceable></userinput></screen>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-status">
 	<title>Status</title>
 
 	<para>To view the local changes that have been made to the
@@ -717,17 +739,17 @@
 
 	<screen>&prompt.user; <userinput>svn status</userinput></screen>
 
-	<para>To show local changes and files that are out-of-date do:</para>
+	<para>To show local changes and files that are out-of-date
+	  do:</para>
 
 	<screen>&prompt.user; <userinput>svn status --show-updates</userinput></screen>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-editing-and-committing">
 	<title>Editing and Committing</title>
 
-	<para>Unlike Perforce,
-	  <acronym>SVN</acronym> does not
-	  need to be told in advance about file editing.</para>
+	<para>Unlike Perforce, <acronym>SVN</acronym> does not need to
+	  be told in advance about file editing.</para>
 
 	<para><command>svn commit</command> works like the equivalent
 	  <acronym>CVS</acronym> command.  To commit all changes in
@@ -743,15 +765,15 @@
 
 	<screen>&prompt.user; <userinput>svn commit <replaceable>lib/libfetch</replaceable> <replaceable>usr/bin/fetch</replaceable></userinput></screen>
 
-	<para>There is also a commit wrapper for the ports tree
-	  to handle the properties and sanity checking your
+	<para>There is also a commit wrapper for the ports tree to
+	  handle the properties and sanity checking your
 	  changes:</para>
 
 	<screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/psvn commit
 	  </userinput></screen>
       </sect3>
 
-      <sect3 id="subversion-primer-add-remove">
+      <sect3 id="svn-daily-use-adding-and-removing">
 	<title>Adding and Removing Files</title>
 
 	<note>
@@ -762,13 +784,12 @@
 	      ports tree specific version</ulink>)
 	    and add it to <filename>~/.subversion/config</filename>
 	    according to the instructions in the file.  If you added
-	    something before you've read this, you may use
+	    something before reading this, use
 	    <command>svn rm --keep-local</command> for just added
 	    files, fix your config file and re-add them again.  The
 	    initial config file is created when you first run a svn
-	    command, even something as simple as <command>svn
-	      help</command>.
-	    </para>
+	    command, even something as simple as
+	    <command>svn help</command>.</para>
 	</note>
 
 	<para>Files are added to a
@@ -778,85 +799,88 @@
 
 	<screen>&prompt.user; <userinput>svn add <replaceable>foo</replaceable></userinput></screen>
 
+	<note>
+	  <para>Most new source files should include a
+	    <literal>&dollar;&os;&dollar;</literal> string in the
+	    new file.  On commit, <command>svn</command> will expand
+	    the <literal>&dollar;&os;&dollar;</literal> string,
+	    adding the file path, revision number, date and time of
+	    commit, and the username of the committer.  Files which
+	    cannot be modified may be committed without the
+	    <literal>&dollar;&os;&dollar;</literal> string.</para>
+	</note>
+
 	<para>Files can be removed with <command>svn
 	    remove</command>:</para>
 
 	<screen>&prompt.user; <userinput>svn remove <replaceable>foo</replaceable></userinput></screen>
 
-	<para>Subversion does not require <command>rm</command>ing the
-	  file before <command>svn rm</command>ing it, and indeed
-	  complains if that happens.</para>
+	<para>Subversion does not require deleting the file before
+	  using <command>svn rm</command>, and indeed complains if
+	  that happens.</para>
 
-	<para>It is possible to add directories with <command>svn
-	    add</command>:</para>
+	<para>It is possible to add directories with
+	  <command>svn add</command>:</para>
 
 	<screen>&prompt.user; <userinput>mkdir <replaceable>bar</replaceable></userinput>
 &prompt.user; <userinput>svn add <replaceable>bar</replaceable></userinput></screen>
 
-	<para>Although <command>svn mkdir</command> makes this
-	  easier by combining the creation of the directory and the
-	  adding of it:</para>
+	<para>Although <command>svn mkdir</command> makes this easier
+	  by combining the creation of the directory and the adding of
+	  it:</para>
 
 	<screen>&prompt.user; <userinput>svn mkdir <replaceable>bar</replaceable></userinput></screen>
 
-	<para>The directory is not immediately
-	  created in the repository when you use <command>svn
-	    mkdir</command>.  Subversion
-	  allows directories to be removed using <command>svn
-	    rm</command>, however there is no <command>svn
-	    rmdir</command>:</para>
+	<para>Like files, directories are removed with
+	  <command>svn rm</command>.  There is no separate command
+	  specifically for removing directories.</para>
 
 	<screen>&prompt.user; <userinput>svn rm <replaceable>bar</replaceable></userinput></screen>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-copying-and-moving">
 	<title>Copying and Moving Files</title>
 
-	<para>The following (obviously) creates a copy of
-	  <filename>foo.c</filename>, named
-	  <filename>bar.c</filename>:</para>
+	<para>This command creates a copy of
+	  <filename>foo.c</filename> named <filename>bar.c</filename>,
+	  with the new file also under version control:</para>
 
 	<screen>&prompt.user; <userinput>svn copy <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput></screen>
 
-	<para>To move and rename a file:</para>
+	<para>The example above is equivalent to:</para>
 
-	<screen>&prompt.user; <userinput>svn move <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput></screen>
+	<screen>&prompt.user; <userinput>cp foo.c bar.c</userinput>
+&prompt.user; <userinput>svn add bar.c</userinput></screen>
 
-	<para>The above command is the exact equivalent of:</para>
+	<para>To move and rename a file:</para>
 
-	<screen>&prompt.user; <userinput>svn copy <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput>
-&prompt.user; <userinput>svn remove <replaceable>foo.c</replaceable></userinput></screen>
+	<screen>&prompt.user; <userinput>svn move <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput></screen>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-log-and-annotate">
 	<title>Log and Annotate</title>
 
-	<para><command>svn log</command> will show all the
-	  revisions that affect a directory and files within that
-	  directory in reverse chronological order, if run on a
-	  directory.  This contrasts with <command>cvs log</command>
-	  in that <acronym>CVS</acronym> shows the complete log for
-	  each file in the directory, including duplicate entries for
-	  revisions that affect multiple files.</para>
+	<para><command>svn log</command> shows revisions and commit
+	  messages, most recent first, for files or directories.  When
+	  used on a directory, all revisions that affected the
+	  directory and files within that directory are shown.</para>
 
 	<para><command>svn annotate</command>, or equally <command>svn
-	    praise</command> or <command>svn blame</command>, is
-	  equivalent to <command>cvs annotate</command> in everything
-	  but output format.</para>
+	    praise</command> or <command>svn blame</command>, shows
+	  the most recent revision number and who committed that
+	  revision for each line of a file.</para>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-diffs">
 	<title>Diffs</title>
 
 	<para><command>svn diff</command> displays changes to the
-	  working copy of the repository.  Diffs generated by
-	  <acronym>SVN</acronym> are unified
-	  and include new files by default
-	  in the diff output.</para>
-
-	<para><command>svn
-	    diff</command> can show the changes between two revisions
-	  of the same file:</para>
+	  working copy.  Diffs generated by <acronym>SVN</acronym> are
+	  unified and include new files by default in the diff
+	  output.</para>
+
+	<para><command>svn diff</command> can show the changes between
+	  two revisions of the same file:</para>
 
 	<screen>&prompt.user; <userinput>svn diff -r179453:179454 ROADMAP.txt</userinput></screen>
 
@@ -868,20 +892,19 @@
 	<screen>&prompt.user; <userinput>svn diff -c179454 .</userinput></screen>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-reverting">
 	<title>Reverting</title>
 
 	<para>Local changes (including additions and deletions) can be
-	  reverted using <command>svn revert</command>.
-	  It does not update out-of-date
-	  files&mdash;it just replaces them with pristine copies of
-	  the original version.</para>
+	  reverted using <command>svn revert</command>.  It does not
+	  update out-of-date files, but just replaces them with
+	  pristine copies of the original version.</para>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-daily-use-conflicts">
 	<title>Conflicts</title>
 
-	<para>If a <command>svn update</command> resulted in a merge
+	<para>If an <command>svn update</command> resulted in a merge
 	  conflict, Subversion will remember which files have
 	  conflicts and refuse to commit any changes to those files
 	  until explicitly told that the conflicts have been resolved.
@@ -903,22 +926,26 @@
 	      working directory (which one presumes has been edited to
 	      resolve the conflicts).</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><literal>base</literal>: use a pristine copy of the
 	      version you had before <command>svn update</command>,
 	      discarding your own changes, the conflicting changes,
 	      and possibly other intervening changes as well.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><literal>mine-full</literal>: use what you had
 	      before <command>svn update</command>, including your own
 	      changes, but discarding the conflicting changes, and
 	      possibly other intervening changes as well.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><literal>theirs-full</literal>: use the version that
-	      was retrieved when you did <command>svn
-		update</command>, discarding your own changes.</para>
+	      was retrieved when you did
+	      <command>svn update</command>, discarding your own
+	      changes.</para>
 	  </listitem>
 	</itemizedlist>
       </sect3>
@@ -927,27 +954,15 @@
     <sect2>
       <title>Advanced Use</title>
 
-      <sect3>
+      <sect3 id="svn-advanced-use-sparse-checkouts">
 	<title>Sparse Checkouts</title>
 
-	<para>The equivalent to <command>cvs checkout -l</command>,
-	  which checks out a directory without its subdirectories, is
-	  <command>svn checkout -N</command>.  Unlike
-	  <acronym>CVS</acronym>, <acronym>SVN</acronym> remembers the
-	  <literal>-N</literal> so that a <command>svn
-	    update</command> does not end up pulling down the
-	  subdirectories.  In Subversion 1.5 and newer,
-	  <literal>-N</literal> has been deprecated in favour of the
-	  <literal>--depth</literal> option which allows for precise
-	  control.  Therefore:</para>
-
-	<screen>&prompt.user; <userinput>svn checkout -N svn+ssh://svn.freebsd.org/base ~/freebsd</userinput></screen>
-
-	<para>is equivalent to:</para>
+	<para><acronym>SVN</acronym> allows
+	  <emphasis>sparse</emphasis>, or partial checkouts of a
+	  directory by adding <option>--depth</option> to a
+	  <command>svn checkout</command>.</para>
 
-	<screen>&prompt.user; <userinput>svn checkout --depth=empty svn+ssh://svn.freebsd.org/base ~/freebsd</userinput></screen>
-
-	<para>Valid arguments to <literal>--depth</literal>
+	<para>Valid arguments to <option>--depth</option>
 	  are:</para>
 
 	<itemizedlist>
@@ -955,15 +970,18 @@
 	    <para><literal>empty</literal>: the directory itself
 	      without any of its contents.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><literal>files</literal>: the directory and any
 	      files it contains.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><literal>immediates</literal>: the directory and any
 	      files and directories it contains, but none of the
 	      subdirectories' contents.</para>
 	  </listitem>
+
 	  <listitem>
 	    <para><literal>infinity</literal>: anything.</para>
 	  </listitem>
@@ -988,39 +1006,44 @@
 	  <filename>ROADMAP.txt</filename> and empty subdirectories,
 	  and nothing will happen when <command>svn update</command>
 	  is executed on the subdirectories.  However, the following
-	  command will set the depth for head (in this case) to
-	  infinity, and fully populate it:</para>
+	  command will set the depth for
+	  <replaceable>head</replaceable> (in this case) to infinity,
+	  and fully populate it:</para>
 
 	<screen>&prompt.user; <userinput>svn update --set-depth=infinity <replaceable>head</replaceable></userinput></screen>
       </sect3>
 
-      <sect3>
+      <sect3 id="svn-advanced-use-direct-operation">
 	<title>Direct Operation</title>
 
 	<para>Certain operations can be performed directly on the
-	  repository, without touching the working copy.
-	  Specifically, this applies to any operation that does not
-	  require editing a file, including:</para>
+	  repository without touching the working copy.  Specifically,
+	  this applies to any operation that does not require editing
+	  a file, including:</para>
 
 	<itemizedlist>
 	  <listitem>
 	    <para><literal>log</literal>,
-	      <literal>diff</literal>.</para>
+	      <literal>diff</literal></para>
 	  </listitem>
+
 	  <listitem>
-	    <para><literal>mkdir</literal>.</para>
+	    <para><literal>mkdir</literal></para>
 	  </listitem>
+
 	  <listitem>
 	    <para><literal>remove</literal>, <literal>copy</literal>,
-	      <literal>rename</literal>.</para>
+	      <literal>rename</literal></para>
 	  </listitem>
+
 	  <listitem>
 	    <para><literal>propset</literal>,
 	      <literal>propedit</literal>,
-	      <literal>propdel</literal>.</para>
+	      <literal>propdel</literal></para>
 	  </listitem>
+
 	  <listitem>
-	    <para><literal>merge</literal>.</para>
+	    <para><literal>merge</literal></para>
 	  </listitem>
 	</itemizedlist>
 
@@ -1029,8 +1052,8 @@
 
 	<screen>&prompt.user; <userinput>svn copy svn+ssh://svn.freebsd.org/base/head svn+ssh://svn.freebsd.org/base/stable/8</userinput></screen>
 
-	<para>This is equivalent to the following set of
-	  commands which take minutes and hours as opposed to seconds,
+	<para>This is equivalent to the following set of commands
+	  which take minutes and hours as opposed to seconds,
 	  depending on your network connection:</para>
 
 	<screen>&prompt.user; <userinput>svn checkout --depth=immediates svn+ssh://svn.freebsd.org/base</userinput>
@@ -1040,7 +1063,7 @@
 &prompt.user; <userinput>svn commit stable/8</userinput></screen>
       </sect3>
 
-      <sect3 id="subversion-primer-merge">
+      <sect3 id="svn-advanced-use-merging">
 	<title>Merging with <acronym>SVN</acronym></title>
 
 	<para>This section deals with merging code from one branch to
@@ -1067,37 +1090,39 @@
 
 	  <para>It is <emphasis>not</emphasis> inherited.  For
 	    instance, <filename
-	      class="directory">stable/6/contrib/openpam/</filename>
-	    does not implicitly inherit mergeinfo from <filename
-	      class="directory">stable/6/</filename>, or <filename
-	      class="directory">stable/6/contrib/</filename>.  Doing
-	    so would make partial checkouts very hard to manage.
+	    class="directory">stable/6/contrib/openpam/</filename>
+	    does not implicitly inherit mergeinfo from
+	    <filename class="directory">stable/6/</filename>, or
+	    <filename class="directory">stable/6/contrib/</filename>.
+	    Doing so would make partial checkouts very hard to manage.
 	    Instead, mergeinfo is explicitly propagated down the tree.
-	    For merging something into <filename
-	      class="directory">branch/foo/bar/</filename>, the
-	    following rules apply:</para>
+	    For merging something into
+	    <filename class="directory">branch/foo/bar/</filename>,
+	    the following rules apply:</para>
 
 	  <orderedlist>
 	    <listitem>
-	      <para>If <filename
-		  class="directory">branch/foo/bar/</filename> doesn't
-		already have a mergeinfo record, but a direct ancestor
-		(for instance, <filename
-		  class="directory">branch/foo/</filename>) does,
-		then that record will be propagated down to
+	      <para>If
+		<filename class="directory">branch/foo/bar/</filename>
+		does not already have a mergeinfo record, but a direct
+		ancestor (for instance,
+		<filename class="directory">branch/foo/</filename>)
+		does, then that record will be propagated down to
 		<filename class="directory">branch/foo/bar/</filename>
-		before information
-		about the current merge is recorded.</para>
+		before information about the current merge is
+		recorded.</para>
 	    </listitem>
+
 	    <listitem>
 	      <para>Information about the current merge will
 		<emphasis>not</emphasis> be propagated back up that
 		ancestor.</para>
 	    </listitem>
+
 	    <listitem>
-	      <para>If a direct descendant of <filename
-		  class="directory">branch/foo/bar/</filename> (for
-		instance, <filename
+	      <para>If a direct descendant of
+		<filename class="directory">branch/foo/bar/</filename>
+		(for instance, <filename
 		  class="directory">branch/foo/bar/baz/</filename>)
 		already has a mergeinfo record, information about the
 		current merge will be propagated down to it.</para>
@@ -1132,43 +1157,51 @@
 	    <listitem>
 	      <para>Never merge directly to a file.</para>
 	    </listitem>
+
 	    <listitem>
 	      <para>Never, ever merge directly to a file.</para>
 	    </listitem>
+
 	    <listitem>
 	      <para><emphasis>Never, ever, ever</emphasis> merge
 		directly to a file.</para>
 	    </listitem>
+
 	    <listitem>
 	      <para>Changes to kernel code should be merged to
 		<filename class="directory">sys/</filename>.  For
 		instance, a change to the &man.ichwd.4; driver should
-		be merged to <filename
-		  class="directory">sys/</filename>, not <filename
-		  class="directory">sys/dev/ichwd/</filename>.
+		be merged to

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

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jul 11 03:07:24 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D739E367;
 Thu, 11 Jul 2013 03:07:24 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C6F7F1CD1;
 Thu, 11 Jul 2013 03:07:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6B37OC8095668;
 Thu, 11 Jul 2013 03:07:24 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6B37NuR095656;
 Thu, 11 Jul 2013 03:07:23 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201307110307.r6B37NuR095656@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 11 Jul 2013 03:07:23 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42245 - in projects/zfsupdate-201307: .
 de_DE.ISO8859-1/books/handbook/firewalls
 de_DE.ISO8859-1/books/porters-handbook
 el_GR.ISO8859-7/books/handbook/firewalls en_US.ISO8859-1/article...
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jul 2013 03:07:24 -0000

Author: gjb
Date: Thu Jul 11 03:07:22 2013
New Revision: 42245
URL: http://svnweb.freebsd.org/changeset/doc/42245

Log:
  MFH:
     Merged /head/Makefile:r42119-42242
     Merged /head/README:r42119-42242
     Merged /head/bn_BD.ISO10646-1:r42119-42242
     Merged /head/da_DK.ISO8859-1:r42119-42242
     Merged /head/de_DE.ISO8859-1:r42119-42242
     Merged /head/el_GR.ISO8859-7:r42119-42242
     Merged /head/en_US.ISO8859-1:r42119-42242
     Merged /head/es_ES.ISO8859-1:r42119-42242
     Merged /head/fr_FR.ISO8859-1:r42119-42242
     Merged /head/hu_HU.ISO8859-2:r42119-42242
     Merged /head/it_IT.ISO8859-15:r42119-42242
     Merged /head/ja_JP.eucJP:r42119-42242
     Merged /head/mn_MN.UTF-8:r42119-42242
     Merged /head/nl_NL.ISO8859-1:r42119-42242
     Merged /head/no_NO.ISO8859-1:r42119-42242
     Merged /head/pl_PL.ISO8859-2:r42119-42242
     Merged /head/pt_BR.ISO8859-1:r42119-42242
     Merged /head/release:r42119-42242
     Merged /head/ru_RU.KOI8-R:r42119-42242
     Merged /head/share:r42119-42242
     Merged /head/sr_YU.ISO8859-2:r42119-42242
     Merged /head/tr_TR.ISO8859-9:r42119-42242
     Merged /head/zh_CN.GB2312:r42119-42242
     Merged /head/zh_TW.Big5:r42119-42242
     Merged /projects/entities/bn_BD.ISO10646-1:r40180-42225
     Merged /projects/entities/da_DK.ISO8859-1:r40180-42225
     Merged /projects/entities/de_DE.ISO8859-1:r40180-42225
     Merged /projects/entities/el_GR.ISO8859-7:r40180-42225
     Merged /projects/entities/en_US.ISO8859-1:r40180-42225
     Merged /projects/entities/es_ES.ISO8859-1:r40180-42225
     Merged /projects/entities/fr_FR.ISO8859-1:r40180-42225
     Merged /projects/entities/hu_HU.ISO8859-2:r40180-42225
     Merged /projects/entities/it_IT.ISO8859-15:r40180-42225
     Merged /projects/entities/ja_JP.eucJP:r40180-42225
     Merged /projects/entities/mn_MN.UTF-8:r40180-42225
     Merged /projects/entities/nl_NL.ISO8859-1:r40180-42225
     Merged /projects/entities/no_NO.ISO8859-1:r40180-42225
     Merged /projects/entities/pl_PL.ISO8859-2:r40180-42225
     Merged /projects/entities/pt_BR.ISO8859-1:r40180-42225
     Merged /projects/entities/release:r40180-42225
     Merged /projects/entities/ru_RU.KOI8-R:r40180-42225
     Merged /projects/entities/share:r40180-42225
     Merged /projects/entities/sr_YU.ISO8859-2:r40180-42225
     Merged /projects/entities/tr_TR.ISO8859-9:r40180-42225
     Merged /projects/entities/zh_CN.GB2312:r40180-42225
     Merged /projects/entities/zh_TW.Big5:r40180-42225
  
  Approved by:	doceng (implicit)

Added:
  projects/zfsupdate-201307/share/pgpkeys/loos.key
     - copied unchanged from r42242, head/share/pgpkeys/loos.key
  projects/zfsupdate-201307/share/pgpkeys/marino.key
     - copied unchanged from r42242, head/share/pgpkeys/marino.key
Deleted:
  projects/zfsupdate-201307/share/xml/developers.ent
Modified:
  projects/zfsupdate-201307/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
  projects/zfsupdate-201307/de_DE.ISO8859-1/books/porters-handbook/book.xml
  projects/zfsupdate-201307/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/committers-guide/article.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/console-server/article.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/article.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/hubs/article.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/linux-emulation/article.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/nanobsd/article.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/releng-packages/article.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/releng/article.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/remote-install/article.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/articles/serial-uart/article.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/dev-model/book.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/faq/book.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/disks/chapter.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/jails/chapter.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/pmake/gods/chapter.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/porters-handbook/book.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/books/porters-handbook/uses.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/htdocs/administration.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/htdocs/internal/doceng.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/htdocs/java/install.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/htdocs/news/status/report-2013-05-devsummit.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/htdocs/platforms/arm.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/htdocs/platforms/sparc.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/htdocs/platforms/xbox.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/htdocs/portmgr/index.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/htdocs/ports/references.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/htdocs/projects/summerofcode-2005.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/htdocs/projects/summerofcode-2006.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/htdocs/releng/index.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/htdocs/security/reporting.xml
  projects/zfsupdate-201307/en_US.ISO8859-1/share/xml/mailing-lists.ent
  projects/zfsupdate-201307/en_US.ISO8859-1/share/xml/teams.ent
  projects/zfsupdate-201307/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
  projects/zfsupdate-201307/fr_FR.ISO8859-1/htdocs/releng/index.xml
  projects/zfsupdate-201307/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
  projects/zfsupdate-201307/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
  projects/zfsupdate-201307/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml
  projects/zfsupdate-201307/it_IT.ISO8859-15/books/handbook/install/chapter.xml
  projects/zfsupdate-201307/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml
  projects/zfsupdate-201307/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml
  projects/zfsupdate-201307/ja_JP.eucJP/articles/contributors/article.xml
  projects/zfsupdate-201307/ja_JP.eucJP/books/faq/book.xml
  projects/zfsupdate-201307/ja_JP.eucJP/books/handbook/Makefile
  projects/zfsupdate-201307/ja_JP.eucJP/books/handbook/book.xml
  projects/zfsupdate-201307/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
  projects/zfsupdate-201307/ja_JP.eucJP/books/handbook/chapters.ent
  projects/zfsupdate-201307/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
  projects/zfsupdate-201307/ja_JP.eucJP/books/handbook/desktop/chapter.xml
  projects/zfsupdate-201307/ja_JP.eucJP/books/handbook/disks/chapter.xml
  projects/zfsupdate-201307/ja_JP.eucJP/books/handbook/introduction/chapter.xml
  projects/zfsupdate-201307/ja_JP.eucJP/books/handbook/preface/preface.xml
  projects/zfsupdate-201307/ja_JP.eucJP/books/porters-handbook/book.xml
  projects/zfsupdate-201307/ja_JP.eucJP/htdocs/java/install.xml
  projects/zfsupdate-201307/ja_JP.eucJP/htdocs/platforms/arm.xml
  projects/zfsupdate-201307/ja_JP.eucJP/htdocs/platforms/sparc.xml
  projects/zfsupdate-201307/ja_JP.eucJP/htdocs/ports/references.xml
  projects/zfsupdate-201307/ja_JP.eucJP/htdocs/security/reporting.xml
  projects/zfsupdate-201307/ja_JP.eucJP/share/xml/mailing-lists.ent
  projects/zfsupdate-201307/ja_JP.eucJP/share/xml/navibar.l10n.ent
  projects/zfsupdate-201307/ja_JP.eucJP/share/xml/news.xml
  projects/zfsupdate-201307/ja_JP.eucJP/share/xml/teams.ent
  projects/zfsupdate-201307/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml
  projects/zfsupdate-201307/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
  projects/zfsupdate-201307/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
  projects/zfsupdate-201307/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
  projects/zfsupdate-201307/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml
  projects/zfsupdate-201307/nl_NL.ISO8859-1/htdocs/administration.xml
  projects/zfsupdate-201307/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml
  projects/zfsupdate-201307/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
  projects/zfsupdate-201307/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
  projects/zfsupdate-201307/ru_RU.KOI8-R/books/porters-handbook/book.xml
  projects/zfsupdate-201307/ru_RU.KOI8-R/htdocs/portmgr/index.xml
  projects/zfsupdate-201307/ru_RU.KOI8-R/htdocs/releng/index.xml
  projects/zfsupdate-201307/share/pgpkeys/README
  projects/zfsupdate-201307/share/pgpkeys/addkey.sh
  projects/zfsupdate-201307/share/pgpkeys/gavin.key
  projects/zfsupdate-201307/share/pgpkeys/pgpkeys-core.xml
  projects/zfsupdate-201307/share/pgpkeys/pgpkeys-developers.xml
  projects/zfsupdate-201307/share/pgpkeys/pgpkeys.ent
  projects/zfsupdate-201307/share/xml/authors.ent
  projects/zfsupdate-201307/share/xml/catalog.xml
  projects/zfsupdate-201307/share/xml/events2013.xml
  projects/zfsupdate-201307/share/xml/freebsd.ent
  projects/zfsupdate-201307/share/xml/freebsd.sch
  projects/zfsupdate-201307/share/xml/mirrors.xml
  projects/zfsupdate-201307/share/xml/news.xml
  projects/zfsupdate-201307/share/xml/templates.events.xsl
  projects/zfsupdate-201307/share/xml/xhtml.xsl
  projects/zfsupdate-201307/share/xml/xhtml10-freebsd.dtd
  projects/zfsupdate-201307/share/xml/xslt10-freebsd.dtd
  projects/zfsupdate-201307/share/xsl/freebsd-xhtml-common.xsl
  projects/zfsupdate-201307/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
  projects/zfsupdate-201307/zh_CN.GB2312/books/porters-handbook/book.xml
  projects/zfsupdate-201307/zh_TW.Big5/books/handbook/firewalls/chapter.xml
  projects/zfsupdate-201307/zh_TW.Big5/books/handbook/serialcomms/chapter.xml
  projects/zfsupdate-201307/zh_TW.Big5/books/porters-handbook/book.xml
Directory Properties:
  projects/zfsupdate-201307/Makefile   (props changed)
  projects/zfsupdate-201307/README   (props changed)
  projects/zfsupdate-201307/bn_BD.ISO10646-1/   (props changed)
  projects/zfsupdate-201307/da_DK.ISO8859-1/   (props changed)
  projects/zfsupdate-201307/de_DE.ISO8859-1/   (props changed)
  projects/zfsupdate-201307/el_GR.ISO8859-7/   (props changed)
  projects/zfsupdate-201307/en_US.ISO8859-1/   (props changed)
  projects/zfsupdate-201307/es_ES.ISO8859-1/   (props changed)
  projects/zfsupdate-201307/fr_FR.ISO8859-1/   (props changed)
  projects/zfsupdate-201307/hu_HU.ISO8859-2/   (props changed)
  projects/zfsupdate-201307/it_IT.ISO8859-15/   (props changed)
  projects/zfsupdate-201307/ja_JP.eucJP/   (props changed)
  projects/zfsupdate-201307/mn_MN.UTF-8/   (props changed)
  projects/zfsupdate-201307/nl_NL.ISO8859-1/   (props changed)
  projects/zfsupdate-201307/nl_NL.ISO8859-1/share/xml/entities.ent   (props changed)
  projects/zfsupdate-201307/no_NO.ISO8859-1/   (props changed)
  projects/zfsupdate-201307/pl_PL.ISO8859-2/   (props changed)
  projects/zfsupdate-201307/pt_BR.ISO8859-1/   (props changed)
  projects/zfsupdate-201307/release/   (props changed)
  projects/zfsupdate-201307/ru_RU.KOI8-R/   (props changed)
  projects/zfsupdate-201307/share/   (props changed)
  projects/zfsupdate-201307/sr_YU.ISO8859-2/   (props changed)
  projects/zfsupdate-201307/tr_TR.ISO8859-9/   (props changed)
  projects/zfsupdate-201307/zh_CN.GB2312/   (props changed)
  projects/zfsupdate-201307/zh_TW.Big5/   (props changed)

Modified: projects/zfsupdate-201307/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
==============================================================================
--- projects/zfsupdate-201307/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml	Thu Jul 11 03:06:43 2013	(r42244)
+++ projects/zfsupdate-201307/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml	Thu Jul 11 03:07:22 2013	(r42245)
@@ -1834,7 +1834,7 @@ block in log first quick on dc0 all
 	Internet:</para>
 
       <informaltable frame="none" pgwide="1">
-	<tgroup cols="2">
+	<tgroup cols="3">
 	  <colspec colwidth="1*"/>
 
 	  <colspec colwidth="1*"/>

Modified: projects/zfsupdate-201307/de_DE.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- projects/zfsupdate-201307/de_DE.ISO8859-1/books/porters-handbook/book.xml	Thu Jul 11 03:06:43 2013	(r42244)
+++ projects/zfsupdate-201307/de_DE.ISO8859-1/books/porters-handbook/book.xml	Thu Jul 11 03:07:22 2013	(r42245)
@@ -6050,6 +6050,7 @@ PLIST_SUB+=             NLS="@comment "
 	    <thead>
 	      <row>
 		<entry>Nur lesbare Variablen</entry>
+		<entry>Bedeutung</entry>
 	      </row>
 	    </thead>
 

Modified: projects/zfsupdate-201307/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
==============================================================================
--- projects/zfsupdate-201307/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml	Thu Jul 11 03:06:43 2013	(r42244)
+++ projects/zfsupdate-201307/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml	Thu Jul 11 03:07:22 2013	(r42245)
@@ -1823,7 +1823,7 @@ block in log first quick on dc0 all
 	Internet:</para>
 
       <informaltable frame="none" pgwide="1">
-	<tgroup cols="2">
+	<tgroup cols="3">
 	  <colspec colwidth="1*"/>
 
 	  <colspec colwidth="1*"/>

Modified: projects/zfsupdate-201307/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- projects/zfsupdate-201307/en_US.ISO8859-1/articles/committers-guide/article.xml	Thu Jul 11 03:06:43 2013	(r42244)
+++ projects/zfsupdate-201307/en_US.ISO8859-1/articles/committers-guide/article.xml	Thu Jul 11 03:07:22 2013	(r42245)
@@ -2046,11 +2046,6 @@ ControlPersist yes</screen>
 	</listitem>
 
 	<listitem>
-	  <para>Also add your author entity to
-	    <filename>head/share/xml/developers.ent</filename>.</para>
-	</listitem>
-
-	<listitem>
 	  <para>Add yourself to the <quote>Developers</quote> section
 	    of the <ulink
 	      url="&url.articles.contributors;/index.html">Contributors
@@ -2079,7 +2074,7 @@ ControlPersist yes</screen>
 	    <filename>head/share/pgpkeys/pgpkeys-developers.xml</filename>.
 	    Please note that entries are sorted by last name.</para>
 
-	  <para>&a.des; has written a shell script
+	  <para>&a.des.email; has written a shell script
 	    (<filename>head/share/pgpkeys/addkey.sh</filename>) to
 	    make this extremely simple.  See the <ulink
 	      url="http://svnweb.FreeBSD.org/doc/head/share/pgpkeys/README">README</ulink>
@@ -2268,7 +2263,7 @@ ControlPersist yes</screen>
 
     <para>The &os; project discourages completely new licenses and
       variations on the standard licenses.  New licenses require the
-      approval of <email>core@FreeBSD.org</email> to reside in the
+      approval of the &a.core; to reside in the
       main repository.  The more different licenses that are used in
       the tree, the more problems that this causes to those wishing to
       utilize this code, typically from unintended consequences from a
@@ -2308,7 +2303,7 @@ ControlPersist yes</screen>
       <filename>Makefile</filename>.  For other parts of the
       repository, if you are unsure who the active maintainer might
       be, it may help to scan the revision history to see who has
-      committed changes in the past.  &a.fenner; has written a nice
+      committed changes in the past.  &a.fenner.email; has written a nice
       shell script that can help determine who the active maintainer
       might be.  It lists each person who has committed to a given
       file along with the number of commits each person has made.  It
@@ -2464,7 +2459,7 @@ ControlPersist yes</screen>
       </varlistentry>
 
       <varlistentry>
-	<term>&a.ru;</term>
+	<term>&a.ru.email;</term>
 
 	<listitem>
 	  <para>Ruslan is Mister &man.mdoc.7;.  If you are writing a
@@ -2474,7 +2469,7 @@ ControlPersist yes</screen>
       </varlistentry>
 
       <varlistentry>
-	<term>&a.bde;</term>
+	<term>&a.bde.email;</term>
 
 	<listitem>
 	  <para>Bruce is the Style Police-Meister.  When you do a
@@ -2486,7 +2481,7 @@ ControlPersist yes</screen>
       </varlistentry>
 
       <varlistentry>
-	<term>&team.re;</term>
+	<term>&a.re.members.email;</term>
 
 	<listitem>
 	  <para>These are the members of the &a.re;.  This team is
@@ -2507,7 +2502,7 @@ ControlPersist yes</screen>
       </varlistentry>
 
       <varlistentry>
-	<term>&a.des;</term>
+	<term>&a.des.email;</term>
 
 	<listitem>
 	  <para>Dag-Erling is the
@@ -2518,7 +2513,7 @@ ControlPersist yes</screen>
       </varlistentry>
 
       <varlistentry>
-	<term>&a.wollman;</term>
+	<term>&a.wollman.email;</term>
 
 	<listitem>
 	  <para>If you need advice on obscure network internals or
@@ -3443,9 +3438,10 @@ ControlPersist yes</screen>
 	      port <filename>Makefile</filename>.  It will also add an
 	      entry to the port's category
 	      <filename>Makefile</filename>.  It was written by
-	      &a.mharo;, &a.will;, and &a.garga;.  When sending
+	      &a.mharo.email;, &a.will.email;, and &a.garga.email;.
+	      When sending
 	      questions about this script to the &a.ports;, please
-	      also CC &a.crees;, the current maintainer.</para>
+	      also CC &a.crees.email;, the current maintainer.</para>
 	  </answer>
 	</qandaentry>
 
@@ -3560,9 +3556,9 @@ ControlPersist yes</screen>
 	    <para>Alternatively, you can use the
 	      <command>rmport</command> script, from <filename
 		class="directory">ports/Tools/scripts</filename>.
-	      This script was written by &a.vd;.  When sending
+	      This script was written by &a.vd.email;.  When sending
 	      questions about this script to the &a.ports;, please
-	      also CC &a.crees;, the current maintainer.</para>
+	      also CC &a.crees.email;, the current maintainer.</para>
 	  </answer>
 	</qandaentry>
       </qandadiv>
@@ -4372,7 +4368,7 @@ bak/packages  packages from last complet
 	      name</replaceable> or
 	    <literal>freebsd/developer/</literal><replaceable>NickServ
 	      name</replaceable>. To request a cloak, send an email to
-	    &a.eadler; with your requested hostmask and NickServ
+	    &a.eadler.email; with your requested hostmask and NickServ
 	    account name.</para>
 	</listitem>
       </varlistentry>

Modified: projects/zfsupdate-201307/en_US.ISO8859-1/articles/console-server/article.xml
==============================================================================
--- projects/zfsupdate-201307/en_US.ISO8859-1/articles/console-server/article.xml	Thu Jul 11 03:06:43 2013	(r42244)
+++ projects/zfsupdate-201307/en_US.ISO8859-1/articles/console-server/article.xml	Thu Jul 11 03:07:22 2013	(r42245)
@@ -539,7 +539,7 @@ print crypt($cleartext, $salt), "\n";</p
 	  likely need a different style of salt.</para>
       </note>
 
-      <para>&a.kris; has since pointed out you can get the same effect using
+      <para>&a.kris.email; has since pointed out you can get the same effect using
 	the <command>openssl passwd</command> command:</para>
 
       <screen>&prompt.user; openssl passwd -1

Modified: projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/article.xml
==============================================================================
--- projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/article.xml	Thu Jul 11 03:06:43 2013	(r42244)
+++ projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/article.xml	Thu Jul 11 03:07:22 2013	(r42245)
@@ -51,7 +51,7 @@
 
 	<itemizedlist>
 	  <listitem>
-	    <para>&a.mbarkah; and his employer, <ulink
+	    <para>&a.mbarkah.email; and his employer, <ulink
 		url="http://www.hemi.com/"> Hemisphere Online</ulink>,
 		donated a <emphasis>Pentium Pro (P6) 200MHz CPU</emphasis>
 	    </para>
@@ -97,7 +97,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>&a.dillon;</para>
+	    <para>&a.dillon.email;</para>
 	  </listitem>
 
 	  <listitem>
@@ -111,7 +111,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>&a.sef;</para>
+	    <para>&a.sef.email;</para>
 	  </listitem>
 
 	  <listitem>
@@ -137,7 +137,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>&a.chuckr;</para>
+	    <para>&a.chuckr.email;</para>
 	  </listitem>
 
 	  <listitem>
@@ -241,7 +241,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>Larry Altneu <email>larry@ALR.COM</email>, and &a.wilko;,
+	    <para>Larry Altneu <email>larry@ALR.COM</email>, and &a.wilko.email;,
 	      provided Wangtek and Archive QIC-02 tape drives in order to
 	      improve the <devicename>wt</devicename> driver.</para>
 	  </listitem>
@@ -273,7 +273,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>Christoph Kukulies <email>kuku@FreeBSD.org</email> donated
+	    <para>&a.kuku.email; donated
 	      an FX120 12 speed Mitsumi CDROM drive for IDE CDROM driver
 	      development.</para>
 	  </listitem>
@@ -309,7 +309,7 @@
 	  <listitem>
 	    <para>The <ulink url="http://www.interface-business.de/">interface
 		business GmbH, Dresden</ulink> has been patiently supporting
-	      &a.joerg; who has often preferred FreeBSD work over paid work, and
+	      &a.joerg.email; who has often preferred FreeBSD work over paid work, and
 	      used to fall back to their (quite expensive) EUnet Internet
 	      connection whenever his private connection became too slow or
 	      flaky to work with it...</para>

Modified: projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Thu Jul 11 03:06:43 2013	(r42244)
+++ projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Thu Jul 11 03:07:22 2013	(r42245)
@@ -365,8 +365,7 @@
     </listitem>
 
     <listitem>
-      <para>Alexander Best
-	<email>arundel@FreeBSD.org</email></para>
+      <para>&a.arundel.email;</para>
     </listitem>
 
     <listitem>
@@ -1747,8 +1746,7 @@
     </listitem>
 
     <listitem>
-      <para>Christoph P. Kukulies
-	<email>kuku@FreeBSD.org</email></para>
+      <para>&a.kuku.email;</para>
     </listitem>
 
     <listitem>
@@ -2220,8 +2218,7 @@
     </listitem>
 
     <listitem>
-      <para>Dave Tweten
-	<email>tweten@FreeBSD.org</email></para>
+      <para>&a.tweten.email;</para>
     </listitem>
 
     <listitem>
@@ -2703,7 +2700,7 @@
     </listitem>
 
     <listitem>
-      <para>&a.whiteside;</para>
+      <para>&a.whiteside.email;</para>
     </listitem>
 
     <listitem>
@@ -3346,7 +3343,7 @@
     </listitem>
 
     <listitem>
-      <para>&a.stanislav;</para>
+      <para>&a.stanislav.email;</para>
     </listitem>
 
     <listitem>
@@ -4308,8 +4305,7 @@
     </listitem>
 
     <listitem>
-      <para>Jan Koum
-	<email>jkb@FreeBSD.org</email></para>
+      <para>&a.jkb.email;</para>
     </listitem>
 
     <listitem>
@@ -4622,8 +4618,7 @@
     </listitem>
 
     <listitem>
-      <para>Jim Babb
-	<email>babb@FreeBSD.org</email></para>
+      <para>&a.babb.email;</para>
     </listitem>
 
     <listitem>
@@ -4918,11 +4913,6 @@
     </listitem>
 
     <listitem>
-      <para>John Marino
-	<email>draco@marino.st</email></para>
-    </listitem>
-
-    <listitem>
       <para>John McAree
 	<email>john@mcaree.org</email></para>
     </listitem>
@@ -5263,7 +5253,7 @@
     </listitem>
 
     <listitem>
-      <para>&a.jhs;</para>
+      <para>&a.jhs.email;</para>
     </listitem>
 
     <listitem>
@@ -5969,11 +5959,6 @@
     </listitem>
 
     <listitem>
-      <para>Luiz Otavio O Souza
-	<email>loos.br@gmail.com</email></para>
-    </listitem>
-
-    <listitem>
       <para>Lukasz Stelmach
 	<email>lukasz.stelmach@iem.pw.edu.pl</email></para>
     </listitem>
@@ -10844,8 +10829,7 @@
     </listitem>
 
     <listitem>
-      <para>Wolfgang Stanglmeier
-	<email>wolf@FreeBSD.org</email></para>
+      <para>&a.wolf.email;</para>
     </listitem>
 
     <listitem>
@@ -10869,7 +10853,7 @@
     </listitem>
 
     <listitem>
-      <para>&a.wylie;</para>
+      <para>&a.wylie.email;</para>
     </listitem>
 
     <listitem>

Modified: projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
==============================================================================
--- projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Thu Jul 11 03:06:43 2013	(r42244)
+++ projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Thu Jul 11 03:07:22 2013	(r42245)
@@ -8,1678 +8,1686 @@
 
   <itemizedlist>
     <listitem>
-      <para>&a.ariff;</para>
+      <para>&a.ariff.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.tabthorpe;</para>
+      <para>&a.tabthorpe.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.eadler;</para>
+      <para>&a.eadler.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.akiyama;</para>
+      <para>&a.akiyama.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.monthadar;</para>
+      <para>&a.monthadar.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.ambrisko;</para>
+      <para>&a.ambrisko.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.shaun;</para>
+      <para>&a.shaun.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.brix;</para>
+      <para>&a.brix.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jonathan;</para>
+      <para>&a.jonathan.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.mandree;</para>
+      <para>&a.mandree.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.will;</para>
+      <para>&a.will.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.dim;</para>
+      <para>&a.dim.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.mva;</para>
+      <para>&a.mva.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.araujo;</para>
+      <para>&a.araujo.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.mat;</para>
+      <para>&a.mat.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.syuu;</para>
+      <para>&a.syuu.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.gavin;</para>
+      <para>&a.gavin.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jsa;</para>
+      <para>&a.jsa.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jadawin;</para>
+      <para>&a.jadawin.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.timur;</para>
+      <para>&a.timur.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jhb;</para>
+      <para>&a.jhb.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.gjb;</para>
+      <para>&a.gjb.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.art;</para>
+      <para>&a.art.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.kib;</para>
+      <para>&a.kib.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.tobez;</para>
+      <para>&a.tobez.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.gber;</para>
+      <para>&a.gber.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.pb;</para>
+      <para>&a.pb.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.tdb;</para>
+      <para>&a.tdb.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.gblach;</para>
+      <para>&a.gblach.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.mbr;</para>
+      <para>&a.mbr.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.wblock;</para>
+      <para>&a.wblock.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.novel;</para>
+      <para>&a.novel.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.garga;</para>
+      <para>&a.garga.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.sbz;</para>
+      <para>&a.sbz.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.ebrandi;</para>
+      <para>&a.ebrandi.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.harti;</para>
+      <para>&a.harti.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.makc;</para>
+      <para>&a.makc.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.antoine;</para>
+      <para>&a.antoine.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.db;</para>
+      <para>&a.db.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.sbruno;</para>
+      <para>&a.sbruno.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.brueffer;</para>
+      <para>&a.brueffer.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.markus;</para>
+      <para>&a.markus.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.oleg;</para>
+      <para>&a.oleg.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jchandra;</para>
+      <para>&a.jchandra.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.acm;</para>
+      <para>&a.acm.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.gahr;</para>
+      <para>&a.gahr.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.adrian;</para>
+      <para>&a.adrian.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.dchagin;</para>
+      <para>&a.dchagin.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.charnier;</para>
+      <para>&a.charnier.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jon;</para>
+      <para>&a.jon.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.loader;</para>
+      <para>&a.loader.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.luoqi;</para>
+      <para>&a.luoqi.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.ache;</para>
+      <para>&a.ache.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.melifaro;</para>
+      <para>&a.melifaro.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.theraven;</para>
+      <para>&a.theraven.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.davidch;</para>
+      <para>&a.davidch.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.marcus;</para>
+      <para>&a.marcus.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.tijl;</para>
+      <para>&a.tijl.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.rakuco;</para>
+      <para>&a.rakuco.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.alc;</para>
+      <para>&a.alc.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.cracauer;</para>
+      <para>&a.cracauer.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.brucec;</para>
+      <para>&a.brucec.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.culot;</para>
+      <para>&a.culot.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.joel;</para>
+      <para>&a.joel.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.bapt;</para>
+      <para>&a.bapt.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.davidc;</para>
+      <para>&a.davidc.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.brd;</para>
+      <para>&a.brd.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.brooks;</para>
+      <para>&a.brooks.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.pjd;</para>
+      <para>&a.pjd.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jwd;</para>
+      <para>&a.jwd.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.carl;</para>
+      <para>&a.carl.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.vd;</para>
+      <para>&a.vd.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.rdivacky;</para>
+      <para>&a.rdivacky.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.mdodd;</para>
+      <para>&a.mdodd.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.danfe;</para>
+      <para>&a.danfe.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.dd;</para>
+      <para>&a.dd.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.iedowse;</para>
+      <para>&a.iedowse.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.bdrewery;</para>
+      <para>&a.bdrewery.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.gad;</para>
+      <para>&a.gad.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.olivierd;</para>
+      <para>&a.olivierd.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.bruno;</para>
+      <para>&a.bruno.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.ale;</para>
+      <para>&a.ale.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.peadar;</para>
+      <para>&a.peadar.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.deischen;</para>
+      <para>&a.deischen.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.eivind;</para>
+      <para>&a.eivind.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.julian;</para>
+      <para>&a.julian.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.ae;</para>
+      <para>&a.ae.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.lme;</para>
+      <para>&a.lme.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.rse;</para>
+      <para>&a.rse.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.ru;</para>
+      <para>&a.ru.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.le;</para>
+      <para>&a.le.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.se;</para>
+      <para>&a.se.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.bde;</para>
+      <para>&a.bde.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jasone;</para>
+      <para>&a.jasone.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.bf;</para>
+      <para>&a.bf.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.madpilot;</para>
+      <para>&a.madpilot.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.rafan;</para>
+      <para>&a.rafan.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.stefanf;</para>
+      <para>&a.stefanf.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.scf;</para>
+      <para>&a.scf.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.feld;</para>
+      <para>&a.feld.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.green;</para>
+      <para>&a.green.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.lioux;</para>
+      <para>&a.lioux.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.fanf;</para>
+      <para>&a.fanf.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.mdf;</para>
+      <para>&a.mdf.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.blackend;</para>
+      <para>&a.blackend.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.olli;</para>
+      <para>&a.olli.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.decke;</para>
+      <para>&a.decke.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.gallatin;</para>
+      <para>&a.gallatin.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.avg;</para>
+      <para>&a.avg.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.beat;</para>
+      <para>&a.beat.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.danger;</para>
+      <para>&a.danger.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.sjg;</para>
+      <para>&a.sjg.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.gibbs;</para>
+      <para>&a.gibbs.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.pfg;</para>
+      <para>&a.pfg.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.girgen;</para>
+      <para>&a.girgen.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.pgollucci;</para>
+      <para>&a.pgollucci.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.trociny;</para>
+      <para>&a.trociny.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.daichi;</para>
+      <para>&a.daichi.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.bgray;</para>
+      <para>&a.bgray.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.dg;</para>
+      <para>&a.dg.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.grehan;</para>
+      <para>&a.grehan.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jamie;</para>
+      <para>&a.jamie.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.edwin;</para>
+      <para>&a.edwin.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.wg;</para>
+      <para>&a.wg.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.bar;</para>
+      <para>&a.bar.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jmg;</para>
+      <para>&a.jmg.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.mjg;</para>
+      <para>&a.mjg.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.vg;</para>
+      <para>&a.vg.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jhale;</para>
+      <para>&a.jhale.email;</para>
     </listitem>
 

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

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jul 11 17:27:12 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6A1E6434;
 Thu, 11 Jul 2013 17:27:12 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 59FCA1BA7;
 Thu, 11 Jul 2013 17:27:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6BHRCbi055905;
 Thu, 11 Jul 2013 17:27:12 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6BHRAr5055885;
 Thu, 11 Jul 2013 17:27:10 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201307111727.r6BHRAr5055885@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 11 Jul 2013 17:27:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42250 - in projects/db5:
 de_DE.ISO8859-1/books/handbook/cutting-edge
 de_DE.ISO8859-1/books/handbook/install de_DE.ISO8859-1/books/handbook/mail
 el_GR.ISO8859-7/books/handbook/cutting-e...
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jul 2013 17:27:12 -0000

Author: gabor
Date: Thu Jul 11 17:27:09 2013
New Revision: 42250
URL: http://svnweb.freebsd.org/changeset/doc/42250

Log:
  - MFH

Added:
  projects/db5/share/pgpkeys/marino.key
     - copied unchanged from r42249, head/share/pgpkeys/marino.key
Deleted:
  projects/db5/share/xml/developers.ent
Modified:
  projects/db5/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
  projects/db5/de_DE.ISO8859-1/books/handbook/install/chapter.xml
  projects/db5/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
  projects/db5/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
  projects/db5/el_GR.ISO8859-7/books/handbook/install/chapter.xml
  projects/db5/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
  projects/db5/en_US.ISO8859-1/articles/committers-guide/article.xml
  projects/db5/en_US.ISO8859-1/articles/console-server/article.xml
  projects/db5/en_US.ISO8859-1/articles/contributors/article.xml
  projects/db5/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
  projects/db5/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
  projects/db5/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
  projects/db5/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
  projects/db5/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
  projects/db5/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
  projects/db5/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
  projects/db5/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
  projects/db5/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
  projects/db5/en_US.ISO8859-1/articles/hubs/article.xml
  projects/db5/en_US.ISO8859-1/articles/linux-emulation/article.xml
  projects/db5/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
  projects/db5/en_US.ISO8859-1/articles/nanobsd/article.xml
  projects/db5/en_US.ISO8859-1/articles/releng-packages/article.xml
  projects/db5/en_US.ISO8859-1/articles/releng/article.xml
  projects/db5/en_US.ISO8859-1/articles/remote-install/article.xml
  projects/db5/en_US.ISO8859-1/articles/serial-uart/article.xml
  projects/db5/en_US.ISO8859-1/books/dev-model/book.xml
  projects/db5/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
  projects/db5/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
  projects/db5/en_US.ISO8859-1/books/faq/book.xml
  projects/db5/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
  projects/db5/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
  projects/db5/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
  projects/db5/en_US.ISO8859-1/books/handbook/disks/chapter.xml
  projects/db5/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
  projects/db5/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
  projects/db5/en_US.ISO8859-1/books/handbook/install/chapter.xml
  projects/db5/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
  projects/db5/en_US.ISO8859-1/books/handbook/jails/chapter.xml
  projects/db5/en_US.ISO8859-1/books/handbook/mail/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/internal/doceng.xml
  projects/db5/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml
  projects/db5/en_US.ISO8859-1/htdocs/news/status/report-2013-05-devsummit.xml
  projects/db5/en_US.ISO8859-1/htdocs/platforms/arm.xml
  projects/db5/en_US.ISO8859-1/htdocs/platforms/sparc.xml
  projects/db5/en_US.ISO8859-1/htdocs/platforms/xbox.xml
  projects/db5/en_US.ISO8859-1/htdocs/portmgr/index.xml
  projects/db5/en_US.ISO8859-1/htdocs/projects/summerofcode-2005.xml
  projects/db5/en_US.ISO8859-1/htdocs/projects/summerofcode-2006.xml
  projects/db5/en_US.ISO8859-1/htdocs/releng/index.xml
  projects/db5/en_US.ISO8859-1/htdocs/security/reporting.xml
  projects/db5/en_US.ISO8859-1/share/xml/mailing-lists.ent
  projects/db5/en_US.ISO8859-1/share/xml/teams.ent
  projects/db5/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
  projects/db5/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
  projects/db5/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
  projects/db5/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
  projects/db5/fr_FR.ISO8859-1/htdocs/releng/index.xml
  projects/db5/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml
  projects/db5/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
  projects/db5/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
  projects/db5/it_IT.ISO8859-15/books/handbook/install/chapter.xml
  projects/db5/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
  projects/db5/ja_JP.eucJP/articles/contributors/article.xml
  projects/db5/ja_JP.eucJP/books/faq/book.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/install/chapter.xml
  projects/db5/ja_JP.eucJP/books/handbook/introduction/chapter.xml
  projects/db5/ja_JP.eucJP/books/handbook/mail/chapter.xml
  projects/db5/ja_JP.eucJP/htdocs/platforms/arm.xml
  projects/db5/ja_JP.eucJP/htdocs/platforms/sparc.xml
  projects/db5/ja_JP.eucJP/htdocs/security/reporting.xml
  projects/db5/ja_JP.eucJP/share/xml/mailing-lists.ent
  projects/db5/ja_JP.eucJP/share/xml/news.xml
  projects/db5/ja_JP.eucJP/share/xml/teams.ent
  projects/db5/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml
  projects/db5/mn_MN.UTF-8/books/handbook/install/chapter.xml
  projects/db5/mn_MN.UTF-8/books/handbook/mail/chapter.xml
  projects/db5/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
  projects/db5/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
  projects/db5/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
  projects/db5/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
  projects/db5/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
  projects/db5/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
  projects/db5/nl_NL.ISO8859-1/htdocs/administration.xml
  projects/db5/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
  projects/db5/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
  projects/db5/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
  projects/db5/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
  projects/db5/ru_RU.KOI8-R/books/handbook/install/chapter.xml
  projects/db5/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
  projects/db5/ru_RU.KOI8-R/htdocs/portmgr/index.xml
  projects/db5/ru_RU.KOI8-R/htdocs/releng/index.xml
  projects/db5/share/pgpkeys/README
  projects/db5/share/pgpkeys/addkey.sh
  projects/db5/share/pgpkeys/pgpkeys-core.xml
  projects/db5/share/pgpkeys/pgpkeys-developers.xml
  projects/db5/share/pgpkeys/pgpkeys.ent
  projects/db5/share/xml/authors.ent
  projects/db5/share/xml/catalog.xml
  projects/db5/share/xml/events2013.xml
  projects/db5/share/xml/freebsd.ent
  projects/db5/share/xml/freebsd.sch
  projects/db5/share/xml/news.xml
  projects/db5/share/xml/templates.events.xsl
  projects/db5/share/xml/xhtml.xsl
  projects/db5/share/xml/xhtml10-freebsd.dtd
  projects/db5/share/xml/xslt10-freebsd.dtd
  projects/db5/share/xsl/freebsd-xhtml-common.xsl
  projects/db5/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
  projects/db5/zh_CN.GB2312/books/handbook/install/chapter.xml
  projects/db5/zh_CN.GB2312/books/handbook/mail/chapter.xml
  projects/db5/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml
  projects/db5/zh_TW.Big5/books/handbook/mail/chapter.xml
Directory Properties:
  projects/db5/   (props changed)
  projects/db5/da_DK.ISO8859-1/   (props changed)
  projects/db5/de_DE.ISO8859-1/   (props changed)
  projects/db5/el_GR.ISO8859-7/   (props changed)
  projects/db5/en_US.ISO8859-1/   (props changed)
  projects/db5/es_ES.ISO8859-1/   (props changed)
  projects/db5/fr_FR.ISO8859-1/   (props changed)
  projects/db5/hu_HU.ISO8859-2/   (props changed)
  projects/db5/it_IT.ISO8859-15/   (props changed)
  projects/db5/ja_JP.eucJP/   (props changed)
  projects/db5/mn_MN.UTF-8/   (props changed)
  projects/db5/nl_NL.ISO8859-1/   (props changed)
  projects/db5/no_NO.ISO8859-1/   (props changed)
  projects/db5/pl_PL.ISO8859-2/   (props changed)
  projects/db5/pt_BR.ISO8859-1/   (props changed)
  projects/db5/release/   (props changed)
  projects/db5/ru_RU.KOI8-R/   (props changed)
  projects/db5/share/   (props changed)
  projects/db5/sr_YU.ISO8859-2/   (props changed)
  projects/db5/tr_TR.ISO8859-9/   (props changed)
  projects/db5/zh_CN.GB2312/   (props changed)
  projects/db5/zh_TW.Big5/   (props changed)

Modified: projects/db5/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- projects/db5/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Thu Jul 11 17:13:40 2013	(r42249)
+++ projects/db5/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Thu Jul 11 17:27:09 2013	(r42250)
@@ -3011,10 +3011,9 @@ Script done, &hellip;</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm><primary>Signal 11</primary></indexterm>
-
 	    <para>Der Bau bricht mit vielen
-	      <errorname>Signal 11</errorname>-Fehlern (oder anderen
+	      <errorname>Signal 11</errorname>-Fehlern<indexterm>
+	      <primary>Signal 11</primary></indexterm> (oder anderen
 	      Signalnummern) ab.  Was ist da passiert?</para>
 	  </question>
 

Modified: projects/db5/de_DE.ISO8859-1/books/handbook/install/chapter.xml
==============================================================================
--- projects/db5/de_DE.ISO8859-1/books/handbook/install/chapter.xml	Thu Jul 11 17:13:40 2013	(r42249)
+++ projects/db5/de_DE.ISO8859-1/books/handbook/install/chapter.xml	Thu Jul 11 17:27:09 2013	(r42250)
@@ -4698,16 +4698,12 @@ Please press any key to reboot.</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm>
-	      <primary>Farben</primary>
-	      <secondary>Kontrast</secondary>
-	    </indexterm>
-
 	    <para>Wenn ich <application>sysinstall</application> aus
 	      einen X-Terminal starte, ist die gelbe Schritt auf dem
 	      grauen Hintergrund nur schwer zu erkennen.  Gibt es
-	      eine Mφglichkeit, den Kontrast fόr dieses
-	      Programm zu erhφhen?</para>
+	      eine Mφglichkeit, den Kontrast<indexterm>
+	      <primary>Farben</primary><secondary>Kontrast</secondary>
+	      </indexterm> fόr dieses Programm zu erhφhen?</para>
 	  </question>
 
 	  <answer>

Modified: projects/db5/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
==============================================================================
--- projects/db5/de_DE.ISO8859-1/books/handbook/mail/chapter.xml	Thu Jul 11 17:13:40 2013	(r42249)
+++ projects/db5/de_DE.ISO8859-1/books/handbook/mail/chapter.xml	Thu Jul 11 17:27:09 2013	(r42250)
@@ -985,10 +985,6 @@ purgestat	/usr/local/supermailer/bin/pur
 
       <qandaentry>
 	<question>
-	  <indexterm>
-	    <primary>MX-Eintrag</primary>
-	  </indexterm>
-
 	  <para>Warum meldet Sendmail
 	    <errorname>mail loops back to myself</errorname>?</para>
 	</question>
@@ -1003,7 +999,8 @@ purgestat	/usr/local/supermailer/bin/pur
 
 	Wie kann ich dieses Problem lφsen?
 
-        Sie haben durch die Benutzung eines MX-Eintrags eingestellt, dass
+        Sie haben durch die Benutzung eines MX-Eintrags<indexterm>
+	<primary>MX-Eintrag</primary></indexterm> eingestellt, dass
         Mail fόr die Domδne (z.B. domain.net) an einen speziellen
         Host (in diesem Fall relay.domain.net) weitergeleitet wird,
         aber der Relay-Host erkennt sich selbst nicht als
@@ -1030,10 +1027,9 @@ purgestat	/usr/local/supermailer/bin/pur
 
       <qandaentry>
         <question>
-	  <indexterm><primary>PPP</primary></indexterm>
-
 	  <para>Wie kann ich einen E-Mail-Server auf einem
-	    Anwahl-PPP Rechner betreiben?</para>
+	    Anwahl-PPP<indexterm>
+	    <primary>PPP</primary></indexterm> Rechner betreiben?</para>
 	</question>
 
 	<answer>
@@ -1042,15 +1038,12 @@ purgestat	/usr/local/supermailer/bin/pur
 	  <foreignphrase>Gateway</foreignphrase> fόr das LAN.
           Die PPP-Verbindung ist keine Standleitung.</para>
 
-	<indexterm>
-	  <primary>MX-Eintrag</primary>
-	</indexterm>
-
 	<para>Es gibt mindestens zwei Wege um dies zu tun.  Einer davon ist
 	  UUCP zu verwenden.</para>
 
 	<para>Ein anderer Weg ist, von einem immer mit dem Internet
-	  verbundenen Server einen sekundδren MX-Dienst fόr Ihre
+	  verbundenen Server einen sekundδren MX-Dienst<indexterm>
+	  <primary>MX-Eintrag</primary></indexterm> fόr Ihre
 	  Domδne zur Verfόgung gestellt zu bekommen.  Wenn die
 	  Domδne Ihrer Firma
 	  <hostid role="domainname">example.com</hostid> ist, und Ihr

Modified: projects/db5/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- projects/db5/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml	Thu Jul 11 17:13:40 2013	(r42249)
+++ projects/db5/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml	Thu Jul 11 17:27:09 2013	(r42250)
@@ -3043,13 +3043,12 @@ Script done, &hellip;</screen>
 
 	<qandaentry>
 	  <question>
-	    <para>Η μεταγλώττιση μου απέτυχε με πλήθος μηνυμάτων signal 11
+	    <para>Η μεταγλώττιση μου απέτυχε με πλήθος μηνυμάτων
+	      signal 11<indexterm><primary>signal 11</primary></indexterm>
 	      (ή λάθη με άλλα σήματα).  Τι έχει συμβεί;</para>
 	  </question>
 
 	  <answer>
-	    <indexterm><primary>signal 11</primary></indexterm>
-
 	    <para>Αυτό συνήθως δείχνει προβλήματα υλικού.  Η διαδικασία
 	      μεταγλώττισης του βασικού συστήματος είναι ένας αποτελεσματικός
 	      τρόπος να δοκιμάσετε το υλικό σας στα όρια του, και συχνά θα

Modified: projects/db5/el_GR.ISO8859-7/books/handbook/install/chapter.xml
==============================================================================
--- projects/db5/el_GR.ISO8859-7/books/handbook/install/chapter.xml	Thu Jul 11 17:13:40 2013	(r42249)
+++ projects/db5/el_GR.ISO8859-7/books/handbook/install/chapter.xml	Thu Jul 11 17:27:09 2013	(r42250)
@@ -4452,16 +4452,12 @@ Please press any key to reboot.</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm>
-	      <primary>color</primary>
-	      <secondary>contrast</secondary>
-	    </indexterm>
-
 	    <para>Όταν χρησιμοποιείται το
 	      <application>sysinstall</application> σε ένα τερματικό X11, η
 	      κίτρινη γραμματοσειρά πάνω στο ανοιχτό γκρι φόντο είναι
-	      δυσανάγνωστη.  Υπάρχει τρόπος να βελτιωθεί η αντίθεση σε αυτή
-	      την εφαρμογή;</para>
+	      δυσανάγνωστη.  Υπάρχει τρόπος να βελτιωθεί η αντίθεση
+	      <indexterm><primary>color</primary><secondary>contrast</secondary>
+	      </indexterm> σε αυτή την εφαρμογή;</para>
 	  </question>
 
 	  <answer>

Modified: projects/db5/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
==============================================================================
--- projects/db5/el_GR.ISO8859-7/books/handbook/mail/chapter.xml	Thu Jul 11 17:13:40 2013	(r42249)
+++ projects/db5/el_GR.ISO8859-7/books/handbook/mail/chapter.xml	Thu Jul 11 17:27:09 2013	(r42250)
@@ -928,8 +928,8 @@ purgestat	/usr/local/supermailer/bin/pur
 	      role="fqdn">mumble.bar.edu</hostid>, αντί για απλώς
 	    <hostid>mumble</hostid>.</para>
 
-	  <indexterm><primary>BIND</primary></indexterm>
-	  <para>Παραδοσιακά, αυτό επιτρεπόταν από τους DNS resolvers του BIND.
+	  <para>Παραδοσιακά, αυτό επιτρεπόταν από τους DNS resolvers του
+	    BIND<indexterm><primary>BIND</primary></indexterm>.
 	    Ωστόσο, η τρέχουσα έκδοση του <application>BIND</application> που
 	    περιλαμβάνεται στο &os;, δεν παρέχει πλέον συντομεύσεις για
 	    μη-πλήρη ονόματα τομέων, εκτός για τον τομέα στον οποίο βρίσκεστε.
@@ -959,10 +959,6 @@ purgestat	/usr/local/supermailer/bin/pur
 
       <qandaentry>
 	<question>
-	  <indexterm>
-	    <primary>MX record</primary>
-	  </indexterm>
-
 	  <para>Το <application>sendmail</application> δίνει το μήνυμα
 	    <errorname>mail loops back to myself</errorname> (το mail
 	    επιστρέφει στον εαυτό μου)</para>
@@ -981,7 +977,8 @@ purgestat	/usr/local/supermailer/bin/pur
 
 Έχετε ζητήσει το mail προς ένα τομέα (π.χ. το domain.net) να
 προωθείται προς ένα συγκεκριμένο υπολογιστή (στην περίπτωση αυτή
-το relay.domain.net) χρησιμοποιώντας μια εγγραφή MX, αλλά το
+το relay.domain.net) χρησιμοποιώντας μια εγγραφή
+MX<indexterm><primary>MX record</primary></indexterm>, αλλά το
 μηχάνημα αναμετάδοσης (relay) δεν αναγνωρίζει τον εαυτό του ως
 domain.net.  Προσθέστε το domain.net στο /etc/mail/local-host-names
 [είναι γνωστό ως /etc/sendmail.cw πριν την έκδοση 8.10]
@@ -998,10 +995,9 @@ domain.net.  Προσθέστε το domain.net στο
 
       <qandaentry>
 	<question>
-	  <indexterm><primary>PPP</primary></indexterm>
-
 	  <para>Πως μπορώ να εκτελέσω εξυπηρετητή mail σε υπολογιστή που
-	    συνδέεται μέσω επιλογικής σύνδεσης PPP;</para>
+	    συνδέεται μέσω επιλογικής σύνδεσης
+	    PPP<indexterm><primary>PPP</primary></indexterm>;</para>
 	</question>
 
 	<answer>
@@ -1009,13 +1005,9 @@ domain.net.  Προσθέστε το domain.net στο
 	    (LAN) στο Internet.  Το &os; μηχάνημα θα γίνει πύλη ταχυδρομείου
 	    για το LAN.  Η σύνδεση PPP δεν είναι αποκλειστική.</para>
 
-	  <indexterm><primary>UUCP</primary></indexterm>
-	  <indexterm>
-	    <primary>MX record</primary>
-	  </indexterm>
-
 	  <para>Υπάρχουν τουλάχιστον δύο τρόποι για να το κάνετε αυτό.  Ο ένας
-	    είναι με τη χρήση UUCP.</para>
+	    είναι με τη χρήση UUCP<indexterm><primary>UUCP</primary>
+	    </indexterm>.</para>
 
 	  <para>Ένας άλλος τρόπος είναι να βάλετε ένα εξυπηρετητή Internet ο
 	    οποίος έχει συνεχή σύνδεση, να σας παρέχει υπηρεσία δευτερεύοντος
@@ -1023,7 +1015,8 @@ domain.net.  Προσθέστε το domain.net στο
 	    σας είναι <hostid role="domainname">example.com</hostid> και ο
 	    παροχέας σας Internet έχει ορίσει το
 	    <hostid role="domainname">example.net</hostid> να παρέχει
-	    υπηρεσίες δευτερεύοντος MX για τον τομέα σας:</para>
+	    υπηρεσίες δευτερεύοντος MX<indexterm><primary>MX record</primary>
+	    </indexterm> για τον τομέα σας:</para>
 
 	  <programlisting>example.com.          MX        10      example.com.
                       MX        20      example.net.</programlisting>

Modified: projects/db5/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/articles/committers-guide/article.xml	Thu Jul 11 17:13:40 2013	(r42249)
+++ projects/db5/en_US.ISO8859-1/articles/committers-guide/article.xml	Thu Jul 11 17:27:09 2013	(r42250)
@@ -2046,11 +2046,6 @@ ControlPersist yes</screen>
 	</listitem>
 
 	<listitem>
-	  <para>Also add your author entity to
-	    <filename>head/share/xml/developers.ent</filename>.</para>
-	</listitem>
-
-	<listitem>
 	  <para>Add yourself to the <quote>Developers</quote> section
 	    of the <ulink
 	      url="&url.articles.contributors;/index.html">Contributors
@@ -2079,7 +2074,7 @@ ControlPersist yes</screen>
 	    <filename>head/share/pgpkeys/pgpkeys-developers.xml</filename>.
 	    Please note that entries are sorted by last name.</para>
 
-	  <para>&a.des; has written a shell script
+	  <para>&a.des.email; has written a shell script
 	    (<filename>head/share/pgpkeys/addkey.sh</filename>) to
 	    make this extremely simple.  See the <ulink
 	      url="http://svnweb.FreeBSD.org/doc/head/share/pgpkeys/README">README</ulink>
@@ -2268,7 +2263,7 @@ ControlPersist yes</screen>
 
     <para>The &os; project discourages completely new licenses and
       variations on the standard licenses.  New licenses require the
-      approval of <email>core@FreeBSD.org</email> to reside in the
+      approval of the &a.core; to reside in the
       main repository.  The more different licenses that are used in
       the tree, the more problems that this causes to those wishing to
       utilize this code, typically from unintended consequences from a
@@ -2308,7 +2303,7 @@ ControlPersist yes</screen>
       <filename>Makefile</filename>.  For other parts of the
       repository, if you are unsure who the active maintainer might
       be, it may help to scan the revision history to see who has
-      committed changes in the past.  &a.fenner; has written a nice
+      committed changes in the past.  &a.fenner.email; has written a nice
       shell script that can help determine who the active maintainer
       might be.  It lists each person who has committed to a given
       file along with the number of commits each person has made.  It
@@ -2464,7 +2459,7 @@ ControlPersist yes</screen>
       </varlistentry>
 
       <varlistentry>
-	<term>&a.ru;</term>
+	<term>&a.ru.email;</term>
 
 	<listitem>
 	  <para>Ruslan is Mister &man.mdoc.7;.  If you are writing a
@@ -2474,7 +2469,7 @@ ControlPersist yes</screen>
       </varlistentry>
 
       <varlistentry>
-	<term>&a.bde;</term>
+	<term>&a.bde.email;</term>
 
 	<listitem>
 	  <para>Bruce is the Style Police-Meister.  When you do a
@@ -2486,7 +2481,7 @@ ControlPersist yes</screen>
       </varlistentry>
 
       <varlistentry>
-	<term>&team.re;</term>
+	<term>&a.re.members.email;</term>
 
 	<listitem>
 	  <para>These are the members of the &a.re;.  This team is
@@ -2507,7 +2502,7 @@ ControlPersist yes</screen>
       </varlistentry>
 
       <varlistentry>
-	<term>&a.des;</term>
+	<term>&a.des.email;</term>
 
 	<listitem>
 	  <para>Dag-Erling is the
@@ -2518,7 +2513,7 @@ ControlPersist yes</screen>
       </varlistentry>
 
       <varlistentry>
-	<term>&a.wollman;</term>
+	<term>&a.wollman.email;</term>
 
 	<listitem>
 	  <para>If you need advice on obscure network internals or
@@ -3443,9 +3438,10 @@ ControlPersist yes</screen>
 	      port <filename>Makefile</filename>.  It will also add an
 	      entry to the port's category
 	      <filename>Makefile</filename>.  It was written by
-	      &a.mharo;, &a.will;, and &a.garga;.  When sending
+	      &a.mharo.email;, &a.will.email;, and &a.garga.email;.
+	      When sending
 	      questions about this script to the &a.ports;, please
-	      also CC &a.crees;, the current maintainer.</para>
+	      also CC &a.crees.email;, the current maintainer.</para>
 	  </answer>
 	</qandaentry>
 
@@ -3560,9 +3556,9 @@ ControlPersist yes</screen>
 	    <para>Alternatively, you can use the
 	      <command>rmport</command> script, from <filename
 		class="directory">ports/Tools/scripts</filename>.
-	      This script was written by &a.vd;.  When sending
+	      This script was written by &a.vd.email;.  When sending
 	      questions about this script to the &a.ports;, please
-	      also CC &a.crees;, the current maintainer.</para>
+	      also CC &a.crees.email;, the current maintainer.</para>
 	  </answer>
 	</qandaentry>
       </qandadiv>
@@ -4372,7 +4368,7 @@ bak/packages  packages from last complet
 	      name</replaceable> or
 	    <literal>freebsd/developer/</literal><replaceable>NickServ
 	      name</replaceable>. To request a cloak, send an email to
-	    &a.eadler; with your requested hostmask and NickServ
+	    &a.eadler.email; with your requested hostmask and NickServ
 	    account name.</para>
 	</listitem>
       </varlistentry>

Modified: projects/db5/en_US.ISO8859-1/articles/console-server/article.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/articles/console-server/article.xml	Thu Jul 11 17:13:40 2013	(r42249)
+++ projects/db5/en_US.ISO8859-1/articles/console-server/article.xml	Thu Jul 11 17:27:09 2013	(r42250)
@@ -539,7 +539,7 @@ print crypt($cleartext, $salt), "\n";</p
 	  likely need a different style of salt.</para>
       </note>
 
-      <para>&a.kris; has since pointed out you can get the same effect using
+      <para>&a.kris.email; has since pointed out you can get the same effect using
 	the <command>openssl passwd</command> command:</para>
 
       <screen>&prompt.user; openssl passwd -1

Modified: projects/db5/en_US.ISO8859-1/articles/contributors/article.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/articles/contributors/article.xml	Thu Jul 11 17:13:40 2013	(r42249)
+++ projects/db5/en_US.ISO8859-1/articles/contributors/article.xml	Thu Jul 11 17:27:09 2013	(r42250)
@@ -51,7 +51,7 @@
 
 	<itemizedlist>
 	  <listitem>
-	    <para>&a.mbarkah; and his employer, <ulink
+	    <para>&a.mbarkah.email; and his employer, <ulink
 		url="http://www.hemi.com/"> Hemisphere Online</ulink>,
 		donated a <emphasis>Pentium Pro (P6) 200MHz CPU</emphasis>
 	    </para>
@@ -97,7 +97,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>&a.dillon;</para>
+	    <para>&a.dillon.email;</para>
 	  </listitem>
 
 	  <listitem>
@@ -111,7 +111,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>&a.sef;</para>
+	    <para>&a.sef.email;</para>
 	  </listitem>
 
 	  <listitem>
@@ -137,7 +137,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>&a.chuckr;</para>
+	    <para>&a.chuckr.email;</para>
 	  </listitem>
 
 	  <listitem>
@@ -241,7 +241,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>Larry Altneu <email>larry@ALR.COM</email>, and &a.wilko;,
+	    <para>Larry Altneu <email>larry@ALR.COM</email>, and &a.wilko.email;,
 	      provided Wangtek and Archive QIC-02 tape drives in order to
 	      improve the <devicename>wt</devicename> driver.</para>
 	  </listitem>
@@ -273,7 +273,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>Christoph Kukulies <email>kuku@FreeBSD.org</email> donated
+	    <para>&a.kuku.email; donated
 	      an FX120 12 speed Mitsumi CDROM drive for IDE CDROM driver
 	      development.</para>
 	  </listitem>
@@ -309,7 +309,7 @@
 	  <listitem>
 	    <para>The <ulink url="http://www.interface-business.de/">interface
 		business GmbH, Dresden</ulink> has been patiently supporting
-	      &a.joerg; who has often preferred FreeBSD work over paid work, and
+	      &a.joerg.email; who has often preferred FreeBSD work over paid work, and
 	      used to fall back to their (quite expensive) EUnet Internet
 	      connection whenever his private connection became too slow or
 	      flaky to work with it...</para>

Modified: projects/db5/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Thu Jul 11 17:13:40 2013	(r42249)
+++ projects/db5/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Thu Jul 11 17:27:09 2013	(r42250)
@@ -365,8 +365,7 @@
     </listitem>
 
     <listitem>
-      <para>Alexander Best
-	<email>arundel@FreeBSD.org</email></para>
+      <para>&a.arundel.email;</para>
     </listitem>
 
     <listitem>
@@ -1747,8 +1746,7 @@
     </listitem>
 
     <listitem>
-      <para>Christoph P. Kukulies
-	<email>kuku@FreeBSD.org</email></para>
+      <para>&a.kuku.email;</para>
     </listitem>
 
     <listitem>
@@ -2220,8 +2218,7 @@
     </listitem>
 
     <listitem>
-      <para>Dave Tweten
-	<email>tweten@FreeBSD.org</email></para>
+      <para>&a.tweten.email;</para>
     </listitem>
 
     <listitem>
@@ -2703,7 +2700,7 @@
     </listitem>
 
     <listitem>
-      <para>&a.whiteside;</para>
+      <para>&a.whiteside.email;</para>
     </listitem>
 
     <listitem>
@@ -3346,7 +3343,7 @@
     </listitem>
 
     <listitem>
-      <para>&a.stanislav;</para>
+      <para>&a.stanislav.email;</para>
     </listitem>
 
     <listitem>
@@ -4308,8 +4305,7 @@
     </listitem>
 
     <listitem>
-      <para>Jan Koum
-	<email>jkb@FreeBSD.org</email></para>
+      <para>&a.jkb.email;</para>
     </listitem>
 
     <listitem>
@@ -4622,8 +4618,7 @@
     </listitem>
 
     <listitem>
-      <para>Jim Babb
-	<email>babb@FreeBSD.org</email></para>
+      <para>&a.babb.email;</para>
     </listitem>
 
     <listitem>
@@ -4918,11 +4913,6 @@
     </listitem>
 
     <listitem>
-      <para>John Marino
-	<email>draco@marino.st</email></para>
-    </listitem>
-
-    <listitem>
       <para>John McAree
 	<email>john@mcaree.org</email></para>
     </listitem>
@@ -5263,7 +5253,7 @@
     </listitem>
 
     <listitem>
-      <para>&a.jhs;</para>
+      <para>&a.jhs.email;</para>
     </listitem>
 
     <listitem>
@@ -10839,8 +10829,7 @@
     </listitem>
 
     <listitem>
-      <para>Wolfgang Stanglmeier
-	<email>wolf@FreeBSD.org</email></para>
+      <para>&a.wolf.email;</para>
     </listitem>
 
     <listitem>
@@ -10864,7 +10853,7 @@
     </listitem>
 
     <listitem>
-      <para>&a.wylie;</para>
+      <para>&a.wylie.email;</para>
     </listitem>
 
     <listitem>

Modified: projects/db5/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Thu Jul 11 17:13:40 2013	(r42249)
+++ projects/db5/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Thu Jul 11 17:27:09 2013	(r42250)
@@ -8,1682 +8,1686 @@
 
   <itemizedlist>
     <listitem>
-      <para>&a.ariff;</para>
+      <para>&a.ariff.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.tabthorpe;</para>
+      <para>&a.tabthorpe.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.eadler;</para>
+      <para>&a.eadler.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.akiyama;</para>
+      <para>&a.akiyama.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.monthadar;</para>
+      <para>&a.monthadar.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.ambrisko;</para>
+      <para>&a.ambrisko.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.shaun;</para>
+      <para>&a.shaun.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.brix;</para>
+      <para>&a.brix.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jonathan;</para>
+      <para>&a.jonathan.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.mandree;</para>
+      <para>&a.mandree.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.will;</para>
+      <para>&a.will.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.dim;</para>
+      <para>&a.dim.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.mva;</para>
+      <para>&a.mva.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.araujo;</para>
+      <para>&a.araujo.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.mat;</para>
+      <para>&a.mat.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.syuu;</para>
+      <para>&a.syuu.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.gavin;</para>
+      <para>&a.gavin.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jsa;</para>
+      <para>&a.jsa.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jadawin;</para>
+      <para>&a.jadawin.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.timur;</para>
+      <para>&a.timur.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jhb;</para>
+      <para>&a.jhb.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.gjb;</para>
+      <para>&a.gjb.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.art;</para>
+      <para>&a.art.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.kib;</para>
+      <para>&a.kib.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.tobez;</para>
+      <para>&a.tobez.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.gber;</para>
+      <para>&a.gber.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.pb;</para>
+      <para>&a.pb.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.tdb;</para>
+      <para>&a.tdb.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.gblach;</para>
+      <para>&a.gblach.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.mbr;</para>
+      <para>&a.mbr.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.wblock;</para>
+      <para>&a.wblock.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.novel;</para>
+      <para>&a.novel.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.garga;</para>
+      <para>&a.garga.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.sbz;</para>
+      <para>&a.sbz.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.ebrandi;</para>
+      <para>&a.ebrandi.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.harti;</para>
+      <para>&a.harti.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.makc;</para>
+      <para>&a.makc.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.antoine;</para>
+      <para>&a.antoine.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.db;</para>
+      <para>&a.db.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.sbruno;</para>
+      <para>&a.sbruno.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.brueffer;</para>
+      <para>&a.brueffer.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.markus;</para>
+      <para>&a.markus.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.oleg;</para>
+      <para>&a.oleg.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jchandra;</para>
+      <para>&a.jchandra.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.acm;</para>
+      <para>&a.acm.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.gahr;</para>
+      <para>&a.gahr.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.adrian;</para>
+      <para>&a.adrian.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.dchagin;</para>
+      <para>&a.dchagin.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.charnier;</para>
+      <para>&a.charnier.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jon;</para>
+      <para>&a.jon.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.loader;</para>
+      <para>&a.loader.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.luoqi;</para>
+      <para>&a.luoqi.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.ache;</para>
+      <para>&a.ache.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.melifaro;</para>
+      <para>&a.melifaro.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.theraven;</para>
+      <para>&a.theraven.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.davidch;</para>
+      <para>&a.davidch.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.marcus;</para>
+      <para>&a.marcus.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.tijl;</para>
+      <para>&a.tijl.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.rakuco;</para>
+      <para>&a.rakuco.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.alc;</para>
+      <para>&a.alc.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.cracauer;</para>
+      <para>&a.cracauer.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.brucec;</para>
+      <para>&a.brucec.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.culot;</para>
+      <para>&a.culot.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.joel;</para>
+      <para>&a.joel.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.bapt;</para>
+      <para>&a.bapt.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.davidc;</para>
+      <para>&a.davidc.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.brd;</para>
+      <para>&a.brd.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.brooks;</para>
+      <para>&a.brooks.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.pjd;</para>
+      <para>&a.pjd.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jwd;</para>
+      <para>&a.jwd.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.carl;</para>
+      <para>&a.carl.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.vd;</para>
+      <para>&a.vd.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.rdivacky;</para>
+      <para>&a.rdivacky.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.mdodd;</para>
+      <para>&a.mdodd.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.danfe;</para>
+      <para>&a.danfe.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.dd;</para>
+      <para>&a.dd.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.iedowse;</para>
+      <para>&a.iedowse.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.bdrewery;</para>
+      <para>&a.bdrewery.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.gad;</para>
+      <para>&a.gad.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.olivierd;</para>
+      <para>&a.olivierd.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.bruno;</para>
+      <para>&a.bruno.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.ale;</para>
+      <para>&a.ale.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.peadar;</para>
+      <para>&a.peadar.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.deischen;</para>
+      <para>&a.deischen.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.eivind;</para>
+      <para>&a.eivind.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.julian;</para>
+      <para>&a.julian.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.ae;</para>
+      <para>&a.ae.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.lme;</para>
+      <para>&a.lme.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.rse;</para>
+      <para>&a.rse.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.ru;</para>
+      <para>&a.ru.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.le;</para>
+      <para>&a.le.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.se;</para>
+      <para>&a.se.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.bde;</para>
+      <para>&a.bde.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.jasone;</para>
+      <para>&a.jasone.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.bf;</para>
+      <para>&a.bf.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.madpilot;</para>
+      <para>&a.madpilot.email;</para>
     </listitem>
 
     <listitem>
-      <para>&a.rafan;</para>
+      <para>&a.rafan.email;</para>
     </listitem>
 

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

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jul 11 18:11:38 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id AA08732E;
 Thu, 11 Jul 2013 18:11:38 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 831BB1DAD;
 Thu, 11 Jul 2013 18:11:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6BIBcdH070036;
 Thu, 11 Jul 2013 18:11:38 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6BIBcM4070034;
 Thu, 11 Jul 2013 18:11:38 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201307111811.r6BIBcM4070034@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 11 Jul 2013 18:11:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42252 - in projects/db5: en_US.ISO8859-1/share/xml
 ja_JP.eucJP/share/xml
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jul 2013 18:11:38 -0000

Author: gabor
Date: Thu Jul 11 18:11:37 2013
New Revision: 42252
URL: http://svnweb.freebsd.org/changeset/doc/42252

Log:
  - Fix after merge

Modified:
  projects/db5/en_US.ISO8859-1/share/xml/mailing-lists.ent
  projects/db5/ja_JP.eucJP/share/xml/teams.ent

Modified: projects/db5/en_US.ISO8859-1/share/xml/mailing-lists.ent
==============================================================================
--- projects/db5/en_US.ISO8859-1/share/xml/mailing-lists.ent	Thu Jul 11 17:56:20 2013	(r42251)
+++ projects/db5/en_US.ISO8859-1/share/xml/mailing-lists.ent	Thu Jul 11 18:11:37 2013	(r42252)
@@ -190,8 +190,8 @@
 <!ENTITY a.firewire.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.firewire.url;'>freebsd-firewire</link>">
 
 <!ENTITY a.fortran.url "&a.mailman.listinfo;/freebsd-fortran">
-<!ENTITY a.fortran "<ulink url='&a.fortran.url;'>Fortran on FreeBSD mailing list</ulink>">
-<!ENTITY a.fortran.name "<ulink url='&a.fortran.url;'>freebsd-fortran</ulink>">
+<!ENTITY a.fortran "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.fortran.url;'>Fortran on FreeBSD mailing list</link>">
+<!ENTITY a.fortran.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.fortran.url;'>freebsd-fortran</link>">
 
 <!ENTITY a.fs.url "&a.mailman.listinfo;/freebsd-fs">
 <!ENTITY a.fs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.fs.url;'>FreeBSD file system project mailing list</link>">

Modified: projects/db5/ja_JP.eucJP/share/xml/teams.ent
==============================================================================
--- projects/db5/ja_JP.eucJP/share/xml/teams.ent	Thu Jul 11 17:56:20 2013	(r42251)
+++ projects/db5/ja_JP.eucJP/share/xml/teams.ent	Thu Jul 11 18:11:37 2013	(r42252)
@@ -21,7 +21,7 @@
 
 <!ENTITY a.core "₯³₯’₯Α‘Ό₯ΰ <email xmlns='http://docbook.org/ns/docbook'>core@FreeBSD.org</email>">
 
-<!ENTITY a.core-secretary "₯³₯’₯Α‘Ό₯ΰ½ρ΅­ <email>core-secretary@FreeBSD.org</email>">
+<!ENTITY a.core-secretary "₯³₯’₯Α‘Ό₯ΰ½ρ΅­ <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 
 <!ENTITY a.cvsadm "CVS ₯κ₯έ₯Έ₯Θ₯κ΄ΙΝύΌΤ <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jul 11 19:24:55 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A40347F1;
 Thu, 11 Jul 2013 19:24:55 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 967CE1077;
 Thu, 11 Jul 2013 19:24:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6BJOtl4090870;
 Thu, 11 Jul 2013 19:24:55 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6BJOtQE090869;
 Thu, 11 Jul 2013 19:24:55 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201307111924.r6BJOtQE090869@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 11 Jul 2013 19:24:55 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42253 - projects/db5/share/xsl
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jul 2013 19:24:55 -0000

Author: gabor
Date: Thu Jul 11 19:24:55 2013
New Revision: 42253
URL: http://svnweb.freebsd.org/changeset/doc/42253

Log:
  - Disable hyphenation for now

Modified:
  projects/db5/share/xsl/freebsd-fo.xsl

Modified: projects/db5/share/xsl/freebsd-fo.xsl
==============================================================================
--- projects/db5/share/xsl/freebsd-fo.xsl	Thu Jul 11 18:11:37 2013	(r42252)
+++ projects/db5/share/xsl/freebsd-fo.xsl	Thu Jul 11 19:24:55 2013	(r42253)
@@ -23,6 +23,7 @@
   <xsl:param name="fop1.extensions" select="1"/>
 -->
 
+  <xsl:param name="hyphenate">false</xsl:param>
 <!--
   <xsl:param name="hyphenate.verbatim" select="1"/>
 -->

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jul 11 19:27:43 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 7404E84B;
 Thu, 11 Jul 2013 19:27:43 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4D59D1087;
 Thu, 11 Jul 2013 19:27:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6BJRhQi091232;
 Thu, 11 Jul 2013 19:27:43 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6BJRgHH091228;
 Thu, 11 Jul 2013 19:27:42 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201307111927.r6BJRgHH091228@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 11 Jul 2013 19:27:42 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42254 - in projects/db5/share: misc mk
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jul 2013 19:27:43 -0000

Author: gabor
Date: Thu Jul 11 19:27:42 2013
New Revision: 42254
URL: http://svnweb.freebsd.org/changeset/doc/42254

Log:
  - Add a FOP config file and use it

Added:
  projects/db5/share/misc/fop.xconf   (contents, props changed)
Modified:
  projects/db5/share/mk/doc.commands.mk
  projects/db5/share/mk/doc.docbook.mk

Added: projects/db5/share/misc/fop.xconf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/db5/share/misc/fop.xconf	Thu Jul 11 19:27:42 2013	(r42254)
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+
+<!-- $FreeBSD$ -->
+
+<fop version="1.0">
+
+  <base>.</base>
+
+  <hyphenation-base>/usr/local/share/java/fop/hyph/</hyphenation-base>
+
+  <source-resolution>72</source-resolution>
+  <target-resolution>72</target-resolution>
+  
+  <default-page-settings height="11in" width="8.26in"/>
+  
+  <renderers>
+    <renderer mime="application/pdf">
+      <filterList>
+        <value>flate</value>
+      </filterList>
+
+      <fonts>
+	<auto-detect/>
+      </fonts>
+
+      <!-- This option lets you specify additional options on an XML handler -->
+      <!--xml-handler namespace="http://www.w3.org/2000/svg">
+        <stroke-text>false</stroke-text>
+      </xml-handler-->
+
+    </renderer>
+
+    <renderer mime="application/postscript">
+      <!-- This option forces the PS renderer to rotate landscape pages -->
+      <!--auto-rotate-landscape>true</auto-rotate-landscape-->
+      
+      <!-- This option lets you specify additional options on an XML handler -->
+      <!--xml-handler namespace="http://www.w3.org/2000/svg">
+        <stroke-text>false</stroke-text>
+      </xml-handler-->
+    </renderer>
+
+    <renderer mime="image/svg+xml">
+      <format type="paginated"/>
+      <link value="true"/>
+      <strokeText value="false"/>
+    </renderer>
+  </renderers>
+</fop>
+

Modified: projects/db5/share/mk/doc.commands.mk
==============================================================================
--- projects/db5/share/mk/doc.commands.mk	Thu Jul 11 19:24:55 2013	(r42253)
+++ projects/db5/share/mk/doc.commands.mk	Thu Jul 11 19:27:42 2013	(r42254)
@@ -62,7 +62,6 @@ DVIPSOPTS?=	-t ${PAPERSIZE:L}
 DVIPSOPTS+=	${DVIPSFLAGS}
 
 FOP?=		${PREFIX}/bin/fop
-FOPOPTS?=
 
 GROFF?=		groff
 

Modified: projects/db5/share/mk/doc.docbook.mk
==============================================================================
--- projects/db5/share/mk/doc.docbook.mk	Thu Jul 11 19:24:55 2013	(r42253)
+++ projects/db5/share/mk/doc.docbook.mk	Thu Jul 11 19:27:42 2013	(r42254)
@@ -76,6 +76,7 @@ SCHEMATRONS?=	${DOC_PREFIX}/share/xml/fr
 XSLTPROCOPTS?=	--nonet
 
 DBLATEXOPTS?=	-I ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -p ${DOC_PREFIX}/share/xsl/freebsd-dblatex.xsl -T simple -d
+FOPOPTS?=	-c ${DOC_PREFIX}/share/misc/fop.xconf
 
 KNOWN_FORMATS=	html html.tar html-split html-split.tar \
 		epub txt rtf ps pdf tex dvi tar pdb

From owner-svn-doc-projects@FreeBSD.ORG  Sat Jul 13 07:02:58 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1F27B4DA;
 Sat, 13 Jul 2013 07:02:58 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EC6AF13C6;
 Sat, 13 Jul 2013 07:02:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6D72vaV025311;
 Sat, 13 Jul 2013 07:02:57 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6D72vC2025309;
 Sat, 13 Jul 2013 07:02:57 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201307130702.r6D72vC2025309@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 13 Jul 2013 07:02:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42268 - in projects/db5/share: mk xsl
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jul 2013 07:02:58 -0000

Author: gabor
Date: Sat Jul 13 07:02:57 2013
New Revision: 42268
URL: http://svnweb.freebsd.org/changeset/doc/42268

Log:
  - Make sure images and callouts are found

Modified:
  projects/db5/share/mk/doc.docbook.mk
  projects/db5/share/xsl/freebsd-fo.xsl

Modified: projects/db5/share/mk/doc.docbook.mk
==============================================================================
--- projects/db5/share/mk/doc.docbook.mk	Sat Jul 13 03:51:22 2013	(r42267)
+++ projects/db5/share/mk/doc.docbook.mk	Sat Jul 13 07:02:57 2013	(r42268)
@@ -75,7 +75,9 @@ IMAGES_LIB?=
 SCHEMATRONS?=	${DOC_PREFIX}/share/xml/freebsd.sch
 XSLTPROCOPTS?=	--nonet
 
-DBLATEXOPTS?=	-I ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -p ${DOC_PREFIX}/share/xsl/freebsd-dblatex.xsl -T simple -d
+IMGDIR?=	${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T}
+CALLOUTDIR=	${.CURDIR}/imagelib/callouts
+DBLATEXOPTS?=	-I ${IMGDIR} -p ${DOC_PREFIX}/share/xsl/freebsd-dblatex.xsl -T simple -d
 FOPOPTS?=	-c ${DOC_PREFIX}/share/misc/fop.xconf
 
 KNOWN_FORMATS=	html html.tar html-split html-split.tar \
@@ -194,6 +196,10 @@ CLEANFILES+= ${_curimage:T} ${_curimage:
 .elif ${_cf} == "pdf"
 CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-pdf ${DOC}.tex-pdf-tmp \
 		${DOC}.tex ${DOC}.fo
+.if ${RENDERENGINE} == "fop"
+XSLTPROCOPTS+=	--param img.src.path "'${IMGDIR}/'"
+XSLTPROCOPTS+=	--param callout.graphics.path "'${CALLOUTDIR}/'"
+.endif
 .for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
 CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
 .endfor

Modified: projects/db5/share/xsl/freebsd-fo.xsl
==============================================================================
--- projects/db5/share/xsl/freebsd-fo.xsl	Sat Jul 13 03:51:22 2013	(r42267)
+++ projects/db5/share/xsl/freebsd-fo.xsl	Sat Jul 13 07:02:57 2013	(r42268)
@@ -29,6 +29,10 @@
 -->
   <xsl:param name="header.column.widths">1 5 1</xsl:param>
 
+  <xsl:param name="callout.graphics.path">imagelib/callouts/</xsl:param>
+  <xsl:param name="callout.graphics.extension">.png</xsl:param>
+  <xsl:param name="default.image.width">400</xsl:param>
+
 
 <xsl:template match="pubdate" mode="article.titlepage.recto.auto.mode"/>
 

From owner-svn-doc-projects@FreeBSD.ORG  Sat Jul 13 07:39:53 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 604BFC76;
 Sat, 13 Jul 2013 07:39:53 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 525571615;
 Sat, 13 Jul 2013 07:39:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6D7drTK034998;
 Sat, 13 Jul 2013 07:39:53 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6D7drIW034997;
 Sat, 13 Jul 2013 07:39:53 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201307130739.r6D7drIW034997@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 13 Jul 2013 07:39:53 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42269 - projects/db5/share/xsl
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jul 2013 07:39:53 -0000

Author: gabor
Date: Sat Jul 13 07:39:52 2013
New Revision: 42269
URL: http://svnweb.freebsd.org/changeset/doc/42269

Log:
  - 400px width and a proportional height looks like a good default
    for most images but some will need more exact parameters on
    an individual basis

Modified:
  projects/db5/share/xsl/freebsd-fo.xsl

Modified: projects/db5/share/xsl/freebsd-fo.xsl
==============================================================================
--- projects/db5/share/xsl/freebsd-fo.xsl	Sat Jul 13 07:02:57 2013	(r42268)
+++ projects/db5/share/xsl/freebsd-fo.xsl	Sat Jul 13 07:39:52 2013	(r42269)
@@ -31,8 +31,10 @@
 
   <xsl:param name="callout.graphics.path">imagelib/callouts/</xsl:param>
   <xsl:param name="callout.graphics.extension">.png</xsl:param>
-  <xsl:param name="default.image.width">400</xsl:param>
 
+  <!-- Use the whole viewport and scale images to fit -->
+  <xsl:param name="default.image.width">400px</xsl:param>
+  <xsl:template name="image.scalefit">1</xsl:template>
 
 <xsl:template match="pubdate" mode="article.titlepage.recto.auto.mode"/>
 

From owner-svn-doc-projects@FreeBSD.ORG  Sat Jul 13 16:20:18 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A1C8A40E;
 Sat, 13 Jul 2013 16:20:18 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 93902182B;
 Sat, 13 Jul 2013 16:20:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6DGKIce088747;
 Sat, 13 Jul 2013 16:20:18 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6DGKIqR088746;
 Sat, 13 Jul 2013 16:20:18 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201307131620.r6DGKIqR088746@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 13 Jul 2013 16:20:18 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42272 - projects/db5/share/xsl
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jul 2013 16:20:18 -0000

Author: gabor
Date: Sat Jul 13 16:20:18 2013
New Revision: 42272
URL: http://svnweb.freebsd.org/changeset/doc/42272

Log:
  - Customize XSL FO stylesheets to render a more realistic handbook format:
    * B5 paper size
    * chapters always start on recto
    * the current chapter in indicated by the verso header and the current
      section by the recto header
    * render page numbers at the outer side of the foooter
    * sections are automatically labelled
    * bibliography entries are enumerated
    * captions of figures and equations are rendered after
    * captions of examples, tables and procedures are rendered before
    * admonitions are highlighted with an icon and a border
    * tables have a grey header with bold labels
    * programlistings and screen elements are rendered with a grey background
    * guibutton is also rendered with a grey background
    * manpage references are real links and it is indicated with the blue color

Modified:
  projects/db5/share/xsl/freebsd-fo.xsl

Modified: projects/db5/share/xsl/freebsd-fo.xsl
==============================================================================
--- projects/db5/share/xsl/freebsd-fo.xsl	Sat Jul 13 14:48:40 2013	(r42271)
+++ projects/db5/share/xsl/freebsd-fo.xsl	Sat Jul 13 16:20:18 2013	(r42272)
@@ -14,27 +14,270 @@
   <!-- Include the common customizations -->
   <xsl:include href="freebsd-common.xsl"/>
 
-  <!-- Redefine variables, and replace templates as necessary here -->
+  <!--
+	FO-SPECIFIC PARAMETER SETTINGS
+  -->
+
+  <!-- Paper settings -->
+  <xsl:param name="paper.type">B5</xsl:param>
+  <xsl:param name="double.sided" select="1"/>
+  <xsl:param name="force.blank.pages" select="1"/>
+
+  <!-- Page margins and spacing -->
+  <xsl:param name="page.margin.bottom">3cm</xsl:param>
+  <xsl:param name="page.margin.inner">3cm</xsl:param>
+  <xsl:param name="page.margin.outer">2.5cm</xsl:param>
+  <xsl:param name="page.margin.top">2.13cm</xsl:param>
+  <xsl:param name="body.margin.bottom">0.5cm</xsl:param>
+  <xsl:param name="body.margin.top">1.0cm</xsl:param>
+  <xsl:param name="body.margin.inner">0</xsl:param>
+  <xsl:param name="body.margin.outer">0</xsl:param>
+  <xsl:param name="body.start.indent">0</xsl:param>
+  <xsl:param name="body.end.indent">0</xsl:param>
+  <xsl:param name="region.after.extent">2cm</xsl:param>
+  <xsl:param name="region.before.extent">2.2cm</xsl:param>
+
+  <!-- Headers and footers -->
+  <xsl:param name="headers.on.blank.pages" select="0"/>
+  <xsl:param name="footers.on.blank.pages" select="0"/>
+  <xsl:param name="footer.rule" select="0"/>
+  <xsl:param name="header.column.widths">500 1 500</xsl:param>
+  <xsl:param name="footer.column.widths">500 1 500</xsl:param>
+
+  <!-- Sections and numbering -->
+  <xsl:param name="section.autolabel" select="1"/>
+  <xsl:param name="section.autolabel.max.depth" select="5"/>
+  <xsl:param name="section.label.includes.component.label" select="1"/>
+  <xsl:param name="bibliography.numbered" select="1"/>
+  <xsl:param name="formal.title.placement">
+    figure after
+    example before
+    equation after
+    table before
+    procedure before</xsl:param>
+
+  <!-- Admonitions -->
+  <xsl:param name="admon.graphics" select="1"/>
+  <xsl:param name="admon.graphics.path">/usr/local/share/xsl/docbook-ns/images/</xsl:param>
+  <xsl:param name="admon.graphics.extension">.svg</xsl:param>
+
+  <!-- Tables -->
+  <xsl:param name="default.table.frame">hsides</xsl:param>
+  <xsl:param name="default.table.rules">rows</xsl:param>
 
-  <!-- FO specific customisation goes here -->
+  <!-- Q & A -->
+  <xsl:param name="qanda.defaultlabel">qanda</xsl:param>
 
-<!--
-  <xsl:param name="use.extensions" select="1"/>
-  <xsl:param name="fop1.extensions" select="1"/>
--->
+  <!-- Graphics -->
+  <xsl:param name="callout.graphics.path">imagelib/callouts/</xsl:param>
+  <xsl:param name="callout.graphics.extension">.png</xsl:param>
+  <xsl:param name="default.image.width">300px</xsl:param>
+  <xsl:template name="image.scalefit">1</xsl:template>
 
+  <!-- Hyphenation -->  
   <xsl:param name="hyphenate">false</xsl:param>
-<!--
-  <xsl:param name="hyphenate.verbatim" select="1"/>
--->
-  <xsl:param name="header.column.widths">1 5 1</xsl:param>
+  <xsl:param name="hyphenate.verbatim" select="0"/>
+  <xsl:param name="hyphenate.verbatim.characters"> </xsl:param>
 
-  <xsl:param name="callout.graphics.path">imagelib/callouts/</xsl:param>
-  <xsl:param name="callout.graphics.extension">.png</xsl:param>
+  <!-- Base Fonts -->
+  <xsl:param name="body.font.master">9.5</xsl:param>
 
-  <!-- Use the whole viewport and scale images to fit -->
-  <xsl:param name="default.image.width">400px</xsl:param>
-  <xsl:template name="image.scalefit">1</xsl:template>
+  <!-- Property sets -->
+  <xsl:attribute-set name="chapter.title.properties">
+  <xsl:attribute name="font-size">24pt</xsl:attribute>
+  <xsl:attribute name="space-before">6pt</xsl:attribute>
+  <xsl:attribute name="space-after">36pt</xsl:attribute>
+  </xsl:attribute-set>
+  
+  <xsl:attribute-set name="section.title.level1.properties">
+  <xsl:attribute name="font-size">14pt</xsl:attribute>
+  <xsl:attribute name="space-before">24pt</xsl:attribute>
+  <xsl:attribute name="space-after">12pt</xsl:attribute>
+  </xsl:attribute-set>
+
+  <xsl:attribute-set name="section.title.level2.properties">
+  <xsl:attribute name="font-size">11pt</xsl:attribute>
+  <xsl:attribute name="space-before">12pt</xsl:attribute>
+  <xsl:attribute name="space-after">6pt</xsl:attribute>
+  </xsl:attribute-set>
+  
+  <xsl:attribute-set name="section.title.level3.properties">
+  <xsl:attribute name="font-size">10pt</xsl:attribute>
+  <xsl:attribute name="space-before">6pt</xsl:attribute>
+  <xsl:attribute name="space-after">3pt</xsl:attribute>
+  </xsl:attribute-set>
+  
+  <xsl:attribute-set name="section.title.properties">
+  <xsl:attribute name="font-family">
+  <xsl:value-of select="$title.fontset"></xsl:value-of>
+  </xsl:attribute>
+  <xsl:attribute name="font-weight">bold</xsl:attribute>
+  <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
+  <xsl:attribute name="text-align">start</xsl:attribute>
+  <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"></xsl:value-of></xsl:attribute>
+  </xsl:attribute-set>
+  
+  <xsl:attribute-set name="section.properties">
+  <xsl:attribute name="font-size">9.5pt</xsl:attribute>
+  <xsl:attribute name="line-height">12pt</xsl:attribute>
+  </xsl:attribute-set>
+
+  <xsl:attribute-set name="normal.para.spacing">
+  <xsl:attribute name="space-before">12pt</xsl:attribute>
+  </xsl:attribute-set>
+
+  <xsl:attribute-set name="monospace.properties">
+  <xsl:attribute name="font-family">
+  <xsl:value-of select="$monospace.font.family"></xsl:value-of>
+  </xsl:attribute>
+  <xsl:attribute name="font-size">8pt</xsl:attribute>
+  </xsl:attribute-set>
+
+  <xsl:attribute-set name="monospace.verbatim.properties">
+  <xsl:attribute name="font-size">8pt</xsl:attribute>
+  <xsl:attribute name="line-height">10pt</xsl:attribute>
+  <xsl:attribute name="space-before">12pt</xsl:attribute>
+  <xsl:attribute name="space-after">0</xsl:attribute>
+  <xsl:attribute name="hyphenate">false</xsl:attribute>
+  <xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
+  <xsl:attribute name="white-space-collapse">false</xsl:attribute>
+  <xsl:attribute name="white-space-treatment">preserve</xsl:attribute>
+  <xsl:attribute name="linefeed-treatment">preserve</xsl:attribute>
+  <xsl:attribute name="text-align">start</xsl:attribute>
+  <xsl:attribute name="background-color">rgb(192,192,192)</xsl:attribute>
+  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
+  <xsl:attribute name="hyphenation-character">&#x25C4;</xsl:attribute>
+  </xsl:attribute-set>
+
+  <xsl:attribute-set name="table.caption.properties">
+  <xsl:attribute name="font-size">8pt</xsl:attribute>
+  <xsl:attribute name="keep-together.within-column">always</xsl:attribute>
+  <xsl:attribute name="line-height">13pt</xsl:attribute>
+  <xsl:attribute name="space-before">12pt</xsl:attribute>
+  <xsl:attribute name="space-after">3pt</xsl:attribute>
+  </xsl:attribute-set>
+
+  <xsl:attribute-set name="table.table.properties">
+  <xsl:attribute name="font-size">9.5pt</xsl:attribute>
+  <xsl:attribute name="border-before-width.conditionality">retain</xsl:attribute>
+  <xsl:attribute name="border-collapse">collapse</xsl:attribute>
+  <xsl:attribute name="margin-top">0</xsl:attribute>
+  <xsl:attribute name="margin-bottom">0</xsl:attribute>
+  <xsl:attribute name="margin-left">0</xsl:attribute>
+  <xsl:attribute name="margin-right">0</xsl:attribute>
+  </xsl:attribute-set>
+
+  <xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing">
+  <xsl:attribute name="font-size">8pt</xsl:attribute>
+  <xsl:attribute name="font-weight">normal</xsl:attribute>
+  <xsl:attribute name="keep-together.within-column">always</xsl:attribute>
+  <xsl:attribute name="line-height">13pt</xsl:attribute>
+  <xsl:attribute name="hyphenate">false</xsl:attribute>
+  </xsl:attribute-set>
+
+  <xsl:attribute-set name="graphical.admonition.properties">
+  <xsl:attribute name="border-style">solid</xsl:attribute>
+  <xsl:attribute name="border-width">1px</xsl:attribute>
+  <xsl:attribute name="margin-right">0</xsl:attribute>
+  <xsl:attribute name="margin-top">12pt</xsl:attribute>
+  <xsl:attribute name="margin-left">0</xsl:attribute>
+  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+  <xsl:attribute name="padding-right">0.5cm</xsl:attribute>
+  <xsl:attribute name="padding-top">0.5cm</xsl:attribute>
+  <xsl:attribute name="padding-left">0.5cm</xsl:attribute>
+  <xsl:attribute name="padding-bottom">0.5cm</xsl:attribute>
+  </xsl:attribute-set>
+
+
+  <!--
+	FO-SPECIFIC TEMPLATE CUSTOMIZATIONS
+  -->
+
+  <!-- Gray background for headers of HTML tables -->
+  <xsl:template match="db:thead" mode="htmlTable">
+    <fo:table-header start-indent="0pt" end-indent="0pt"
+      background-color="rgb(192,192,192)">
+      <xsl:apply-templates mode="htmlTable"/>
+    </fo:table-header>
+  </xsl:template>
+
+  <!-- Gray background for headers of CALS tables -->
+  <xsl:template match="db:thead">
+    <xsl:variable name="tgroup" select="parent::*"/>
+
+    <fo:table-header start-indent="0pt" end-indent="0pt" background-color="rgb(192,192,192)">
+      <xsl:choose>
+	<!-- Use recursion if @morerows is used -->
+	<xsl:when test="db:row/db:entry/@morerows|db:row/db:entrytbl/@morerows">
+	  <xsl:apply-templates select="db:row[1]">
+	    <xsl:with-param name="spans">
+	      <xsl:call-template name="blank.spans">
+		<xsl:with-param name="cols" select="../@cols"/>
+	      </xsl:call-template>
+	    </xsl:with-param>
+	    <xsl:with-param name="browserows" select="'recurse'"/>
+	  </xsl:apply-templates>
+	</xsl:when>
+
+	<xsl:otherwise>
+	  <xsl:apply-templates select="db:row">
+	    <xsl:with-param name="spans">
+	      <xsl:call-template name="blank.spans">
+		<xsl:with-param name="cols" select="../@cols"/>
+	      </xsl:call-template>
+	    </xsl:with-param>
+	    <xsl:with-param name="browserows" select="'loop'" />
+	  </xsl:apply-templates>
+	</xsl:otherwise>
+      </xsl:choose>
+    </fo:table-header>
+  </xsl:template>
+
+  <xsl:template match="db:guibutton">
+    <fo:inline background-color="rgb(192,192,192)">
+      <xsl:apply-templates/>
+    </fo:inline>
+  </xsl:template>
+
+  <!-- Adjust spacing according to where the title is placed -->
+  <xsl:template name="formal.object.heading">
+    <xsl:param name="object" select="."/>
+    <xsl:param name="placement" select="'before'"/>
+
+    <fo:block xsl:use-attribute-sets="formal.title.properties">
+      <xsl:choose>
+	<xsl:when test="$placement = 'before'">
+	  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+	  <xsl:attribute name="space-before">12pt</xsl:attribute>
+	  <xsl:attribute name="space-after">3pt</xsl:attribute>
+	</xsl:when>
+
+	<xsl:otherwise>
+	  <xsl:attribute name="keep-with-previous.within-column">always</xsl:attribute>
+	  <xsl:attribute name="space-before">3pt</xsl:attribute>
+	  <xsl:attribute name="space-after">12pt</xsl:attribute>
+	</xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="$object" mode="object.title.markup">
+	<xsl:with-param name="allow-anchors" select="1"/>
+      </xsl:apply-templates>
+    </fo:block>
+  </xsl:template>
+
+  <xsl:template match="db:citerefentry">
+    <xsl:variable name="xhref">
+      <xsl:text>http://www.FreeBSD.org/cgi/man.cgi?query=</xsl:text>
+      <xsl:value-of select="db:refentrytitle"/>
+      <xsl:text>&#38;amp;sektion=</xsl:text>
+      <xsl:value-of select="db:manvolnum"/>
+    </xsl:variable>
+
+    <fo:basic-link external-destination="url({$xhref})">
+      <fo:inline color="blue">
+	<xsl:value-of select="concat(db:refentrytitle, '(', db:manvolnum, ')')"/>
+      </fo:inline>
+    </fo:basic-link>
+  </xsl:template>
 
 <xsl:template match="pubdate" mode="article.titlepage.recto.auto.mode"/>
 
@@ -82,5 +325,97 @@
 </fo:block>
 </xsl:template>
 
-</xsl:stylesheet>
+<!-- Customize header content -->
+<xsl:template name="header.content">
+  <xsl:param name="pageclass" select="''"/>
+  <xsl:param name="sequence" select="''"/>
+  <xsl:param name="position" select="''"/>
+  <xsl:param name="gentext-key" select="''"/>
+
+  <fo:block>
+    <xsl:choose>
+      <xsl:when test="$pageclass = 'lot' and $sequence='odd' and $position='left' ">
+	<xsl:call-template name="gentext">
+	  <xsl:with-param name="key" select="$gentext-key"/>
+	</xsl:call-template>
+      </xsl:when>
+
+      <xsl:when test="$pageclass = 'lot' and $sequence='even' and $position='right' ">
+	<xsl:call-template name="gentext">
+	  <xsl:with-param name="key" select="$gentext-key"/>
+	</xsl:call-template>
+      </xsl:when>
+
+      <xsl:when test="$pageclass = 'back' and $sequence='odd' and $position='left' ">
+	<xsl:apply-templates select="."  mode="object.title.markup"/>
+      </xsl:when>
+
+      <xsl:when test="$pageclass = 'back' and $sequence='even' and $position='right' ">
+	<xsl:apply-templates select="."  mode="object.title.markup"/>
+      </xsl:when>
+   
+      <xsl:when test="$pageclass = 'index' and $sequence='odd' and $position='left' ">
+	<xsl:call-template name="gentext">
+	  <xsl:with-param name="key" select="$gentext-key"/>
+	</xsl:call-template>
+      </xsl:when>
+
+      <xsl:when test="$pageclass = 'index' and $sequence='even' and $position='right' ">
+	<xsl:call-template name="gentext">
+	  <xsl:with-param name="key" select="$gentext-key"/>
+	</xsl:call-template>
+      </xsl:when>
+	  
+      <xsl:when test="$sequence='odd' and $position='left'">
+	<xsl:if test="$pageclass != 'titlepage'">
+	  <xsl:apply-templates select="."  mode="object.title.markup"/>
+	</xsl:if>
+      </xsl:when>
+	  
+      <xsl:when test="$sequence='even' and $position='right'">
+	<xsl:if test="$pageclass != 'titlepage'">
+	  <fo:retrieve-marker 
+	    retrieve-class-name="section.head.marker"
+	    retrieve-position="first-including-carryover"
+	    retrieve-boundary="page-sequence"/>
+        </xsl:if>
+      </xsl:when>
+    </xsl:choose>
+  </fo:block>
+</xsl:template>
 
+<!-- Customize footer content -->
+<xsl:template name="footer.content">
+  <xsl:param name="pageclass" select="''"/>
+  <xsl:param name="sequence" select="''"/>
+  <xsl:param name="position" select="''"/>
+  <xsl:param name="gentext-key" select="''"/>
+
+  <fo:block>
+    <xsl:choose>
+      <xsl:when test="$sequence = 'odd' and $position='right'">
+	<fo:page-number/>
+      </xsl:when>
+	  
+      <xsl:when test="$sequence = 'even' and $position='left'">
+	<fo:page-number/>
+      </xsl:when>
+    </xsl:choose>
+  </fo:block>
+</xsl:template>
+
+<!-- Customize header separator -->
+<xsl:template name="head.sep.rule">
+  <xsl:param name="pageclass"/>
+  <xsl:param name="sequence"/>
+  <xsl:param name="gentext-key"/>
+
+  <xsl:if test="$header.rule != 0 and $sequence != 'first' and
+    $pageclass != 'front' and $pageclass != 'titlepage'">
+    <xsl:attribute name="border-bottom-width">0.5pt</xsl:attribute>
+    <xsl:attribute name="border-bottom-style">solid</xsl:attribute>
+    <xsl:attribute name="border-bottom-color">black</xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+</xsl:stylesheet>