From owner-svn-doc-projects@FreeBSD.ORG  Mon Jun 17 20:52:31 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 76F0FFBC;
 Mon, 17 Jun 2013 20:52:31 +0000 (UTC)
 (envelope-from trhodes@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 69D9A1F07;
 Mon, 17 Jun 2013 20:52:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HKqV2x037950;
 Mon, 17 Jun 2013 20:52:31 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5HKqVbc037949;
 Mon, 17 Jun 2013 20:52:31 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201306172052.r5HKqVbc037949@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Mon, 17 Jun 2013 20:52:31 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41939 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/linuxemu
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, 17 Jun 2013 20:52:31 -0000

Author: trhodes
Date: Mon Jun 17 20:52:30 2013
New Revision: 41939
URL: http://svnweb.freebsd.org/changeset/doc/41939

Log:
  MFHead:
  
  Remove dead port reference.

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

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Mon Jun 17 20:49:44 2013	(r41938)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Mon Jun 17 20:52:30 2013	(r41939)
@@ -933,10 +933,9 @@ exit 0</programlisting>
     <sect2>
       <title>Installing the &linux; Environment</title>
 
-      <para>Make sure both <filename
-	  role='package'>emulators/linux_base</filename> and
-	<filename role='package'>devel/linux_devtools</filename>
-	are installed from the Ports Collection.</para>
+      <para>Make sure <filename
+	  role='package'>emulators/linux_base</filename>
+	has been installed from the Ports Collection.</para>
 
       <para>To run the intelligent agent, install the Red Hat Tcl
 	package:  <filename>tcl-8.0.3-20.i386.rpm</filename>.  The

From owner-svn-doc-projects@FreeBSD.ORG  Tue Jun 18 00:01: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
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 4BBB41EC;
 Tue, 18 Jun 2013 00:01:56 +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 252B618F1;
 Tue, 18 Jun 2013 00:01: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 r5I01tAU098777;
 Tue, 18 Jun 2013 00:01:55 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5I01tQw098776;
 Tue, 18 Jun 2013 00:01:55 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201306180001.r5I01tQw098776@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 18 Jun 2013 00:01:55 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41941 - projects/ISBN_1-57176-407-0/en_US.ISO8859-1
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, 18 Jun 2013 00:01:56 -0000

Author: gjb
Date: Tue Jun 18 00:01:55 2013
New Revision: 41941
URL: http://svnweb.freebsd.org/changeset/doc/41941

Log:
  Record mergeinfo for r41939.

Modified:
Directory Properties:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/   (props changed)

From owner-svn-doc-projects@FreeBSD.ORG  Tue Jun 18 21:57: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 [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 768641BB;
 Tue, 18 Jun 2013 21:57:43 +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 660311736;
 Tue, 18 Jun 2013 21:57: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 r5ILvhbh029648;
 Tue, 18 Jun 2013 21:57:43 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5ILvf8Q029637;
 Tue, 18 Jun 2013 21:57:41 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201306182157.r5ILvf8Q029637@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 18 Jun 2013 21:57:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41947 - in projects/sysctl:
 de_DE.ISO8859-1/htdocs/releases de_DE.ISO8859-1/share/xml
 en_US.ISO8859-1/articles/committers-guide
 en_US.ISO8859-1/articles/contributors en_US.ISO8859-1/ar...
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, 18 Jun 2013 21:57:43 -0000

Author: gjb
Date: Tue Jun 18 21:57:41 2013
New Revision: 41947
URL: http://svnweb.freebsd.org/changeset/doc/41947

Log:
  MFH:
     Merged /head/de_DE.ISO8859-1:r41730-41946
     Merged /head/en_US.ISO8859-1:r41730-41946
     Merged /head/it_IT.ISO8859-15:r41730-41946
     Merged /head/ja_JP.eucJP:r41730-41946
     Merged /head/mn_MN.UTF-8:r41730-41946
     Merged /head/nl_NL.ISO8859-1:r41730-41946
     Merged /head/ru_RU.KOI8-R:r41730-41946
     Merged /head/share:r41730-41946
     Merged /head/zh_CN.GB2312:r41730-41946
  
  Approved by:	doceng (implicit)

Added:
  projects/sysctl/en_US.ISO8859-1/htdocs/releases/8.4R/announce.xml
     - copied unchanged from r41946, head/en_US.ISO8859-1/htdocs/releases/8.4R/announce.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/releases/8.4R/errata.html
     - copied unchanged from r41946, head/en_US.ISO8859-1/htdocs/releases/8.4R/errata.html
  projects/sysctl/en_US.ISO8859-1/htdocs/releases/8.4R/hardware.html
     - copied unchanged from r41946, head/en_US.ISO8859-1/htdocs/releases/8.4R/hardware.html
  projects/sysctl/en_US.ISO8859-1/htdocs/releases/8.4R/installation.html
     - copied unchanged from r41946, head/en_US.ISO8859-1/htdocs/releases/8.4R/installation.html
  projects/sysctl/en_US.ISO8859-1/htdocs/releases/8.4R/readme.html
     - copied unchanged from r41946, head/en_US.ISO8859-1/htdocs/releases/8.4R/readme.html
  projects/sysctl/en_US.ISO8859-1/htdocs/releases/8.4R/relnotes-detailed.html
     - copied unchanged from r41946, head/en_US.ISO8859-1/htdocs/releases/8.4R/relnotes-detailed.html
  projects/sysctl/en_US.ISO8859-1/htdocs/releases/8.4R/relnotes.xml
     - copied unchanged from r41946, head/en_US.ISO8859-1/htdocs/releases/8.4R/relnotes.xml
  projects/sysctl/ja_JP.eucJP/htdocs/releases/8.4R/
     - copied from r41946, head/ja_JP.eucJP/htdocs/releases/8.4R/
  projects/sysctl/share/pgpkeys/alc.key
     - copied unchanged from r41946, head/share/pgpkeys/alc.key
  projects/sysctl/share/pgpkeys/qingli.key
     - copied unchanged from r41946, head/share/pgpkeys/qingli.key
  projects/sysctl/share/pgpkeys/vg.key
     - copied unchanged from r41946, head/share/pgpkeys/vg.key
  projects/sysctl/share/security/advisories/FreeBSD-SA-13:06.mmap.asc
     - copied unchanged from r41946, head/share/security/advisories/FreeBSD-SA-13:06.mmap.asc
  projects/sysctl/share/security/patches/SA-13:06/
     - copied from r41946, head/share/security/patches/SA-13:06/
Modified:
  projects/sysctl/de_DE.ISO8859-1/htdocs/releases/Makefile
  projects/sysctl/de_DE.ISO8859-1/share/xml/news.xml
  projects/sysctl/en_US.ISO8859-1/articles/committers-guide/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/releng/article.xml
  projects/sysctl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/advanced-networking/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/cutting-edge/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/disks/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/geom/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/linuxemu/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/handbook/multimedia/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/vinum/chapter.xml
  projects/sysctl/en_US.ISO8859-1/books/porters-handbook/book.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/administration.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/cgi/man.cgi
  projects/sysctl/en_US.ISO8859-1/htdocs/layout/js/google.js
  projects/sysctl/en_US.ISO8859-1/htdocs/platforms/alpha.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/projects/c99/index.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/projects/cvsweb.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/releases/8.4R/Makefile
  projects/sysctl/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/releases/Makefile
  projects/sysctl/en_US.ISO8859-1/htdocs/releases/index.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/releng/index.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/robots.txt
  projects/sysctl/en_US.ISO8859-1/htdocs/security/security.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/send-pr.xml
  projects/sysctl/en_US.ISO8859-1/htdocs/where.xml
  projects/sysctl/fr_FR.ISO8859-1/htdocs/releases/Makefile
  projects/sysctl/it_IT.ISO8859-15/htdocs/releases/Makefile
  projects/sysctl/ja_JP.eucJP/books/handbook/Makefile
  projects/sysctl/ja_JP.eucJP/books/handbook/book.xml
  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/install/chapter.xml
  projects/sysctl/ja_JP.eucJP/books/handbook/introduction/chapter.xml
  projects/sysctl/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
  projects/sysctl/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
  projects/sysctl/ja_JP.eucJP/books/handbook/ports/chapter.xml
  projects/sysctl/ja_JP.eucJP/htdocs/projects/Makefile
  projects/sysctl/ja_JP.eucJP/htdocs/projects/cvsweb.xml
  projects/sysctl/ja_JP.eucJP/htdocs/releases/Makefile
  projects/sysctl/ja_JP.eucJP/htdocs/security/security.xml
  projects/sysctl/ja_JP.eucJP/htdocs/send-pr.xml
  projects/sysctl/ja_JP.eucJP/htdocs/where.xml
  projects/sysctl/ja_JP.eucJP/share/xml/l10n.ent
  projects/sysctl/ja_JP.eucJP/share/xml/news.xml
  projects/sysctl/mn_MN.UTF-8/books/handbook/boot/chapter.xml
  projects/sysctl/nl_NL.ISO8859-1/books/handbook/Makefile
  projects/sysctl/nl_NL.ISO8859-1/books/handbook/book.xml
  projects/sysctl/nl_NL.ISO8859-1/books/handbook/colophon.xml
  projects/sysctl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
  projects/sysctl/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml
  projects/sysctl/nl_NL.ISO8859-1/books/handbook/preface/preface.xml
  projects/sysctl/nl_NL.ISO8859-1/htdocs/administration.xml
  projects/sysctl/nl_NL.ISO8859-1/htdocs/send-pr.xml
  projects/sysctl/nl_NL.ISO8859-1/htdocs/where.xml
  projects/sysctl/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
  projects/sysctl/ru_RU.KOI8-R/books/handbook/mail/Makefile
  projects/sysctl/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
  projects/sysctl/ru_RU.KOI8-R/books/handbook/ports/Makefile
  projects/sysctl/ru_RU.KOI8-R/books/handbook/ports/chapter.xml
  projects/sysctl/ru_RU.KOI8-R/htdocs/releases/Makefile
  projects/sysctl/share/images/articles/releng/branches-releng8.pic
  projects/sysctl/share/misc/docbook.css
  projects/sysctl/share/pgpkeys/hrs.key
  projects/sysctl/share/pgpkeys/pgj.key
  projects/sysctl/share/pgpkeys/pgpkeys-developers.xml
  projects/sysctl/share/pgpkeys/pgpkeys.ent
  projects/sysctl/share/pgpkeys/rm.key
  projects/sysctl/share/xml/advisories.xml
  projects/sysctl/share/xml/authors.ent
  projects/sysctl/share/xml/developers.ent
  projects/sysctl/share/xml/freebsd.ent
  projects/sysctl/share/xml/man-refs.ent
  projects/sysctl/share/xml/news.xml
  projects/sysctl/share/xml/release.ent
  projects/sysctl/share/xsl/freebsd-xhtml-common.xsl
  projects/sysctl/zh_CN.GB2312/htdocs/releases/Makefile
Directory Properties:
  projects/sysctl/de_DE.ISO8859-1/   (props changed)
  projects/sysctl/en_US.ISO8859-1/   (props changed)
  projects/sysctl/fr_FR.ISO8859-1/   (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/ru_RU.KOI8-R/   (props changed)
  projects/sysctl/share/   (props changed)
  projects/sysctl/zh_CN.GB2312/   (props changed)

Modified: projects/sysctl/de_DE.ISO8859-1/htdocs/releases/Makefile
==============================================================================
--- projects/sysctl/de_DE.ISO8859-1/htdocs/releases/Makefile	Tue Jun 18 19:22:01 2013	(r41946)
+++ projects/sysctl/de_DE.ISO8859-1/htdocs/releases/Makefile	Tue Jun 18 21:57:41 2013	(r41947)
@@ -14,7 +14,7 @@ DOCS?=	index.xml
 SUBDIR=		4.6.2R 4.7R 4.8R 4.9R 4.11R
 SUBDIR+=	5.0R 5.1R 5.2R 5.3R
 
-.if defined $(NEW_BUILD)
+.if defined(NEW_BUILD)
 SUBDIR=
 .endif
 

Modified: projects/sysctl/de_DE.ISO8859-1/share/xml/news.xml
==============================================================================
--- projects/sysctl/de_DE.ISO8859-1/share/xml/news.xml	Tue Jun 18 19:22:01 2013	(r41946)
+++ projects/sysctl/de_DE.ISO8859-1/share/xml/news.xml	Tue Jun 18 21:57:41 2013	(r41947)
@@ -4,7 +4,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r41693
+     basiert auf: r41837
 -->
 
 <!-- Simple schema for FreeBSD Project news.
@@ -39,9 +39,31 @@
     <name>2013</name>
 
     <month>
+      <name>6</name>
+
+      <day>
+	<name>4</name>
+
+	<event>
+	  <p>Erweiterte Commit-Privilegien: <a
+	    href="mailto:gjb@FreeBSD.org">Glen Barber</a> (doc, ports, src)</p>
+	</event>
+      </day>
+    </month>
+
+    <month>
       <name>5</name>
 
       <day>
+	<name>27</name>
+
+	<event>
+	  <p>Erweiterte Commit-Privilegien: <a
+	    href="mailto:crees@FreeBSD.org">Chris Rees</a> (doc, ports)</p>
+	</event>
+      </day>
+
+      <day>
 	<name>14</name>
 
 	<event>
@@ -1281,7 +1303,7 @@
 
         <event>
           <p>Neuer Committer: <a
-	    href="mailto:rm@FreeBSD.org">Ruslan Mahmatkhanov</a> (ports)</p>
+	    href="mailto:rm@FreeBSD.org">Ruslan Makhmatkhanov</a> (ports)</p>
         </event>
       </day>
 

Modified: projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml	Tue Jun 18 19:22:01 2013	(r41946)
+++ projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml	Tue Jun 18 21:57:41 2013	(r41947)
@@ -604,19 +604,20 @@
       <title>Daily Use</title>
 
       <para>This section will explain how to perform common day-to-day
-	operations with Subversion.  There should be no difference
-	between <acronym>SVN</acronym> and <acronym>SVK</acronym> in
-	daily use, except for the revision renumbering mentioned
-	earlier.</para>
+	operations with Subversion.</para>
 
       <sect3>
 	<title>Help</title>
 
-	<para>Both <acronym>SVN</acronym> and <acronym>SVK</acronym>
-	  have built in help documentation.  It can be accessed by
+	<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>
       </sect3>
 
       <sect3>
@@ -725,7 +726,7 @@
 	<title>Editing and Committing</title>
 
 	<para>Unlike Perforce,
-	  <acronym>SVN</acronym> and <acronym>SVK</acronym> do not
+	  <acronym>SVN</acronym> does not
 	  need to be told in advance about file editing.</para>
 
 	<para><command>svn commit</command> works like the equivalent

Modified: projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Tue Jun 18 19:22:01 2013	(r41946)
+++ projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Tue Jun 18 21:57:41 2013	(r41947)
@@ -7839,6 +7839,11 @@
     </listitem>
 
     <listitem>
+      <para>Oleg Moskalenko
+	<email>mom040267@gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Oleg R. Muhutdinov
         <email>mor@whiteluna.com</email></para>
     </listitem>
@@ -10573,11 +10578,6 @@
     </listitem>
 
     <listitem>
-      <para>Veniamin Gvozdikov
-	<email>g.veniamin@googlemail.com</email></para>
-    </listitem>
-
-    <listitem>
       <para>Vernon J. Schryver
 	<email>vjs@mica.denver.sgi.com</email></para>
     </listitem>

Modified: projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
==============================================================================
--- projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Tue Jun 18 19:22:01 2013	(r41946)
+++ projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Tue Jun 18 21:57:41 2013	(r41947)
@@ -512,6 +512,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.vg;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.jhale;</para>
     </listitem>
 

Modified: projects/sysctl/en_US.ISO8859-1/articles/releng/article.xml
==============================================================================
--- projects/sysctl/en_US.ISO8859-1/articles/releng/article.xml	Tue Jun 18 19:22:01 2013	(r41946)
+++ projects/sysctl/en_US.ISO8859-1/articles/releng/article.xml	Tue Jun 18 21:57:41 2013	(r41947)
@@ -47,7 +47,7 @@
     <abstract>
       <para>
         <warning>
-          <para>2013/02/26: This document is outdated and does not
+          <para>2013/02/26: This document is partially outdated and does not
             accurately describe the current release procedures of the
             &os; Release Engineering team.  The &os; Release
             Engineering team is currently reviewing this document and
@@ -85,39 +85,38 @@
     formal source code management provides.  This has been a huge help
     in attracting more talented developers to &os;.  However, I
     think everyone would agree that chaos would soon manifest if write
-    access was opened up to everyone on the Internet.  Therefore only
-    a <quote>select</quote> group of nearly 300 people are given write
-    access to the Subversion repository.  These
+    access to the main repository was opened up to everyone on the Internet.
+    Therefore only a <quote>select</quote> group of nearly 300 people are
+    given write access to the Subversion repository.  These
     <ulink url="&url.articles.contributors;/article.html#staff-committers">committers</ulink>
     <footnote>
       <simpara>
         <ulink url="&url.articles.contributors;/article.html#staff-committers">FreeBSD committers</ulink>
       </simpara>
     </footnote>
-    are responsible for the bulk of &os; development.  An elected
+    are usually the people who do the bulk of &os; development.  An elected
     <ulink url="&url.base;/administration.html#t-core">Core Team</ulink>
     <footnote>
       <simpara>
         <ulink url="&url.base;/administration.html#t-core">&os; Core Team</ulink>
       </simpara>
     </footnote>
-    of very senior developers provides some level of direction over
-    the project.</para>
+    of developers provide some level of direction over the project.</para>
 
-  <para>The rapid pace of <systemitem
-    class="osname">&os;</systemitem> development leaves little time
-    for polishing the development system into a production quality
-    release.  To solve this dilemma, development continues on two
-    parallel tracks.  The main development branch is the
-    <emphasis>HEAD</emphasis> or <emphasis>trunk</emphasis> of our Subversion
-    tree, known as <quote>&os;-CURRENT</quote> or
+  <para>The rapid pace of <systemitem class="osname">&os;</systemitem>
+    development makes the main development branch unsuitable for the
+    everyday use by the general public.  In particular, stabilizing
+    efforts are required for polishing the development system into a
+    production quality release.  To solve this conflict, development
+    continues on several parallel tracks.  The main development branch
+    is the <emphasis>HEAD</emphasis> or <emphasis>trunk</emphasis> of
+    our Subversion tree, known as <quote>&os;-CURRENT</quote> or
     <quote>-CURRENT</quote> for short.</para>
 
-  <para>A more stable branch is maintained, known as
+  <para>A set of more stable branches are maintained, known as
     <quote>&os;-STABLE</quote> or <quote>-STABLE</quote> for short.
-    Both branches live in a master Subversion repository on a machine
-    maintained by the &os; Project.
-    &os;-CURRENT is the <quote>bleeding-edge</quote> of
+    All branches live in a master Subversion repository maintained by the
+    &os; Project.  &os;-CURRENT is the <quote>bleeding-edge</quote> of
     &os; development where all new changes first enter the system.
     &os;-STABLE is the development branch from which major releases
     are made.  Changes go into this branch at a different pace, and
@@ -125,6 +124,17 @@
     &os;-CURRENT and have been thoroughly tested by our user
     community.</para>
 
+  <para>The term <emphasis>stable</emphasis> in the name of the branch
+    refers to the presumed Application Binary Interface stability,
+    which is promised by the project.  This means that a user
+    application compiled on an older version of the system from the
+    same branch works on a newer system from the same branch.  The
+    ABI stability has improved greatly from the compared to previous
+    releases.  In most cases, binaries from the older
+    <emphasis>STABLE</emphasis> systems run unmodified on newer systems,
+    including <emphasis>HEAD</emphasis>, assuming that the system
+    management interfaces are not used.</para>
+
   <para>In the interim period between releases, monthly snapshots are
     built automatically by the &os; Project build machines and made
     available for download from <systemitem
@@ -222,24 +232,34 @@
 
   <para>New releases of &os; are released from the -STABLE branch
     at approximately four month intervals.  The &os; release
-    process begins to ramp up 45 days before the anticipated release
+    process begins to ramp up 70-80 days before the anticipated release
     date when the release engineer sends an email to the development
     mailing lists to remind developers that they only have 15 days to
     integrate new changes before the code freeze.  During this time,
     many developers perform what have become known as <quote>MFC
-    sweeps</quote>.  <acronym>MFC</acronym> stands for <quote>Merge
-    From CURRENT</quote> and it describes the process of merging a
-    tested change from our -CURRENT development branch to our -STABLE
-    branch.</para>
+      sweeps</quote>.</para>
+
+  <para><acronym>MFC</acronym> stands for <quote>Merge From
+      CURRENT</quote> and it describes the process of merging a tested
+    change from our -CURRENT development branch to our -STABLE branch.
+    Project policy requires any change to be first applied to
+    trunk, and merged to the -STABLE branches after sufficient
+    external testing was done by -CURRENT users (developers are
+    expected to extensively test the change before committing to
+    -CURRENT, but it is impossible for a person to exercise all usages
+    of the general-purpose operating system).  Minimal MFC period is 3
+    days, which is typically used only for trivial or critical
+    bugfixes.</para>
 
   <sect2>
     <title>Code Review</title>
 
-    <para>Thirty days before the anticipated release, the source
-      repository enters a <quote>code slush</quote>.  During this
+    <para>Sixty days before the anticipated release, the source
+      repository enters a <quote>code freeze</quote>.  During this
       time, all commits to the -STABLE branch must be approved by the
-      &a.re;.  The kinds of changes that are allowed during this 15 day
-      period include:</para>
+      &a.re;, the approval process is technically enforced by the
+      pre-commit hook.  The kinds of changes that are allowed during
+      this period include:</para>
 
     <itemizedlist>
       <listitem>
@@ -260,30 +280,41 @@
       </listitem>
 
       <listitem>
+        <para>Driver updates from the vendors.</para>
+      </listitem>
+
+      <listitem>
         <para>Any additional change that the release engineering team feels
         is justified, given the potential risk.</para>
       </listitem>
     </itemizedlist>
 
-    <para>After the first 15 days of the code slush, a
-      <emphasis>release candidate</emphasis> is released for
-      widespread testing and the code enters a <quote>code
-      freeze</quote> where it becomes much harder to justify new
-      changes to the system unless a serious bug-fix or security issue
-      is involved.  During the code freeze, at least one release
-      candidate is released per week, until the final release is
-      ready.  During the days leading to the final release, the
-      release engineering team is in constant communication with the
-      security-officer team, the documentation maintainers, and the
-      port maintainers, to ensure that all of the
+    <para>Shortly after the code freeze is started, a
+      <emphasis>BETA1</emphasis> image is built and released for
+      widespread testing.  During the code freeze, at least one beta
+      image or release candidate is released every two weeks until the
+      final release is ready.  During the days preceeding the final
+      release, the release engineering team is in constant
+      communication with the security-officer team, the documentation
+      maintainers, and the port maintainers to ensure that all of the
       different components required for a successful release are
       available.</para>
+
+    <para>After the quality of the BETA images is satisfying enough,
+      and no large and potentially risky changes are planned, the
+      release branch is created and <emphasis>Release
+      Candidate</emphasis> (RC) images are built from the release
+      branch, instead of the BETA images from the STABLE branch.
+      Also, the freeze on the STABLE branch is lifted and release
+      branch enters a <quote>hard code freeze</quote> where it becomes
+      much harder to justify new changes to the system unless a
+      serious bug-fix or security issue is involved.</para>
   </sect2>
 
   <sect2>
     <title>Final Release Checklist</title>
 
-    <para>When several release candidates have been made available for
+    <para>When several BETA images have been made available for
       widespread testing and all major issues have been resolved, the
       final release <quote>polishing</quote> can begin.</para>
 
@@ -315,10 +346,10 @@
       <screen>&prompt.root; <userinput>svn co $FSVN/releng/9.2 src</userinput></screen>
 
       <note>
-        <para>Creating <literal>releng</literal> branch and <literal>release</literal>
-          tags are restricted to
-          <ulink url="&url.base;/administration.html#t-subversion">Subversion administrators</ulink>
-          and the <ulink url="&url.base;/administration.html#t-re">Release Engineering Team</ulink>.
+        <para>Creating the <literal>releng</literal> branch and
+          <literal>release</literal> tags is done by the <ulink
+	    url="&url.base;/administration.html#t-re">Release
+          Engineering Team</ulink>.
         </para>
       </note>
 

Modified: projects/sysctl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
==============================================================================
--- projects/sysctl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml	Tue Jun 18 19:22:01 2013	(r41946)
+++ projects/sysctl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml	Tue Jun 18 21:57:41 2013	(r41947)
@@ -34,279 +34,261 @@
 <chapter id="overview">
   <title>Overview</title>
 
-  <para>Welcome to the FreeBSD Documentation Project.  Good quality
-    documentation is very important to the success of FreeBSD, and the
-    FreeBSD Documentation Project (FDP) is how a lot of that
-    documentation is produced.  Your contributions are very
+  <para>Welcome to the &os; Documentation Project
+    (<acronym>FDP</acronym>).  Quality documentation is very important
+    to the success of &os;.  Your contributions are very
     valuable.</para>
 
-  <para>This document's main purpose is to clearly explain
-    <emphasis>how the FDP is organized</emphasis>, <emphasis>how to
-      write and submit documentation to the FDP</emphasis>, and
-    <emphasis>how to effectively use the tools available to you when
-      writing documentation</emphasis>.</para>
-
-  <indexterm>
-    <primary>Membership</primary>
-  </indexterm>
-  <para>Everyone is welcome to join the FDP.  There is no minimum
-    membership requirement, no quota of documentation you need to
-    produce per month.  All you need to do is subscribe to the
-    &a.doc;.</para>
+  <para>This document's main purpose is to explain how the
+    <acronym>FDP</acronym> is organized, how to write and submit
+    documentation, and how to effectively use the available
+    tools.</para>
+
+  <para>Everyone is welcome to contribute to the
+    <acronym>FDP</acronym>.  There is no membership requirement or
+    minimum quota of documentation that needs to be produced.</para>
 
-  <para>After you have finished reading this document you
-    should:</para>
+  <para>After you have finished reading this document you will be
+    able to:</para>
 
   <itemizedlist>
     <listitem>
-      <para>Know which documentation is maintained by the FDP.</para>
+      <para>Identify which parts of &os; are maintained by the
+	<acronym>FDP</acronym>.</para>
     </listitem>
 
     <listitem>
-      <para>Be able to read and understand the XML source code for
-	the documentation maintained by the FDP.</para>
+      <para>Install the required tools and files.</para>
     </listitem>
 
     <listitem>
-      <para>Be able to make changes to the documentation.</para>
+      <para>Make changes to the documentation.</para>
     </listitem>
 
     <listitem>
-      <para>Be able to submit your changes back for review and
-	eventual inclusion in the FreeBSD documentation.</para>
+      <para>Submit changes back for review and eventual inclusion in
+	the &os; documentation.</para>
     </listitem>
   </itemizedlist>
 
   <sect1 id="overview-doc">
-    <title>The FreeBSD Documentation Set</title>
+    <title>The &os; Documentation Set</title>
 
-    <para>The FDP is responsible for four categories of FreeBSD
-      documentation.</para>
+    <para>The <acronym>FDP</acronym> is responsible for four
+      categories of &os; documentation.</para>
 
-    <variablelist>
-      <varlistentry>
-	<term>Manual pages</term>
-
-	<listitem>
-	  <para>The English language system manual pages are not
-	    written by the FDP, as they are part of the base system.
-	    However, the FDP can (and has) re-worded parts of existing
-	    manual pages to make them clearer, or to correct
-	    inaccuracies.</para>
-
-	  <para>The translation teams are responsible for translating
-	    the system manual pages into different languages.  These
-	    translations are kept within the FDP.</para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>FAQ</term>
-
-	<listitem>
-	  <para>The FAQ aims to address (in short question and answer
-	    format) questions that are asked, or should be asked, on
-	    the various mailing lists and newsgroups devoted to
-	    FreeBSD.  The format does not permit long and
-	    comprehensive answers.</para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Handbook</term>
-
-	<listitem>
-	  <para>The Handbook aims to be the comprehensive on-line
-	    resource and reference for FreeBSD users.</para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Web site</term>
-
-	<listitem>
-	  <para>This is the main FreeBSD presence on the World Wide
-	    Web, visible at <ulink
-	      url="&url.base;/index.html">http://www.FreeBSD.org/</ulink>
-	    and many mirrors around the world.  The web site is many
-	    people's first exposure to FreeBSD.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para>The documentation for the web site, &os; Handbook, and FAQ
-      are available in the <literal>doc/</literal> Subversion
-      repository, which is located at
-      <literal>https://svn.FreeBSD.org/doc/</literal>.</para>
-
-    <para>Manual pages are available in the <literal>src/</literal>
-      Subversion repository, which is available at
-      <literal>https://svn.FreeBSD.org/base/</literal>.</para>
-
-    <para>This means that the logs of changes to these
-      files are visible to anyone, and anyone can use
-      <application>svn</application> to view the changes.</para>
-
-    <para>In addition, many people have written tutorials or other web
-      sites relating to FreeBSD.  Some of these are stored in the
-      Subversion repository as well (where the author has agreed to
-      this).  In other cases the author has decided to keep his
-      documentation separate from the main FreeBSD repository.  The
-      FDP endeavors to provide links to as much of this documentation
-      as possible.</para>
-  </sect1>
+    <itemizedlist>
 
-  <sect1 id="overview-before">
-    <title>Before You Start</title>
+      <listitem>
+	<para><emphasis>Handbook</emphasis>: The Handbook is the
+	  comprehensive online resource and reference for &os;
+	  users.</para>
+      </listitem>
 
-    <para>This document assumes that you already know:</para>
+      <listitem>
+	<para><emphasis>FAQ</emphasis>: The <acronym>FAQ</acronym>
+	  uses a short question and answer format to address questions
+	  that are frequently asked on the various mailing lists and
+	  forums devoted to &os;.  This format does not permit long
+	  and comprehensive answers.</para>
+      </listitem>
 
-    <itemizedlist>
       <listitem>
-	<para>How to maintain an up-to-date local copy of the FreeBSD
-	  documentation by maintaining a local copy of the FreeBSD
-	  Subversion repository using
-	  <application>svn</application>.</para>
+	<para><emphasis>Manual pages</emphasis>: The English language
+	  system manual pages are usually not written by the
+	  <acronym>FDP</acronym>, as they are part of the base system.
+	  However, the <acronym>FDP</acronym> can reword parts of
+	  existing manual pages to make them clearer or to correct
+	  inaccuracies.</para>
       </listitem>
 
       <listitem>
-	<para>How to download and install new software using either
-	  the FreeBSD Ports system or &man.pkg.add.1;.</para>
+	<para><emphasis>Web site</emphasis>: This is the main &os;
+	  presence on the web, visible at <ulink
+	    url="http://www.freebsd.org/index.html">http://www.FreeBSD.org/</ulink>
+	  and many mirrors around the world.  The web site is
+	  typically a new user's first exposure to &os;.</para>
       </listitem>
     </itemizedlist>
+
+    <para>Translation teams are responsible for translating
+      the Handbook and web site into different languages.  Manual
+      pages are not translated.</para>
+
+    <para>Documentation source for the &os; web site, Handbook, and
+      <acronym>FAQ</acronym> is available in the Subversion
+      repository at
+      <literal>https://svn.FreeBSD.org/doc/</literal>.</para>
+
+    <para>Source for manual pages is available in a separate
+      Subversion repository located at
+      <literal>https://svn.FreeBSD.org/base/</literal>.</para>
+
+    <para>The commit messages to the <acronym>FDP</acronym>
+      are visible to anyone usingv<application>svn</application>.
+      They are also archived at &a.svn-doc-all.url;.</para>
+
+    <para>In addition, many people have written tutorials or how-to
+      articles about &os;.  Some are stored in the
+      <acronym>FDP</acronym>.  In other cases, the author has decided
+      to keep the documentation separate from the
+      <acronym>FDP</acronym>.  The <acronym>FDP</acronym> endeavors to
+      provide links to as much of this documentation as
+      possible.</para>
   </sect1>
 
   <sect1 id="overview-quick-start">
     <title>Quick Start</title>
 
-    <para>If you just want to get going, and feel confident you can
-      pick things up as you go along, follow these
-      instructions.</para>
+    <para>This section outlines the steps which new contributors need
+      to follow before they can make changes to the
+      <acronym>FDP</acronym>.  New contributors will interact with
+      other members of the &os; Documentation Team which can assist in
+      learning how to use <acronym>XML</acronym> and the <xref
+	linkend="writing-style-guide"/>.  If a new user contributes
+      regularly, a Documentation Team member may be assigned as a
+      mentor to guide the user through the process from contributor
+      to documentation committer.</para>
 
     <procedure>
       <step>
-	<para>Install the
-	  <filename role="package">textproc/docproj</filename>
-	  meta-port.</para>
-
-	<screen>&prompt.root; <userinput>cd /usr/ports/textproc/docproj</userinput>
-&prompt.root; <userinput>make JADETEX=no install</userinput></screen>
+	<para>Subscribe to the &a.doc;.  Some members of the mailing
+	  list also interact on the <literal>#bsddocs</literal>
+	  <acronym>IRC</acronym> channel on <ulink
+	    url="http://www.efnet.org/">EFnet</ulink>.</para>
       </step>
 
       <step>
-	<para>Get a local copy of the FreeBSD <filename>doc</filename>
-	  tree using <application>svn</application>.</para>
-
-	<para>If network bandwidth or local drive space is a concern,
-	  then at minimum, the <filename>head/share</filename> and
-	  <filename>head/<replaceable>language</replaceable>/share</filename>
-	  directories will need to be checked out.  For
-	  example:</para>
-
-	<screen>&prompt.user; <userinput>mkdir -p head/share</userinput>
-&prompt.user; <userinput>mkdir -p head/en_US.ISO8859-1/share</userinput>
-&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head/share head/share</userinput>
-&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head/en_US.ISO8859-1/share head/en_US.ISO8859-1/share</userinput></screen>
-
-	<para>If you have plenty of disk space then you could check
-	  out everything.</para>
-
-	<screen>&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head head</userinput></screen>
-
-	<note>
-	  <para><ulink
-	    url="https://svn0.us-east.FreeBSD.org/">svn0.us-east.FreeBSD.org</ulink>
-	  is a public <literal>SVN</literal> server.
-	  Select the closest mirror and verify the mirror server
-	  certificate from the list of <ulink
-	    url="&url.books.handbook;/svn-mirrors.html">Subversion
-	  mirror sites</ulink>.</para>
-	</note>
-      </step>
-
-      <step>
-	<para>If you are preparing a change to an existing book or
-	  article, check it out of the repository as necessary.  If
-	  you are planning on contributing a new book or article then
-	  use an existing one as a guide.</para>
-
-	<para>For example, if you want to contribute a new article
-	  about setting up a VPN between FreeBSD and Windows 2000 you
-	  might do the following.</para>
-
-	<procedure>
-	  <step>
-	    <para>Check out the <filename>articles</filename>
-	      directory.</para>
-
-	    <screen>&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head/en_US.ISO8859-1/articles</userinput></screen>
-	  </step>
-
-	  <step>
-	    <para>Copy an existing article to use as a template.  In
-	      this case, you have decided that your new article
-	      belongs in a directory called
-	      <filename>vpn-w2k</filename>.</para>
-
-	    <screen>&prompt.user; <userinput>cd head/en_US.ISO8859-1/articles</userinput>
-&prompt.user; <userinput>svn export committers-guide vpn-w2k</userinput></screen>
-	  </step>
-	</procedure>
-
-	<para>If you wanted to edit an existing document, such as the
-	  FAQ, which is in
-	  <filename>head/en_US.ISO8859-1/books/faq</filename> you
-	  would check it out of the repository like this.</para>
-
-	<screen>&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head/en_US.ISO8859-1/books/faq</userinput></screen>
-      </step>
-
-      <step>
-	<para>Edit the <filename>.xml</filename> files using your
-	  editor of choice.</para>
-      </step>
-
-      <step>
-	<para>Test the markup using the <maketarget>lint</maketarget>
-	  target.  This will quickly find any errors in the document
-	  without actually performing the time-consuming
-	  transformation.</para>
-
-	<screen>&prompt.user; <userinput>make lint</userinput></screen>
-
-	<para>When you are ready to actually build the document, you
-	  may specify a single format or a list of formats in the
-	  <varname>FORMATS</varname> variable.  Currently,
-	  <literal>html</literal>, <literal>html-split</literal>,
-	  <literal>txt</literal>, <literal>ps</literal>,
-	  <literal>pdf</literal>, and <literal>rtf</literal> are
-	  supported.  The most up to date list of supported formats is
-	  listed at the top of the
-	  <filename>head/share/mk/doc.docbook.mk</filename> file.
-	  Make sure to use quotes around the list of formats when you
-	  build more than one format with a single command.</para>
-
-	<para>For example, to convert the document to
-	  <literal>html</literal> only, you would use:</para>
-
-	<screen>&prompt.user; <userinput>make FORMATS=html</userinput></screen>
-
-	<para>But when you want to convert the document to both
-	  <literal>html</literal> and <literal>txt</literal> format,
-	  you could use either two separate &man.make.1; runs,
-	  with:</para>
-
-	<screen>&prompt.user; <userinput>make FORMATS=html</userinput>
-&prompt.user; <userinput>make FORMATS=txt</userinput></screen>
-
-	<para>or, you can do it in one command:</para>
-
-	<screen>&prompt.user; <userinput>make FORMATS="html txt"</userinput></screen>
+	<para>Install the
+	  <filename role="package">textproc/docproj</filename>
+	  package or port.  This meta-port installs all of the
+	  utilities needed by the <acronym>FDP</acronym>.</para>
       </step>
 
       <step>
-	<para>Submit your changes using &man.send-pr.1;.</para>
-      </step>
-    </procedure>
-  </sect1>
-</chapter>
+	<para>Install a local working copy of the documentation
+	  from a mirror of the &os; repository.  For the fastest
+	  download, pick the nearest mirror from the list of <ulink
+	    url="&url.books.handbook;/subversion-mirrors.html">Subversion
+	    mirror sites</ulink>.  If <filename
+	    role="directory">/usr/doc</filename> already exists, move
+	  or delete it first to prevent file conflicts.</para>
+
+	<screen>&prompt.user; <userinput>svn checkout https://<replaceable>svn0.us-west.FreeBSD.org</replaceable>/doc/head <replaceable>/usr/doc</replaceable></userinput></screen>
+	</step>
+
+	<step>
+	  <para>Before making any documentation edits, configure your
+	    editor to conform to <acronym>FDP</acronym> standards.
+	    How to do so varies by editor.  Some editor configurations
+	    are listed in <xref linkend="writing-style"/>. The editor
+	    should be configured as follows:</para>
+	  <itemizedlist>
+	    <listitem>
+	      <para>Word wrap set to 70 characters.</para>
+	    </listitem>
+	    <listitem>
+	      <para>Tab stops set to 2.</para>
+	    </listitem>
+	    <listitem>
+	      <para>Replace each group of 8 leading spaces with a
+		single tab.</para>
+	    </listitem>
+	  </itemizedlist>
+	</step>
+
+	<step>
+	  <para>Determine which file to edit.  Run
+	    <command>svn up</command> within the local working copy
+	    to make sure that it is current.  Before making major
+	    changes to a file, discuss the proposed changes first with
+	    the &a.doc;.</para>
+
+	  <para>When making edits, determine which tags and entities
+	    are needed to achieve the desired formatting.  One way to
+	    learn is to compare some text in the
+	    <acronym>HTML</acronym> formatted version of the document
+	    to the tags which surround the text or the entities that
+	    represent that text in the <acronym>XML</acronym> file.
+	    A reference to the commonly used tags and entities can be
+	    found in <xref linkend="xml-markup"/>.</para>
+	</step>
+
+	<step>
+	  <para>Once the edits are complete, check for problems by
+	    running:</para>
+
+	  <screen>&prompt.user; <userinput>igor -R filename.xml | less -RS</userinput></screen>
+
+	  <para>While reviewing the output, edit the file to fix the
+	    listed tab errors, spelling mistakes, and improper
+	    grammar.  Save the changes and rerun this command to find
+	    any remaining problems.  Repeat until all of the errors
+	    that you deem fixable are resolved.  If you get stuck
+	    trying to fix errors, ask for assistance on the
+	    &a.doc;.</para>
+	</step>
+
+	<step>
+	  <para><emphasis>Always</emphasis> build-test changes before
+	    submitting them.  By default, typing
+	    <userinput>make</userinput> in the top-level directory of
+	    the type of documentation being edited will generate that
+	    documentation in split HTML format.  For example, to build
+	    the English version of the Handbook, type
+	    <userinput>make</userinput> in the
+	    <filename>en_US.ISO8859-1/books/handbook/</filename>
+	    directory.  This step is necessary to make sure that the
+	    edits do not break the build.</para>
+	</step>
+
+	<step>
+	  <para>In order to build the output in other formats, other
+	    <application>make</application> targets are defined in
+	    <filename>head/share/mk/doc.docbook.mk</filename>.  Use
+	    quotes around the list of formats when building more than
+	    one format with a single command.</para>
+
+	  <para>For example, to convert the document to both
+	    <literal>.html</literal> and <literal>.txt</literal>, use
+	    this command:</para>
+
+	  <screen>&prompt.user; <userinput>make FORMATS="html txt"</userinput></screen>
+
+	<para>Once these steps are successfully completed, generate a
+	  <quote>diff file</quote> of the changes.  While in <filename
+	    class="directory">/usr/doc</filename>, run this command,
+	  replacing <replaceable>bsdinstall</replaceable> with the
+	  name of the directory containing the edits:</para>
+
+	<screen>&prompt.user; <userinput>svn diff > <replaceable>bsdinstall</replaceable>.diff.txt</userinput></screen>
+	</step>
+
+	<step>
+	  <para>Submit the diff file using the web-based <ulink
+	      url="&url.base;/support.html#gnats">Problem
+	      Report</ulink> system or with &man.send-pr.1;.  If using
+	    the web form, input a synopsis of <emphasis>[patch]
+	      <replaceable>short description of
+	      problem</replaceable></emphasis>.  Select the category
+	    <literal>docs</literal> and the class
+	    <literal>doc-bug</literal>.  The body of the message
+	    should contain a short description of the edits and any
+	    important discussion points.  Use the
+	    <guibutton>[&nbsp;Browse...&nbsp;]</guibutton> button to
+	    attach the <literal>.diff.txt</literal> file and enter
+	    the captcha phrase.</para>
+
+	  <para>It is important to remember that the
+	    <acronym>FDP</acronym> is comprised of volunteers who
+	    review edits in their spare time and who live in different
+	    time zones across the globe.  It takes time to review
+	    edits and to either commit them or respond if additional
+	    edits are required.  If you do not receive a response in a
+	    reasonable amount of time, send a follow-up email to the
+	    &a.doc; and ask if anyone has had a chance to review the
+	    patch or if additional information is required.</para>
+	</step>
+      </procedure>
+    </sect1>
+  </chapter>
\ No newline at end of file

Modified: projects/sysctl/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
==============================================================================
--- projects/sysctl/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml	Tue Jun 18 19:22:01 2013	(r41946)
+++ projects/sysctl/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml	Tue Jun 18 21:57:41 2013	(r41947)
@@ -205,13 +205,68 @@
 	also define them the first time they appear in each
 	chapter.</para>
 
-      <para>The first three uses of an acronym should be enclosed in
+      <para>All acronyms should be enclosed in
 	<sgmltag>acronym</sgmltag> tags, with a
 	<literal>role</literal> attribute with the full term defined.
 	This allows a link to the glossary to be created, and for
 	mouseovers to be rendered with the fully expanded term.</para>
     </sect2>
 
+    <sect2 id="writing-style-beformal">
+      <title>Be Formal</title>
+
+      <para>Write in a formal style.  Avoid addressing the reader
+	as <quote>you</quote>.  For example, say
+	<quote>copy the file to <filename>/tmp</filename></quote>
+	rather than <quote>you can copy the file to
+	  <filename>/tmp</filename></quote>.</para>
+    </sect2>
+
+    <sect2 id="writing-style-confident">
+      <title>Be Confident</title>
+
+      <para>Avoid <emphasis>weasel words</emphasis> like
+	<quote>should</quote>, <quote>might</quote>,
+	<quote>try</quote>, or <quote>could</quote>.  These words
+	imply that the speaker is unsure of the facts, and
+	create doubt in the reader.</para>
+    </sect2>
+
+    <sect2 id="writing-style-imperative">
+      <title>Be Imperative</title>
+
+      <para>Give instructions as an imperative command: not
+	<quote>you should do this</quote>, but merely
+	<quote>do this</quote>.</para>
+    </sect2>
+
+    <sect2 id="writing-style-simple">
+      <title>Be Simple</title>
+
+      <para>Avoid flowery or embellished speech, jokes, or colloquial
+	expressions.  Write as simply and clearly as possible.  Simple
+	text is easier to understand and makes the job of translation
+	easier.</para>
+
+      <para>Keep explanations as short, simple, and clear as possible.
+	Avoid empty phrases like <quote>in order to</quote>, which
+	usually just means <quote>to</quote>.  Avoid potentially
+	patronizing words like <quote>basically</quote>.  Avoid Latin
+	terms like <quote>i.e.</quote> or <quote>cf.</quote>, which
+	may be unknown outside of academic or scientific
+	groups.</para>
+    </sect2>
+
+    <sect2 id="writing-style-threecs">
+      <title>Use the <quote>Three C</quote> Approach</title>
+
+      <para>Writing must be <emphasis>clear</emphasis>,
+	<emphasis>complete</emphasis>, and
+	<emphasis>concise</emphasis>.  These goals can conflict with
+	each other.  Good writing consists of a balance between
+	them.</para>
+    </sect2>
+
     <sect2>
       <title>Indentation</title>
 
@@ -402,89 +457,80 @@ GB.  Hardware compression &hellip;</lite
   <sect1 id="writing-style-word-list">
     <title>Word List</title>
 
-    <para>The following is a small list of words spelled the way they
-      should be used in the FreeBSD Documentation Project.  If the
-      word you are looking for is not in this list, then please
-      consult the <ulink
-	url="http://www.oreilly.com/oreilly/author/stylesheet.html">O'Reilly
-	word list</ulink>.</para>
-
-    <itemizedlist>
-      <listitem>
-	<para>2.2.X</para>
-      </listitem>
-
-      <listitem>
-	<para>4.X-STABLE</para>
-      </listitem>
-
-      <listitem>
-	<para>CD-ROM</para>
-      </listitem>
-
-      <listitem>
-	<para>DoS <emphasis>(Denial of Service)</emphasis> </para>
-      </listitem>
-
-      <listitem>
-	<para>Ports Collection</para>
-      </listitem>
-
-      <listitem>
-	<para>IPsec</para>
-      </listitem>
-
-      <listitem>
-	<para>Internet</para>
-      </listitem>
-
-      <listitem>
-	<para>MHz</para>
-      </listitem>
-
-      <listitem>
-	<para>Soft Updates</para>
-      </listitem>
-
-      <listitem>
-	<para>Unix</para>
-      </listitem>
-
-      <listitem>
-	<para>disk label</para>
-      </listitem>
-
-      <listitem>
-	<para>email</para>
-      </listitem>
-
-      <listitem>
-	<para>file system</para>
-      </listitem>
-
-      <listitem>
-	<para>manual page</para>
-      </listitem>
-
-      <listitem>
-	<para>mail server</para>
-      </listitem>
-
-      <listitem>
-	<para>name server</para>
-      </listitem>
-
-      <listitem>
-	<para>null-modem</para>
-      </listitem>
-
-      <listitem>
-	<para>read-only</para>
-      </listitem>
-
-      <listitem>
-	<para>web server</para>
-      </listitem>
-    </itemizedlist>
+    <para>This list of words shows the correct spelling and
+      capitalization when used in FreeBSD Documentation.  If a word is
+      not on this list, ask about that word on the &a.doc;.</para>
+
+    <informaltable frame="none" pgwide="0">

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

From owner-svn-doc-projects@FreeBSD.ORG  Tue Jun 18 21:59: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 5DA1620C;
 Tue, 18 Jun 2013 21:59:12 +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 4CF721743;
 Tue, 18 Jun 2013 21:59: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 r5ILxCiw029877;
 Tue, 18 Jun 2013 21:59:12 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5ILx56i029867;
 Tue, 18 Jun 2013 21:59:05 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201306182159.r5ILx56i029867@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 18 Jun 2013 21:59:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41948 - in projects/ISBN_1-57176-407-0:
 de_DE.ISO8859-1/htdocs/releases de_DE.ISO8859-1/share/xml
 en_US.ISO8859-1/articles/committers-guide
 en_US.ISO8859-1/articles/contributors en_US....
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, 18 Jun 2013 21:59:12 -0000

Author: gjb
Date: Tue Jun 18 21:59:05 2013
New Revision: 41948
URL: http://svnweb.freebsd.org/changeset/doc/41948

Log:
  MFH:
     Merged /head/de_DE.ISO8859-1:r41735-41946
     Merged /head/en_US.ISO8859-1:r41735-41781,41783-41938,41940-41946
     Merged /head/fr_FR.ISO8859-1:r41735-41946
     Merged /head/it_IT.ISO8859-15:r41735-41946
     Merged /head/ja_JP.eucJP:r41735-41946
     Merged /head/mn_MN.UTF-8:r41735-41946
     Merged /head/nl_NL.ISO8859-1:r41735-41946
     Merged /head/ru_RU.KOI8-R:r41735-41946
     Merged /head/share:r41735-41946
     Merged /head/zh_CN.GB2312:r41735-41946
  
  Approved by:	doceng (implicit)

Added:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releases/8.4R/announce.xml
     - copied unchanged from r41938, head/en_US.ISO8859-1/htdocs/releases/8.4R/announce.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releases/8.4R/errata.html
     - copied unchanged from r41938, head/en_US.ISO8859-1/htdocs/releases/8.4R/errata.html
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releases/8.4R/hardware.html
     - copied unchanged from r41938, head/en_US.ISO8859-1/htdocs/releases/8.4R/hardware.html
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releases/8.4R/installation.html
     - copied unchanged from r41938, head/en_US.ISO8859-1/htdocs/releases/8.4R/installation.html
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releases/8.4R/readme.html
     - copied unchanged from r41938, head/en_US.ISO8859-1/htdocs/releases/8.4R/readme.html
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releases/8.4R/relnotes-detailed.html
     - copied unchanged from r41938, head/en_US.ISO8859-1/htdocs/releases/8.4R/relnotes-detailed.html
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releases/8.4R/relnotes.xml
     - copied unchanged from r41938, head/en_US.ISO8859-1/htdocs/releases/8.4R/relnotes.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/releases/8.4R/
     - copied from r41946, head/ja_JP.eucJP/htdocs/releases/8.4R/
  projects/ISBN_1-57176-407-0/share/pgpkeys/alc.key
     - copied unchanged from r41946, head/share/pgpkeys/alc.key
  projects/ISBN_1-57176-407-0/share/pgpkeys/qingli.key
     - copied unchanged from r41946, head/share/pgpkeys/qingli.key
  projects/ISBN_1-57176-407-0/share/pgpkeys/vg.key
     - copied unchanged from r41946, head/share/pgpkeys/vg.key
  projects/ISBN_1-57176-407-0/share/security/advisories/FreeBSD-SA-13:06.mmap.asc
     - copied unchanged from r41946, head/share/security/advisories/FreeBSD-SA-13:06.mmap.asc
  projects/ISBN_1-57176-407-0/share/security/patches/SA-13:06/
     - copied from r41946, head/share/security/patches/SA-13:06/
Modified:
  projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/htdocs/releases/Makefile
  projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/share/xml/news.xml
  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/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/releng/article.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/writing-style/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/basics/chapter.xml
  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/cutting-edge/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/firewalls/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/geom/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/install/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/mirrors/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports/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/handbook/vinum/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/htdocs/administration.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/cgi/man.cgi
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/layout/js/google.js
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/platforms/alpha.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/projects/c99/index.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/projects/cvsweb.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releases/8.4R/Makefile
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.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/releases/index.xml
  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/robots.txt
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/security/security.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/send-pr.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/where.xml
  projects/ISBN_1-57176-407-0/fr_FR.ISO8859-1/htdocs/releases/Makefile
  projects/ISBN_1-57176-407-0/it_IT.ISO8859-15/htdocs/releases/Makefile
  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/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/install/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/mirrors/chapter.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/books/handbook/ports/chapter.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/projects/Makefile
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/projects/cvsweb.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/releases/Makefile
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/security/security.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/send-pr.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/htdocs/where.xml
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/share/xml/l10n.ent
  projects/ISBN_1-57176-407-0/ja_JP.eucJP/share/xml/news.xml
  projects/ISBN_1-57176-407-0/mn_MN.UTF-8/books/handbook/boot/chapter.xml
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/books/handbook/Makefile
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/books/handbook/book.xml
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/books/handbook/colophon.xml
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/books/handbook/preface/preface.xml
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/htdocs/administration.xml
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/htdocs/send-pr.xml
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/htdocs/where.xml
  projects/ISBN_1-57176-407-0/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
  projects/ISBN_1-57176-407-0/ru_RU.KOI8-R/books/handbook/mail/Makefile
  projects/ISBN_1-57176-407-0/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
  projects/ISBN_1-57176-407-0/ru_RU.KOI8-R/books/handbook/ports/Makefile
  projects/ISBN_1-57176-407-0/ru_RU.KOI8-R/books/handbook/ports/chapter.xml
  projects/ISBN_1-57176-407-0/ru_RU.KOI8-R/htdocs/releases/Makefile
  projects/ISBN_1-57176-407-0/share/images/articles/releng/branches-releng8.pic
  projects/ISBN_1-57176-407-0/share/misc/docbook.css
  projects/ISBN_1-57176-407-0/share/pgpkeys/hrs.key
  projects/ISBN_1-57176-407-0/share/pgpkeys/pgj.key
  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/pgpkeys/rm.key
  projects/ISBN_1-57176-407-0/share/xml/advisories.xml
  projects/ISBN_1-57176-407-0/share/xml/authors.ent
  projects/ISBN_1-57176-407-0/share/xml/developers.ent
  projects/ISBN_1-57176-407-0/share/xml/freebsd.ent
  projects/ISBN_1-57176-407-0/share/xml/man-refs.ent
  projects/ISBN_1-57176-407-0/share/xml/news.xml
  projects/ISBN_1-57176-407-0/share/xml/release.ent
  projects/ISBN_1-57176-407-0/share/xsl/freebsd-xhtml-common.xsl
  projects/ISBN_1-57176-407-0/zh_CN.GB2312/htdocs/releases/Makefile
Directory Properties:
  projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/   (props changed)
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/   (props changed)
  projects/ISBN_1-57176-407-0/fr_FR.ISO8859-1/   (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/ru_RU.KOI8-R/   (props changed)
  projects/ISBN_1-57176-407-0/share/   (props changed)
  projects/ISBN_1-57176-407-0/zh_CN.GB2312/   (props changed)

Modified: projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/htdocs/releases/Makefile
==============================================================================
--- projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/htdocs/releases/Makefile	Tue Jun 18 21:57:41 2013	(r41947)
+++ projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/htdocs/releases/Makefile	Tue Jun 18 21:59:05 2013	(r41948)
@@ -14,7 +14,7 @@ DOCS?=	index.xml
 SUBDIR=		4.6.2R 4.7R 4.8R 4.9R 4.11R
 SUBDIR+=	5.0R 5.1R 5.2R 5.3R
 
-.if defined $(NEW_BUILD)
+.if defined(NEW_BUILD)
 SUBDIR=
 .endif
 

Modified: projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/share/xml/news.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/share/xml/news.xml	Tue Jun 18 21:57:41 2013	(r41947)
+++ projects/ISBN_1-57176-407-0/de_DE.ISO8859-1/share/xml/news.xml	Tue Jun 18 21:59:05 2013	(r41948)
@@ -4,7 +4,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r41693
+     basiert auf: r41837
 -->
 
 <!-- Simple schema for FreeBSD Project news.
@@ -39,9 +39,31 @@
     <name>2013</name>
 
     <month>
+      <name>6</name>
+
+      <day>
+	<name>4</name>
+
+	<event>
+	  <p>Erweiterte Commit-Privilegien: <a
+	    href="mailto:gjb@FreeBSD.org">Glen Barber</a> (doc, ports, src)</p>
+	</event>
+      </day>
+    </month>
+
+    <month>
       <name>5</name>
 
       <day>
+	<name>27</name>
+
+	<event>
+	  <p>Erweiterte Commit-Privilegien: <a
+	    href="mailto:crees@FreeBSD.org">Chris Rees</a> (doc, ports)</p>
+	</event>
+      </day>
+
+      <day>
 	<name>14</name>
 
 	<event>
@@ -1281,7 +1303,7 @@
 
         <event>
           <p>Neuer Committer: <a
-	    href="mailto:rm@FreeBSD.org">Ruslan Mahmatkhanov</a> (ports)</p>
+	    href="mailto:rm@FreeBSD.org">Ruslan Makhmatkhanov</a> (ports)</p>
         </event>
       </day>
 

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	Tue Jun 18 21:57:41 2013	(r41947)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/committers-guide/article.xml	Tue Jun 18 21:59:05 2013	(r41948)
@@ -604,19 +604,20 @@
       <title>Daily Use</title>
 
       <para>This section will explain how to perform common day-to-day
-	operations with Subversion.  There should be no difference
-	between <acronym>SVN</acronym> and <acronym>SVK</acronym> in
-	daily use, except for the revision renumbering mentioned
-	earlier.</para>
+	operations with Subversion.</para>
 
       <sect3>
 	<title>Help</title>
 
-	<para>Both <acronym>SVN</acronym> and <acronym>SVK</acronym>
-	  have built in help documentation.  It can be accessed by
+	<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>
       </sect3>
 
       <sect3>
@@ -725,7 +726,7 @@
 	<title>Editing and Committing</title>
 
 	<para>Unlike Perforce,
-	  <acronym>SVN</acronym> and <acronym>SVK</acronym> do not
+	  <acronym>SVN</acronym> does not
 	  need to be told in advance about file editing.</para>
 
 	<para><command>svn commit</command> works like the equivalent

Modified: 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.additional.xml	Tue Jun 18 21:57:41 2013	(r41947)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Tue Jun 18 21:59:05 2013	(r41948)
@@ -7839,6 +7839,11 @@
     </listitem>
 
     <listitem>
+      <para>Oleg Moskalenko
+	<email>mom040267@gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Oleg R. Muhutdinov
         <email>mor@whiteluna.com</email></para>
     </listitem>
@@ -10573,11 +10578,6 @@
     </listitem>
 
     <listitem>
-      <para>Veniamin Gvozdikov
-	<email>g.veniamin@googlemail.com</email></para>
-    </listitem>
-
-    <listitem>
       <para>Vernon J. Schryver
 	<email>vjs@mica.denver.sgi.com</email></para>
     </listitem>

Modified: 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.committers.xml	Tue Jun 18 21:57:41 2013	(r41947)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Tue Jun 18 21:59:05 2013	(r41948)
@@ -512,6 +512,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.vg;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.jhale;</para>
     </listitem>
 

Modified: 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/releng/article.xml	Tue Jun 18 21:57:41 2013	(r41947)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/releng/article.xml	Tue Jun 18 21:59:05 2013	(r41948)
@@ -47,7 +47,7 @@
     <abstract>
       <para>
         <warning>
-          <para>2013/02/26: This document is outdated and does not
+          <para>2013/02/26: This document is partially outdated and does not
             accurately describe the current release procedures of the
             &os; Release Engineering team.  The &os; Release
             Engineering team is currently reviewing this document and
@@ -85,39 +85,38 @@
     formal source code management provides.  This has been a huge help
     in attracting more talented developers to &os;.  However, I
     think everyone would agree that chaos would soon manifest if write
-    access was opened up to everyone on the Internet.  Therefore only
-    a <quote>select</quote> group of nearly 300 people are given write
-    access to the Subversion repository.  These
+    access to the main repository was opened up to everyone on the Internet.
+    Therefore only a <quote>select</quote> group of nearly 300 people are
+    given write access to the Subversion repository.  These
     <ulink url="&url.articles.contributors;/article.html#staff-committers">committers</ulink>
     <footnote>
       <simpara>
         <ulink url="&url.articles.contributors;/article.html#staff-committers">FreeBSD committers</ulink>
       </simpara>
     </footnote>
-    are responsible for the bulk of &os; development.  An elected
+    are usually the people who do the bulk of &os; development.  An elected
     <ulink url="&url.base;/administration.html#t-core">Core Team</ulink>
     <footnote>
       <simpara>
         <ulink url="&url.base;/administration.html#t-core">&os; Core Team</ulink>
       </simpara>
     </footnote>
-    of very senior developers provides some level of direction over
-    the project.</para>
+    of developers provide some level of direction over the project.</para>
 
-  <para>The rapid pace of <systemitem
-    class="osname">&os;</systemitem> development leaves little time
-    for polishing the development system into a production quality
-    release.  To solve this dilemma, development continues on two
-    parallel tracks.  The main development branch is the
-    <emphasis>HEAD</emphasis> or <emphasis>trunk</emphasis> of our Subversion
-    tree, known as <quote>&os;-CURRENT</quote> or
+  <para>The rapid pace of <systemitem class="osname">&os;</systemitem>
+    development makes the main development branch unsuitable for the
+    everyday use by the general public.  In particular, stabilizing
+    efforts are required for polishing the development system into a
+    production quality release.  To solve this conflict, development
+    continues on several parallel tracks.  The main development branch
+    is the <emphasis>HEAD</emphasis> or <emphasis>trunk</emphasis> of
+    our Subversion tree, known as <quote>&os;-CURRENT</quote> or
     <quote>-CURRENT</quote> for short.</para>
 
-  <para>A more stable branch is maintained, known as
+  <para>A set of more stable branches are maintained, known as
     <quote>&os;-STABLE</quote> or <quote>-STABLE</quote> for short.
-    Both branches live in a master Subversion repository on a machine
-    maintained by the &os; Project.
-    &os;-CURRENT is the <quote>bleeding-edge</quote> of
+    All branches live in a master Subversion repository maintained by the
+    &os; Project.  &os;-CURRENT is the <quote>bleeding-edge</quote> of
     &os; development where all new changes first enter the system.
     &os;-STABLE is the development branch from which major releases
     are made.  Changes go into this branch at a different pace, and
@@ -125,6 +124,17 @@
     &os;-CURRENT and have been thoroughly tested by our user
     community.</para>
 
+  <para>The term <emphasis>stable</emphasis> in the name of the branch
+    refers to the presumed Application Binary Interface stability,
+    which is promised by the project.  This means that a user
+    application compiled on an older version of the system from the
+    same branch works on a newer system from the same branch.  The
+    ABI stability has improved greatly from the compared to previous
+    releases.  In most cases, binaries from the older
+    <emphasis>STABLE</emphasis> systems run unmodified on newer systems,
+    including <emphasis>HEAD</emphasis>, assuming that the system
+    management interfaces are not used.</para>
+
   <para>In the interim period between releases, monthly snapshots are
     built automatically by the &os; Project build machines and made
     available for download from <systemitem
@@ -222,24 +232,34 @@
 
   <para>New releases of &os; are released from the -STABLE branch
     at approximately four month intervals.  The &os; release
-    process begins to ramp up 45 days before the anticipated release
+    process begins to ramp up 70-80 days before the anticipated release
     date when the release engineer sends an email to the development
     mailing lists to remind developers that they only have 15 days to
     integrate new changes before the code freeze.  During this time,
     many developers perform what have become known as <quote>MFC
-    sweeps</quote>.  <acronym>MFC</acronym> stands for <quote>Merge
-    From CURRENT</quote> and it describes the process of merging a
-    tested change from our -CURRENT development branch to our -STABLE
-    branch.</para>
+      sweeps</quote>.</para>
+
+  <para><acronym>MFC</acronym> stands for <quote>Merge From
+      CURRENT</quote> and it describes the process of merging a tested
+    change from our -CURRENT development branch to our -STABLE branch.
+    Project policy requires any change to be first applied to
+    trunk, and merged to the -STABLE branches after sufficient
+    external testing was done by -CURRENT users (developers are
+    expected to extensively test the change before committing to
+    -CURRENT, but it is impossible for a person to exercise all usages
+    of the general-purpose operating system).  Minimal MFC period is 3
+    days, which is typically used only for trivial or critical
+    bugfixes.</para>
 
   <sect2>
     <title>Code Review</title>
 
-    <para>Thirty days before the anticipated release, the source
-      repository enters a <quote>code slush</quote>.  During this
+    <para>Sixty days before the anticipated release, the source
+      repository enters a <quote>code freeze</quote>.  During this
       time, all commits to the -STABLE branch must be approved by the
-      &a.re;.  The kinds of changes that are allowed during this 15 day
-      period include:</para>
+      &a.re;, the approval process is technically enforced by the
+      pre-commit hook.  The kinds of changes that are allowed during
+      this period include:</para>
 
     <itemizedlist>
       <listitem>
@@ -260,30 +280,41 @@
       </listitem>
 
       <listitem>
+        <para>Driver updates from the vendors.</para>
+      </listitem>
+
+      <listitem>
         <para>Any additional change that the release engineering team feels
         is justified, given the potential risk.</para>
       </listitem>
     </itemizedlist>
 
-    <para>After the first 15 days of the code slush, a
-      <emphasis>release candidate</emphasis> is released for
-      widespread testing and the code enters a <quote>code
-      freeze</quote> where it becomes much harder to justify new
-      changes to the system unless a serious bug-fix or security issue
-      is involved.  During the code freeze, at least one release
-      candidate is released per week, until the final release is
-      ready.  During the days leading to the final release, the
-      release engineering team is in constant communication with the
-      security-officer team, the documentation maintainers, and the
-      port maintainers, to ensure that all of the
+    <para>Shortly after the code freeze is started, a
+      <emphasis>BETA1</emphasis> image is built and released for
+      widespread testing.  During the code freeze, at least one beta
+      image or release candidate is released every two weeks until the
+      final release is ready.  During the days preceeding the final
+      release, the release engineering team is in constant
+      communication with the security-officer team, the documentation
+      maintainers, and the port maintainers to ensure that all of the
       different components required for a successful release are
       available.</para>
+
+    <para>After the quality of the BETA images is satisfying enough,
+      and no large and potentially risky changes are planned, the
+      release branch is created and <emphasis>Release
+      Candidate</emphasis> (RC) images are built from the release
+      branch, instead of the BETA images from the STABLE branch.
+      Also, the freeze on the STABLE branch is lifted and release
+      branch enters a <quote>hard code freeze</quote> where it becomes
+      much harder to justify new changes to the system unless a
+      serious bug-fix or security issue is involved.</para>
   </sect2>
 
   <sect2>
     <title>Final Release Checklist</title>
 
-    <para>When several release candidates have been made available for
+    <para>When several BETA images have been made available for
       widespread testing and all major issues have been resolved, the
       final release <quote>polishing</quote> can begin.</para>
 
@@ -315,10 +346,10 @@
       <screen>&prompt.root; <userinput>svn co $FSVN/releng/9.2 src</userinput></screen>
 
       <note>
-        <para>Creating <literal>releng</literal> branch and <literal>release</literal>
-          tags are restricted to
-          <ulink url="&url.base;/administration.html#t-subversion">Subversion administrators</ulink>
-          and the <ulink url="&url.base;/administration.html#t-re">Release Engineering Team</ulink>.
+        <para>Creating the <literal>releng</literal> branch and
+          <literal>release</literal> tags is done by the <ulink
+	    url="&url.base;/administration.html#t-re">Release
+          Engineering Team</ulink>.
         </para>
       </note>
 

Modified: 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/overview/chapter.xml	Tue Jun 18 21:57:41 2013	(r41947)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml	Tue Jun 18 21:59:05 2013	(r41948)
@@ -34,279 +34,261 @@
 <chapter id="overview">
   <title>Overview</title>
 
-  <para>Welcome to the FreeBSD Documentation Project.  Good quality
-    documentation is very important to the success of FreeBSD, and the
-    FreeBSD Documentation Project (FDP) is how a lot of that
-    documentation is produced.  Your contributions are very
+  <para>Welcome to the &os; Documentation Project
+    (<acronym>FDP</acronym>).  Quality documentation is very important
+    to the success of &os;.  Your contributions are very
     valuable.</para>
 
-  <para>This document's main purpose is to clearly explain
-    <emphasis>how the FDP is organized</emphasis>, <emphasis>how to
-      write and submit documentation to the FDP</emphasis>, and
-    <emphasis>how to effectively use the tools available to you when
-      writing documentation</emphasis>.</para>
-
-  <indexterm>
-    <primary>Membership</primary>
-  </indexterm>
-  <para>Everyone is welcome to join the FDP.  There is no minimum
-    membership requirement, no quota of documentation you need to
-    produce per month.  All you need to do is subscribe to the
-    &a.doc;.</para>
+  <para>This document's main purpose is to explain how the
+    <acronym>FDP</acronym> is organized, how to write and submit
+    documentation, and how to effectively use the available
+    tools.</para>
+
+  <para>Everyone is welcome to contribute to the
+    <acronym>FDP</acronym>.  There is no membership requirement or
+    minimum quota of documentation that needs to be produced.</para>
 
-  <para>After you have finished reading this document you
-    should:</para>
+  <para>After you have finished reading this document you will be
+    able to:</para>
 
   <itemizedlist>
     <listitem>
-      <para>Know which documentation is maintained by the FDP.</para>
+      <para>Identify which parts of &os; are maintained by the
+	<acronym>FDP</acronym>.</para>
     </listitem>
 
     <listitem>
-      <para>Be able to read and understand the XML source code for
-	the documentation maintained by the FDP.</para>
+      <para>Install the required tools and files.</para>
     </listitem>
 
     <listitem>
-      <para>Be able to make changes to the documentation.</para>
+      <para>Make changes to the documentation.</para>
     </listitem>
 
     <listitem>
-      <para>Be able to submit your changes back for review and
-	eventual inclusion in the FreeBSD documentation.</para>
+      <para>Submit changes back for review and eventual inclusion in
+	the &os; documentation.</para>
     </listitem>
   </itemizedlist>
 
   <sect1 id="overview-doc">
-    <title>The FreeBSD Documentation Set</title>
+    <title>The &os; Documentation Set</title>
 
-    <para>The FDP is responsible for four categories of FreeBSD
-      documentation.</para>
+    <para>The <acronym>FDP</acronym> is responsible for four
+      categories of &os; documentation.</para>
 
-    <variablelist>
-      <varlistentry>
-	<term>Manual pages</term>
-
-	<listitem>
-	  <para>The English language system manual pages are not
-	    written by the FDP, as they are part of the base system.
-	    However, the FDP can (and has) re-worded parts of existing
-	    manual pages to make them clearer, or to correct
-	    inaccuracies.</para>
-
-	  <para>The translation teams are responsible for translating
-	    the system manual pages into different languages.  These
-	    translations are kept within the FDP.</para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>FAQ</term>
-
-	<listitem>
-	  <para>The FAQ aims to address (in short question and answer
-	    format) questions that are asked, or should be asked, on
-	    the various mailing lists and newsgroups devoted to
-	    FreeBSD.  The format does not permit long and
-	    comprehensive answers.</para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Handbook</term>
-
-	<listitem>
-	  <para>The Handbook aims to be the comprehensive on-line
-	    resource and reference for FreeBSD users.</para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Web site</term>
-
-	<listitem>
-	  <para>This is the main FreeBSD presence on the World Wide
-	    Web, visible at <ulink
-	      url="&url.base;/index.html">http://www.FreeBSD.org/</ulink>
-	    and many mirrors around the world.  The web site is many
-	    people's first exposure to FreeBSD.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para>The documentation for the web site, &os; Handbook, and FAQ
-      are available in the <literal>doc/</literal> Subversion
-      repository, which is located at
-      <literal>https://svn.FreeBSD.org/doc/</literal>.</para>
-
-    <para>Manual pages are available in the <literal>src/</literal>
-      Subversion repository, which is available at
-      <literal>https://svn.FreeBSD.org/base/</literal>.</para>
-
-    <para>This means that the logs of changes to these
-      files are visible to anyone, and anyone can use
-      <application>svn</application> to view the changes.</para>
-
-    <para>In addition, many people have written tutorials or other web
-      sites relating to FreeBSD.  Some of these are stored in the
-      Subversion repository as well (where the author has agreed to
-      this).  In other cases the author has decided to keep his
-      documentation separate from the main FreeBSD repository.  The
-      FDP endeavors to provide links to as much of this documentation
-      as possible.</para>
-  </sect1>
+    <itemizedlist>
 
-  <sect1 id="overview-before">
-    <title>Before You Start</title>
+      <listitem>
+	<para><emphasis>Handbook</emphasis>: The Handbook is the
+	  comprehensive online resource and reference for &os;
+	  users.</para>
+      </listitem>
 
-    <para>This document assumes that you already know:</para>
+      <listitem>
+	<para><emphasis>FAQ</emphasis>: The <acronym>FAQ</acronym>
+	  uses a short question and answer format to address questions
+	  that are frequently asked on the various mailing lists and
+	  forums devoted to &os;.  This format does not permit long
+	  and comprehensive answers.</para>
+      </listitem>
 
-    <itemizedlist>
       <listitem>
-	<para>How to maintain an up-to-date local copy of the FreeBSD
-	  documentation by maintaining a local copy of the FreeBSD
-	  Subversion repository using
-	  <application>svn</application>.</para>
+	<para><emphasis>Manual pages</emphasis>: The English language
+	  system manual pages are usually not written by the
+	  <acronym>FDP</acronym>, as they are part of the base system.
+	  However, the <acronym>FDP</acronym> can reword parts of
+	  existing manual pages to make them clearer or to correct
+	  inaccuracies.</para>
       </listitem>
 
       <listitem>
-	<para>How to download and install new software using either
-	  the FreeBSD Ports system or &man.pkg.add.1;.</para>
+	<para><emphasis>Web site</emphasis>: This is the main &os;
+	  presence on the web, visible at <ulink
+	    url="http://www.freebsd.org/index.html">http://www.FreeBSD.org/</ulink>
+	  and many mirrors around the world.  The web site is
+	  typically a new user's first exposure to &os;.</para>
       </listitem>
     </itemizedlist>
+
+    <para>Translation teams are responsible for translating
+      the Handbook and web site into different languages.  Manual
+      pages are not translated.</para>
+
+    <para>Documentation source for the &os; web site, Handbook, and
+      <acronym>FAQ</acronym> is available in the Subversion
+      repository at
+      <literal>https://svn.FreeBSD.org/doc/</literal>.</para>
+
+    <para>Source for manual pages is available in a separate
+      Subversion repository located at
+      <literal>https://svn.FreeBSD.org/base/</literal>.</para>
+
+    <para>The commit messages to the <acronym>FDP</acronym>
+      are visible to anyone usingv<application>svn</application>.
+      They are also archived at &a.svn-doc-all.url;.</para>
+
+    <para>In addition, many people have written tutorials or how-to
+      articles about &os;.  Some are stored in the
+      <acronym>FDP</acronym>.  In other cases, the author has decided
+      to keep the documentation separate from the
+      <acronym>FDP</acronym>.  The <acronym>FDP</acronym> endeavors to
+      provide links to as much of this documentation as
+      possible.</para>
   </sect1>
 
   <sect1 id="overview-quick-start">
     <title>Quick Start</title>
 
-    <para>If you just want to get going, and feel confident you can
-      pick things up as you go along, follow these
-      instructions.</para>
+    <para>This section outlines the steps which new contributors need
+      to follow before they can make changes to the
+      <acronym>FDP</acronym>.  New contributors will interact with
+      other members of the &os; Documentation Team which can assist in
+      learning how to use <acronym>XML</acronym> and the <xref
+	linkend="writing-style-guide"/>.  If a new user contributes
+      regularly, a Documentation Team member may be assigned as a
+      mentor to guide the user through the process from contributor
+      to documentation committer.</para>
 
     <procedure>
       <step>
-	<para>Install the
-	  <filename role="package">textproc/docproj</filename>
-	  meta-port.</para>
-
-	<screen>&prompt.root; <userinput>cd /usr/ports/textproc/docproj</userinput>
-&prompt.root; <userinput>make JADETEX=no install</userinput></screen>
+	<para>Subscribe to the &a.doc;.  Some members of the mailing
+	  list also interact on the <literal>#bsddocs</literal>
+	  <acronym>IRC</acronym> channel on <ulink
+	    url="http://www.efnet.org/">EFnet</ulink>.</para>
       </step>
 
       <step>
-	<para>Get a local copy of the FreeBSD <filename>doc</filename>
-	  tree using <application>svn</application>.</para>
-
-	<para>If network bandwidth or local drive space is a concern,
-	  then at minimum, the <filename>head/share</filename> and
-	  <filename>head/<replaceable>language</replaceable>/share</filename>
-	  directories will need to be checked out.  For
-	  example:</para>
-
-	<screen>&prompt.user; <userinput>mkdir -p head/share</userinput>
-&prompt.user; <userinput>mkdir -p head/en_US.ISO8859-1/share</userinput>
-&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head/share head/share</userinput>
-&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head/en_US.ISO8859-1/share head/en_US.ISO8859-1/share</userinput></screen>
-
-	<para>If you have plenty of disk space then you could check
-	  out everything.</para>
-
-	<screen>&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head head</userinput></screen>
-
-	<note>
-	  <para><ulink
-	    url="https://svn0.us-east.FreeBSD.org/">svn0.us-east.FreeBSD.org</ulink>
-	  is a public <literal>SVN</literal> server.
-	  Select the closest mirror and verify the mirror server
-	  certificate from the list of <ulink
-	    url="&url.books.handbook;/svn-mirrors.html">Subversion
-	  mirror sites</ulink>.</para>
-	</note>
-      </step>
-
-      <step>
-	<para>If you are preparing a change to an existing book or
-	  article, check it out of the repository as necessary.  If
-	  you are planning on contributing a new book or article then
-	  use an existing one as a guide.</para>
-
-	<para>For example, if you want to contribute a new article
-	  about setting up a VPN between FreeBSD and Windows 2000 you
-	  might do the following.</para>
-
-	<procedure>
-	  <step>
-	    <para>Check out the <filename>articles</filename>
-	      directory.</para>
-
-	    <screen>&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head/en_US.ISO8859-1/articles</userinput></screen>
-	  </step>
-
-	  <step>
-	    <para>Copy an existing article to use as a template.  In
-	      this case, you have decided that your new article
-	      belongs in a directory called
-	      <filename>vpn-w2k</filename>.</para>
-
-	    <screen>&prompt.user; <userinput>cd head/en_US.ISO8859-1/articles</userinput>
-&prompt.user; <userinput>svn export committers-guide vpn-w2k</userinput></screen>
-	  </step>
-	</procedure>
-
-	<para>If you wanted to edit an existing document, such as the
-	  FAQ, which is in
-	  <filename>head/en_US.ISO8859-1/books/faq</filename> you
-	  would check it out of the repository like this.</para>
-
-	<screen>&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head/en_US.ISO8859-1/books/faq</userinput></screen>
-      </step>
-
-      <step>
-	<para>Edit the <filename>.xml</filename> files using your
-	  editor of choice.</para>
-      </step>
-
-      <step>
-	<para>Test the markup using the <maketarget>lint</maketarget>
-	  target.  This will quickly find any errors in the document
-	  without actually performing the time-consuming
-	  transformation.</para>
-
-	<screen>&prompt.user; <userinput>make lint</userinput></screen>
-
-	<para>When you are ready to actually build the document, you
-	  may specify a single format or a list of formats in the
-	  <varname>FORMATS</varname> variable.  Currently,
-	  <literal>html</literal>, <literal>html-split</literal>,
-	  <literal>txt</literal>, <literal>ps</literal>,
-	  <literal>pdf</literal>, and <literal>rtf</literal> are
-	  supported.  The most up to date list of supported formats is
-	  listed at the top of the
-	  <filename>head/share/mk/doc.docbook.mk</filename> file.
-	  Make sure to use quotes around the list of formats when you
-	  build more than one format with a single command.</para>
-
-	<para>For example, to convert the document to
-	  <literal>html</literal> only, you would use:</para>
-
-	<screen>&prompt.user; <userinput>make FORMATS=html</userinput></screen>
-
-	<para>But when you want to convert the document to both
-	  <literal>html</literal> and <literal>txt</literal> format,
-	  you could use either two separate &man.make.1; runs,
-	  with:</para>
-
-	<screen>&prompt.user; <userinput>make FORMATS=html</userinput>
-&prompt.user; <userinput>make FORMATS=txt</userinput></screen>
-
-	<para>or, you can do it in one command:</para>
-
-	<screen>&prompt.user; <userinput>make FORMATS="html txt"</userinput></screen>
+	<para>Install the
+	  <filename role="package">textproc/docproj</filename>
+	  package or port.  This meta-port installs all of the
+	  utilities needed by the <acronym>FDP</acronym>.</para>
       </step>
 
       <step>
-	<para>Submit your changes using &man.send-pr.1;.</para>
-      </step>
-    </procedure>
-  </sect1>
-</chapter>
+	<para>Install a local working copy of the documentation
+	  from a mirror of the &os; repository.  For the fastest
+	  download, pick the nearest mirror from the list of <ulink
+	    url="&url.books.handbook;/subversion-mirrors.html">Subversion
+	    mirror sites</ulink>.  If <filename
+	    role="directory">/usr/doc</filename> already exists, move
+	  or delete it first to prevent file conflicts.</para>
+
+	<screen>&prompt.user; <userinput>svn checkout https://<replaceable>svn0.us-west.FreeBSD.org</replaceable>/doc/head <replaceable>/usr/doc</replaceable></userinput></screen>
+	</step>
+
+	<step>
+	  <para>Before making any documentation edits, configure your
+	    editor to conform to <acronym>FDP</acronym> standards.
+	    How to do so varies by editor.  Some editor configurations
+	    are listed in <xref linkend="writing-style"/>. The editor
+	    should be configured as follows:</para>
+	  <itemizedlist>
+	    <listitem>
+	      <para>Word wrap set to 70 characters.</para>
+	    </listitem>
+	    <listitem>
+	      <para>Tab stops set to 2.</para>
+	    </listitem>
+	    <listitem>
+	      <para>Replace each group of 8 leading spaces with a
+		single tab.</para>
+	    </listitem>
+	  </itemizedlist>
+	</step>
+
+	<step>
+	  <para>Determine which file to edit.  Run
+	    <command>svn up</command> within the local working copy
+	    to make sure that it is current.  Before making major
+	    changes to a file, discuss the proposed changes first with
+	    the &a.doc;.</para>
+
+	  <para>When making edits, determine which tags and entities
+	    are needed to achieve the desired formatting.  One way to
+	    learn is to compare some text in the
+	    <acronym>HTML</acronym> formatted version of the document
+	    to the tags which surround the text or the entities that
+	    represent that text in the <acronym>XML</acronym> file.
+	    A reference to the commonly used tags and entities can be
+	    found in <xref linkend="xml-markup"/>.</para>
+	</step>
+
+	<step>
+	  <para>Once the edits are complete, check for problems by
+	    running:</para>
+
+	  <screen>&prompt.user; <userinput>igor -R filename.xml | less -RS</userinput></screen>
+
+	  <para>While reviewing the output, edit the file to fix the
+	    listed tab errors, spelling mistakes, and improper
+	    grammar.  Save the changes and rerun this command to find
+	    any remaining problems.  Repeat until all of the errors
+	    that you deem fixable are resolved.  If you get stuck
+	    trying to fix errors, ask for assistance on the
+	    &a.doc;.</para>
+	</step>
+
+	<step>
+	  <para><emphasis>Always</emphasis> build-test changes before
+	    submitting them.  By default, typing
+	    <userinput>make</userinput> in the top-level directory of
+	    the type of documentation being edited will generate that
+	    documentation in split HTML format.  For example, to build
+	    the English version of the Handbook, type
+	    <userinput>make</userinput> in the
+	    <filename>en_US.ISO8859-1/books/handbook/</filename>
+	    directory.  This step is necessary to make sure that the
+	    edits do not break the build.</para>
+	</step>
+
+	<step>
+	  <para>In order to build the output in other formats, other
+	    <application>make</application> targets are defined in
+	    <filename>head/share/mk/doc.docbook.mk</filename>.  Use
+	    quotes around the list of formats when building more than
+	    one format with a single command.</para>
+
+	  <para>For example, to convert the document to both
+	    <literal>.html</literal> and <literal>.txt</literal>, use
+	    this command:</para>
+
+	  <screen>&prompt.user; <userinput>make FORMATS="html txt"</userinput></screen>
+
+	<para>Once these steps are successfully completed, generate a
+	  <quote>diff file</quote> of the changes.  While in <filename
+	    class="directory">/usr/doc</filename>, run this command,
+	  replacing <replaceable>bsdinstall</replaceable> with the
+	  name of the directory containing the edits:</para>
+
+	<screen>&prompt.user; <userinput>svn diff > <replaceable>bsdinstall</replaceable>.diff.txt</userinput></screen>
+	</step>
+
+	<step>
+	  <para>Submit the diff file using the web-based <ulink
+	      url="&url.base;/support.html#gnats">Problem
+	      Report</ulink> system or with &man.send-pr.1;.  If using
+	    the web form, input a synopsis of <emphasis>[patch]
+	      <replaceable>short description of
+	      problem</replaceable></emphasis>.  Select the category
+	    <literal>docs</literal> and the class
+	    <literal>doc-bug</literal>.  The body of the message
+	    should contain a short description of the edits and any
+	    important discussion points.  Use the
+	    <guibutton>[&nbsp;Browse...&nbsp;]</guibutton> button to
+	    attach the <literal>.diff.txt</literal> file and enter
+	    the captcha phrase.</para>
+
+	  <para>It is important to remember that the
+	    <acronym>FDP</acronym> is comprised of volunteers who
+	    review edits in their spare time and who live in different
+	    time zones across the globe.  It takes time to review
+	    edits and to either commit them or respond if additional
+	    edits are required.  If you do not receive a response in a
+	    reasonable amount of time, send a follow-up email to the
+	    &a.doc; and ask if anyone has had a chance to review the
+	    patch or if additional information is required.</para>
+	</step>
+      </procedure>
+    </sect1>
+  </chapter>
\ No newline at end of file

Modified: 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/fdp-primer/writing-style/chapter.xml	Tue Jun 18 21:57:41 2013	(r41947)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml	Tue Jun 18 21:59:05 2013	(r41948)
@@ -205,13 +205,68 @@
 	also define them the first time they appear in each
 	chapter.</para>
 
-      <para>The first three uses of an acronym should be enclosed in
+      <para>All acronyms should be enclosed in
 	<sgmltag>acronym</sgmltag> tags, with a
 	<literal>role</literal> attribute with the full term defined.
 	This allows a link to the glossary to be created, and for
 	mouseovers to be rendered with the fully expanded term.</para>
     </sect2>
 
+    <sect2 id="writing-style-beformal">
+      <title>Be Formal</title>
+
+      <para>Write in a formal style.  Avoid addressing the reader
+	as <quote>you</quote>.  For example, say
+	<quote>copy the file to <filename>/tmp</filename></quote>
+	rather than <quote>you can copy the file to
+	  <filename>/tmp</filename></quote>.</para>
+    </sect2>
+
+    <sect2 id="writing-style-confident">
+      <title>Be Confident</title>
+
+      <para>Avoid <emphasis>weasel words</emphasis> like
+	<quote>should</quote>, <quote>might</quote>,
+	<quote>try</quote>, or <quote>could</quote>.  These words
+	imply that the speaker is unsure of the facts, and
+	create doubt in the reader.</para>
+    </sect2>
+
+    <sect2 id="writing-style-imperative">
+      <title>Be Imperative</title>
+
+      <para>Give instructions as an imperative command: not
+	<quote>you should do this</quote>, but merely
+	<quote>do this</quote>.</para>
+    </sect2>
+
+    <sect2 id="writing-style-simple">
+      <title>Be Simple</title>
+
+      <para>Avoid flowery or embellished speech, jokes, or colloquial
+	expressions.  Write as simply and clearly as possible.  Simple
+	text is easier to understand and makes the job of translation
+	easier.</para>
+
+      <para>Keep explanations as short, simple, and clear as possible.
+	Avoid empty phrases like <quote>in order to</quote>, which
+	usually just means <quote>to</quote>.  Avoid potentially
+	patronizing words like <quote>basically</quote>.  Avoid Latin
+	terms like <quote>i.e.</quote> or <quote>cf.</quote>, which
+	may be unknown outside of academic or scientific
+	groups.</para>
+    </sect2>
+
+    <sect2 id="writing-style-threecs">
+      <title>Use the <quote>Three C</quote> Approach</title>
+
+      <para>Writing must be <emphasis>clear</emphasis>,
+	<emphasis>complete</emphasis>, and
+	<emphasis>concise</emphasis>.  These goals can conflict with
+	each other.  Good writing consists of a balance between
+	them.</para>
+    </sect2>
+
     <sect2>
       <title>Indentation</title>
 
@@ -402,89 +457,80 @@ GB.  Hardware compression &hellip;</lite
   <sect1 id="writing-style-word-list">
     <title>Word List</title>
 
-    <para>The following is a small list of words spelled the way they
-      should be used in the FreeBSD Documentation Project.  If the
-      word you are looking for is not in this list, then please
-      consult the <ulink
-	url="http://www.oreilly.com/oreilly/author/stylesheet.html">O'Reilly
-	word list</ulink>.</para>
-
-    <itemizedlist>
-      <listitem>
-	<para>2.2.X</para>
-      </listitem>
-
-      <listitem>
-	<para>4.X-STABLE</para>
-      </listitem>
-
-      <listitem>
-	<para>CD-ROM</para>
-      </listitem>
-
-      <listitem>
-	<para>DoS <emphasis>(Denial of Service)</emphasis> </para>
-      </listitem>
-
-      <listitem>
-	<para>Ports Collection</para>
-      </listitem>
-
-      <listitem>
-	<para>IPsec</para>
-      </listitem>
-
-      <listitem>
-	<para>Internet</para>
-      </listitem>
-
-      <listitem>
-	<para>MHz</para>
-      </listitem>
-
-      <listitem>
-	<para>Soft Updates</para>
-      </listitem>
-
-      <listitem>
-	<para>Unix</para>
-      </listitem>
-
-      <listitem>
-	<para>disk label</para>
-      </listitem>
-
-      <listitem>
-	<para>email</para>
-      </listitem>
-
-      <listitem>
-	<para>file system</para>
-      </listitem>
-
-      <listitem>
-	<para>manual page</para>
-      </listitem>
-
-      <listitem>
-	<para>mail server</para>
-      </listitem>
-
-      <listitem>
-	<para>name server</para>
-      </listitem>
-
-      <listitem>
-	<para>null-modem</para>
-      </listitem>
-
-      <listitem>
-	<para>read-only</para>
-      </listitem>
-
-      <listitem>
-	<para>web server</para>
-      </listitem>
-    </itemizedlist>
+    <para>This list of words shows the correct spelling and
+      capitalization when used in FreeBSD Documentation.  If a word is
+      not on this list, ask about that word on the &a.doc;.</para>
+
+    <informaltable frame="none" pgwide="0">

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

From owner-svn-doc-projects@FreeBSD.ORG  Wed Jun 19 15:07:54 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 C8301CD3;
 Wed, 19 Jun 2013 15:07:54 +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 B7F0E18FD;
 Wed, 19 Jun 2013 15:07:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JF7sRJ058372;
 Wed, 19 Jun 2013 15:07:54 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5JF7sEP058363;
 Wed, 19 Jun 2013 15:07:54 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306191507.r5JF7sEP058363@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 19 Jun 2013 15:07:54 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41951 - projects/db5/zh_CN.GB2312/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: Wed, 19 Jun 2013 15:07:54 -0000

Author: gabor
Date: Wed Jun 19 15:07:53 2013
New Revision: 41951
URL: http://svnweb.freebsd.org/changeset/doc/41951

Log:
  - Add namespace declarations and convert entities to DB 5.0

Modified:
  projects/db5/zh_CN.GB2312/share/xml/authors.ent
  projects/db5/zh_CN.GB2312/share/xml/l10n.ent
  projects/db5/zh_CN.GB2312/share/xml/mailing-lists.ent
  projects/db5/zh_CN.GB2312/share/xml/teams.ent
  projects/db5/zh_CN.GB2312/share/xml/trademarks.ent

Modified: projects/db5/zh_CN.GB2312/share/xml/authors.ent
==============================================================================
--- projects/db5/zh_CN.GB2312/share/xml/authors.ent	Wed Jun 19 14:59:48 2013	(r41950)
+++ projects/db5/zh_CN.GB2312/share/xml/authors.ent	Wed Jun 19 15:07:53 2013	(r41951)
@@ -25,53 +25,53 @@
      if you know more.
 -->
 
-<!ENTITY a.avatar "а╨л╘╩╙ <email>avatar@FreeBSD.org</email>">
+<!ENTITY a.avatar "а╨л╘╩╙ <email xmlns='http://docbook.org/ns/docbook'>avatar@FreeBSD.org</email>">
 
-<!ENTITY a.bmah "бМт╢╨ф <email>bmah@FreeBSD.org</email>">
+<!ENTITY a.bmah "бМт╢╨ф <email xmlns='http://docbook.org/ns/docbook'>bmah@FreeBSD.org</email>">
 
-<!ENTITY a.chinsan "╩фгЮи╫ <email>chinsan@FreeBSD.org</email>">
+<!ENTITY a.chinsan "╩фгЮи╫ <email xmlns='http://docbook.org/ns/docbook'>chinsan@FreeBSD.org</email>">
 
-<!ENTITY a.clive "аж╤╚рЦ <email>clive@FreeBSD.org</email>">
+<!ENTITY a.clive "аж╤╚рЦ <email xmlns='http://docbook.org/ns/docbook'>clive@FreeBSD.org</email>">
 
-<!ENTITY a.clsung "кнуЧб║ <email>clsung@FreeBSD.org</email>">
+<!ENTITY a.clsung "кнуЧб║ <email xmlns='http://docbook.org/ns/docbook'>clsung@FreeBSD.org</email>">
 
-<!ENTITY a.davidxu "пЛрщ╥Ф <email>davidxu@FreeBSD.org</email>">
+<!ENTITY a.davidxu "пЛрщ╥Ф <email xmlns='http://docbook.org/ns/docbook'>davidxu@FreeBSD.org</email>">
 
-<!ENTITY a.delphij "юНЖн <email>delphij@FreeBSD.org</email>">
+<!ENTITY a.delphij "юНЖн <email xmlns='http://docbook.org/ns/docbook'>delphij@FreeBSD.org</email>">
 
-<!ENTITY a.dryice "аУ╤╟ <email>dryice@FreeBSD.org</email>">
+<!ENTITY a.dryice "аУ╤╟ <email xmlns='http://docbook.org/ns/docbook'>dryice@FreeBSD.org</email>">
 
-<!ENTITY a.foxfair "╨Зм╔╨ю <email>foxfair@FreeBSD.org</email>">
+<!ENTITY a.foxfair "╨Зм╔╨ю <email xmlns='http://docbook.org/ns/docbook'>foxfair@FreeBSD.org</email>">
 
-<!ENTITY a.hsu "пЛцТ╫э <email>hsu@FreeBSD.org</email>">
+<!ENTITY a.hsu "пЛцТ╫э <email xmlns='http://docbook.org/ns/docbook'>hsu@FreeBSD.org</email>">
 
-<!ENTITY a.ijliao "анс╒╫э <email>ijliao@FreeBSD.org</email>">
+<!ENTITY a.ijliao "анс╒╫э <email xmlns='http://docbook.org/ns/docbook'>ijliao@FreeBSD.org</email>">
 
-<!ENTITY a.kaiw "мУ©╛ <email>kaiw@FreeBSD.org</email>">
+<!ENTITY a.kaiw "мУ©╛ <email xmlns='http://docbook.org/ns/docbook'>kaiw@FreeBSD.org</email>">
 
-<!ENTITY a.keichii "нБ╬╢т╙ <email>keichii@FreeBSD.org</email>">
+<!ENTITY a.keichii "нБ╬╢т╙ <email xmlns='http://docbook.org/ns/docbook'>keichii@FreeBSD.org</email>">
 
-<!ENTITY a.kevlo "бчп╩╪рн╟ <email>kevlo@FreeBSD.org</email>">
+<!ENTITY a.kevlo "бчп╩╪рн╟ <email xmlns='http://docbook.org/ns/docbook'>kevlo@FreeBSD.org</email>">
 
-<!ENTITY a.leeym "юНяЕцВ <email>leeym@FreeBSD.org</email>">
+<!ENTITY a.leeym "юНяЕцВ <email xmlns='http://docbook.org/ns/docbook'>leeym@FreeBSD.org</email>">
 
-<!ENTITY a.loader "Ёб╦ё©╣ <email>loader@FreeBSD.org</email>">
+<!ENTITY a.loader "Ёб╦ё©╣ <email xmlns='http://docbook.org/ns/docbook'>loader@FreeBSD.org</email>">
 
-<!ENTITY a.luoqi "ЁббЕфН <email>luoqi@FreeBSD.org</email>">
+<!ENTITY a.luoqi "ЁббЕфН <email xmlns='http://docbook.org/ns/docbook'>luoqi@FreeBSD.org</email>">
 
-<!ENTITY a.lwhsu "пМа╒нд <email>lwhsu@FreeBSD.org</email>">
+<!ENTITY a.lwhsu "пМа╒нд <email xmlns='http://docbook.org/ns/docbook'>lwhsu@FreeBSD.org</email>">
 
-<!ENTITY a.nemoliu "аУм╝ <email>nemoliu@FreeBSD.org</email>">
+<!ENTITY a.nemoliu "аУм╝ <email xmlns='http://docbook.org/ns/docbook'>nemoliu@FreeBSD.org</email>">
 
-<!ENTITY a.pat "юНтф╬а <email>pat@FreeBSD.org</email>">
+<!ENTITY a.pat "юНтф╬а <email xmlns='http://docbook.org/ns/docbook'>pat@FreeBSD.org</email>">
 
-<!ENTITY a.rafan "╥╤хы╤В <email>rafan@FreeBSD.org</email>">
+<!ENTITY a.rafan "╥╤хы╤В <email xmlns='http://docbook.org/ns/docbook'>rafan@FreeBSD.org</email>">
 
-<!ENTITY a.sephe "ггяЕГК <email>sephe@FreeBSD.org</email>">
+<!ENTITY a.sephe "ггяЕГК <email xmlns='http://docbook.org/ns/docbook'>sephe@FreeBSD.org</email>">
 
-<!ENTITY a.vanilla "пЛхЩл╘ <email>vanilla@FreeBSD.org</email>">
+<!ENTITY a.vanilla "пЛхЩл╘ <email xmlns='http://docbook.org/ns/docbook'>vanilla@FreeBSD.org</email>">
 
-<!ENTITY a.wen "нд╨мф╫ <email>wen@FreeBSD.org</email>">
+<!ENTITY a.wen "нд╨мф╫ <email xmlns='http://docbook.org/ns/docbook'>wen@FreeBSD.org</email>">
 
 <!--
      Names and email address of Chinese local contributing authors and
@@ -80,16 +80,16 @@
      names on tarsier.cn.FreeBSD.org.
 -->
 
-<!ENTITY a.cn.alu "б╫╨ёяЦ <email>alu@cn.FreeBSD.org</email>">
+<!ENTITY a.cn.alu "б╫╨ёяЦ <email xmlns='http://docbook.org/ns/docbook'>alu@cn.FreeBSD.org</email>">
 
-<!ENTITY a.cn.delphij "юНЖн <email>delphij@FreeBSD.org</email>">
+<!ENTITY a.cn.delphij "юНЖн <email xmlns='http://docbook.org/ns/docbook'>delphij@FreeBSD.org</email>">
 
-<!ENTITY a.cn.gavin "дба╒Ё╛ <email>gavin@cn.FreeBSD.org</email>">
+<!ENTITY a.cn.gavin "дба╒Ё╛ <email xmlns='http://docbook.org/ns/docbook'>gavin@cn.FreeBSD.org</email>">
 
-<!ENTITY a.cn.intron "<email>intron@cn.FreeBSD.org</email>">
+<!ENTITY a.cn.intron "<email xmlns='http://docbook.org/ns/docbook'>intron@cn.FreeBSD.org</email>">
 
-<!ENTITY a.cn.lih "юН╨фт╢ <email>lih@cn.FreeBSD.org</email>">
+<!ENTITY a.cn.lih "юН╨фт╢ <email xmlns='http://docbook.org/ns/docbook'>lih@cn.FreeBSD.org</email>">
 
-<!ENTITY a.cn.wjf "нб©║╥Е <email>wjf@cn.FreeBSD.org</email>">
+<!ENTITY a.cn.wjf "нб©║╥Е <email xmlns='http://docbook.org/ns/docbook'>wjf@cn.FreeBSD.org</email>">
 
-<!ENTITY a.cn.yarshure "©воИ╡╗ <email>yarshure@cn.FreeBSD.org</email>">
+<!ENTITY a.cn.yarshure "©воИ╡╗ <email xmlns='http://docbook.org/ns/docbook'>yarshure@cn.FreeBSD.org</email>">

Modified: projects/db5/zh_CN.GB2312/share/xml/l10n.ent
==============================================================================
--- projects/db5/zh_CN.GB2312/share/xml/l10n.ent	Wed Jun 19 14:59:48 2013	(r41950)
+++ projects/db5/zh_CN.GB2312/share/xml/l10n.ent	Wed Jun 19 15:07:53 2013	(r41951)
@@ -23,24 +23,25 @@
 
 <!ENTITY cnsnap.url.base "http://cnsnap.cn.FreeBSD.org">
 
-<!ENTITY cnproj.contributing.to.freebsd.doc "
+<!ENTITY cnproj.contributing.to.freebsd.doc "<para xmlns='http://docbook.org/ns/docbook'>╩╤с╜дЗтд╤а║╤&os;о╣мЁ╫А╧╧йж╡А║╥║ё
          уБ╠╬йж╡А╩╧тз╡╩╤осипМ╤Юхк<emphasis>╪лпЬйИп╢</emphasis>║ё
          пМ╤Юуб╫з╩╧йг©у╟вё╛сп╣дуб╫зь╫╢Щ╦Эпб║ё
-         хГ╧ШдЗ╤туБ╦ЖоНд©╦ппкх╓╡╒т╦рБспкЫ╧╠овё╛гК╥╒пе╦Ь &a.doc;║ё
+         хГ╧ШдЗ╤туБ╦ЖоНд©╦ппкх╓╡╒т╦рБспкЫ╧╠овё╛гК╥╒пе╦Ь &a.doc;║ё</para>
 ">
 
-<!ENTITY cnproj.getting.freebsd.doc "
+<!ENTITY cnproj.getting.freebsd.doc "<para xmlns='http://docbook.org/ns/docbook'>
          ╠╬нд╣╣╣двНпбс╒ндт╜й╪╟Ф╠╬©и╢с
-         <ulink url='&url.base;/index.html'>FreeBSD Web у╬╣Ц</ulink> ╩Я╣цё╛
-         си <ulink url='&cnproj.url.base;/'>&cnproj.freebsd.org;</ulink>
-         н╛╩╓╣двНпбрК╠╬©ирттз <ulink url='&cnsnap.url.base;/zh_CN/'>&cnproj.freebsd.org; ©Луу Web у╬╣Ц</ulink>
-         ╨м <ulink url='&cnsnap.url.base;/doc/zh_CN.GB2312/'>&cnproj.freebsd.org; нд╣╣©Луу</ulink>
+         <link xlink:href='&url.base;/index.html'>FreeBSD Web у╬╣Ц</link> ╩Я╣цё╛
+         си <link xlink:href='&cnproj.url.base;/'>&cnproj.freebsd.org;</link>
+         н╛╩╓╣двНпбрК╠╬©ирттз <link xlink:href='&cnsnap.url.base;/zh_CN/'>&cnproj.freebsd.org; ©Луу Web у╬╣Ц</link>
+         ╨м <link xlink:href='&cnsnap.url.base;/doc/zh_CN.GB2312/'>&cnproj.freebsd.org; нд╣╣©Луу</link>
          ╢╕╩Я╣цё╛ уБр╩рК╠╬╩А╡╩╤ооРжВу╬м╛╡╫║ё ╢кмБё╛ дЗр╡©ирт╢с
-         <ulink url='ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/'>FreeBSD FTP ╥ЧнЯфВ</ulink>
-         ╩Ржз╤Ю╣д <ulink url='&url.books.handbook;/mirrors-ftp.html'>╬╣оЯу╬╣Ц</ulink>
-         ╣ц╣╫уБ╥щнд╣╣╣д╦ВжжфДкШ╦Яй╫рт╪╟я╧кУпнй╫╣д╟Ф╠╬║ё
+         <link xlink:href='ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/'>FreeBSD FTP ╥ЧнЯфВ</link>
+         ╩Ржз╤Ю╣д <link xlink:href='&url.books.handbook;/mirrors-ftp.html'>╬╣оЯу╬╣Ц</link>
+         ╣ц╣╫уБ╥щнд╣╣╣д╦ВжжфДкШ╦Яй╫рт╪╟я╧кУпнй╫╣д╟Ф╠╬║ё</para>
 ">
 
+
 <!ENTITY cnproj.contributed.by "╧╘╦Её╨">
 
 <!ENTITY cnproj.modified.for.handbook.by "╦д╠Юн╙йж╡Аё╨">

Modified: projects/db5/zh_CN.GB2312/share/xml/mailing-lists.ent
==============================================================================
--- projects/db5/zh_CN.GB2312/share/xml/mailing-lists.ent	Wed Jun 19 14:59:48 2013	(r41950)
+++ projects/db5/zh_CN.GB2312/share/xml/mailing-lists.ent	Wed Jun 19 15:07:53 2013	(r41951)
@@ -8,80 +8,80 @@
 -->
 
 <!ENTITY a.mailman.listinfo "http://lists.FreeBSD.org/mailman/listinfo">
-<!ENTITY a.mailman.lists "<ulink url='&a.mailman.listinfo;'>FreeBSD сй╪Чап╠М╥ЧнЯфВ</ulink>">
-<!ENTITY a.mailman.lists.link "<ulink url='&a.mailman.listinfo;'>&a.mailman.listinfo;</ulink>">
+<!ENTITY a.mailman.lists "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mailman.listinfo;'>FreeBSD сй╪Чап╠М╥ЧнЯфВ</link>">
+<!ENTITY a.mailman.lists.link "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mailman.listinfo;'>&a.mailman.listinfo;</link>">
 
 <!ENTITY a.acpi.url "&a.mailman.listinfo;/freebsd-acpi">
-<!ENTITY a.acpi "<ulink url='&a.acpi.url;'>FreeBSD ACPI сй╪Чап╠М</ulink>">
-<!ENTITY a.acpi.name "<ulink url='&a.acpi.url;'>freebsd-acpi</ulink>">
+<!ENTITY a.acpi "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.acpi.url;'>FreeBSD ACPI сй╪Чап╠М</link>">
+<!ENTITY a.acpi.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.acpi.url;'>freebsd-acpi</link>">
 
 <!ENTITY a.advocacy.url "&a.mailman.listinfo;/freebsd-advocacy">
-<!ENTITY a.advocacy "<ulink url='&a.advocacy.url;'>FreeBSD advocacy сй╪Чап╠М</ulink>">
-<!ENTITY a.advocacy.name "<ulink url='&a.advocacy.url;'>freebsd-advocacy</ulink>">
+<!ENTITY a.advocacy "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.advocacy.url;'>FreeBSD advocacy сй╪Чап╠М</link>">
+<!ENTITY a.advocacy.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.advocacy.url;'>freebsd-advocacy</link>">
 
 <!ENTITY a.afs.url "&a.mailman.listinfo;/freebsd-afs">
-<!ENTITY a.afs "<ulink url='&a.afs.url;'>FreeBSD AFS рфж╡сй╪Чап╠М</ulink>">
-<!ENTITY a.afs.name "<ulink url='&a.afs.url;'>freebsd-afs</ulink>">
+<!ENTITY a.afs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.afs.url;'>FreeBSD AFS рфж╡сй╪Чап╠М</link>">
+<!ENTITY a.afs.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.afs.url;'>freebsd-afs</link>">
 
 <!ENTITY a.aic7xxx.url "&a.mailman.listinfo;/aic7xxx">
-<!ENTITY a.aic7xxx "<ulink url='&a.aic7xxx.url;'>FreeBSD Adaptec AIC7xxx оЮ╧ьлжбшсй╪Чап╠М</ulink>">
-<!ENTITY a.aic7xxx.name "<ulink url='&a.aic7xxx.url;'>freebsd-aic7xxx</ulink>">
+<!ENTITY a.aic7xxx "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.aic7xxx.url;'>FreeBSD Adaptec AIC7xxx оЮ╧ьлжбшсй╪Чап╠М</link>">
+<!ENTITY a.aic7xxx.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.aic7xxx.url;'>freebsd-aic7xxx</link>">
 
 <!ENTITY a.amd64.url "&a.mailman.listinfo;/freebsd-amd64">
-<!ENTITY a.amd64 "<ulink url='&a.amd64.url;'>╫╚ FreeBSD рфж╡╣╫ AMD64 о╣мЁио</ulink>">
-<!ENTITY a.amd64.name "<ulink url='&a.amd64.url;'>freebsd-amd64</ulink>">
+<!ENTITY a.amd64 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.amd64.url;'>╫╚ FreeBSD рфж╡╣╫ AMD64 о╣мЁио</link>">
+<!ENTITY a.amd64.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.amd64.url;'>freebsd-amd64</link>">
 
 <!ENTITY a.announce.url "&a.mailman.listinfo;/freebsd-announce">
-<!ENTITY a.announce "<ulink url='&a.announce.url;'>FreeBSD ╧╚╦Фсй╪Чап╠М</ulink>">
-<!ENTITY a.announce.name "<ulink url='&a.announce.url;'>freebsd-announce</ulink>">
+<!ENTITY a.announce "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.announce.url;'>FreeBSD ╧╚╦Фсй╪Чап╠М</link>">
+<!ENTITY a.announce.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.announce.url;'>freebsd-announce</link>">
 
 <!ENTITY a.apache.url "&a.mailman.listinfo;/freebsd-apache">
-<!ENTITY a.apache "<ulink url='&a.apache.url;'>FreeBSD Apache сй╪Чап╠М</ulink>">
-<!ENTITY a.apache.name "<ulink url='&a.apache.url;'>freebsd-apache</ulink>">
+<!ENTITY a.apache "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.apache.url;'>FreeBSD Apache сй╪Чап╠М</link>">
+<!ENTITY a.apache.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.apache.url;'>freebsd-apache</link>">
 
 <!ENTITY a.arch.url "&a.mailman.listinfo;/freebsd-arch">
-<!ENTITY a.arch "<ulink url='&a.arch.url;'>FreeBSD ╪э╧╧сКиХ╪фсй╪Чап╠М</ulink>">
-<!ENTITY a.arch.name "<ulink url='&a.arch.url;'>freebsd-arch</ulink>">
+<!ENTITY a.arch "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.arch.url;'>FreeBSD ╪э╧╧сКиХ╪фсй╪Чап╠М</link>">
+<!ENTITY a.arch.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.arch.url;'>freebsd-arch</link>">
 
 <!ENTITY a.arm.url "&a.mailman.listinfo;/freebsd-arm">
-<!ENTITY a.arm "<ulink url='&a.arm.url;'>FreeBSD ARM рфж╡сй╪Чап╠М</ulink>">
-<!ENTITY a.arm.name "<ulink url='&a.arm.url;'>freebsd-arm</ulink>">
+<!ENTITY a.arm "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.arm.url;'>FreeBSD ARM рфж╡сй╪Чап╠М</link>">
+<!ENTITY a.arm.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.arm.url;'>freebsd-arm</link>">
 
 <!ENTITY a.atm.url "&a.mailman.listinfo;/freebsd-atm">
-<!ENTITY a.atm "<ulink url='&a.atm.url;'>FreeBSD ATM мЬбГсй╪Чап╠М</ulink>">
-<!ENTITY a.atm.name "<ulink url='&a.atm.url;'>freebsd-atm</ulink>">
+<!ENTITY a.atm "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.atm.url;'>FreeBSD ATM мЬбГсй╪Чап╠М</link>">
+<!ENTITY a.atm.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.atm.url;'>freebsd-atm</link>">
 
 <!ENTITY a.audit.url "&a.mailman.listinfo;/freebsd-audit">
-<!ENTITY a.audit "<ulink url='&a.audit.url;'>FreeBSD т╢╢ЗбКиС╪фсй╪Чап╠М</ulink>">
-<!ENTITY a.audit.name "<ulink url='&a.audit.url;'>freebsd-audit</ulink>">
+<!ENTITY a.audit "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.audit.url;'>FreeBSD т╢╢ЗбКиС╪фсй╪Чап╠М</link>">
+<!ENTITY a.audit.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.audit.url;'>freebsd-audit</link>">
 
 <!ENTITY a.binup.url "&a.mailman.listinfo;/freebsd-binup">
-<!ENTITY a.binup "<ulink url='&a.binup.url;'>FreeBSD т╓╠ЮрКо╣мЁ╦Эпбсй╪Чап╠М</ulink>">
-<!ENTITY a.binup.name "<ulink url='&a.binup.url;'>freebsd-binup</ulink>">
+<!ENTITY a.binup "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.binup.url;'>FreeBSD т╓╠ЮрКо╣мЁ╦Эпбсй╪Чап╠М</link>">
+<!ENTITY a.binup.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.binup.url;'>freebsd-binup</link>">
 
 <!ENTITY a.bluetooth.url "&a.mailman.listinfo;/freebsd-bluetooth">
-<!ENTITY a.bluetooth "<ulink url='&a.bluetooth.url;'>FreeBSD Bluetooth сй╪Чап╠М</ulink>">
-<!ENTITY a.bluetooth.name "<ulink url='&a.bluetooth.url;'>freebsd-bluetooth</ulink>">
+<!ENTITY a.bluetooth "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bluetooth.url;'>FreeBSD Bluetooth сй╪Чап╠М</link>">
+<!ENTITY a.bluetooth.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bluetooth.url;'>freebsd-bluetooth</link>">
 
 <!ENTITY a.bugbusters.url "&a.mailman.listinfo;/freebsd-bugbusters">
-<!ENTITY a.bugbusters "<ulink url='&a.bugbusters.url;'>FreeBSD bugbusters сй╪Чап╠М</ulink>">
-<!ENTITY a.bugbusters.name "<ulink url='&a.bugbusters.url;'>freebsd-bugbusters</ulink>">
+<!ENTITY a.bugbusters "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bugbusters.url;'>FreeBSD bugbusters сй╪Чап╠М</link>">
+<!ENTITY a.bugbusters.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bugbusters.url;'>freebsd-bugbusters</link>">
 
 <!ENTITY a.bugs.url "&a.mailman.listinfo;/freebsd-bugs">
-<!ENTITY a.bugs "<ulink url='&a.bugs.url;'>FreeBSD нйлБ╠╗╦Фсй╪Чап╠М</ulink>">
-<!ENTITY a.bugs.name "<ulink url='&a.bugs.url;'>freebsd-bugs</ulink>">
+<!ENTITY a.bugs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bugs.url;'>FreeBSD нйлБ╠╗╦Фсй╪Чап╠М</link>">
+<!ENTITY a.bugs.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bugs.url;'>freebsd-bugs</link>">
 
 <!ENTITY a.chat.url "&a.mailman.listinfo;/freebsd-chat">
-<!ENTITY a.chat "<ulink url='&a.chat.url;'>FreeBSD опадсй╪Чап╠М</ulink>">
-<!ENTITY a.chat.name "<ulink url='&a.chat.url;'>freebsd-chat</ulink>">
+<!ENTITY a.chat "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.chat.url;'>FreeBSD опадсй╪Чап╠М</link>">
+<!ENTITY a.chat.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.chat.url;'>freebsd-chat</link>">
 
 <!ENTITY a.chromium.url "&a.mailman.listinfo;/freebsd-chromium">
-<!ENTITY a.chromium "<ulink url='&a.chromium.url;'>FreeBSD Chromium сй╪Чап╠М</ulink>">
-<!ENTITY a.chromium.name "<ulink url='&a.chromium.url;'>freebsd-chromium</ulink>">
+<!ENTITY a.chromium "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.chromium.url;'>FreeBSD Chromium сй╪Чап╠М</link>">
+<!ENTITY a.chromium.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.chromium.url;'>freebsd-chromium</link>">
 
 <!ENTITY a.cluster.url "&a.mailman.listinfo;/freebsd-cluster">
-<!ENTITY a.cluster "<ulink url='&a.cluster.url;'>FreeBSD ╪╞х╨сй╪Чап╠М</ulink>">
-<!ENTITY a.cluster.name "<ulink url='&a.cluster.url;'>freebsd-cluster</ulink>">
+<!ENTITY a.cluster "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cluster.url;'>FreeBSD ╪╞х╨сй╪Чап╠М</link>">
+<!ENTITY a.cluster.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cluster.url;'>freebsd-cluster</link>">
 
 <!ENTITY a.committers "FreeBSD committer ╣дсй╪Чап╠М">
 <!ENTITY a.committers.name "cvs-committers">
@@ -90,83 +90,83 @@
 <!ENTITY a.core.name "freebsd-core">
 
 <!ENTITY a.current.url "&a.mailman.listinfo;/freebsd-current">
-<!ENTITY a.current "<ulink url='&a.current.url;'>&os.current; сй╪Чап╠М</ulink>">
-<!ENTITY a.current.name "<ulink url='&a.current.url;'>freebsd-current</ulink>">
+<!ENTITY a.current "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.current.url;'>&os.current; сй╪Чап╠М</link>">
+<!ENTITY a.current.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.current.url;'>freebsd-current</link>">
 
 <!ENTITY a.ctm-announce.url "&a.mailman.listinfo;/ctm-announce">
-<!ENTITY a.ctm-announce "<ulink url='&a.ctm-announce.url;'>CTM ╧╚╦Ф</ulink>">
-<!ENTITY a.ctm-announce.name "<ulink url='&a.ctm-announce.url;'>ctm-announce</ulink>">
+<!ENTITY a.ctm-announce "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-announce.url;'>CTM ╧╚╦Ф</link>">
+<!ENTITY a.ctm-announce.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-announce.url;'>ctm-announce</link>">
 
 <!ENTITY a.ctm-cvs-cur.url "&a.mailman.listinfo;/ctm-cvs-cur">
-<!ENTITY a.ctm-cvs-cur "<ulink url='&a.ctm-cvs-cur.url;'>м╗╧Щ CTM ╥╒╡╪╣д CVS нд╪Ч</ulink>">
-<!ENTITY a.ctm-cvs-cur.name "<ulink url='&a.ctm-cvs-cur.url;'>ctm-cvs-cur</ulink>">
+<!ENTITY a.ctm-cvs-cur "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-cvs-cur.url;'>м╗╧Щ CTM ╥╒╡╪╣д CVS нд╪Ч</link>">
+<!ENTITY a.ctm-cvs-cur.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-cvs-cur.url;'>ctm-cvs-cur</link>">
 
 <!ENTITY a.ctm-src-4.url "&a.mailman.listinfo;/ctm-src-4">
-<!ENTITY a.ctm-src-4 "<ulink url='&a.ctm-src-4.url;'>CTM 4-STABLE src branch distribution сй╪Чап╠М</ulink>">
-<!ENTITY a.ctm-src-4.name "<ulink url='&a.ctm-src-4.url;'>ctm-src-4</ulink>">
+<!ENTITY a.ctm-src-4 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-4.url;'>CTM 4-STABLE src branch distribution сй╪Чап╠М</link>">
+<!ENTITY a.ctm-src-4.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-4.url;'>ctm-src-4</link>">
 
 <!ENTITY a.ctm-src-5.url "&a.mailman.listinfo;/ctm-src-5">
-<!ENTITY a.ctm-src-5 "<ulink url='&a.ctm-src-5.url;'>CTM 5-STABLE src branch distribution сй╪Чап╠М</ulink>">
-<!ENTITY a.ctm-src-5.name "<ulink url='&a.ctm-src-5.url;'>ctm-src-5</ulink>">
+<!ENTITY a.ctm-src-5 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-5.url;'>CTM 5-STABLE src branch distribution сй╪Чап╠М</link>">
+<!ENTITY a.ctm-src-5.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-5.url;'>ctm-src-5</link>">
 
 <!ENTITY a.ctm-src-6.url "&a.mailman.listinfo;/ctm-src-6">
-<!ENTITY a.ctm-src-6 "<ulink url='&a.ctm-src-6.url;'>CTM 6-STABLE src branch distribution сй╪Чап╠М</ulink>">
-<!ENTITY a.ctm-src-6.name "<ulink url='&a.ctm-src-6.url;'>ctm-src-6</ulink>">
+<!ENTITY a.ctm-src-6 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-6.url;'>CTM 6-STABLE src branch distribution сй╪Чап╠М</link>">
+<!ENTITY a.ctm-src-6.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-6.url;'>ctm-src-6</link>">
 
 <!ENTITY a.ctm-src-7.url "&a.mailman.listinfo;/ctm-src-7">
-<!ENTITY a.ctm-src-7 "<ulink url='&a.ctm-src-7.url;'>CTM 7-STABLE src branch distribution сй╪Чап╠М</ulink>">
-<!ENTITY a.ctm-src-7.name "<ulink url='&a.ctm-src-7.url;'>ctm-src-7</ulink>">
+<!ENTITY a.ctm-src-7 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-7.url;'>CTM 7-STABLE src branch distribution сй╪Чап╠М</link>">
+<!ENTITY a.ctm-src-7.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-7.url;'>ctm-src-7</link>">
 
 <!ENTITY a.ctm-src-8.url "&a.mailman.listinfo;/ctm-src-8">
-<!ENTITY a.ctm-src-8 "<ulink url='&a.ctm-src-8.url;'>CTM 8-STABLE src branch distribution сй╪Чап╠М</ulink>">
-<!ENTITY a.ctm-src-8.name "<ulink url='&a.ctm-src-8.url;'>ctm-src-8</ulink>">
+<!ENTITY a.ctm-src-8 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-8.url;'>CTM 8-STABLE src branch distribution сй╪Чап╠М</link>">
+<!ENTITY a.ctm-src-8.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-8.url;'>ctm-src-8</link>">
 
 <!ENTITY a.ctm-src-9.url "&a.mailman.listinfo;/ctm-src-9">
-<!ENTITY a.ctm-src-9 "<ulink url='&a.ctm-src-9.url;'>CTM 9-STABLE src branch distribution сй╪Чап╠М</ulink>">
-<!ENTITY a.ctm-src-9.name "<ulink url='&a.ctm-src-9.url;'>ctm-src-9</ulink>">
+<!ENTITY a.ctm-src-9 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-9.url;'>CTM 9-STABLE src branch distribution сй╪Чап╠М</link>">
+<!ENTITY a.ctm-src-9.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-9.url;'>ctm-src-9</link>">
 
 <!ENTITY a.ctm-src-cur.url "&a.mailman.listinfo;/ctm-src-cur">
-<!ENTITY a.ctm-src-cur "<ulink url='&a.ctm-src-cur.url;'>CTM -CURRENT src branch distribution сй╪Чап╠М</ulink>">
-<!ENTITY a.ctm-src-cur.name "<ulink url='&a.ctm-src-cur.url;'>ctm-src-cur</ulink>">
+<!ENTITY a.ctm-src-cur "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-cur.url;'>CTM -CURRENT src branch distribution сй╪Чап╠М</link>">
+<!ENTITY a.ctm-src-cur.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-cur.url;'>ctm-src-cur</link>">
 
 <!ENTITY a.ctm-users.url "&a.mailman.listinfo;/ctm-users">
-<!ENTITY a.ctm-users "<ulink url='&a.ctm-users.url;'>CTM user discussion сй╪Чап╠М</ulink>">
-<!ENTITY a.ctm-users.name "<ulink url='&a.ctm-users.url;'>ctm-users</ulink>">
+<!ENTITY a.ctm-users "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-users.url;'>CTM user discussion сй╪Чап╠М</link>">
+<!ENTITY a.ctm-users.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-users.url;'>ctm-users</link>">
 
 <!ENTITY a.cvsall.url "&a.mailman.listinfo;/cvs-all">
-<!ENTITY a.cvsall "<ulink url='&a.cvsall.url;'>FreeBSD CVS х╚╡©пч╤╘╪гб╪сй╪Чап╠М</ulink>">
-<!ENTITY a.cvsall.name "<ulink url='&a.cvsall.url;'>cvs-all</ulink>">
+<!ENTITY a.cvsall "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvsall.url;'>FreeBSD CVS х╚╡©пч╤╘╪гб╪сй╪Чап╠М</link>">
+<!ENTITY a.cvsall.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvsall.url;'>cvs-all</link>">
 
 <!ENTITY a.cvs-doc.url "&a.mailman.listinfo;/cvs-doc">
-<!ENTITY a.cvs-doc "<ulink url='&a.cvs-doc.url;'>FreeBSD CVS нд╣╣пч╤╘╪гб╪сй╪Чап╠М</ulink>">
-<!ENTITY a.cvs-doc.name "<ulink url='&a.cvs-doc.url;'>cvs-doc</ulink>">
+<!ENTITY a.cvs-doc "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-doc.url;'>FreeBSD CVS нд╣╣пч╤╘╪гб╪сй╪Чап╠М</link>">
+<!ENTITY a.cvs-doc.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-doc.url;'>cvs-doc</link>">
 
 <!ENTITY a.cvs-ports.url "&a.mailman.listinfo;/cvs-ports">
-<!ENTITY a.cvs-ports "<ulink url='&a.cvs-ports.url;'>FreeBSD CVS ports пч╤╘╪гб╪сй╪Чап╠М</ulink>">
-<!ENTITY a.cvs-ports.name "<ulink url='&a.cvs-ports.url;'>cvs-ports</ulink>">
+<!ENTITY a.cvs-ports "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-ports.url;'>FreeBSD CVS ports пч╤╘╪гб╪сй╪Чап╠М</link>">
+<!ENTITY a.cvs-ports.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-ports.url;'>cvs-ports</link>">
 
 <!ENTITY a.cvs-projects.url "&a.mailman.listinfo;/cvs-projects">
-<!ENTITY a.cvs-projects "<ulink url='&a.cvs-projects.url;'>FreeBSD CVS ╦╫йТоНд©пч╤╘╪гб╪сй╪Чап╠М</ulink>">
-<!ENTITY a.cvs-projects.name "<ulink url='&a.cvs-projects.url;'>cvs-projects</ulink>">
+<!ENTITY a.cvs-projects "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-projects.url;'>FreeBSD CVS ╦╫йТоНд©пч╤╘╪гб╪сй╪Чап╠М</link>">
+<!ENTITY a.cvs-projects.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-projects.url;'>cvs-projects</link>">
 
 <!ENTITY a.cvs-src.url "&a.mailman.listinfo;/cvs-src">
-<!ENTITY a.cvs-src "<ulink url='&a.cvs-src.url;'>FreeBSD CVS т╢╢ЗбКпч╤╘╪гб╪сй╪Чап╠М</ulink>">
-<!ENTITY a.cvs-src.name "<ulink url='&a.cvs-src.url;'>cvs-src</ulink>">
+<!ENTITY a.cvs-src "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-src.url;'>FreeBSD CVS т╢╢ЗбКпч╤╘╪гб╪сй╪Чап╠М</link>">
+<!ENTITY a.cvs-src.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-src.url;'>cvs-src</link>">
 
 <!ENTITY a.cvsweb.url "&a.mailman.listinfo;/freebsd-cvsweb">
-<!ENTITY a.cvsweb "<ulink url='&a.cvsweb.url;'>FreeBSD CVSweb н╛╩╓сй╪Чап╠М</ulink>">
-<!ENTITY a.cvsweb.name "<ulink url='&a.cvsweb.url;'>freebsd-cvsweb</ulink>">
+<!ENTITY a.cvsweb "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvsweb.url;'>FreeBSD CVSweb н╛╩╓сй╪Чап╠М</link>">
+<!ENTITY a.cvsweb.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvsweb.url;'>freebsd-cvsweb</link>">
 
 <!ENTITY a.database.url "&a.mailman.listinfo;/freebsd-database">
-<!ENTITY a.database "<ulink url='&a.database.url;'>тз FreeBSD иоткпп╣дйЩ╬щ©Бсй╪Чап╠М</ulink>">
-<!ENTITY a.database.name "<ulink url='&a.database.url;'>freebsd-database</ulink>">
+<!ENTITY a.database "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.database.url;'>тз FreeBSD иоткпп╣дйЩ╬щ©Бсй╪Чап╠М</link>">
+<!ENTITY a.database.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.database.url;'>freebsd-database</link>">
 
 <!ENTITY a.developers "FreeBSD ©╙╥╒хкт╠сй╪Чап╠М">
 <!ENTITY a.developers.name "freebsd-developers">
 
 <!ENTITY a.doc.url "&a.mailman.listinfo;/freebsd-doc">
-<!ENTITY a.doc "<ulink url='&a.doc.url;'>FreeBSD нд╣╣╪ф╩╝сй╪Чап╠М</ulink>">
-<!ENTITY a.doc.name "<ulink url='&a.doc.url;'>freebsd-doc</ulink>">
+<!ENTITY a.doc "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.doc.url;'>FreeBSD нд╣╣╪ф╩╝сй╪Чап╠М</link>">
+<!ENTITY a.doc.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.doc.url;'>freebsd-doc</link>">
 
 <!ENTITY a.doc-committers "FreeBSD doc/ committer ╣дсй╪Чап╠М">
 <!ENTITY a.doc-committers.name "doc-committers">
@@ -175,172 +175,172 @@
 <!ENTITY a.doc-developers.name "doc-developers">
 
 <!ENTITY a.drivers.url "&a.mailman.listinfo;/freebsd-drivers">
-<!ENTITY a.drivers "<ulink url='&a.drivers.url;'>н╙ FreeBSD ╠Юп╢иХ╠╦гЩ╤╞ЁлпР</ulink>">
-<!ENTITY a.drivers.name "<ulink url='&a.drivers.url;'>freebsd-drivers</ulink>">
+<!ENTITY a.drivers "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.drivers.url;'>н╙ FreeBSD ╠Юп╢иХ╠╦гЩ╤╞ЁлпР</link>">
+<!ENTITY a.drivers.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.drivers.url;'>freebsd-drivers</link>">
 
 <!ENTITY a.eclipse.url "&a.mailman.listinfo;/freebsd-eclipse">
-<!ENTITY a.eclipse "<ulink url='&a.eclipse.url;'>FreeBSD ио╣д Eclipse IDE║╒ ╧╓╬ъ║╒ ╦╩©м╩╖с╕сцЁлпР╨м port ╣дсц╩╖</ulink>">
-<!ENTITY a.eclipse.name "<ulink url='&a.eclipse.url;'>freebsd-eclipse</ulink>">
+<!ENTITY a.eclipse "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.eclipse.url;'>FreeBSD ио╣д Eclipse IDE║╒ ╧╓╬ъ║╒ ╦╩©м╩╖с╕сцЁлпР╨м port ╣дсц╩╖</link>">
+<!ENTITY a.eclipse.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.eclipse.url;'>freebsd-eclipse</link>">
 
 <!ENTITY a.embedded.url "&a.mailman.listinfo;/freebsd-embedded">
-<!ENTITY a.embedded "<ulink url='&a.embedded.url;'>FreeBSD-embedded сй╪Чап╠М</ulink>">
-<!ENTITY a.embedded.name "<ulink url='&a.embedded.url;'>freebsd-embedded</ulink>">
+<!ENTITY a.embedded "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.embedded.url;'>FreeBSD-embedded сй╪Чап╠М</link>">
+<!ENTITY a.embedded.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.embedded.url;'>freebsd-embedded</link>">
 
 <!ENTITY a.emulation.url "&a.mailman.listinfo;/freebsd-emulation">
-<!ENTITY a.emulation "<ulink url='&a.emulation.url;'>FreeBSD-emulation сй╪Чап╠М</ulink>">
-<!ENTITY a.emulation.name "<ulink url='&a.emulation.url;'>freebsd-emulation</ulink>">
+<!ENTITY a.emulation "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.emulation.url;'>FreeBSD-emulation сй╪Чап╠М</link>">
+<!ENTITY a.emulation.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.emulation.url;'>freebsd-emulation</link>">
 
 <!ENTITY a.eol.url "&a.mailman.listinfo;/freebsd-eol">
-<!ENTITY a.eol "<ulink url='&a.eol.url;'>FreeBSD-eol сй╪Чап╠М</ulink>">
-<!ENTITY a.eol.name "<ulink url='&a.eol.url;'>freebsd-eol</ulink>">
+<!ENTITY a.eol "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.eol.url;'>FreeBSD-eol сй╪Чап╠М</link>">
+<!ENTITY a.eol.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.eol.url;'>freebsd-eol</link>">
 
 <!ENTITY a.firewire.url "&a.mailman.listinfo;/freebsd-firewire">
-<!ENTITY a.firewire "<ulink url='&a.firewire.url;'>FreeBSD ╩Поъ╪╪йУ (IEEE 1394) лжбшсй╪Чап╠М</ulink>">
-<!ENTITY a.firewire.name "<ulink url='&a.firewire.url;'>freebsd-firewire</ulink>">
+<!ENTITY a.firewire "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.firewire.url;'>FreeBSD ╩Поъ╪╪йУ (IEEE 1394) лжбшсй╪Чап╠М</link>">
+<!ENTITY a.firewire.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.firewire.url;'>freebsd-firewire</link>">
 
 <!ENTITY a.fs.url "&a.mailman.listinfo;/freebsd-fs">
-<!ENTITY a.fs "<ulink url='&a.fs.url;'>FreeBSD нд╪Чо╣мЁоНд©сй╪Чап╠М</ulink>">
-<!ENTITY a.fs.name "<ulink url='&a.fs.url;'>freebsd-fs</ulink>">
+<!ENTITY a.fs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.fs.url;'>FreeBSD нд╪Чо╣мЁоНд©сй╪Чап╠М</link>">
+<!ENTITY a.fs.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.fs.url;'>freebsd-fs</link>">
 
 <!ENTITY a.gecko.url "&a.mailman.listinfo;/freebsd-gecko">
-<!ENTITY a.gecko "<ulink url='&a.gecko.url;'>FreeBSD gecko сй╪Чап╠М</ulink>">
-<!ENTITY a.gecko.name "<ulink url='&a.gecko.url;'>freebsd-gecko</ulink>">
+<!ENTITY a.gecko "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.gecko.url;'>FreeBSD gecko сй╪Чап╠М</link>">
+<!ENTITY a.gecko.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.gecko.url;'>freebsd-gecko</link>">
 
 <!ENTITY a.geom.url "&a.mailman.listinfo;/freebsd-geom">
-<!ENTITY a.geom "<ulink url='&a.geom.url;'>FreeBSD GEOM сй╪Чап╠М</ulink>">
-<!ENTITY a.geom.name "<ulink url='&a.geom.url;'>freebsd-geom</ulink>">
+<!ENTITY a.geom "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.geom.url;'>FreeBSD GEOM сй╪Чап╠М</link>">
+<!ENTITY a.geom.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.geom.url;'>freebsd-geom</link>">
 
 <!ENTITY a.gnome.url "&a.mailman.listinfo;/freebsd-gnome">
-<!ENTITY a.gnome "<ulink url='&a.gnome.url;'>FreeBSD GNOME ╨м GNOME с╕сцЁлпРсй╪Чап╠М</ulink>">
-<!ENTITY a.gnome.name "<ulink url='&a.gnome.url;'>freebsd-gnome</ulink>">
+<!ENTITY a.gnome "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.gnome.url;'>FreeBSD GNOME ╨м GNOME с╕сцЁлпРсй╪Чап╠М</link>">
+<!ENTITY a.gnome.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.gnome.url;'>freebsd-gnome</link>">
 
 <!ENTITY a.hackers.url "&a.mailman.listinfo;/freebsd-hackers">
-<!ENTITY a.hackers "<ulink url='&a.hackers.url;'>FreeBSD ╪╪йУлжбшсй╪Чап╠М</ulink>">
-<!ENTITY a.hackers.name "<ulink url='&a.hackers.url;'>freebsd-hackers</ulink>">
+<!ENTITY a.hackers "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hackers.url;'>FreeBSD ╪╪йУлжбшсй╪Чап╠М</link>">
+<!ENTITY a.hackers.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hackers.url;'>freebsd-hackers</link>">
 
 <!ENTITY a.hardware.url "&a.mailman.listinfo;/freebsd-hardware">
-<!ENTITY a.hardware "<ulink url='&a.hardware.url;'>FreeBSD с╡╪Ч╨миХ╠╦сй╪Чап╠М</ulink>">
-<!ENTITY a.hardware.name "<ulink url='&a.hardware.url;'>freebsd-hardware</ulink>">
+<!ENTITY a.hardware "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hardware.url;'>FreeBSD с╡╪Ч╨миХ╠╦сй╪Чап╠М</link>">
+<!ENTITY a.hardware.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hardware.url;'>freebsd-hardware</link>">
 
 <!ENTITY a.hubs.url "&a.mailman.listinfo;/freebsd-hubs">
-<!ENTITY a.hubs "<ulink url='&a.hubs.url;'>FreeBSD ╬╣оЯу╬╣Цсй╪Чап╠Мs</ulink>">
-<!ENTITY a.hubs.name "<ulink url='&a.hubs.url;'>freebsd-hubs</ulink>">
+<!ENTITY a.hubs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hubs.url;'>FreeBSD ╬╣оЯу╬╣Цсй╪Чап╠Мs</link>">
+<!ENTITY a.hubs.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hubs.url;'>freebsd-hubs</link>">
 
 <!ENTITY a.i18n.url "&a.mailman.listinfo;/freebsd-i18n">
-<!ENTITY a.i18n "<ulink url='&a.i18n.url;'>FreeBSD ╧З╪й╩╞сй╪Чап╠М</ulink>">
-<!ENTITY a.i18n.name "<ulink url='&a.i18n.url;'>freebsd-i18n</ulink>">
+<!ENTITY a.i18n "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.i18n.url;'>FreeBSD ╧З╪й╩╞сй╪Чап╠М</link>">
+<!ENTITY a.i18n.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.i18n.url;'>freebsd-i18n</link>">
 
 <!ENTITY a.i386.url "&a.mailman.listinfo;/freebsd-i386">
-<!ENTITY a.i386 "<ulink url='&a.i386.url;'>FreeBSD i386 в╗спнйлБсй╪Чап╠М</ulink>">
-<!ENTITY a.i386.name "<ulink url='&a.i386.url;'>freebsd-i386</ulink>">
+<!ENTITY a.i386 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.i386.url;'>FreeBSD i386 в╗спнйлБсй╪Чап╠М</link>">
+<!ENTITY a.i386.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.i386.url;'>freebsd-i386</link>">
 
 <!ENTITY a.ia32.url "&a.mailman.listinfo;/freebsd-ia32">
-<!ENTITY a.ia32 "<ulink url='&a.ia32.url;'>FreeBSD IA32 рфж╡сй╪Чап╠М</ulink>">
-<!ENTITY a.ia32.name "<ulink url='&a.ia32.url;'>freebsd-ia32</ulink>">
+<!ENTITY a.ia32 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ia32.url;'>FreeBSD IA32 рфж╡сй╪Чап╠М</link>">
+<!ENTITY a.ia32.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ia32.url;'>freebsd-ia32</link>">
 
 <!ENTITY a.ia64.url "&a.mailman.listinfo;/freebsd-ia64">
-<!ENTITY a.ia64 "<ulink url='&a.ia64.url;'>FreeBSD IA64 рфж╡сй╪Чап╠М</ulink>">
-<!ENTITY a.ia64.name "<ulink url='&a.ia64.url;'>freebsd-ia64</ulink>">
+<!ENTITY a.ia64 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ia64.url;'>FreeBSD IA64 рфж╡сй╪Чап╠М</link>">
+<!ENTITY a.ia64.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ia64.url;'>freebsd-ia64</link>">
 
 <!ENTITY a.ipfw.url "&a.mailman.listinfo;/freebsd-ipfw">
-<!ENTITY a.ipfw "<ulink url='&a.ipfw.url;'>FreeBSD IPFW ╢ЗбКсй╪Чап╠М</ulink>">
-<!ENTITY a.ipfw.name "<ulink url='&a.ipfw.url;'>freebsd-ipfw</ulink>">
+<!ENTITY a.ipfw "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ipfw.url;'>FreeBSD IPFW ╢ЗбКсй╪Чап╠М</link>">
+<!ENTITY a.ipfw.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ipfw.url;'>freebsd-ipfw</link>">
 
 <!ENTITY a.isdn.url "&a.mailman.listinfo;/freebsd-isdn">
-<!ENTITY a.isdn "<ulink url='&a.isdn.url;'>FreeBSD ISDN сй╪Чап╠М</ulink>">
-<!ENTITY a.isdn.name "<ulink url='&a.isdn.url;'>freebsd-isdn</ulink>">
+<!ENTITY a.isdn "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.isdn.url;'>FreeBSD ISDN сй╪Чап╠М</link>">
+<!ENTITY a.isdn.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.isdn.url;'>freebsd-isdn</link>">
 
 <!ENTITY a.isp.url "&a.mailman.listinfo;/freebsd-isp">
-<!ENTITY a.isp "<ulink url='&a.isp.url;'>FreeBSD Internet ╥ЧнЯлА╧╘ил╣дсй╪Чап╠М</ulink>">
-<!ENTITY a.isp.name "<ulink url='&a.isp.url;'>freebsd-isp</ulink>">
+<!ENTITY a.isp "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.isp.url;'>FreeBSD Internet ╥ЧнЯлА╧╘ил╣дсй╪Чап╠М</link>">
+<!ENTITY a.isp.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.isp.url;'>freebsd-isp</link>">
 
 <!ENTITY a.jail.url "&a.mailman.listinfo;/freebsd-jail">
-<!ENTITY a.jail "<ulink url='&a.jail.url;'>FreeBSD jails сй╪Чап╠М</ulink>">
-<!ENTITY a.jail.name "<ulink url='&a.jail.url;'>freebsd-jail</ulink>">
+<!ENTITY a.jail "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.jail.url;'>FreeBSD jails сй╪Чап╠М</link>">
+<!ENTITY a.jail.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.jail.url;'>freebsd-jail</link>">
 
 <!ENTITY a.java.url "&a.mailman.listinfo;/freebsd-java">
-<!ENTITY a.java "<ulink url='&a.java.url;'>FreeBSD Java сОятсй╪Чап╠М</ulink>">
-<!ENTITY a.java.name "<ulink url='&a.java.url;'>freebsd-java</ulink>">
+<!ENTITY a.java "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.java.url;'>FreeBSD Java сОятсй╪Чап╠М</link>">
+<!ENTITY a.java.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.java.url;'>freebsd-java</link>">
 
 <!ENTITY a.jobs.url "&a.mailman.listinfo;/freebsd-jobs">
-<!ENTITY a.jobs "<ulink url='&a.jobs.url;'>FreeBSD оЮ╧ь╣д╧╓вВ╩З╩Асй╪Чап╠М</ulink>">
-<!ENTITY a.jobs.name "<ulink url='&a.jobs.url;'>freebsd-jobs</ulink>">
+<!ENTITY a.jobs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.jobs.url;'>FreeBSD оЮ╧ь╣д╧╓вВ╩З╩Асй╪Чап╠М</link>">
+<!ENTITY a.jobs.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.jobs.url;'>freebsd-jobs</link>">
 
 <!ENTITY a.kde.url "https://mail.kde.org/mailman/listinfo/kde-freebsd">
-<!ENTITY a.kde "<ulink url='&a.kde.url;'>FreeBSD KDE/Qt ╨м KDE с╕сцЁлпРсй╪Чап╠М</ulink>">
-<!ENTITY a.kde.name "<ulink url='&a.kde.url;'>freebsd-kde</ulink>">
+<!ENTITY a.kde "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.kde.url;'>FreeBSD KDE/Qt ╨м KDE с╕сцЁлпРсй╪Чап╠М</link>">
+<!ENTITY a.kde.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.kde.url;'>freebsd-kde</link>">
 
 <!ENTITY a.lfs.url "&a.mailman.listinfo;/freebsd-lfs">
-<!ENTITY a.lfs "<ulink url='&a.lfs.url;'>FreeBSD LFS рфж╡сй╪Чап╠М</ulink>">
-<!ENTITY a.lfs.name "<ulink url='&a.lfs.url;'>freebsd-lfs</ulink>">
+<!ENTITY a.lfs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.lfs.url;'>FreeBSD LFS рфж╡сй╪Чап╠М</link>">
+<!ENTITY a.lfs.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.lfs.url;'>freebsd-lfs</link>">
 
 <!ENTITY a.mips.url "&a.mailman.listinfo;/freebsd-mips">
-<!ENTITY a.mips "<ulink url='&a.mips.url;'>FreeBSD MIPS рфж╡сй╪Чап╠М</ulink>">
-<!ENTITY a.mips.name "<ulink url='&a.mips.url;'>freebsd-mips</ulink>">
+<!ENTITY a.mips "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mips.url;'>FreeBSD MIPS рфж╡сй╪Чап╠М</link>">
+<!ENTITY a.mips.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mips.url;'>freebsd-mips</link>">
 
 <!ENTITY a.mirror-announce.url "&a.mailman.listinfo;/mirror-announce">
-<!ENTITY a.mirror-announce "<ulink url='&a.mirror-announce.url;'>FreeBSD ╬╣оЯу╬╣Ц╧эюМт╠</ulink>">
-<!ENTITY a.mirror-announce.name "<ulink url='&a.mirror-announce.url;'>mirror-announce</ulink>">
+<!ENTITY a.mirror-announce "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mirror-announce.url;'>FreeBSD ╬╣оЯу╬╣Ц╧эюМт╠</link>">
+<!ENTITY a.mirror-announce.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mirror-announce.url;'>mirror-announce</link>">
 
 <!ENTITY a.mobile.url "&a.mailman.listinfo;/freebsd-mobile">
-<!ENTITY a.mobile "<ulink url='&a.mobile.url;'>FreeBSD ╠й╪г╠╬╣Гдтсй╪Чап╠М</ulink>">
-<!ENTITY a.mobile.name "<ulink url='&a.mobile.url;'>freebsd-mobile</ulink>">
+<!ENTITY a.mobile "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mobile.url;'>FreeBSD ╠й╪г╠╬╣Гдтсй╪Чап╠М</link>">
+<!ENTITY a.mobile.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mobile.url;'>freebsd-mobile</link>">
 
 <!ENTITY a.mono.url "&a.mailman.listinfo;/freebsd-mono">
-<!ENTITY a.mono "<ulink url='&a.mono.url;'>FreeBSD ио╣д Mono ╨м C# с╕сц</ulink>">
-<!ENTITY a.mono.name "<ulink url='&a.mono.url;'>freebsd-mono</ulink>">
+<!ENTITY a.mono "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mono.url;'>FreeBSD ио╣д Mono ╨м C# с╕сц</link>">
+<!ENTITY a.mono.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mono.url;'>freebsd-mono</link>">
 
 <!ENTITY a.mozilla.url "&a.mailman.listinfo;/freebsd-mozilla">
-<!ENTITY a.mozilla "<ulink url='&a.mozilla.url;'>FreeBSD ╣д Mozilla Д╞ююфВ port сй╪Чап╠М</ulink>">
-<!ENTITY a.mozilla.name "<ulink url='&a.mozilla.url;'>freebsd-mozilla</ulink>">
+<!ENTITY a.mozilla "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mozilla.url;'>FreeBSD ╣д Mozilla Д╞ююфВ port сй╪Чап╠М</link>">
+<!ENTITY a.mozilla.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mozilla.url;'>freebsd-mozilla</link>">
 
 <!ENTITY a.multimedia.url "&a.mailman.listinfo;/freebsd-multimedia">
-<!ENTITY a.multimedia "<ulink url='&a.multimedia.url;'>FreeBSD ╤Юц╫лЕс╕сцсй╪Чап╠М</ulink>">
-<!ENTITY a.multimedia.name "<ulink url='&a.multimedia.url;'>freebsd-multimedia</ulink>">
+<!ENTITY a.multimedia "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.multimedia.url;'>FreeBSD ╤Юц╫лЕс╕сцсй╪Чап╠М</link>">
+<!ENTITY a.multimedia.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.multimedia.url;'>freebsd-multimedia</link>">
 
 <!ENTITY a.net.url "&a.mailman.listinfo;/freebsd-net">
-<!ENTITY a.net "<ulink url='&a.net.url;'>FreeBSD мЬбГсй╪Чап╠М</ulink>">
-<!ENTITY a.net.name "<ulink url='&a.net.url;'>freebsd-net</ulink>">
+<!ENTITY a.net "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.net.url;'>FreeBSD мЬбГсй╪Чап╠М</link>">
+<!ENTITY a.net.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.net.url;'>freebsd-net</link>">
 
 <!ENTITY a.newbies.url "&a.mailman.listinfo;/freebsd-newbies">
-<!ENTITY a.newbies "<ulink url='&a.newbies.url;'>FreeBSD пбйжиоб╥сй╪Чап╠М</ulink>">
-<!ENTITY a.newbies.name "<ulink url='&a.newbies.url;'>freebsd-newbies</ulink>">
+<!ENTITY a.newbies "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.newbies.url;'>FreeBSD пбйжиоб╥сй╪Чап╠М</link>">
+<!ENTITY a.newbies.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.newbies.url;'>freebsd-newbies</link>">
 
 <!ENTITY a.newbus.url "&a.mailman.listinfo;/freebsd-new-bus">
-<!ENTITY a.newbus "<ulink url='&a.newbus.url;'>FreeBSD new-bus сй╪Чап╠М</ulink>">
-<!ENTITY a.newbus.name "<ulink url='&a.newbus.url;'>freebsd-new-bus</ulink>">
+<!ENTITY a.newbus "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.newbus.url;'>FreeBSD new-bus сй╪Чап╠М</link>">
+<!ENTITY a.newbus.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.newbus.url;'>freebsd-new-bus</link>">
 
 <!ENTITY a.office.url "&a.mailman.listinfo;/freebsd-office">
-<!ENTITY a.office "<ulink url='&a.office.url;'>FreeBSD ╟Л╧╚лв╪Чс╕сц сй╪Чап╠М</ulink>">
-<!ENTITY a.office.name "<ulink url='&a.office.url;'>freebsd-office</ulink>">
+<!ENTITY a.office "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.office.url;'>FreeBSD ╟Л╧╚лв╪Чс╕сц сй╪Чап╠М</link>">
+<!ENTITY a.office.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.office.url;'>freebsd-office</link>">
 
 <!ENTITY a.performance.url "&a.mailman.listinfo;/freebsd-performance">
-<!ENTITY a.performance "<ulink url='&a.performance.url;'>FreeBSD птдэсй╪Чап╠М</ulink>">
-<!ENTITY a.performance.name "<ulink url='&a.performance.url;'>freebsd-performance</ulink>">
+<!ENTITY a.performance "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.performance.url;'>FreeBSD птдэсй╪Чап╠М</link>">
+<!ENTITY a.performance.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.performance.url;'>freebsd-performance</link>">
 
 <!ENTITY a.perl.url "&a.mailman.listinfo;/freebsd-perl">
-<!ENTITY a.perl "<ulink url='&a.perl.url;'>FreeBSD Perl сй╪Чап╠М</ulink>">
-<!ENTITY a.perl.name "<ulink url='&a.perl.url;'>freebsd-perl</ulink>">
+<!ENTITY a.perl "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.perl.url;'>FreeBSD Perl сй╪Чап╠М</link>">
+<!ENTITY a.perl.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.perl.url;'>freebsd-perl</link>">
 
 <!ENTITY a.pf.url "&a.mailman.listinfo;/freebsd-pf">
-<!ENTITY a.pf "<ulink url='&a.pf.url;'>FreeBSD packet filter сй╪Чап╠М</ulink>">
-<!ENTITY a.pf.name "<ulink url='&a.pf.url;'>freebsd-pf</ulink>">
+<!ENTITY a.pf "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.pf.url;'>FreeBSD packet filter сй╪Чап╠М</link>">
+<!ENTITY a.pf.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.pf.url;'>freebsd-pf</link>">
 
 <!ENTITY a.platforms.url "&a.mailman.listinfo;/freebsd-platforms">
-<!ENTITY a.platforms "<ulink url='&a.platforms.url;'>FreeBSD ╥г Intel ф╫л╗рфж╡сй╪Чап╠М</ulink>">
-<!ENTITY a.platforms.name "<ulink url='&a.platforms.url;'>freebsd-platforms</ulink>">
+<!ENTITY a.platforms "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.platforms.url;'>FreeBSD ╥г Intel ф╫л╗рфж╡сй╪Чап╠М</link>">
+<!ENTITY a.platforms.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.platforms.url;'>freebsd-platforms</link>">
 
 <!ENTITY a.policy.url "&a.mailman.listinfo;/freebsd-policy">
-<!ENTITY a.policy "<ulink url='&a.policy.url;'>FreeBSD ╨кпдме╤суЧ╡ължбшсй╪Чап╠М</ulink>">
-<!ENTITY a.policy.name "<ulink url='&a.policy.url;'>freebsd-policy</ulink>">
+<!ENTITY a.policy "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.policy.url;'>FreeBSD ╨кпдме╤суЧ╡ължбшсй╪Чап╠М</link>">
+<!ENTITY a.policy.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.policy.url;'>freebsd-policy</link>">
 
 <!ENTITY a.ports.url "&a.mailman.listinfo;/freebsd-ports">
-<!ENTITY a.ports "<ulink url='&a.ports.url;'>FreeBSD ports сй╪Чап╠М</ulink>">
-<!ENTITY a.ports.name "<ulink url='&a.ports.url;'>freebsd-ports</ulink>">
+<!ENTITY a.ports "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports.url;'>FreeBSD ports сй╪Чап╠М</link>">
+<!ENTITY a.ports.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports.url;'>freebsd-ports</link>">
 
 <!ENTITY a.ports-bugs.url "&a.mailman.listinfo;/freebsd-ports-bugs">
-<!ENTITY a.ports-bugs "<ulink url='&a.ports-bugs.url;'>FreeBSD ports bugs сй╪Чап╠М</ulink>">
-<!ENTITY a.ports-bugs.name "<ulink url='&a.ports-bugs.url;'>freebsd-ports-bugs</ulink>">
+<!ENTITY a.ports-bugs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports-bugs.url;'>FreeBSD ports bugs сй╪Чап╠М</link>">
+<!ENTITY a.ports-bugs.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports-bugs.url;'>freebsd-ports-bugs</link>">
 
 <!ENTITY a.ports-committers "FreeBSD ports/ committer ╣дсй╪Чап╠М">
 <!ENTITY a.ports-committers.name "ports-committers">
@@ -349,52 +349,52 @@
 <!ENTITY a.ports-developers.name "ports-developers">
 
 <!ENTITY a.ppc.url "&a.mailman.listinfo;/freebsd-ppc">
-<!ENTITY a.ppc "<ulink url='&a.ppc.url;'>FreeBSD PowerPC рфж╡сй╪Чап╠М</ulink>">
-<!ENTITY a.ppc.name "<ulink url='&a.ppc.url;'>freebsd-ppc</ulink>">
+<!ENTITY a.ppc "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ppc.url;'>FreeBSD PowerPC рфж╡сй╪Чап╠М</link>">
+<!ENTITY a.ppc.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ppc.url;'>freebsd-ppc</link>">
 
 <!ENTITY a.proliant.url "&a.mailman.listinfo;/freebsd-proliant">
-<!ENTITY a.proliant "<ulink url='&a.proliant.url;'>тз HP ProLiant ╥ЧнЯфВф╫л╗ио╣д FreeBSD ╪╪йУлжбш</ulink>">
-<!ENTITY a.proliant.name "<ulink url='&a.proliant.url;'>freebsd-proliant</ulink>">
+<!ENTITY a.proliant "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.proliant.url;'>тз HP ProLiant ╥ЧнЯфВф╫л╗ио╣д FreeBSD ╪╪йУлжбш</link>">
+<!ENTITY a.proliant.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.proliant.url;'>freebsd-proliant</link>">
 
 <!ENTITY a.python.url "&a.mailman.listinfo;/freebsd-python">
-<!ENTITY a.python "<ulink url='&a.python.url;'>FreeBSD Python сй╪Чап╠М</ulink>">
-<!ENTITY a.python.name "<ulink url='&a.python.url;'>freebsd-python</ulink>">
+<!ENTITY a.python "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.python.url;'>FreeBSD Python сй╪Чап╠М</link>">
+<!ENTITY a.python.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.python.url;'>freebsd-python</link>">
 
 <!ENTITY a.questions.url "&a.mailman.listinfo;/freebsd-questions">
-<!ENTITY a.questions "<ulink url='&a.questions.url;'>FreeBSD р╩╟ЦнйлБсй╪Чап╠М</ulink>">
-<!ENTITY a.questions.name "<ulink url='&a.questions.url;'>freebsd-questions</ulink>">
+<!ENTITY a.questions "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.questions.url;'>FreeBSD р╩╟ЦнйлБсй╪Чап╠М</link>">
+<!ENTITY a.questions.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.questions.url;'>freebsd-questions</link>">
 
 <!ENTITY a.rc.url "&a.mailman.listinfo;/freebsd-rc">
-<!ENTITY a.rc "<ulink url='&a.rc.url;'>FreeBSD фТ╤╞╫е╠╬о╣мЁсй╪Чап╠М</ulink>">
-<!ENTITY a.rc.name "<ulink url='&a.rc.url;'>freebsd-rc</ulink>">
+<!ENTITY a.rc "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.rc.url;'>FreeBSD фТ╤╞╫е╠╬о╣мЁсй╪Чап╠М</link>">
+<!ENTITY a.rc.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.rc.url;'>freebsd-rc</link>">
 
 <!ENTITY a.realtime.url "&a.mailman.listinfo;/freebsd-realtime">
-<!ENTITY a.realtime "<ulink url='&a.realtime.url;'>FreeBSD й╣й╠ю╘у╧сй╪Чап╠М</ulink>">
-<!ENTITY a.realtime.name "<ulink url='&a.realtime.url;'>freebsd-realtime</ulink>">
+<!ENTITY a.realtime "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.realtime.url;'>FreeBSD й╣й╠ю╘у╧сй╪Чап╠М</link>">
+<!ENTITY a.realtime.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.realtime.url;'>freebsd-realtime</link>">
 
 <!ENTITY a.ruby.url "&a.mailman.listinfo;/freebsd-ruby">
-<!ENTITY a.ruby "<ulink url='&a.ruby.url;'>FreeBSD Ruby сй╪Чап╠М</ulink>">
-<!ENTITY a.ruby.name "<ulink url='&a.ruby.url;'>freebsd-ruby</ulink>">
+<!ENTITY a.ruby "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ruby.url;'>FreeBSD Ruby сй╪Чап╠М</link>">
+<!ENTITY a.ruby.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ruby.url;'>freebsd-ruby</link>">
 
 <!ENTITY a.scsi.url "&a.mailman.listinfo;/freebsd-scsi">
-<!ENTITY a.scsi "<ulink url='&a.scsi.url;'>FreeBSD SCSI всо╣мЁсй╪Чап╠М</ulink>">
-<!ENTITY a.scsi.name "<ulink url='&a.scsi.url;'>freebsd-scsi</ulink>">
+<!ENTITY a.scsi "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.scsi.url;'>FreeBSD SCSI всо╣мЁсй╪Чап╠М</link>">
+<!ENTITY a.scsi.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.scsi.url;'>freebsd-scsi</link>">
 
 <!ENTITY a.security.url "&a.mailman.listinfo;/freebsd-security">
-<!ENTITY a.security "<ulink url='&a.security.url;'>FreeBSD ╟╡х╚нйлБсй╪Чап╠М</ulink>">
-<!ENTITY a.security.name "<ulink url='&a.security.url;'>freebsd-security</ulink>">
+<!ENTITY a.security "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.security.url;'>FreeBSD ╟╡х╚нйлБсй╪Чап╠М</link>">
+<!ENTITY a.security.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.security.url;'>freebsd-security</link>">
 
 <!ENTITY a.security-notifications.url "&a.mailman.listinfo;/freebsd-security-notifications">
-<!ENTITY a.security-notifications "<ulink url='&a.security-notifications.url;'>FreeBSD ╟╡х╚нйлБм╗ж╙сй╪Чап╠М</ulink>">
-<!ENTITY a.security-notifications.name "<ulink url='&a.security-notifications.url;'>freebsd-security-notifications</ulink>">
+<!ENTITY a.security-notifications "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.security-notifications.url;'>FreeBSD ╟╡х╚нйлБм╗ж╙сй╪Чап╠М</link>">
+<!ENTITY a.security-notifications.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.security-notifications.url;'>freebsd-security-notifications</link>">
 
 <!ENTITY a.small.url "&a.mailman.listinfo;/freebsd-small">
-<!ENTITY a.small "<ulink url='&a.small.url;'>FreeBSD-small сй╪Чап╠М</ulink>">
-<!ENTITY a.small.name "<ulink url='&a.small.url;'>freebsd-small</ulink>">
+<!ENTITY a.small "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.small.url;'>FreeBSD-small сй╪Чап╠М</link>">
+<!ENTITY a.small.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.small.url;'>freebsd-small</link>">
 
 <!ENTITY a.sparc.url "&a.mailman.listinfo;/freebsd-sparc64">
-<!ENTITY a.sparc "<ulink url='&a.sparc.url;'>FreeBSD SPARC рфж╡сй╪Чап╠М</ulink>">
-<!ENTITY a.sparc.name "<ulink url='&a.sparc.url;'>freebsd-sparc64</ulink>">
+<!ENTITY a.sparc "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sparc.url;'>FreeBSD SPARC рфж╡сй╪Чап╠М</link>">
+<!ENTITY a.sparc.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sparc.url;'>freebsd-sparc64</link>">
 
 <!ENTITY a.src-committers "FreeBSD src/ committer ╣дсй╪Чап╠М">
 <!ENTITY a.src-committers.name "freebsd-src-committers">
@@ -403,151 +403,151 @@
 <!ENTITY a.src-developers.name "freebsd-src-developers">
 
 <!ENTITY a.stable.url "&a.mailman.listinfo;/freebsd-stable">
-<!ENTITY a.stable "<ulink url='&a.stable.url;'>&os.stable; сй╪Чап╠М</ulink>">
-<!ENTITY a.stable.name "<ulink url='&a.stable.url;'>freebsd-stable</ulink>">
+<!ENTITY a.stable "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.stable.url;'>&os.stable; сй╪Чап╠М</link>">
+<!ENTITY a.stable.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.stable.url;'>freebsd-stable</link>">
 
 <!ENTITY a.standards.url "&a.mailman.listinfo;/freebsd-standards">
-<!ENTITY a.standards "<ulink url='&a.standards.url;'>FreeBSD C99 ╨м POSIX ╠Йв╪оЮхщптсй╪Чап╠М</ulink>">
-<!ENTITY a.standards.name "<ulink url='&a.standards.url;'>freebsd-standards</ulink>">
+<!ENTITY a.standards "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.standards.url;'>FreeBSD C99 ╨м POSIX ╠Йв╪оЮхщптсй╪Чап╠М</link>">
+<!ENTITY a.standards.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.standards.url;'>freebsd-standards</link>">
 
 <!ENTITY a.sun4v.url "&a.mailman.listinfo;/freebsd-sun4v">
-<!ENTITY a.sun4v "<ulink url='&a.sun4v.url;'>FreeBSD sun4v рфж╡сй╪Чап╠М</ulink>">
-<!ENTITY a.sun4v.name "<ulink url='&a.sun4v.url;'>freebsd-sun4v</ulink>">
+<!ENTITY a.sun4v "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sun4v.url;'>FreeBSD sun4v рфж╡сй╪Чап╠М</link>">
+<!ENTITY a.sun4v.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sun4v.url;'>freebsd-sun4v</link>">
 
 <!ENTITY a.svn-src-all.url "&a.mailman.listinfo;/svn-src-all">
-<!ENTITY a.svn-src-all "<ulink url='&a.svn-src-all.url;'>SVN уШ╦Ж src йВ╣дпч╤╘я╤о╒ (ЁЩак <quote>user</quote> сК <quote>projects</quote>)</ulink>">
-<!ENTITY a.svn-src-all.name "<ulink url='&a.svn-src-all.url;'>svn-src-all</ulink>">
+<!ENTITY a.svn-src-all "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-all.url;'>SVN уШ╦Ж src йВ╣дпч╤╘я╤о╒ (ЁЩак <quote>user</quote> сК <quote>projects</quote>)</link>">
+<!ENTITY a.svn-src-all.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-all.url;'>svn-src-all</link>">
 
 <!ENTITY a.svn-src-head.url "&a.mailman.listinfo;/svn-src-head">
-<!ENTITY a.svn-src-head "<ulink url='&a.svn-src-head.url;'>SVN src йВ head/-current ╥жж╖╣дпч╤╘я╤о╒</ulink>">
-<!ENTITY a.svn-src-head.name "<ulink url='&a.svn-src-head.url;'>svn-src-head</ulink>">
+<!ENTITY a.svn-src-head "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-head.url;'>SVN src йВ head/-current ╥жж╖╣дпч╤╘я╤о╒</link>">
+<!ENTITY a.svn-src-head.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-head.url;'>svn-src-head</link>">
 
 <!ENTITY a.svn-src-projects.url "&a.mailman.listinfo;/svn-src-projects">
-<!ENTITY a.svn-src-projects "<ulink url='&a.svn-src-projects.url;'>SVN src йВ <quote>projects</quote> ╥жж╖╣дпч╤╘я╤о╒</ulink>">
-<!ENTITY a.svn-src-projects.name "<ulink url='&a.svn-src-projects.url;'>svn-src-projects</ulink>">
+<!ENTITY a.svn-src-projects "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-projects.url;'>SVN src йВ <quote>projects</quote> ╥жж╖╣дпч╤╘я╤о╒</link>">
+<!ENTITY a.svn-src-projects.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-projects.url;'>svn-src-projects</link>">
 
 <!ENTITY a.svn-src-release.url "&a.mailman.listinfo;/svn-src-release">
-<!ENTITY a.svn-src-release "<ulink url='&a.svn-src-release.url;'>SVN src йВ╦Вжж releases ╥жж╖╣дпч╤╘я╤о╒</ulink>">
-<!ENTITY a.svn-src-release.name "<ulink url='&a.svn-src-release.url;'>svn-src-release</ulink>">
+<!ENTITY a.svn-src-release "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-release.url;'>SVN src йВ╦Вжж releases ╥жж╖╣дпч╤╘я╤о╒</link>">
+<!ENTITY a.svn-src-release.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-release.url;'>svn-src-release</link>">
 
 <!ENTITY a.svn-src-releng.url "&a.mailman.listinfo;/svn-src-releng">
-<!ENTITY a.svn-src-releng "<ulink url='&a.svn-src-releng.url;'>SVN src йВ release ╧╓Ёл&nbsp;/ ╟╡х╚сп╧ь╣дпч╤╘я╤о╒</ulink>">
-<!ENTITY a.svn-src-releng.name "<ulink url='&a.svn-src-releng.url;'>svn-src-releng</ulink>">
+<!ENTITY a.svn-src-releng "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-releng.url;'>SVN src йВ release ╧╓Ёл&nbsp;/ ╟╡х╚сп╧ь╣дпч╤╘я╤о╒</link>">
+<!ENTITY a.svn-src-releng.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-releng.url;'>svn-src-releng</link>">
 
 <!ENTITY a.svn-src-stable.url "&a.mailman.listinfo;/svn-src-stable">
-<!ENTITY a.svn-src-stable "<ulink url='&a.svn-src-stable.url;'>SVN src йВкЫсп -stable ╥жж╖╣дпч╤╘я╤о╒</ulink>">
-<!ENTITY a.svn-src-stable.name "<ulink url='&a.svn-src-stable.url;'>svn-src-stable</ulink>">
+<!ENTITY a.svn-src-stable "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable.url;'>SVN src йВкЫсп -stable ╥жж╖╣дпч╤╘я╤о╒</link>">
+<!ENTITY a.svn-src-stable.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable.url;'>svn-src-stable</link>">
 
 <!ENTITY a.svn-src-stable-6.url "&a.mailman.listinfo;/svn-src-stable-6">
-<!ENTITY a.svn-src-stable-6 "<ulink url='&a.svn-src-stable-6.url;'>SVN src йВ 6-stable ╥жж╖╣дпч╤╘я╤о╒</ulink>">
-<!ENTITY a.svn-src-stable-6.name "<ulink url='&a.svn-src-stable-6.url;'>svn-src-stable-6</ulink>">
+<!ENTITY a.svn-src-stable-6 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-6.url;'>SVN src йВ 6-stable ╥жж╖╣дпч╤╘я╤о╒</link>">
+<!ENTITY a.svn-src-stable-6.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-6.url;'>svn-src-stable-6</link>">
 
 <!ENTITY a.svn-src-stable-7.url "&a.mailman.listinfo;/svn-src-stable-7">
-<!ENTITY a.svn-src-stable-7 "<ulink url='&a.svn-src-stable-7.url;'>SVN src йВ 7-stable ╥жж╖╣дпч╤╘я╤о╒</ulink>">
-<!ENTITY a.svn-src-stable-7.name "<ulink url='&a.svn-src-stable-7.url;'>svn-src-stable-7</ulink>">
+<!ENTITY a.svn-src-stable-7 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-7.url;'>SVN src йВ 7-stable ╥жж╖╣дпч╤╘я╤о╒</link>">
+<!ENTITY a.svn-src-stable-7.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-7.url;'>svn-src-stable-7</link>">
 
 <!ENTITY a.svn-src-stable-8.url "&a.mailman.listinfo;/svn-src-stable-8">
-<!ENTITY a.svn-src-stable-8 "<ulink url='&a.svn-src-stable-8.url;'>SVN src йВ 8-stable ╥жж╖╣дпч╤╘я╤о╒</ulink>">
-<!ENTITY a.svn-src-stable-8.name "<ulink url='&a.svn-src-stable-8.url;'>svn-src-stable-8</ulink>">
+<!ENTITY a.svn-src-stable-8 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-8.url;'>SVN src йВ 8-stable ╥жж╖╣дпч╤╘я╤о╒</link>">
+<!ENTITY a.svn-src-stable-8.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-8.url;'>svn-src-stable-8</link>">
 
 <!ENTITY a.svn-src-stable-9.url "&a.mailman.listinfo;/svn-src-stable-9">
-<!ENTITY a.svn-src-stable-9 "<ulink url='&a.svn-src-stable-9.url;'>SVN commit messages for only the 9-stable src tree</ulink>">
-<!ENTITY a.svn-src-stable-9.name "<ulink url='&a.svn-src-stable-9.url;'>svn-src-stable-9</ulink>">
+<!ENTITY a.svn-src-stable-9 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-9.url;'>SVN commit messages for only the 9-stable src tree</link>">
+<!ENTITY a.svn-src-stable-9.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-9.url;'>svn-src-stable-9</link>">
 
 <!ENTITY a.svn-src-stable-other.url "&a.mailman.listinfo;/svn-src-stable-other">
-<!ENTITY a.svn-src-stable-other "<ulink url='&a.svn-src-stable-other.url;'>SVN src йВртмЫ stable ╥жж╖╣дпч╤╘я╤о╒</ulink>">
-<!ENTITY a.svn-src-stable-other.name "<ulink url='&a.svn-src-stable-other.url;'>svn-src-stable-other</ulink>">
+<!ENTITY a.svn-src-stable-other "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-other.url;'>SVN src йВртмЫ stable ╥жж╖╣дпч╤╘я╤о╒</link>">
+<!ENTITY a.svn-src-stable-other.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-other.url;'>svn-src-stable-other</link>">
 
 <!ENTITY a.svn-src-svnadmin.url "&a.mailman.listinfo;/svn-src-svnadmin">
-<!ENTITY a.svn-src-svnadmin "<ulink url='&a.svn-src-svnadmin.url;'>SVN сп╧ь╧эюМ&nbsp;/ еДжц╣дпч╤╘я╤о╒</ulink>">
-<!ENTITY a.svn-src-svnadmin.name "<ulink url='&a.svn-src-svnadmin.url;'>svn-src-svnadmin</ulink>">
+<!ENTITY a.svn-src-svnadmin "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-svnadmin.url;'>SVN сп╧ь╧эюМ&nbsp;/ еДжц╣дпч╤╘я╤о╒</link>">
+<!ENTITY a.svn-src-svnadmin.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-svnadmin.url;'>svn-src-svnadmin</link>">
 
 <!ENTITY a.svn-src-user.url "&a.mailman.listinfo;/svn-src-user">
-<!ENTITY a.svn-src-user "<ulink url='&a.svn-src-user.url;'>SVN src йВ <quote>user</quote> йтяИпт╥жж╖╣дпч╤╘я╤о╒</ulink>">
-<!ENTITY a.svn-src-user.name "<ulink url='&a.svn-src-user.url;'>svn-src-user</ulink>">
+<!ENTITY a.svn-src-user "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-user.url;'>SVN src йВ <quote>user</quote> йтяИпт╥жж╖╣дпч╤╘я╤о╒</link>">
+<!ENTITY a.svn-src-user.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-user.url;'>svn-src-user</link>">
 
 <!ENTITY a.svn-src-vendor.url "&a.mailman.listinfo;/svn-src-vendor">
-<!ENTITY a.svn-src-vendor "<ulink url='&a.svn-src-vendor.url;'>SVN vendor юЮоЮ╧ь╧╓вВйВ╣дпч╤╘я╤о╒</ulink>">
-<!ENTITY a.svn-src-vendor.name "<ulink url='&a.svn-src-vendor.url;'>svn-src-vendor</ulink>">
+<!ENTITY a.svn-src-vendor "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-vendor.url;'>SVN vendor юЮоЮ╧ь╧╓вВйВ╣дпч╤╘я╤о╒</link>">
+<!ENTITY a.svn-src-vendor.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-vendor.url;'>svn-src-vendor</link>">
 
 <!ENTITY a.sysinstall.url "&a.mailman.listinfo;/freebsd-sysinstall">
-<!ENTITY a.sysinstall "<ulink url='&a.sysinstall.url;'>Sysinstall ©╙╥╒сй╪Чап╠М</ulink>">
-<!ENTITY a.sysinstall.name "<ulink url='&a.sysinstall.url;'>freebsd-sysinstall</ulink>">
+<!ENTITY a.sysinstall "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sysinstall.url;'>Sysinstall ©╙╥╒сй╪Чап╠М</link>">
+<!ENTITY a.sysinstall.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sysinstall.url;'>freebsd-sysinstall</link>">
 
 <!ENTITY a.test.url "&a.mailman.listinfo;/freebsd-test">
-<!ENTITY a.test "<ulink url='&a.test.url;'>FreeBSD ╡Бйтсй╪Чап╠М</ulink>">
-<!ENTITY a.test.name "<ulink url='&a.test.url;'>freebsd-test</ulink>">
+<!ENTITY a.test "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.test.url;'>FreeBSD ╡Бйтсй╪Чап╠М</link>">
+<!ENTITY a.test.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.test.url;'>freebsd-test</link>">
 
 <!ENTITY a.testing.url "&a.mailman.listinfo;/freebsd-testing">
-<!ENTITY a.testing "<ulink url='&a.testing.url;'>FreeBSD птдэ╨мнх╤╗пт╡Бйтсй╪Чап╠М</ulink>">
-<!ENTITY a.testing.name "<ulink url='&a.testing.url;'>freebsd-testing</ulink>">
+<!ENTITY a.testing "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.testing.url;'>FreeBSD птдэ╨мнх╤╗пт╡Бйтсй╪Чап╠М</link>">
+<!ENTITY a.testing.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.testing.url;'>freebsd-testing</link>">
 
 <!ENTITY a.threads.url "&a.mailman.listinfo;/freebsd-threads">
-<!ENTITY a.threads "<ulink url='&a.threads.url;'>FreeBSD оъЁлсй╪Чап╠М</ulink>">
-<!ENTITY a.threads.name "<ulink url='&a.threads.url;'>freebsd-threads</ulink>">
+<!ENTITY a.threads "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.threads.url;'>FreeBSD оъЁлсй╪Чап╠М</link>">
+<!ENTITY a.threads.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.threads.url;'>freebsd-threads</link>">
 
 <!ENTITY a.tilera.url "&a.mailman.listinfo;/freebsd-tilera">
-<!ENTITY a.tilera "<ulink url='&a.tilera.url;'>FreeBSD Tilera CPU рфж╡сй╪Чап╠М</ulink>">
-<!ENTITY a.tilera.name "<ulink url='&a.tilera.url;'>freebsd-tilera</ulink>">
+<!ENTITY a.tilera "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.tilera.url;'>FreeBSD Tilera CPU рфж╡сй╪Чап╠М</link>">
+<!ENTITY a.tilera.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.tilera.url;'>freebsd-tilera</link>">
 
 <!ENTITY a.tokenring.url "&a.mailman.listinfo;/freebsd-tokenring">
-<!ENTITY a.tokenring "<ulink url='&a.tokenring.url;'>FreeBSD аНеф╩╥сй╪Чап╠М</ulink>">
-<!ENTITY a.tokenring.name "<ulink url='&a.tokenring.url;'>freebsd-tokenring</ulink>">
+<!ENTITY a.tokenring "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.tokenring.url;'>FreeBSD аНеф╩╥сй╪Чап╠М</link>">
+<!ENTITY a.tokenring.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.tokenring.url;'>freebsd-tokenring</link>">
 
 <!ENTITY a.toolchain.url "&a.mailman.listinfo;/freebsd-toolchain">
-<!ENTITY a.toolchain "<ulink url='&a.toolchain.url;'>FreeBSD ╪╞Ёи╣да╙╠Ю╧╓╬ъ╪╞сй╪Чап╠М</ulink>">
-<!ENTITY a.toolchain.name "<ulink url='&a.toolchain.url;'>freebsd-toolchain</ulink>">
+<!ENTITY a.toolchain "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.toolchain.url;'>FreeBSD ╪╞Ёи╣да╙╠Ю╧╓╬ъ╪╞сй╪Чап╠М</link>">
+<!ENTITY a.toolchain.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.toolchain.url;'>freebsd-toolchain</link>">
 
 <!ENTITY a.usb.url "&a.mailman.listinfo;/freebsd-usb">
-<!ENTITY a.usb "<ulink url='&a.usb.url;'>FreeBSD USB сй╪Чап╠М</ulink>">
-<!ENTITY a.usb.name "<ulink url='&a.usb.url;'>freebsd-usb</ulink>">
+<!ENTITY a.usb "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.usb.url;'>FreeBSD USB сй╪Чап╠М</link>">
+<!ENTITY a.usb.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.usb.url;'>freebsd-usb</link>">
 
 <!ENTITY a.usergroups.url "&a.mailman.listinfo;/freebsd-user-groups">
-<!ENTITY a.usergroups "<ulink url='&a.usergroups.url;'>FreeBSD сц╩╖вИуы╪╞сй╪Чап╠М</ulink>">
-<!ENTITY a.usergroups.name "<ulink url='&a.usergroups.url;'>freebsd-user-groups</ulink>">
+<!ENTITY a.usergroups "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.usergroups.url;'>FreeBSD сц╩╖вИуы╪╞сй╪Чап╠М</link>">
+<!ENTITY a.usergroups.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.usergroups.url;'>freebsd-user-groups</link>">
 
 <!ENTITY a.vendors.url "&a.mailman.listinfo;/freebsd-vendors">
-<!ENTITY a.vendors "<ulink url='&a.vendors.url;'>FreeBSD ╥╒╡╪г╟╧╘с╕илуы╪╞сй╪Чап╠М</ulink>">
-<!ENTITY a.vendors.name "<ulink url='&a.vendors.url;'>freebsd-vendors</ulink>">
+<!ENTITY a.vendors "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.vendors.url;'>FreeBSD ╥╒╡╪г╟╧╘с╕илуы╪╞сй╪Чап╠М</link>">
+<!ENTITY a.vendors.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.vendors.url;'>freebsd-vendors</link>">
 
 <!ENTITY a.virtualization.url "&a.mailman.listinfo;/freebsd-virtualization">
-<!ENTITY a.virtualization "<ulink url='&a.virtualization.url;'>╧ьсз FreeBSD кЫж╖Ёж╣д╦ВжжпИдБ╩╞╪╪йУ╣длжбш</ulink>">
-<!ENTITY a.virtualization.name "<ulink url='&a.virtualization.url;'>freebsd-virtualization</ulink>">
+<!ENTITY a.virtualization "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.virtualization.url;'>╧ьсз FreeBSD кЫж╖Ёж╣д╦ВжжпИдБ╩╞╪╪йУ╣длжбш</link>">
+<!ENTITY a.virtualization.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.virtualization.url;'>freebsd-virtualization</link>">
 
 <!ENTITY a.vuxml.url "&a.mailman.listinfo;/freebsd-vuxml">
-<!ENTITY a.vuxml "<ulink url='&a.vuxml.url;'>╧ьсз VuXML ╣длжбш</ulink>">
-<!ENTITY a.vuxml.name "<ulink url='&a.vuxml.url;'>freebsd-vuxml</ulink>">
+<!ENTITY a.vuxml "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.vuxml.url;'>╧ьсз VuXML ╣длжбш</link>">
+<!ENTITY a.vuxml.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.vuxml.url;'>freebsd-vuxml</link>">
 
 <!ENTITY a.wip-status.url "&a.mailman.listinfo;/freebsd-wip-status">
-<!ENTITY a.wip-status "<ulink url='&a.wip-status.url;'>FreeBSD оНд©╫Ьу╧в╢л╛</ulink>">
-<!ENTITY a.wip-status.name "<ulink url='&a.wip-status.url;'>freebsd-wip-status</ulink>">
+<!ENTITY a.wip-status "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.wip-status.url;'>FreeBSD оНд©╫Ьу╧в╢л╛</link>">
+<!ENTITY a.wip-status.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.wip-status.url;'>freebsd-wip-status</link>">
 
 <!ENTITY a.wireless.url "&a.mailman.listinfo;/freebsd-wireless">
-<!ENTITY a.wireless "<ulink url='&a.wireless.url;'>╧ьсз 802.11 у╩ё╛ ╧╓╬ъ║╒ гЩ╤╞©╙╥╒╣длжбш</ulink>">
-<!ENTITY a.wireless.name "<ulink url='&a.wireless.url;'>freebsd-wireless</ulink>">
+<!ENTITY a.wireless "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.wireless.url;'>╧ьсз 802.11 у╩ё╛ ╧╓╬ъ║╒ гЩ╤╞©╙╥╒╣длжбш</link>">
+<!ENTITY a.wireless.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.wireless.url;'>freebsd-wireless</link>">
 
 <!ENTITY a.www.url "&a.mailman.listinfo;/freebsd-www">
-<!ENTITY a.www "<ulink url='&a.www.url;'>FreeBSD Webmaster сй╪Чап╠М</ulink>">
-<!ENTITY a.www.name "<ulink url='&a.www.url;'>freebsd-www</ulink>">
+<!ENTITY a.www "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.www.url;'>FreeBSD Webmaster сй╪Чап╠М</link>">
+<!ENTITY a.www.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.www.url;'>freebsd-www</link>">
 
 <!ENTITY a.x11.url "&a.mailman.listinfo;/freebsd-x11">
-<!ENTITY a.x11 "<ulink url='&a.x11.url;'>FreeBSD X11 сй╪Чап╠М</ulink>">
-<!ENTITY a.x11.name "<ulink url='&a.x11.url;'>freebsd-x11</ulink>">
+<!ENTITY a.x11 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.x11.url;'>FreeBSD X11 сй╪Чап╠М</link>">
+<!ENTITY a.x11.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.x11.url;'>freebsd-x11</link>">
 
 <!ENTITY a.xen.url "&a.mailman.listinfo;/freebsd-xen">
-<!ENTITY a.xen "<ulink url='&a.xen.url;'>FreeBSD сп╧ь Xen рфж╡╣дсй╪Чап╠М</ulink>">
-<!ENTITY a.xen.name "<ulink url='&a.xen.url;'>freebsd-xen</ulink>">
+<!ENTITY a.xen "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.xen.url;'>FreeBSD сп╧ь Xen рфж╡╣дсй╪Чап╠М</link>">
+<!ENTITY a.xen.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.xen.url;'>freebsd-xen</link>">
 
 <!ENTITY a.xfce.url "&a.mailman.listinfo;/freebsd-xfce">
-<!ENTITY a.xfce "<ulink url='&a.xfce.url;'>FreeBSD сп╧ь XFCE ╣дсй╪Чап╠М</ulink>">
-<!ENTITY a.xfce.name "<ulink url='&a.xfce.url;'>freebsd-xfce</ulink>">
+<!ENTITY a.xfce "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.xfce.url;'>FreeBSD сп╧ь XFCE ╣дсй╪Чап╠М</link>">
+<!ENTITY a.xfce.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.xfce.url;'>freebsd-xfce</link>">
 
 <!-- Not really proper mailing lists -->
 
-<!ENTITY a.bugfollowup "<email>bug-followup@FreeBSD.org</email>">
+<!ENTITY a.bugfollowup "<email xmlns='http://docbook.org/ns/docbook'>bug-followup@FreeBSD.org</email>">
 <!ENTITY a.bugsubmit "&a.bugfollowup;">
 
-<!ENTITY a.majordomo "<email>majordomo@FreeBSD.org</email>">
+<!ENTITY a.majordomo "<email xmlns='http://docbook.org/ns/docbook'>majordomo@FreeBSD.org</email>">
 
 <!--
      The following mailinglists are deactivated.  Keep them until all references
@@ -555,13 +555,13 @@
 -->
 
 <!ENTITY a.alpha.url "&a.mailman.listinfo;/freebsd-alpha">
-<!ENTITY a.alpha "<ulink url='&a.alpha.url;'>FreeBSD Alpha рфж╡сй╪Чап╠М</ulink>">
-<!ENTITY a.alpha.name "<ulink url='&a.alpha.url;'>freebsd-alpha</ulink>">
+<!ENTITY a.alpha "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.alpha.url;'>FreeBSD Alpha рфж╡сй╪Чап╠М</link>">
+<!ENTITY a.alpha.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.alpha.url;'>freebsd-alpha</link>">
 
 <!ENTITY a.qa.url "&a.mailman.listinfo;/freebsd-qa">
-<!ENTITY a.qa "<ulink url='&a.qa.url;'>FreeBSD жйа©╠ёуосй╪Чап╠М</ulink>">
-<!ENTITY a.qa.name "<ulink url='&a.qa.url;'>freebsd-qa</ulink>">
+<!ENTITY a.qa "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.qa.url;'>FreeBSD жйа©╠ёуосй╪Чап╠М</link>">
+<!ENTITY a.qa.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.qa.url;'>freebsd-qa</link>">
 
 <!ENTITY a.smp.url "&a.mailman.listinfo;/freebsd-smp">
-<!ENTITY a.smp "<ulink url='&a.smp.url;'>FreeBSD ╤тЁф╤Ю╢╕юМ (SMP) сй╪Чап╠М</ulink>">
-<!ENTITY a.smp.name "<ulink url='&a.smp.url;'>freebsd-smp</ulink>">
+<!ENTITY a.smp "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.smp.url;'>FreeBSD ╤тЁф╤Ю╢╕юМ (SMP) сй╪Чап╠М</link>">
+<!ENTITY a.smp.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.smp.url;'>freebsd-smp</link>">

Modified: projects/db5/zh_CN.GB2312/share/xml/teams.ent
==============================================================================
--- projects/db5/zh_CN.GB2312/share/xml/teams.ent	Wed Jun 19 14:59:48 2013	(r41950)
+++ projects/db5/zh_CN.GB2312/share/xml/teams.ent	Wed Jun 19 15:07:53 2013	(r41951)
@@ -17,40 +17,40 @@
      $FreeBSD$
 -->
 
-<!ENTITY a.admins "FreeBSD ╪╞х╨╧эюМт╠ <email>admins@FreeBSD.org</email>">
+<!ENTITY a.admins "FreeBSD ╪╞х╨╧эюМт╠ <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 
-<!ENTITY a.bugmeister "нйлБ╠╗╦ФйЩ╬щ©Б╧эюМт╠ <email>bugmeister@FreeBSD.org</email>">
+<!ENTITY a.bugmeister "нйлБ╠╗╦ФйЩ╬щ©Б╧эюМт╠ <email xmlns='http://docbook.org/ns/docbook'>bugmeister@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>cvsadm@FreeBSD.org</email>">
+<!ENTITY a.cvsadm "CVS ╢ЗбК©Б╧эюМт╠ <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 
-<!ENTITY a.cvsup-master "CVSup ╬╣оЯу╬╣Цуы╪╞хк <email>cvsup-master@FreeBSD.org</email>">
+<!ENTITY a.cvsup-master "CVSup ╬╣оЯу╬╣Цуы╪╞хк <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
 
-<!ENTITY a.dcvs "CVS doc ╢ЗбК©Б╧эюМт╠ <email>dcvs@FreeBSD.org</email>">
+<!ENTITY a.dcvs "CVS doc ╢ЗбК©Б╧эюМт╠ <email xmlns='http://docbook.org/ns/docbook'>dcvs@FreeBSD.org</email>">
 
-<!ENTITY a.doceng "нд╣╣╧╓ЁлвИ <email>doceng@FreeBSD.org</email>">
+<!ENTITY a.doceng "нд╣╣╧╓ЁлвИ <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 
-<!ENTITY a.donations "╬ХтЫа╙бГ╧ы <email>donations@FreeBSD.org</email>">
+<!ENTITY a.donations "╬ХтЫа╙бГ╧ы <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
 
-<!ENTITY a.faq "FAQ н╛╩╓хк <email>faq@FreeBSD.org</email>">
+<!ENTITY a.faq "FAQ н╛╩╓хк <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 
-<!ENTITY a.ftp-master "FTP ╬╣оЯу╬╣Цуы╪╞хк <email>ftp-master@FreeBSD.org</email>">
+<!ENTITY a.ftp-master "FTP ╬╣оЯу╬╣Цуы╪╞хк <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 
-<!ENTITY a.mirror-admin "FTP/WWW ╬╣оЯу╬╣Цуы╪╞хк <email>mirror-admin@FreeBSD.org</email>">

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

From owner-svn-doc-projects@FreeBSD.ORG  Wed Jun 19 15:10:09 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 30339E7E;
 Wed, 19 Jun 2013 15:10:09 +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 1FFF8192D;
 Wed, 19 Jun 2013 15:10:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JFA9E7058875;
 Wed, 19 Jun 2013 15:10:09 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5JFA8fN058873;
 Wed, 19 Jun 2013 15:10:08 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306191510.r5JFA8fN058873@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 19 Jun 2013 15:10:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41952 - projects/db5/zh_TW.Big5/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: Wed, 19 Jun 2013 15:10:09 -0000

Author: gabor
Date: Wed Jun 19 15:10:08 2013
New Revision: 41952
URL: http://svnweb.freebsd.org/changeset/doc/41952

Log:
  - Add namespace declarations and convert entities to DB 5.0

Modified:
  projects/db5/zh_TW.Big5/share/xml/authors.ent
  projects/db5/zh_TW.Big5/share/xml/mailing-lists.ent

Modified: projects/db5/zh_TW.Big5/share/xml/authors.ent
==============================================================================
--- projects/db5/zh_TW.Big5/share/xml/authors.ent	Wed Jun 19 15:07:53 2013	(r41951)
+++ projects/db5/zh_TW.Big5/share/xml/authors.ent	Wed Jun 19 15:10:08 2013	(r41952)
@@ -25,70 +25,70 @@
      if you know more.
 -->
 
-<!ENTITY a.avatar "╠Г╝У╣ь <email>avatar@FreeBSD.org</email>">
+<!ENTITY a.avatar "╠Г╝У╣ь <email xmlns='http://docbook.org/ns/docbook'>avatar@FreeBSD.org</email>">
 
-<!ENTITY a.bmah "╟╗╥╫╞E <email>bmah@FreeBSD.org</email>">
+<!ENTITY a.bmah "╟╗╥╫╞E <email xmlns='http://docbook.org/ns/docbook'>bmah@FreeBSD.org</email>">
 
-<!ENTITY a.chinsan "╤ю╚C╓s <email>chinsan@FreeBSD.org</email>">
+<!ENTITY a.chinsan "╤ю╚C╓s <email xmlns='http://docbook.org/ns/docbook'>chinsan@FreeBSD.org</email>">
 
-<!ENTITY a.clive "╙L╙F╪щ <email>clive@FreeBSD.org</email>">
+<!ENTITY a.clive "╙L╙F╪щ <email xmlns='http://docbook.org/ns/docbook'>clive@FreeBSD.org</email>">
 
-<!ENTITY a.clsung "╖╨╛F╤╘ <email>clsung@FreeBSD.org</email>">
+<!ENTITY a.clsung "╖╨╛F╤╘ <email xmlns='http://docbook.org/ns/docbook'>clsung@FreeBSD.org</email>">
 
-<!ENTITY a.davidxu "╝}╤h╬W <email>davidxu@FreeBSD.org</email>">
+<!ENTITY a.davidxu "╝}╤h╬W <email xmlns='http://docbook.org/ns/docbook'>davidxu@FreeBSD.org</email>">
 
-<!ENTITY a.delphij "╖УЬй <email>delphij@FreeBSD.org</email>">
+<!ENTITY a.delphij "╖УЬй <email xmlns='http://docbook.org/ns/docbook'>delphij@FreeBSD.org</email>">
 
-<!ENTITY a.dryice "╪B╢и <email>dryice@FreeBSD.org</email>">
+<!ENTITY a.dryice "╪B╢и <email xmlns='http://docbook.org/ns/docbook'>dryice@FreeBSD.org</email>">
 
-<!ENTITY a.foxfair "╜J╝x╩╗ <email>foxfair@FreeBSD.org</email>">
+<!ENTITY a.foxfair "╜J╝x╩╗ <email xmlns='http://docbook.org/ns/docbook'>foxfair@FreeBSD.org</email>">
 
-<!ENTITY a.hsu "╝}╠сЁг <email>hsu@FreeBSD.org</email>">
+<!ENTITY a.hsu "╝}╠сЁг <email xmlns='http://docbook.org/ns/docbook'>hsu@FreeBSD.org</email>">
 
-<!ENTITY a.ijliao "╧Ы╜^Ёг <email>ijliao@FreeBSD.org</email>">
+<!ENTITY a.ijliao "╧Ы╜^Ёг <email xmlns='http://docbook.org/ns/docbook'>ijliao@FreeBSD.org</email>">
 
-<!ENTITY a.kaiw "╓Щ╥╒ <email>kaiw@FreeBSD.org</email>">
+<!ENTITY a.kaiw "╓Щ╥╒ <email xmlns='http://docbook.org/ns/docbook'>kaiw@FreeBSD.org</email>">
 
-<!ENTITY a.keichii "╖d╥q╓╦ <email>keichii@FreeBSD.org</email>">
+<!ENTITY a.keichii "╖d╥q╓╦ <email xmlns='http://docbook.org/ns/docbook'>keichii@FreeBSD.org</email>">
 
-<!ENTITY a.kevlo "ц╧аб╝a╟╤ <email>kevlo@FreeBSD.org</email>">
+<!ENTITY a.kevlo "ц╧аб╝a╟╤ <email xmlns='http://docbook.org/ns/docbook'>kevlo@FreeBSD.org</email>">
 
-<!ENTITY a.leeym "╖У╚ш╘З <email>leeym@FreeBSD.org</email>">
+<!ENTITY a.leeym "╖У╚ш╘З <email xmlns='http://docbook.org/ns/docbook'>leeym@FreeBSD.org</email>">
 
-<!ENTITY a.loader "Ё╞╨ж╠d <email>loader@FreeBSD.org</email>">
+<!ENTITY a.loader "Ё╞╨ж╠d <email xmlns='http://docbook.org/ns/docbook'>loader@FreeBSD.org</email>">
 
-<!ENTITY a.luoqi "Ё╞╛╔╙б <email>luoqi@FreeBSD.org</email>">
+<!ENTITY a.luoqi "Ё╞╛╔╙б <email xmlns='http://docbook.org/ns/docbook'>luoqi@FreeBSD.org</email>">
 
-<!ENTITY a.lwhsu "Ё\╔ъ╓Е <email>lwhsu@FreeBSD.org</email>">
+<!ENTITY a.lwhsu "Ё\╔ъ╓Е <email xmlns='http://docbook.org/ns/docbook'>lwhsu@FreeBSD.org</email>">
 
-<!ENTITY a.nemoliu "╪B╖м <email>nemoliu@FreeBSD.org</email>">
+<!ENTITY a.nemoliu "╪B╖м <email xmlns='http://docbook.org/ns/docbook'>nemoliu@FreeBSD.org</email>">
 
-<!ENTITY a.pat "╖У╤Ё╗h <email>pat@FreeBSD.org</email>">
+<!ENTITY a.pat "╖У╤Ё╗h <email xmlns='http://docbook.org/ns/docbook'>pat@FreeBSD.org</email>">
 
-<!ENTITY a.rafan "╜S╨a╝╕ <email>rafan@FreeBSD.org</email>">
+<!ENTITY a.rafan "╜S╨a╝╕ <email xmlns='http://docbook.org/ns/docbook'>rafan@FreeBSD.org</email>">
 
-<!ENTITY a.sephe "ЁЛ╚ш(╓Щ╔а) <email>sephe@FreeBSD.org</email>">
+<!ENTITY a.sephe "ЁЛ╚ш(╓Щ╔а) <email xmlns='http://docbook.org/ns/docbook'>sephe@FreeBSD.org</email>">
 <!--
   ╔я╘С Big5 ╓╓╓Е╗ц╣L╦с╕r║A╔u╠o╔H ╓Щ╔а ╗Б╕r╪х╔N║C
   ╦с╕r╖╧╬Ц╪g╙k╫п╟я╬\ http://www.zdic.net/zd/zi/ZdicE7Zdic8FZdic89.htm
   ╘н http://www.cns11643.gov.tw/web/show_font.jsp?page_n=3&number=11642
 -->
 
-<!ENTITY a.vanilla "╝}╓T╝У <email>vanilla@FreeBSD.org</email>">
+<!ENTITY a.vanilla "╝}╓T╝У <email xmlns='http://docbook.org/ns/docbook'>vanilla@FreeBSD.org</email>">
 
 
 <!--
      Names and email address of Traditional Chinese local contributing authors
 -->
 
-<!ENTITY a.tw.cwlin "╙L╚ьчЁ <email>cwlin0416@gmail.com</email>">
+<!ENTITY a.tw.cwlin "╙L╚ьчЁ <email xmlns='http://docbook.org/ns/docbook'>cwlin0416@gmail.com</email>">
 
-<!ENTITY a.tw.gaod "Ё╞╖╩╞q <email>gaod.chen@gmail.com</email>">
+<!ENTITY a.tw.gaod "Ё╞╖╩╞q <email xmlns='http://docbook.org/ns/docbook'>gaod.chen@gmail.com</email>">
 
-<!ENTITY a.tw.psilotum "╙L╛F╧D <email>b89605222@ntu.edu.tw</email>">
+<!ENTITY a.tw.psilotum "╙L╛F╧D <email xmlns='http://docbook.org/ns/docbook'>b89605222@ntu.edu.tw</email>">
 
-<!ENTITY a.tw.tzhuan "╤ю╓l╝ы <email>tzhuan@gmail.com</email>">
+<!ENTITY a.tw.tzhuan "╤ю╓l╝ы <email xmlns='http://docbook.org/ns/docbook'>tzhuan@gmail.com</email>">
 
-<!ENTITY a.tw.whsyu "╝}╟╤╞E <email>whsyu@arbor.ee.ntu.edu.tw</email>">
+<!ENTITY a.tw.whsyu "╝}╟╤╞E <email xmlns='http://docbook.org/ns/docbook'>whsyu@arbor.ee.ntu.edu.tw</email>">
 
-<!ENTITY a.tw.yzlin "╙L╘y╛F <email>yzlin1985@gmail.com</email>">
+<!ENTITY a.tw.yzlin "╙L╘y╛F <email xmlns='http://docbook.org/ns/docbook'>yzlin1985@gmail.com</email>">

Modified: projects/db5/zh_TW.Big5/share/xml/mailing-lists.ent
==============================================================================
--- projects/db5/zh_TW.Big5/share/xml/mailing-lists.ent	Wed Jun 19 15:07:53 2013	(r41951)
+++ projects/db5/zh_TW.Big5/share/xml/mailing-lists.ent	Wed Jun 19 15:10:08 2013	(r41952)
@@ -8,80 +8,80 @@
 -->
 
 <!ENTITY a.mailman.listinfo "http://lists.FreeBSD.org/mailman/listinfo">
-<!ENTITY a.mailman.lists "<ulink url='&a.mailman.listinfo;'>FreeBSD list server</ulink>">
-<!ENTITY a.mailman.lists.link "<ulink url='&a.mailman.listinfo;'>&a.mailman.listinfo;</ulink>">
+<!ENTITY a.mailman.lists "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mailman.listinfo;'>FreeBSD list server</link>">
+<!ENTITY a.mailman.lists.link "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mailman.listinfo;'>&a.mailman.listinfo;</link>">
 
 <!ENTITY a.acpi.url "&a.mailman.listinfo;/freebsd-acpi">
-<!ENTITY a.acpi "<ulink url='&a.acpi.url;'>FreeBSD ACPI ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.acpi.name "<ulink url='&a.acpi.url;'>freebsd-acpi</ulink>">
+<!ENTITY a.acpi "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.acpi.url;'>FreeBSD ACPI ╤l╩╪╫в╬б</link>">
+<!ENTITY a.acpi.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.acpi.url;'>freebsd-acpi</link>">
 
 <!ENTITY a.advocacy.url "&a.mailman.listinfo;/freebsd-advocacy">
-<!ENTITY a.advocacy "<ulink url='&a.advocacy.url;'>FreeBSD advocacy ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.advocacy.name "<ulink url='&a.advocacy.url;'>freebsd-advocacy</ulink>">
+<!ENTITY a.advocacy "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.advocacy.url;'>FreeBSD advocacy ╤l╩╪╫в╬б</link>">
+<!ENTITY a.advocacy.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.advocacy.url;'>freebsd-advocacy</link>">
 
 <!ENTITY a.afs.url "&a.mailman.listinfo;/freebsd-afs">
-<!ENTITY a.afs "<ulink url='&a.afs.url;'>FreeBSD AFS porting ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.afs.name "<ulink url='&a.afs.url;'>freebsd-afs</ulink>">
+<!ENTITY a.afs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.afs.url;'>FreeBSD AFS porting ╤l╩╪╫в╬б</link>">
+<!ENTITY a.afs.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.afs.url;'>freebsd-afs</link>">
 
 <!ENTITY a.aic7xxx.url "&a.mailman.listinfo;/aic7xxx">
-<!ENTITY a.aic7xxx "<ulink url='&a.aic7xxx.url;'>FreeBSD Adaptec AIC7xxx discussions ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.aic7xxx.name "<ulink url='&a.aic7xxx.url;'>freebsd-aic7xxx</ulink>">
+<!ENTITY a.aic7xxx "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.aic7xxx.url;'>FreeBSD Adaptec AIC7xxx discussions ╤l╩╪╫в╬б</link>">
+<!ENTITY a.aic7xxx.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.aic7xxx.url;'>freebsd-aic7xxx</link>">
 
 <!ENTITY a.alpha.url "&a.mailman.listinfo;/freebsd-alpha">
-<!ENTITY a.alpha "<ulink url='&a.alpha.url;'>FreeBSD Alpha porting ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.alpha.name "<ulink url='&a.alpha.url;'>freebsd-alpha</ulink>">
+<!ENTITY a.alpha "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.alpha.url;'>FreeBSD Alpha porting ╤l╩╪╫в╬б</link>">
+<!ENTITY a.alpha.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.alpha.url;'>freebsd-alpha</link>">
 
 <!ENTITY a.amd64.url "&a.mailman.listinfo;/freebsd-amd64">
-<!ENTITY a.amd64 "<ulink url='&a.amd64.url;'>Porting FreeBSD to AMD64 systems</ulink>">
-<!ENTITY a.amd64.name "<ulink url='&a.amd64.url;'>freebsd-amd64</ulink>">
+<!ENTITY a.amd64 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.amd64.url;'>Porting FreeBSD to AMD64 systems</link>">
+<!ENTITY a.amd64.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.amd64.url;'>freebsd-amd64</link>">
 
 <!ENTITY a.announce.url "&a.mailman.listinfo;/freebsd-announce">
-<!ENTITY a.announce "<ulink url='&a.announce.url;'>FreeBSD announcements ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.announce.name "<ulink url='&a.announce.url;'>freebsd-announce</ulink>">
+<!ENTITY a.announce "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.announce.url;'>FreeBSD announcements ╤l╩╪╫в╬б</link>">
+<!ENTITY a.announce.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.announce.url;'>freebsd-announce</link>">
 
 <!ENTITY a.apache.url "&a.mailman.listinfo;/freebsd-apache">
-<!ENTITY a.apache "<ulink url='&a.apache.url;'>FreeBSD Apache ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.apache.name "<ulink url='&a.apache.url;'>freebsd-apache</ulink>">
+<!ENTITY a.apache "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.apache.url;'>FreeBSD Apache ╤l╩╪╫в╬б</link>">
+<!ENTITY a.apache.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.apache.url;'>freebsd-apache</link>">
 
 <!ENTITY a.arch.url "&a.mailman.listinfo;/freebsd-arch">
-<!ENTITY a.arch "<ulink url='&a.arch.url;'>FreeBSD architecture and design ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.arch.name "<ulink url='&a.arch.url;'>freebsd-arch</ulink>">
+<!ENTITY a.arch "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.arch.url;'>FreeBSD architecture and design ╤l╩╪╫в╬б</link>">
+<!ENTITY a.arch.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.arch.url;'>freebsd-arch</link>">
 
 <!ENTITY a.arm.url "&a.mailman.listinfo;/freebsd-arm">
-<!ENTITY a.arm "<ulink url='&a.arm.url;'>FreeBSD ARM porting ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.arm.name "<ulink url='&a.arm.url;'>freebsd-arm</ulink>">
+<!ENTITY a.arm "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.arm.url;'>FreeBSD ARM porting ╤l╩╪╫в╬б</link>">
+<!ENTITY a.arm.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.arm.url;'>freebsd-arm</link>">
 
 <!ENTITY a.atm.url "&a.mailman.listinfo;/freebsd-atm">
-<!ENTITY a.atm "<ulink url='&a.atm.url;'>FreeBSD ATM networking ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.atm.name "<ulink url='&a.atm.url;'>freebsd-atm</ulink>">
+<!ENTITY a.atm "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.atm.url;'>FreeBSD ATM networking ╤l╩╪╫в╬б</link>">
+<!ENTITY a.atm.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.atm.url;'>freebsd-atm</link>">
 
 <!ENTITY a.audit.url "&a.mailman.listinfo;/freebsd-audit">
-<!ENTITY a.audit "<ulink url='&a.audit.url;'>FreeBSD source code audit ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.audit.name "<ulink url='&a.audit.url;'>freebsd-audit</ulink>">
+<!ENTITY a.audit "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.audit.url;'>FreeBSD source code audit ╤l╩╪╫в╬б</link>">
+<!ENTITY a.audit.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.audit.url;'>freebsd-audit</link>">
 
 <!ENTITY a.binup.url "&a.mailman.listinfo;/freebsd-binup">
-<!ENTITY a.binup "<ulink url='&a.binup.url;'>FreeBSD binary update system ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.binup.name "<ulink url='&a.binup.url;'>freebsd-binup</ulink>">
+<!ENTITY a.binup "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.binup.url;'>FreeBSD binary update system ╤l╩╪╫в╬б</link>">
+<!ENTITY a.binup.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.binup.url;'>freebsd-binup</link>">
 
 <!ENTITY a.bluetooth.url "&a.mailman.listinfo;/freebsd-bluetooth">
-<!ENTITY a.bluetooth "<ulink url='&a.bluetooth.url;'>FreeBSD Bluetooth ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.bluetooth.name "<ulink url='&a.bluetooth.url;'>freebsd-bluetooth</ulink>">
+<!ENTITY a.bluetooth "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bluetooth.url;'>FreeBSD Bluetooth ╤l╩╪╫в╬б</link>">
+<!ENTITY a.bluetooth.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bluetooth.url;'>freebsd-bluetooth</link>">
 
 <!ENTITY a.bugbusters.url "&a.mailman.listinfo;/freebsd-bugbusters">
-<!ENTITY a.bugbusters "<ulink url='&a.bugbusters.url;'>FreeBSD bugbusters ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.bugbusters.name "<ulink url='&a.bugbusters.url;'>freebsd-bugbusters</ulink>">
+<!ENTITY a.bugbusters "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bugbusters.url;'>FreeBSD bugbusters ╤l╩╪╫в╬б</link>">
+<!ENTITY a.bugbusters.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bugbusters.url;'>freebsd-bugbusters</link>">
 
 <!ENTITY a.bugs.url "&a.mailman.listinfo;/freebsd-bugs">
-<!ENTITY a.bugs "<ulink url='&a.bugs.url;'>FreeBSD problem reports ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.bugs.name "<ulink url='&a.bugs.url;'>freebsd-bugs</ulink>">
+<!ENTITY a.bugs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bugs.url;'>FreeBSD problem reports ╤l╩╪╫в╬б</link>">
+<!ENTITY a.bugs.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bugs.url;'>freebsd-bugs</link>">
 
 <!ENTITY a.chat.url "&a.mailman.listinfo;/freebsd-chat">
-<!ENTITY a.chat "<ulink url='&a.chat.url;'>FreeBSD chat ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.chat.name "<ulink url='&a.chat.url;'>freebsd-chat</ulink>">
+<!ENTITY a.chat "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.chat.url;'>FreeBSD chat ╤l╩╪╫в╬б</link>">
+<!ENTITY a.chat.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.chat.url;'>freebsd-chat</link>">
 
 <!ENTITY a.cluster.url "&a.mailman.listinfo;/freebsd-cluster">
-<!ENTITY a.cluster "<ulink url='&a.cluster.url;'>FreeBSD clustering ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.cluster.name "<ulink url='&a.cluster.url;'>freebsd-cluster</ulink>">
+<!ENTITY a.cluster "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cluster.url;'>FreeBSD clustering ╤l╩╪╫в╬б</link>">
+<!ENTITY a.cluster.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cluster.url;'>freebsd-cluster</link>">
 
 <!ENTITY a.committers "FreeBSD committer's ╤l╩╪╫в╬б">
 <!ENTITY a.committers.name "cvs-committers">
@@ -90,63 +90,63 @@
 <!ENTITY a.core.name "freebsd-core">
 
 <!ENTITY a.current.url "&a.mailman.listinfo;/freebsd-current">
-<!ENTITY a.current "<ulink url='&a.current.url;'>&os.current; ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.current.name "<ulink url='&a.current.url;'>freebsd-current</ulink>">
+<!ENTITY a.current "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.current.url;'>&os.current; ╤l╩╪╫в╬б</link>">
+<!ENTITY a.current.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.current.url;'>freebsd-current</link>">
 
 <!ENTITY a.ctm-announce.url "&a.mailman.listinfo;/ctm-announce">
-<!ENTITY a.ctm-announce "<ulink url='&a.ctm-announce.url;'>CTM ╓╫╖i</ulink>">
-<!ENTITY a.ctm-announce.name "<ulink url='&a.ctm-announce.url;'>ctm-announce</ulink>">
+<!ENTITY a.ctm-announce "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-announce.url;'>CTM ╓╫╖i</link>">
+<!ENTITY a.ctm-announce.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-announce.url;'>ctm-announce</link>">
 
 <!ENTITY a.ctm-cvs-cur.url "&a.mailman.listinfo;/ctm-cvs-cur">
-<!ENTITY a.ctm-cvs-cur "<ulink url='&a.ctm-cvs-cur.url;'>Ёz╧L CTM ╣o╖G╙╨ CVS юи╝в</ulink>">
-<!ENTITY a.ctm-cvs-cur.name "<ulink url='&a.ctm-cvs-cur.url;'>ctm-cvs-cur</ulink>">
+<!ENTITY a.ctm-cvs-cur "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-cvs-cur.url;'>Ёz╧L CTM ╣o╖G╙╨ CVS юи╝в</link>">
+<!ENTITY a.ctm-cvs-cur.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-cvs-cur.url;'>ctm-cvs-cur</link>">
 
 <!ENTITY a.ctm-src-4.url "&a.mailman.listinfo;/ctm-src-4">
-<!ENTITY a.ctm-src-4 "<ulink url='&a.ctm-src-4.url;'>CTM 4-STABLE src branch distribution ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.ctm-src-4.name "<ulink url='&a.ctm-src-4.url;'>ctm-src-4</ulink>">
+<!ENTITY a.ctm-src-4 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-4.url;'>CTM 4-STABLE src branch distribution ╤l╩╪╫в╬б</link>">
+<!ENTITY a.ctm-src-4.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-4.url;'>ctm-src-4</link>">
 
 <!ENTITY a.ctm-src-cur.url "&a.mailman.listinfo;/ctm-src-cur">
-<!ENTITY a.ctm-src-cur "<ulink url='&a.ctm-src-cur.url;'>CTM -CURRENT src branch distribution ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.ctm-src-cur.name "<ulink url='&a.ctm-src-cur.url;'>ctm-src-cur</ulink>">
+<!ENTITY a.ctm-src-cur "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-cur.url;'>CTM -CURRENT src branch distribution ╤l╩╪╫в╬б</link>">
+<!ENTITY a.ctm-src-cur.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-cur.url;'>ctm-src-cur</link>">
 
 <!ENTITY a.ctm-users.url "&a.mailman.listinfo;/ctm-users">
-<!ENTITY a.ctm-users "<ulink url='&a.ctm-users.url;'>CTM user discussion ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.ctm-users.name "<ulink url='&a.ctm-users.url;'>ctm-users</ulink>">
+<!ENTITY a.ctm-users "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-users.url;'>CTM user discussion ╤l╩╪╫в╬б</link>">
+<!ENTITY a.ctm-users.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-users.url;'>ctm-users</link>">
 
 <!ENTITY a.cvsall.url "&a.mailman.listinfo;/cvs-all">
-<!ENTITY a.cvsall "<ulink url='&a.cvsall.url;'>FreeBSD CVS commit message ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.cvsall.name "<ulink url='&a.cvsall.url;'>cvs-all</ulink>">
+<!ENTITY a.cvsall "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvsall.url;'>FreeBSD CVS commit message ╤l╩╪╫в╬б</link>">
+<!ENTITY a.cvsall.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvsall.url;'>cvs-all</link>">
 
 <!ENTITY a.cvs-doc.url "&a.mailman.listinfo;/cvs-doc">
-<!ENTITY a.cvs-doc "<ulink url='&a.cvs-doc.url;'>FreeBSD CVS doc commit list</ulink>">
-<!ENTITY a.cvs-doc.name "<ulink url='&a.cvs-doc.url;'>cvs-doc</ulink>">
+<!ENTITY a.cvs-doc "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-doc.url;'>FreeBSD CVS doc commit list</link>">
+<!ENTITY a.cvs-doc.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-doc.url;'>cvs-doc</link>">
 
 <!ENTITY a.cvs-ports.url "&a.mailman.listinfo;/cvs-ports">
-<!ENTITY a.cvs-ports "<ulink url='&a.cvs-ports.url;'>FreeBSD CVS ports commit list</ulink>">
-<!ENTITY a.cvs-ports.name "<ulink url='&a.cvs-ports.url;'>cvs-ports</ulink>">
+<!ENTITY a.cvs-ports "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-ports.url;'>FreeBSD CVS ports commit list</link>">
+<!ENTITY a.cvs-ports.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-ports.url;'>cvs-ports</link>">
 
 <!ENTITY a.cvs-projects.url "&a.mailman.listinfo;/cvs-projects">
-<!ENTITY a.cvs-projects "<ulink url='&a.cvs-projects.url;'>FreeBSD CVS projects commit list</ulink>">
-<!ENTITY a.cvs-projects.name "<ulink url='&a.cvs-projects.url;'>cvs-projects</ulink>">
+<!ENTITY a.cvs-projects "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-projects.url;'>FreeBSD CVS projects commit list</link>">
+<!ENTITY a.cvs-projects.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-projects.url;'>cvs-projects</link>">
 
 <!ENTITY a.cvs-src.url "&a.mailman.listinfo;/cvs-src">
-<!ENTITY a.cvs-src "<ulink url='&a.cvs-src.url;'>FreeBSD CVS src commit list</ulink>">
-<!ENTITY a.cvs-src.name "<ulink url='&a.cvs-src.url;'>cvs-src</ulink>">
+<!ENTITY a.cvs-src "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-src.url;'>FreeBSD CVS src commit list</link>">
+<!ENTITY a.cvs-src.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-src.url;'>cvs-src</link>">
 
 <!ENTITY a.cvsweb.url "&a.mailman.listinfo;/freebsd-cvsweb">
-<!ENTITY a.cvsweb "<ulink url='&a.cvsweb.url;'>FreeBSD CVSweb ╨Ше@╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.cvsweb.name "<ulink url='&a.cvsweb.url;'>freebsd-cvsweb</ulink>">
+<!ENTITY a.cvsweb "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvsweb.url;'>FreeBSD CVSweb ╨Ше@╤l╩╪╫в╬б</link>">
+<!ENTITY a.cvsweb.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvsweb.url;'>freebsd-cvsweb</link>">
 
 <!ENTITY a.database.url "&a.mailman.listinfo;/freebsd-database">
-<!ENTITY a.database "<ulink url='&a.database.url;'>FreeBSD based Databases ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.database.name "<ulink url='&a.database.url;'>freebsd-database</ulink>">
+<!ENTITY a.database "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.database.url;'>FreeBSD based Databases ╤l╩╪╫в╬б</link>">
+<!ENTITY a.database.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.database.url;'>freebsd-database</link>">
 
 <!ENTITY a.developers "FreeBSD developers ╤l╩╪╫в╬б">
 <!ENTITY a.developers.name "freebsd-developers">
 
 <!ENTITY a.doc.url "&a.mailman.listinfo;/freebsd-doc">
-<!ENTITY a.doc "<ulink url='&a.doc.url;'>FreeBSD documentation project ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.doc.name "<ulink url='&a.doc.url;'>freebsd-doc</ulink>">
+<!ENTITY a.doc "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.doc.url;'>FreeBSD documentation project ╤l╩╪╫в╬б</link>">
+<!ENTITY a.doc.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.doc.url;'>freebsd-doc</link>">
 
 <!ENTITY a.doc-committers "FreeBSD doc/ committer's ╤l╩╪╫в╬б">
 <!ENTITY a.doc-committers.name "doc-committers">
@@ -155,168 +155,168 @@
 <!ENTITY a.doc-developers.name "doc-developers">
 
 <!ENTITY a.drivers.url "&a.mailman.listinfo;/freebsd-drivers">
-<!ENTITY a.drivers "<ulink url='&a.drivers.url;'>Writing device drivers for FreeBSD</ulink>">
-<!ENTITY a.drivers.name "<ulink url='&a.drivers.url;'>freebsd-drivers</ulink>">
+<!ENTITY a.drivers "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.drivers.url;'>Writing device drivers for FreeBSD</link>">
+<!ENTITY a.drivers.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.drivers.url;'>freebsd-drivers</link>">
 
 <!ENTITY a.eclipse.url "&a.mailman.listinfo;/freebsd-eclipse">
-<!ENTITY a.eclipse "<ulink url='&a.eclipse.url;'>FreeBSD users of Eclipse IDE, tools, rich client applications and ports</ulink>">
-<!ENTITY a.eclipse.name "<ulink url='&a.eclipse.url;'>freebsd-eclipse</ulink>">
+<!ENTITY a.eclipse "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.eclipse.url;'>FreeBSD users of Eclipse IDE, tools, rich client applications and ports</link>">
+<!ENTITY a.eclipse.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.eclipse.url;'>freebsd-eclipse</link>">
 
 <!ENTITY a.embedded.url "&a.mailman.listinfo;/freebsd-embedded">
-<!ENTITY a.embedded "<ulink url='&a.embedded.url;'>FreeBSD-embedded ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.embedded.name "<ulink url='&a.embedded.url;'>freebsd-embedded</ulink>">
+<!ENTITY a.embedded "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.embedded.url;'>FreeBSD-embedded ╤l╩╪╫в╬б</link>">
+<!ENTITY a.embedded.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.embedded.url;'>freebsd-embedded</link>">
 
 <!ENTITY a.emulation.url "&a.mailman.listinfo;/freebsd-emulation">
-<!ENTITY a.emulation "<ulink url='&a.emulation.url;'>FreeBSD-emulation ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.emulation.name "<ulink url='&a.emulation.url;'>freebsd-emulation</ulink>">
+<!ENTITY a.emulation "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.emulation.url;'>FreeBSD-emulation ╤l╩╪╫в╬б</link>">
+<!ENTITY a.emulation.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.emulation.url;'>freebsd-emulation</link>">
 
 <!ENTITY a.eol.url "&a.mailman.listinfo;/freebsd-eol">
-<!ENTITY a.eol "<ulink url='&a.eol.url;'>FreeBSD-eol ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.eol.name "<ulink url='&a.eol.url;'>freebsd-eol</ulink>">
+<!ENTITY a.eol "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.eol.url;'>FreeBSD-eol ╤l╩╪╫в╬б</link>">
+<!ENTITY a.eol.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.eol.url;'>freebsd-eol</link>">
 
 <!ENTITY a.firewire.url "&a.mailman.listinfo;/freebsd-firewire">
-<!ENTITY a.firewire "<ulink url='&a.firewire.url;'>FreeBSD FireWire (IEEE 1394) discussion ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.firewire.name "<ulink url='&a.firewire.url;'>freebsd-firewire</ulink>">
+<!ENTITY a.firewire "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.firewire.url;'>FreeBSD FireWire (IEEE 1394) discussion ╤l╩╪╫в╬б</link>">
+<!ENTITY a.firewire.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.firewire.url;'>freebsd-firewire</link>">
 
 <!ENTITY a.fs.url "&a.mailman.listinfo;/freebsd-fs">
-<!ENTITY a.fs "<ulink url='&a.fs.url;'>FreeBSD file system project ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.fs.name "<ulink url='&a.fs.url;'>freebsd-fs</ulink>">
+<!ENTITY a.fs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.fs.url;'>FreeBSD file system project ╤l╩╪╫в╬б</link>">
+<!ENTITY a.fs.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.fs.url;'>freebsd-fs</link>">
 
 <!ENTITY a.geom.url "&a.mailman.listinfo;/freebsd-geom">
-<!ENTITY a.geom "<ulink url='&a.geom.url;'>FreeBSD GEOM ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.geom.name "<ulink url='&a.geom.url;'>freebsd-geom</ulink>">
+<!ENTITY a.geom "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.geom.url;'>FreeBSD GEOM ╤l╩╪╫в╬б</link>">
+<!ENTITY a.geom.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.geom.url;'>freebsd-geom</link>">
 
 <!ENTITY a.gnome.url "&a.mailman.listinfo;/freebsd-gnome">
-<!ENTITY a.gnome "<ulink url='&a.gnome.url;'>FreeBSD GNOME and GNOME applications ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.gnome.name "<ulink url='&a.gnome.url;'>freebsd-gnome</ulink>">
+<!ENTITY a.gnome "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.gnome.url;'>FreeBSD GNOME and GNOME applications ╤l╩╪╫в╬б</link>">
+<!ENTITY a.gnome.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.gnome.url;'>freebsd-gnome</link>">
 
 <!ENTITY a.hackers.url "&a.mailman.listinfo;/freebsd-hackers">
-<!ENTITY a.hackers "<ulink url='&a.hackers.url;'>FreeBSD technical discussions ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.hackers.name "<ulink url='&a.hackers.url;'>freebsd-hackers</ulink>">
+<!ENTITY a.hackers "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hackers.url;'>FreeBSD technical discussions ╤l╩╪╫в╬б</link>">
+<!ENTITY a.hackers.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hackers.url;'>freebsd-hackers</link>">
 
 <!ENTITY a.hardware.url "&a.mailman.listinfo;/freebsd-hardware">
-<!ENTITY a.hardware "<ulink url='&a.hardware.url;'>FreeBSD hardware and equipment ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.hardware.name "<ulink url='&a.hardware.url;'>freebsd-hardware</ulink>">
+<!ENTITY a.hardware "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hardware.url;'>FreeBSD hardware and equipment ╤l╩╪╫в╬б</link>">
+<!ENTITY a.hardware.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hardware.url;'>freebsd-hardware</link>">
 
 <!ENTITY a.hubs.url "&a.mailman.listinfo;/freebsd-hubs">
-<!ENTITY a.hubs "<ulink url='&a.hubs.url;'>FreeBSD mirror sites ╤l╩╪╫в╬бs</ulink>">
-<!ENTITY a.hubs.name "<ulink url='&a.hubs.url;'>freebsd-hubs</ulink>">
+<!ENTITY a.hubs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hubs.url;'>FreeBSD mirror sites ╤l╩╪╫в╬бs</link>">
+<!ENTITY a.hubs.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hubs.url;'>freebsd-hubs</link>">
 
 <!ENTITY a.i18n.url "&a.mailman.listinfo;/freebsd-i18n">
-<!ENTITY a.i18n "<ulink url='&a.i18n.url;'>FreeBSD internationalization ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.i18n.name "<ulink url='&a.i18n.url;'>freebsd-i18n</ulink>">
+<!ENTITY a.i18n "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.i18n.url;'>FreeBSD internationalization ╤l╩╪╫в╬б</link>">
+<!ENTITY a.i18n.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.i18n.url;'>freebsd-i18n</link>">
 
 <!ENTITY a.i386.url "&a.mailman.listinfo;/freebsd-i386">
-<!ENTITY a.i386 "<ulink url='&a.i386.url;'>FreeBSD i386-specific issues ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.i386.name "<ulink url='&a.i386.url;'>freebsd-i386</ulink>">
+<!ENTITY a.i386 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.i386.url;'>FreeBSD i386-specific issues ╤l╩╪╫в╬б</link>">
+<!ENTITY a.i386.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.i386.url;'>freebsd-i386</link>">
 
 <!ENTITY a.ia32.url "&a.mailman.listinfo;/freebsd-ia32">
-<!ENTITY a.ia32 "<ulink url='&a.ia32.url;'>FreeBSD IA32 porting ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.ia32.name "<ulink url='&a.ia32.url;'>freebsd-ia32</ulink>">
+<!ENTITY a.ia32 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ia32.url;'>FreeBSD IA32 porting ╤l╩╪╫в╬б</link>">
+<!ENTITY a.ia32.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ia32.url;'>freebsd-ia32</link>">
 
 <!ENTITY a.ia64.url "&a.mailman.listinfo;/freebsd-ia64">
-<!ENTITY a.ia64 "<ulink url='&a.ia64.url;'>FreeBSD IA64 porting ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.ia64.name "<ulink url='&a.ia64.url;'>freebsd-ia64</ulink>">
+<!ENTITY a.ia64 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ia64.url;'>FreeBSD IA64 porting ╤l╩╪╫в╬б</link>">
+<!ENTITY a.ia64.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ia64.url;'>freebsd-ia64</link>">
 
 <!ENTITY a.ipfw.url "&a.mailman.listinfo;/freebsd-ipfw">
-<!ENTITY a.ipfw "<ulink url='&a.ipfw.url;'>FreeBSD IPFW code ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.ipfw.name "<ulink url='&a.ipfw.url;'>freebsd-ipfw</ulink>">
+<!ENTITY a.ipfw "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ipfw.url;'>FreeBSD IPFW code ╤l╩╪╫в╬б</link>">
+<!ENTITY a.ipfw.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ipfw.url;'>freebsd-ipfw</link>">
 
 <!ENTITY a.isdn.url "&a.mailman.listinfo;/freebsd-isdn">
-<!ENTITY a.isdn "<ulink url='&a.isdn.url;'>FreeBSD ISDN ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.isdn.name "<ulink url='&a.isdn.url;'>freebsd-isdn</ulink>">
+<!ENTITY a.isdn "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.isdn.url;'>FreeBSD ISDN ╤l╩╪╫в╬б</link>">
+<!ENTITY a.isdn.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.isdn.url;'>freebsd-isdn</link>">
 
 <!ENTITY a.isp.url "&a.mailman.listinfo;/freebsd-isp">
-<!ENTITY a.isp "<ulink url='&a.isp.url;'>FreeBSD Internet service provider's ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.isp.name "<ulink url='&a.isp.url;'>freebsd-isp</ulink>">
+<!ENTITY a.isp "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.isp.url;'>FreeBSD Internet service provider's ╤l╩╪╫в╬б</link>">
+<!ENTITY a.isp.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.isp.url;'>freebsd-isp</link>">
 
 <!ENTITY a.jail.url "&a.mailman.listinfo;/freebsd-jail">
-<!ENTITY a.jail "<ulink url='&a.jail.url;'>FreeBSD jails ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.jail.name "<ulink url='&a.jail.url;'>freebsd-jail</ulink>">
+<!ENTITY a.jail "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.jail.url;'>FreeBSD jails ╤l╩╪╫в╬б</link>">
+<!ENTITY a.jail.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.jail.url;'>freebsd-jail</link>">
 
 <!ENTITY a.java.url "&a.mailman.listinfo;/freebsd-java">
-<!ENTITY a.java "<ulink url='&a.java.url;'>FreeBSD Java Language ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.java.name "<ulink url='&a.java.url;'>freebsd-java</ulink>">
+<!ENTITY a.java "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.java.url;'>FreeBSD Java Language ╤l╩╪╫в╬б</link>">
+<!ENTITY a.java.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.java.url;'>freebsd-java</link>">
 
 <!ENTITY a.jobs.url "&a.mailman.listinfo;/freebsd-jobs">
-<!ENTITY a.jobs "<ulink url='&a.jobs.url;'>FreeBSD related employment ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.jobs.name "<ulink url='&a.jobs.url;'>freebsd-jobs</ulink>">
+<!ENTITY a.jobs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.jobs.url;'>FreeBSD related employment ╤l╩╪╫в╬б</link>">
+<!ENTITY a.jobs.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.jobs.url;'>freebsd-jobs</link>">
 
 <!ENTITY a.kde.url "https://mail.kde.org/mailman/listinfo/kde-freebsd">
-<!ENTITY a.kde "<ulink url='&a.kde.url;'>FreeBSD KDE/Qt and KDE applications ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.kde.name "<ulink url='&a.kde.url;'>freebsd-kde</ulink>">
+<!ENTITY a.kde "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.kde.url;'>FreeBSD KDE/Qt and KDE applications ╤l╩╪╫в╬б</link>">
+<!ENTITY a.kde.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.kde.url;'>freebsd-kde</link>">
 
 <!ENTITY a.lfs.url "&a.mailman.listinfo;/freebsd-lfs">
-<!ENTITY a.lfs "<ulink url='&a.lfs.url;'>FreeBSD LFS porting ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.lfs.name "<ulink url='&a.lfs.url;'>freebsd-lfs</ulink>">
+<!ENTITY a.lfs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.lfs.url;'>FreeBSD LFS porting ╤l╩╪╫в╬б</link>">
+<!ENTITY a.lfs.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.lfs.url;'>freebsd-lfs</link>">
 
 <!ENTITY a.libh.url "&a.mailman.listinfo;/freebsd-libh">
-<!ENTITY a.libh "<ulink url='&a.libh.url;'>FreeBSD libh installation and packaging system ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.libh.name "<ulink url='&a.libh.url;'>freebsd-libh</ulink>">
+<!ENTITY a.libh "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.libh.url;'>FreeBSD libh installation and packaging system ╤l╩╪╫в╬б</link>">
+<!ENTITY a.libh.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.libh.url;'>freebsd-libh</link>">
 
 <!ENTITY a.mips.url "&a.mailman.listinfo;/freebsd-mips">
-<!ENTITY a.mips "<ulink url='&a.mips.url;'>FreeBSD MIPS porting ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.mips.name "<ulink url='&a.mips.url;'>freebsd-mips</ulink>">
+<!ENTITY a.mips "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mips.url;'>FreeBSD MIPS porting ╤l╩╪╫в╬б</link>">
+<!ENTITY a.mips.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mips.url;'>freebsd-mips</link>">
 
 <!ENTITY a.mirror-announce.url "&a.mailman.listinfo;/mirror-announce">
-<!ENTITY a.mirror-announce "<ulink url='&a.mirror-announce.url;'>FreeBSD mirror site administrators</ulink>">
-<!ENTITY a.mirror-announce.name "<ulink url='&a.mirror-announce.url;'>mirror-announce</ulink>">
+<!ENTITY a.mirror-announce "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mirror-announce.url;'>FreeBSD mirror site administrators</link>">
+<!ENTITY a.mirror-announce.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mirror-announce.url;'>mirror-announce</link>">
 
 <!ENTITY a.mobile.url "&a.mailman.listinfo;/freebsd-mobile">
-<!ENTITY a.mobile "<ulink url='&a.mobile.url;'>FreeBSD laptop computer ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.mobile.name "<ulink url='&a.mobile.url;'>freebsd-mobile</ulink>">
+<!ENTITY a.mobile "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mobile.url;'>FreeBSD laptop computer ╤l╩╪╫в╬б</link>">
+<!ENTITY a.mobile.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mobile.url;'>freebsd-mobile</link>">
 
 <!ENTITY a.mozilla.url "&a.mailman.listinfo;/freebsd-mozilla">
-<!ENTITY a.mozilla "<ulink url='&a.mozilla.url;'>FreeBSD port of the Mozilla browser ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.mozilla.name "<ulink url='&a.mozilla.url;'>freebsd-mozilla</ulink>">
+<!ENTITY a.mozilla "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mozilla.url;'>FreeBSD port of the Mozilla browser ╤l╩╪╫в╬б</link>">
+<!ENTITY a.mozilla.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mozilla.url;'>freebsd-mozilla</link>">
 
 <!ENTITY a.multimedia.url "&a.mailman.listinfo;/freebsd-multimedia">
-<!ENTITY a.multimedia "<ulink url='&a.multimedia.url;'>FreeBSD multimedia ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.multimedia.name "<ulink url='&a.multimedia.url;'>freebsd-multimedia</ulink>">
+<!ENTITY a.multimedia "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.multimedia.url;'>FreeBSD multimedia ╤l╩╪╫в╬б</link>">
+<!ENTITY a.multimedia.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.multimedia.url;'>freebsd-multimedia</link>">
 
 <!ENTITY a.net.url "&a.mailman.listinfo;/freebsd-net">
-<!ENTITY a.net "<ulink url='&a.net.url;'>FreeBSD networking ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.net.name "<ulink url='&a.net.url;'>freebsd-net</ulink>">
+<!ENTITY a.net "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.net.url;'>FreeBSD networking ╤l╩╪╫в╬б</link>">
+<!ENTITY a.net.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.net.url;'>freebsd-net</link>">
 
 <!ENTITY a.newbies.url "&a.mailman.listinfo;/freebsd-newbies">
-<!ENTITY a.newbies "<ulink url='&a.newbies.url;'>FreeBSD new users ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.newbies.name "<ulink url='&a.newbies.url;'>freebsd-newbies</ulink>">
+<!ENTITY a.newbies "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.newbies.url;'>FreeBSD new users ╤l╩╪╫в╬б</link>">
+<!ENTITY a.newbies.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.newbies.url;'>freebsd-newbies</link>">
 
 <!ENTITY a.newbus.url "&a.mailman.listinfo;/freebsd-new-bus">
-<!ENTITY a.newbus "<ulink url='&a.newbus.url;'>FreeBSD new-bus ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.newbus.name "<ulink url='&a.newbus.url;'>freebsd-new-bus</ulink>">
+<!ENTITY a.newbus "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.newbus.url;'>FreeBSD new-bus ╤l╩╪╫в╬б</link>">
+<!ENTITY a.newbus.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.newbus.url;'>freebsd-new-bus</link>">
 
 <!ENTITY a.openoffice.url "&a.mailman.listinfo;/freebsd-openoffice">
-<!ENTITY a.openoffice "<ulink url='&a.openoffice.url;'>FreeBSD OpenOffice ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.openoffice.name "<ulink url='&a.openoffice.url;'>freebsd-openoffice</ulink>">
+<!ENTITY a.openoffice "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.openoffice.url;'>FreeBSD OpenOffice ╤l╩╪╫в╬б</link>">
+<!ENTITY a.openoffice.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.openoffice.url;'>freebsd-openoffice</link>">
 
 <!ENTITY a.performance.url "&a.mailman.listinfo;/freebsd-performance">
-<!ENTITY a.performance "<ulink url='&a.performance.url;'>FreeBSD performance ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.performance.name "<ulink url='&a.performance.url;'>freebsd-performance</ulink>">
+<!ENTITY a.performance "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.performance.url;'>FreeBSD performance ╤l╩╪╫в╬б</link>">
+<!ENTITY a.performance.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.performance.url;'>freebsd-performance</link>">
 
 <!ENTITY a.perl.url "&a.mailman.listinfo;/freebsd-perl">
-<!ENTITY a.perl "<ulink url='&a.perl.url;'>FreeBSD Perl ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.perl.name "<ulink url='&a.perl.url;'>freebsd-perl</ulink>">
+<!ENTITY a.perl "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.perl.url;'>FreeBSD Perl ╤l╩╪╫в╬б</link>">
+<!ENTITY a.perl.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.perl.url;'>freebsd-perl</link>">
 
 <!ENTITY a.pf.url "&a.mailman.listinfo;/freebsd-pf">
-<!ENTITY a.pf "<ulink url='&a.pf.url;'>FreeBSD packet filter ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.pf.name "<ulink url='&a.pf.url;'>freebsd-pf</ulink>">
+<!ENTITY a.pf "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.pf.url;'>FreeBSD packet filter ╤l╩╪╫в╬б</link>">
+<!ENTITY a.pf.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.pf.url;'>freebsd-pf</link>">
 
 <!ENTITY a.platforms.url "&a.mailman.listinfo;/freebsd-platforms">
-<!ENTITY a.platforms "<ulink url='&a.platforms.url;'>FreeBSD non-Intel platforms porting ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.platforms.name "<ulink url='&a.platforms.url;'>freebsd-platforms</ulink>">
+<!ENTITY a.platforms "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.platforms.url;'>FreeBSD non-Intel platforms porting ╤l╩╪╫в╬б</link>">
+<!ENTITY a.platforms.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.platforms.url;'>freebsd-platforms</link>">
 
 <!ENTITY a.policy.url "&a.mailman.listinfo;/freebsd-policy">
-<!ENTITY a.policy "<ulink url='&a.policy.url;'>FreeBSD core team policy decisions ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.policy.name "<ulink url='&a.policy.url;'>freebsd-policy</ulink>">
+<!ENTITY a.policy "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.policy.url;'>FreeBSD core team policy decisions ╤l╩╪╫в╬б</link>">
+<!ENTITY a.policy.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.policy.url;'>freebsd-policy</link>">
 
 <!ENTITY a.ports.url "&a.mailman.listinfo;/freebsd-ports">
-<!ENTITY a.ports "<ulink url='&a.ports.url;'>FreeBSD ports ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.ports.name "<ulink url='&a.ports.url;'>freebsd-ports</ulink>">
+<!ENTITY a.ports "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports.url;'>FreeBSD ports ╤l╩╪╫в╬б</link>">
+<!ENTITY a.ports.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports.url;'>freebsd-ports</link>">
 
 <!ENTITY a.ports-bugs.url "&a.mailman.listinfo;/freebsd-ports-bugs">
-<!ENTITY a.ports-bugs "<ulink url='&a.ports-bugs.url;'>FreeBSD ports bugs ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.ports-bugs.name "<ulink url='&a.ports-bugs.url;'>freebsd-ports-bugs</ulink>">
+<!ENTITY a.ports-bugs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports-bugs.url;'>FreeBSD ports bugs ╤l╩╪╫в╬б</link>">
+<!ENTITY a.ports-bugs.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports-bugs.url;'>freebsd-ports-bugs</link>">
 
 <!ENTITY a.ports-committers "FreeBSD ports/ committer's ╤l╩╪╫в╬б">
 <!ENTITY a.ports-committers.name "ports-committers">
@@ -325,56 +325,56 @@
 <!ENTITY a.ports-developers.name "ports-developers">
 
 <!ENTITY a.ppc.url "&a.mailman.listinfo;/freebsd-ppc">
-<!ENTITY a.ppc "<ulink url='&a.ppc.url;'>FreeBSD PowerPC porting ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.ppc.name "<ulink url='&a.ppc.url;'>freebsd-ppc</ulink>">
+<!ENTITY a.ppc "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ppc.url;'>FreeBSD PowerPC porting ╤l╩╪╫в╬б</link>">
+<!ENTITY a.ppc.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ppc.url;'>freebsd-ppc</link>">
 
 <!ENTITY a.proliant.url "&a.mailman.listinfo;/freebsd-proliant">
-<!ENTITY a.proliant "<ulink url='&a.proliant.url;'>Technical discussion of FreeBSD on HP ProLiant server platforms</ulink>">
-<!ENTITY a.proliant.name "<ulink url='&a.proliant.url;'>freebsd-proliant</ulink>">
+<!ENTITY a.proliant "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.proliant.url;'>Technical discussion of FreeBSD on HP ProLiant server platforms</link>">
+<!ENTITY a.proliant.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.proliant.url;'>freebsd-proliant</link>">
 
 <!ENTITY a.python.url "&a.mailman.listinfo;/freebsd-python">
-<!ENTITY a.python "<ulink url='&a.python.url;'>FreeBSD Python ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.python.name "<ulink url='&a.python.url;'>freebsd-python</ulink>">
+<!ENTITY a.python "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.python.url;'>FreeBSD Python ╤l╩╪╫в╬б</link>">
+<!ENTITY a.python.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.python.url;'>freebsd-python</link>">
 
 <!ENTITY a.qa.url "&a.mailman.listinfo;/freebsd-qa">
-<!ENTITY a.qa "<ulink url='&a.qa.url;'>FreeBSD Quality Assurance ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.qa.name "<ulink url='&a.qa.url;'>freebsd-qa</ulink>">
+<!ENTITY a.qa "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.qa.url;'>FreeBSD Quality Assurance ╤l╩╪╫в╬б</link>">
+<!ENTITY a.qa.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.qa.url;'>freebsd-qa</link>">
 
 <!ENTITY a.questions.url "&a.mailman.listinfo;/freebsd-questions">
-<!ENTITY a.questions "<ulink url='&a.questions.url;'>FreeBSD general questions ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.questions.name "<ulink url='&a.questions.url;'>freebsd-questions</ulink>">
+<!ENTITY a.questions "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.questions.url;'>FreeBSD general questions ╤l╩╪╫в╬б</link>">
+<!ENTITY a.questions.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.questions.url;'>freebsd-questions</link>">
 
 <!ENTITY a.rc.url "&a.mailman.listinfo;/freebsd-rc">
-<!ENTITY a.rc "<ulink url='&a.rc.url;'>FreeBSD boot script system ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.rc.name "<ulink url='&a.rc.url;'>freebsd-rc</ulink>">
+<!ENTITY a.rc "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.rc.url;'>FreeBSD boot script system ╤l╩╪╫в╬б</link>">
+<!ENTITY a.rc.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.rc.url;'>freebsd-rc</link>">
 
 <!ENTITY a.realtime.url "&a.mailman.listinfo;/freebsd-realtime">
-<!ENTITY a.realtime "<ulink url='&a.realtime.url;'>FreeBSD realtime extensions ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.realtime.name "<ulink url='&a.realtime.url;'>freebsd-realtime</ulink>">
+<!ENTITY a.realtime "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.realtime.url;'>FreeBSD realtime extensions ╤l╩╪╫в╬б</link>">
+<!ENTITY a.realtime.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.realtime.url;'>freebsd-realtime</link>">
 
 <!ENTITY a.scsi.url "&a.mailman.listinfo;/freebsd-scsi">
-<!ENTITY a.scsi "<ulink url='&a.scsi.url;'>FreeBSD SCSI subsystem ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.scsi.name "<ulink url='&a.scsi.url;'>freebsd-scsi</ulink>">
+<!ENTITY a.scsi "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.scsi.url;'>FreeBSD SCSI subsystem ╤l╩╪╫в╬б</link>">
+<!ENTITY a.scsi.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.scsi.url;'>freebsd-scsi</link>">
 
 <!ENTITY a.security.url "&a.mailman.listinfo;/freebsd-security">
-<!ENTITY a.security "<ulink url='&a.security.url;'>FreeBSD security ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.security.name "<ulink url='&a.security.url;'>freebsd-security</ulink>">
+<!ENTITY a.security "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.security.url;'>FreeBSD security ╤l╩╪╫в╬б</link>">
+<!ENTITY a.security.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.security.url;'>freebsd-security</link>">
 
 <!ENTITY a.security-notifications.url "&a.mailman.listinfo;/freebsd-security-notifications">
-<!ENTITY a.security-notifications "<ulink url='&a.security-notifications.url;'>FreeBSD security notifications ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.security-notifications.name "<ulink url='&a.security-notifications.url;'>freebsd-security-notifications</ulink>">
+<!ENTITY a.security-notifications "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.security-notifications.url;'>FreeBSD security notifications ╤l╩╪╫в╬б</link>">
+<!ENTITY a.security-notifications.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.security-notifications.url;'>freebsd-security-notifications</link>">
 
 <!ENTITY a.small.url "&a.mailman.listinfo;/freebsd-small">
-<!ENTITY a.small "<ulink url='&a.small.url;'>FreeBSD-small ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.small.name "<ulink url='&a.small.url;'>freebsd-small</ulink>">
+<!ENTITY a.small "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.small.url;'>FreeBSD-small ╤l╩╪╫в╬б</link>">
+<!ENTITY a.small.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.small.url;'>freebsd-small</link>">
 
 <!ENTITY a.smp.url "&a.mailman.listinfo;/freebsd-smp">
-<!ENTITY a.smp "<ulink url='&a.smp.url;'>FreeBSD symmetric multiprocessing ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.smp.name "<ulink url='&a.smp.url;'>freebsd-smp</ulink>">
+<!ENTITY a.smp "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.smp.url;'>FreeBSD symmetric multiprocessing ╤l╩╪╫в╬б</link>">
+<!ENTITY a.smp.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.smp.url;'>freebsd-smp</link>">
 
 <!ENTITY a.sparc.url "&a.mailman.listinfo;/freebsd-sparc64">
-<!ENTITY a.sparc "<ulink url='&a.sparc.url;'>FreeBSD SPARC porting ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.sparc.name "<ulink url='&a.sparc.url;'>freebsd-sparc64</ulink>">
+<!ENTITY a.sparc "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sparc.url;'>FreeBSD SPARC porting ╤l╩╪╫в╬б</link>">
+<!ENTITY a.sparc.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sparc.url;'>freebsd-sparc64</link>">
 
 <!ENTITY a.src-committers "FreeBSD src/ committer's ╤l╩╪╫в╬б">
 <!ENTITY a.src-committers.name "freebsd-src-committers">
@@ -383,61 +383,61 @@
 <!ENTITY a.src-developers.name "freebsd-src-developers">
 
 <!ENTITY a.stable.url "&a.mailman.listinfo;/freebsd-stable">
-<!ENTITY a.stable "<ulink url='&a.stable.url;'>&os.stable; ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.stable.name "<ulink url='&a.stable.url;'>freebsd-stable</ulink>">
+<!ENTITY a.stable "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.stable.url;'>&os.stable; ╤l╩╪╫в╬б</link>">
+<!ENTITY a.stable.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.stable.url;'>freebsd-stable</link>">
 
 <!ENTITY a.standards.url "&a.mailman.listinfo;/freebsd-standards">
-<!ENTITY a.standards "<ulink url='&a.standards.url;'>FreeBSD C99 and POSIX compliance ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.standards.name "<ulink url='&a.standards.url;'>freebsd-standards</ulink>">
+<!ENTITY a.standards "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.standards.url;'>FreeBSD C99 and POSIX compliance ╤l╩╪╫в╬б</link>">
+<!ENTITY a.standards.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.standards.url;'>freebsd-standards</link>">
 
 <!ENTITY a.sun4v.url "&a.mailman.listinfo;/freebsd-sun4v">
-<!ENTITY a.sun4v "<ulink url='&a.sun4v.url;'>FreeBSD sun4v porting ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.sun4v.name "<ulink url='&a.sun4v.url;'>freebsd-sun4v</ulink>">
+<!ENTITY a.sun4v "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sun4v.url;'>FreeBSD sun4v porting ╤l╩╪╫в╬б</link>">
+<!ENTITY a.sun4v.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sun4v.url;'>freebsd-sun4v</link>">
 
 <!ENTITY a.test.url "&a.mailman.listinfo;/freebsd-test">
-<!ENTITY a.test "<ulink url='&a.test.url;'>FreeBSD test ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.test.name "<ulink url='&a.test.url;'>freebsd-test</ulink>">
+<!ENTITY a.test "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.test.url;'>FreeBSD test ╤l╩╪╫в╬б</link>">
+<!ENTITY a.test.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.test.url;'>freebsd-test</link>">
 
 <!ENTITY a.testing.url "&a.mailman.listinfo;/freebsd-testing">
-<!ENTITY a.testing "<ulink url='&a.testing.url;'>FreeBSD performance and stability testing ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.testing.name "<ulink url='&a.testing.url;'>freebsd-testing</ulink>">
+<!ENTITY a.testing "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.testing.url;'>FreeBSD performance and stability testing ╤l╩╪╫в╬б</link>">
+<!ENTITY a.testing.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.testing.url;'>freebsd-testing</link>">
 
 <!ENTITY a.threads.url "&a.mailman.listinfo;/freebsd-threads">
-<!ENTITY a.threads "<ulink url='&a.threads.url;'>FreeBSD threads ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.threads.name "<ulink url='&a.threads.url;'>freebsd-threads</ulink>">
+<!ENTITY a.threads "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.threads.url;'>FreeBSD threads ╤l╩╪╫в╬б</link>">
+<!ENTITY a.threads.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.threads.url;'>freebsd-threads</link>">
 
 <!ENTITY a.tokenring.url "&a.mailman.listinfo;/freebsd-tokenring">
-<!ENTITY a.tokenring "<ulink url='&a.tokenring.url;'>FreeBSD tokenring ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.tokenring.name "<ulink url='&a.tokenring.url;'>freebsd-tokenring</ulink>">
+<!ENTITY a.tokenring "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.tokenring.url;'>FreeBSD tokenring ╤l╩╪╫в╬б</link>">
+<!ENTITY a.tokenring.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.tokenring.url;'>freebsd-tokenring</link>">
 
 <!ENTITY a.usb.url "&a.mailman.listinfo;/freebsd-usb">
-<!ENTITY a.usb "<ulink url='&a.usb.url;'>FreeBSD USB ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.usb.name "<ulink url='&a.usb.url;'>freebsd-usb</ulink>">
+<!ENTITY a.usb "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.usb.url;'>FreeBSD USB ╤l╩╪╫в╬б</link>">
+<!ENTITY a.usb.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.usb.url;'>freebsd-usb</link>">
 
 <!ENTITY a.usergroups.url "&a.mailman.listinfo;/freebsd-user-groups">
-<!ENTITY a.usergroups "<ulink url='&a.usergroups.url;'>FreeBSD user group coordination ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.usergroups.name "<ulink url='&a.usergroups.url;'>freebsd-user-groups</ulink>">
+<!ENTITY a.usergroups "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.usergroups.url;'>FreeBSD user group coordination ╤l╩╪╫в╬б</link>">
+<!ENTITY a.usergroups.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.usergroups.url;'>freebsd-user-groups</link>">
 
 <!ENTITY a.vendors.url "&a.mailman.listinfo;/freebsd-vendors">
-<!ENTITY a.vendors "<ulink url='&a.vendors.url;'>FreeBSD vendors pre-release coordination ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.vendors.name "<ulink url='&a.vendors.url;'>freebsd-vendors</ulink>">
+<!ENTITY a.vendors "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.vendors.url;'>FreeBSD vendors pre-release coordination ╤l╩╪╫в╬б</link>">
+<!ENTITY a.vendors.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.vendors.url;'>freebsd-vendors</link>">
 
 <!ENTITY a.vuxml.url "&a.mailman.listinfo;/freebsd-vuxml">
 <!ENTITY a.vuxml "<unlink url='&a.vuxml.url;'>Discussion on the VuXML
-infrastructure</ulink>">
-<!ENTITY a.vuxml.name "<ulink url='&a.vuxml.url;'>freebsd-vuxml</ulink>">
+infrastructure</link>">
+<!ENTITY a.vuxml.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.vuxml.url;'>freebsd-vuxml</link>">
 
 <!ENTITY a.www.url "&a.mailman.listinfo;/freebsd-www">
-<!ENTITY a.www "<ulink url='&a.www.url;'>FreeBSD Webmaster ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.www.name "<ulink url='&a.www.url;'>freebsd-www</ulink>">
+<!ENTITY a.www "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.www.url;'>FreeBSD Webmaster ╤l╩╪╫в╬б</link>">
+<!ENTITY a.www.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.www.url;'>freebsd-www</link>">
 
 <!ENTITY a.x11.url "&a.mailman.listinfo;/freebsd-x11">
-<!ENTITY a.x11 "<ulink url='&a.x11.url;'>FreeBSD X11 ╤l╩╪╫в╬б</ulink>">
-<!ENTITY a.x11.name "<ulink url='&a.x11.url;'>freebsd-x11</ulink>">
+<!ENTITY a.x11 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.x11.url;'>FreeBSD X11 ╤l╩╪╫в╬б</link>">
+<!ENTITY a.x11.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.x11.url;'>freebsd-x11</link>">
 
 <!-- Not really proper mailing lists -->
 
-<!ENTITY a.bugfollowup "<email>bug-followup@FreeBSD.org</email>">
+<!ENTITY a.bugfollowup "<email xmlns='http://docbook.org/ns/docbook'>bug-followup@FreeBSD.org</email>">
 <!ENTITY a.bugsubmit "&a.bugfollowup;">
 
-<!ENTITY a.majordomo "<email>majordomo@FreeBSD.org</email>">
+<!ENTITY a.majordomo "<email xmlns='http://docbook.org/ns/docbook'>majordomo@FreeBSD.org</email>">

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 10:40:41 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 2061821A;
 Thu, 20 Jun 2013 10:40:41 +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 0F31D1BC0;
 Thu, 20 Jun 2013 10:40:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KAefc1076726;
 Thu, 20 Jun 2013 10:40:41 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KAeccl076706;
 Thu, 20 Jun 2013 10:40:38 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201040.r5KAeccl076706@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 10:40:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41955 - in projects/db5:
 de_DE.ISO8859-1/books/fdp-primer/sgml-markup
 de_DE.ISO8859-1/books/fdp-primer/sgml-primer
 de_DE.ISO8859-1/books/fdp-primer/tools en_US.ISO8859-1/books/fdp-prim...
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, 20 Jun 2013 10:40:41 -0000

Author: gabor
Date: Thu Jun 20 10:40:37 2013
New Revision: 41955
URL: http://svnweb.freebsd.org/changeset/doc/41955

Log:
  - Avoid comments in CDATA sections so that these documents can easily be
    converted to DocBook 5.0.  This results in an ugly markup at some parts
    but this can be corrected after the conversion is done.  Anyway, these
    sections need serious rewriting.
  - Fix a double application element

Modified:
  projects/db5/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
  projects/db5/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
  projects/db5/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml
  projects/db5/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
  projects/db5/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
  projects/db5/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
  projects/db5/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
  projects/db5/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
  projects/db5/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
  projects/db5/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
  projects/db5/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
  projects/db5/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
  projects/db5/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
  projects/db5/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml

Modified: projects/db5/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
==============================================================================
--- projects/db5/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml	Wed Jun 19 20:28:08 2013	(r41954)
+++ projects/db5/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml	Thu Jun 20 10:40:37 2013	(r41955)
@@ -165,21 +165,21 @@
 
 	  <para>FЭgen Sie in eine der existierenden эbungsdateien folgendes ein:</para>
 
-	  <programlisting><![CDATA[<h1>Erstes Kapitel</h1>
+	  <programlisting>&lt;h1&gt;Erstes Kapitel&lt;/h1&gt;
 
-<!-- Hier steht die EinfЭhrung -->
+&lt;!&hyphen;- Hier steht die EinfЭhrung -&hyphen;&gt;
 
-<h2>Das ist die эberschrift des ersten Kapitels</h2>
+&lt;h2&gt;Das ist die эberschrift des ersten Kapitels&lt;/h2&gt;
 
-<!-- Hier steht der Inhalt des ersten Kapitels -->
+&lt;!&hyphen;- Hier steht der Inhalt des ersten Kapitels -&hyphen;&gt;
 
-<h3>Das ist die эberschrift des ersten Unterkapitels</h3>
+&lt;h3&gt;Das ist die эberschrift des ersten Unterkapitels&lt;/h3&gt;
 
-<!-- Hier steht der Inhalt des ersten Unterkapitels -->
+&lt;!&hyphen;- Hier steht der Inhalt des ersten Unterkapitels -&hyphen;&gt;
 
-<h2>Das ist die эberschrift des zweiten Kapitels</h2>
+&lt;h2&gt;Das ist die эberschrift des zweiten Kapitels&lt;/h2&gt;
 
-<!-- Hier steht der Inhalt des zweiten Kapitels -->]]></programlisting>
+&lt;!&hyphen;- Hier steht der Inhalt des zweiten Kapitels -&hyphen;&gt;</programlisting>
 	</example>
 
         <para>Eine XHTML-Seite sollte immer nur eine эberschrift
@@ -198,13 +198,13 @@
 
 	  <para>FЭgen Sie in eine der existierenden эbungsdateien folgendes ein:</para>
 
-	  <programlisting><![CDATA[<h1>Erstes Kapitel</h1>
+	  <programlisting>&lt;h1&gt;Erstes Kapitel&lt;/h1&gt;
 
-<!-- Allgemeines zum Dokument -->
+&lt;!&hyphen;- Allgemeines zum Dokument -&hyphen;&gt;
 
-<h3>Unterkapitel</h3>
+&lt;h3&gt;Unterkapitel&lt;/h3&gt;
 
-<!-- h3 folgt direkt auf h1. h2 wurde ausgelassen -->]]></programlisting>
+&lt;!&hyphen;- h3 folgt direkt auf h1. h2 wurde ausgelassen -&hyphen;&gt;</programlisting>
 	</example>
       </sect3>
 
@@ -508,10 +508,6 @@
   </tr>
 
   <tr>
-    <!-- Da sich die zusammengefasste Zelle Эber zwei Zeilen
-         erstreckt, befindet sich das die durch dieses <td>
-         definierte Zelle ganz rechts. -->
-
     <td>Mittlere rechte Zelle</td>
   </tr>
 

Modified: projects/db5/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
==============================================================================
--- projects/db5/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml	Wed Jun 19 20:28:08 2013	(r41954)
+++ projects/db5/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml	Thu Jun 20 10:40:37 2013	(r41955)
@@ -1058,16 +1058,16 @@ onsgmls:beispiel.xml:6:8:E: end tag for 
 
       <programlisting>&lt;!-- Testkommentar --></programlisting>
 
-      <programlisting><![CDATA[
-<!-- Text innerhalb eines Kommentars -->
+      <programlisting>
+&lt;!&hyphen;- Text innerhalb eines Kommentars -&hyphen;&gt;
 
-<!-- Ein anderer Kommentar    -->
+6lt;!&hyphen;- Ein anderer Kommentar    -&hyphen;&gt;
 
-<!-- So kЖnnen mehrzeilige Kommentare
-     genutzt werden -->
+6lt;!&hyphen;- So kЖnnen mehrzeilige Kommentare
+     genutzt werden -&hyphen;&gt;
 
-<!-- Eine andere MЖglichkeit fЭr --
-  -- mehrzeilige Kommentare.     -->]]></programlisting>
+&lt;!&hyphen;- Eine andere MЖglichkeit fЭr -&hyphen;
+  &hyphen;- mehrzeilige Kommentare.     -&hyphen;&gt;</programlisting>
     </example>
 
     <para>Hat man frЭher schon Erfahrungen mit HTML gesammelt,
@@ -1086,12 +1086,12 @@ onsgmls:beispiel.xml:6:8:E: end tag for 
     <example>
       <title>Fehlerhafte SGML-Kommentare</title>
 
-      <programlisting><![CDATA[
-<!-- Innerhalb eines Kommentars --
+      <programlisting>
+&lt;!&hyphen;- Innerhalb eines Kommentars -&hyphen;
 
      DIES IST NICHT TEIL EINES KOMMENTARS
 
-  -- Wieder innerhalb eines Kommentars -->]]></programlisting>
+  &hyphen;- Wieder innerhalb eines Kommentars -&hyphen;&gt;</programlisting>
 
       <para>SGML-Parser wЭrden die mittlere Zeile wie folgt
         interpretieren:</para>
@@ -1102,7 +1102,7 @@ onsgmls:beispiel.xml:6:8:E: end tag for 
       <para>Da es sich hierbei nicht um gЭltiges SGML handelt, kann
         diese Zeile zur verwirrenden  Fehlermeldungen fЭhren.</para>
 
-      <programlisting><![CDATA[<!--------------- Eine wirklich schlechte Idee  --------------->]]></programlisting>
+      <programlisting>&lt;!&hyphen;&hyphen;&hyphen;&hyphen;&hyphen; Eine wirklich schlechte Idee  &hyphen;&hyphen;&hyphen;&hyphen;&hyphen;&gt;</programlisting>
 
       <para>Wie das Beispiel zeigt, sollten solche Kommentare
         tunlichst vermieden werden.</para>
@@ -1110,7 +1110,7 @@ onsgmls:beispiel.xml:6:8:E: end tag for 
       <!--<para>As the example suggests, <emphasis>do not</emphasis> write
       comments like that.</para>-->
 
-      <programlisting><![CDATA[<!--===================================================-->]]></programlisting>
+      <programlisting>&lt;!&hyphen;-===================================================-&hyphen;&gt;</programlisting>
 
       <para>Ein solcher Kommentar ist (ein wenig) besser, kann aber
         jemanden, der mit SGML noch nicht so vertraut ist,
@@ -1278,8 +1278,6 @@ onsgmls:beispiel.xml:6:8:E: end tag for 
 <!ENTITY % param.etwas "etwas">
 <!ENTITY % param.text "Text">
 <!ENTITY % param.neu  "%param.etwas mehr %param.text">
-
-<!-- %param.neu ist jetzt "etwas mehr Text" -->
 ]>]]></programlisting>
         </example>
 
@@ -1423,11 +1421,9 @@ onsgmls:beispiel.xml:6:8:E: end tag for 
 <!ENTITY kapitel.1 SYSTEM "kapitel1.xml">
 <!ENTITY kapitel.2 SYSTEM "kapitel2.xml">
 <!ENTITY kapitel.3 SYSTEM "kapitel3.xml">
-<!-- Und so weiter... -->
 ]>
 
 <html>
-  <!-- Jetzt werden die Kapitel Эber die EntitДten eingebunden -->
 
   &amp;kapitel.1;
   &amp;kapitel.2;
@@ -1489,11 +1485,7 @@ onsgmls:beispiel.xml:6:8:E: end tag for 
           genutzt werden.</para>
 
 	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!-- Definieren einer ParameterentitДt um die Allgemeinen EntitДten fЭr -->
-<!-- die Kapitel laden zu kЖnnen                                        -->
 <!ENTITY % kapitel SYSTEM "kapitel.ent">
-
-<!-- Nun wird der Inhalt der referenzierten Datei geladen -->
 %kapitel;
 ]>
 

Modified: projects/db5/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml
==============================================================================
--- projects/db5/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml	Wed Jun 19 20:28:08 2013	(r41954)
+++ projects/db5/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml	Thu Jun 20 10:40:37 2013	(r41955)
@@ -98,7 +98,7 @@
       von diesen Ports automatisch entsprechend gesetzt.  Ohne
       <application>JadeTeX</application> kЖnnen Sie nur die Formate
       HTML und ASCII erzeugen.  Die Formate PostScript und PDF
-      erfordern <application>&tex;</application>.</para>
+      erfordern &tex;.</para>
   </tip>
 
   <sect1 id="tools-mandatory">

Modified: projects/db5/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml	Wed Jun 19 20:28:08 2013	(r41954)
+++ projects/db5/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml	Thu Jun 20 10:40:37 2013	(r41955)
@@ -155,21 +155,21 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![CDATA[<h1>First section</h1>
+	  <programlisting>&lt;h1&gt;First section&lt;/h1&gt;
 
-<!-- Document introduction goes here -->
+&lt;!&hyphen;- Document introduction goes here -&hyphen;&gt;
 
-<h2>This is the heading for the first section</h2>
+&lt;h2&gt;This is the heading for the first section&lt;/h2&gt;
 
-<!-- Content for the first section goes here -->
+&lt;!&hyphen;- Content for the first section goes here -&hyphen;&gt;
 
-<h3>This is the heading for the first sub-section</h3>
+&lt;h3&gt;This is the heading for the first sub-section&lt;/h3&gt;
 
-<!-- Content for the first sub-section goes here -->
+&lt;!&hyphen;- Content for the first sub-section goes here -&hyphen;&gt;
 
-<h2>This is the heading for the second section</h2>
+&lt;h2&gt;This is the heading for the second section&lt;/h2&gt;
 
-<!-- Content for the second section goes here -->]]></programlisting>
+&lt;!&hyphen;- Content for the second section goes here -&hyphen;&gt;</programlisting>
 	</example>
 
 	<para>Generally, an XHTML page should have one first level
@@ -188,13 +188,13 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![CDATA[<h1>First section</h1>
+	  <programlisting>&lt;h1&gt;First section&lt;/h1&gt;
 
-<!-- Document introduction -->
+&lt;!&hyphen;- Document introduction -&hyphen;&gt;
 
-<h3>Sub-section</h3>
+&lt;h3&gt;Sub-section&lt;/h3&gt;
 
-<!-- This is bad, <h2> has been left out -->]]></programlisting>
+&lt;!&hyphen;- This is bad, &lt;h2&gt; has been left out -&hyphen;&gt;</programlisting>
 	</example>
       </sect3>
 
@@ -471,10 +471,6 @@
   </tr>
 
   <tr>
-    <!-- Because the large cell on the left merges into
-         this row, the first <td> will occur on its
-         right -->
-
     <td>Middle right cell</td>
   </tr>
 

Modified: projects/db5/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml	Wed Jun 19 20:28:08 2013	(r41954)
+++ projects/db5/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml	Thu Jun 20 10:40:37 2013	(r41955)
@@ -40,8 +40,7 @@
     of XML tricks you will see used in the documentation.</para>
 
   <para>Portions of this section were inspired by Mark Galassi's
-    <ulink
-      url="http://www.galassi.org/mark/mydocs/docbook-intro/docbook-intro.html">Get
+    <ulink url="http://www.galassi.org/mark/mydocs/docbook-intro/docbook-intro.html">Get
       Going With DocBook</ulink>.</para>
 
   <sect1 id="xml-primer-overview">
@@ -816,16 +815,16 @@ example.xml:5: element head: validity er
 
       <programlisting>&lt;!-- test comment --></programlisting>
 
-      <programlisting><![CDATA[
-<!-- This is inside the comment -->
+      <programlisting>
+&lt;!&hyphen;- This is inside the comment -&hyphen;&gt;
 
-<!-- This is another comment    -->
+&lt;!&hyphen;- This is another comment    -&hyphen;&gt;
 
-<!-- This is one way
-     of doing multiline comments -->
+&lt;!&hyphen;- This is one way
+     of doing multiline comments -&hyphen;&gt;
 
-<!-- This is another way of   --
-  -- doing multiline comments -->]]></programlisting>
+&lt;!&hyphen;- This is another way of   -&hyphen;
+  &hyphen;- doing multiline comments -&hyphen;&gt;</programlisting>
     </example>
 
     <para>If you have used XHTML before you may have been shown
@@ -842,12 +841,12 @@ example.xml:5: element head: validity er
     <example>
       <title>Erroneous XML Comments</title>
 
-      <programlisting><![CDATA[
-<!-- This is in the comment --
+      <programlisting>
+&lt;!&hyphen;- This is in the comment -&hyphen;
 
      THIS IS OUTSIDE THE COMMENT!
 
-  -- back inside the comment -->]]></programlisting>
+  &hyphen;- back inside the comment -&hyphen;&gt;</programlisting>
 
       <para>The XML parser will treat this as though it were
 	actually:</para>
@@ -857,12 +856,12 @@ example.xml:5: element head: validity er
       <para>This is not valid XML, and may give confusing error
 	messages.</para>
 
-      <programlisting><![CDATA[<!--------------- This is a very bad idea --------------->]]></programlisting>
+      <programlisting>&gt;!&hyphen;&hyphen;&hyphen;&hyphen;&hyphen; This is a very bad idea &hyphen;&hyphen;&hyphen;&hyphen;&hyphen;&gt;</programlisting>
 
       <para>As the example suggests, <emphasis>do not</emphasis> write
 	comments like that.</para>
 
-      <programlisting><![CDATA[<!--===================================================-->]]></programlisting>
+      <programlisting>&gt;!-&hyphen;===================================================-&hyphen;&gt;</programlisting>
 
       <para>That is a (slightly) better approach, but it still
 	potentially confusing to people new to XML.</para>
@@ -998,8 +997,6 @@ example.xml:5: element head: validity er
 <!ENTITY % param.some "some">
 <!ENTITY % param.text "text">
 <!ENTITY % param.new  "%param.some more %param.text">
-
-<!-- %param.new now contains "some more text" -->
 ]>]]></programlisting>
       </example>
 
@@ -1024,8 +1021,6 @@ example.xml:5: element head: validity er
     <title>An Example XHTML File</title>
   </head>
 
-  <!-- You might well have some comments in here as well -->
-
   <body>
     <p>This is a paragraph containing some text.</p>
 
@@ -1116,12 +1111,9 @@ example.xml:5: element head: validity er
 <!ENTITY chapter.1 SYSTEM "chapter1.xml">
 <!ENTITY chapter.2 SYSTEM "chapter2.xml">
 <!ENTITY chapter.3 SYSTEM "chapter3.xml">
-<!-- And so forth -->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <!-- Use the entities to load in the chapters -->
-
   &chapter.1;
   &chapter.2;
   &chapter.3;
@@ -1180,10 +1172,7 @@ example.xml:5: element head: validity er
 
 	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-<!-- Define a parameter entity to load in the chapter general entities -->
 <!ENTITY % chapters SYSTEM "chapters.ent">
-
-<!-- Now use the parameter entity to load in this file -->
 %chapters;
 ]>
 

Modified: projects/db5/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
==============================================================================
--- projects/db5/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml	Wed Jun 19 20:28:08 2013	(r41954)
+++ projects/db5/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml	Thu Jun 20 10:40:37 2013	(r41955)
@@ -159,21 +159,21 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitiona
 	  <para>Utilisez&nbsp;:</para>
 
 	  <programlisting>
-<![CDATA[<h1>PremiХre section</h1>
+&lt;h1&gt;PremiХre section&lt;/h1&gt;
 
-<!-- Introduction du document -->
+&lt;!&hyphen;- Introduction du document -&hyphen;&gt;
 
-<h2>C'est le titre de la premiХre section</h2>
+&lt;h2&gt;C'est le titre de la premiХre section&lt;/h2&gt;
 
-<!-- Contenu de la premiХre section -->
+&lt;!&hyphen;- Contenu de la premiХre section -&hyphen;&gt;
 
-<h3>C'est le titre de la premiХre sous-section</h3>
+&lt;h3&gt;C'est le titre de la premiХre sous-section&lt;/h3&gt;
 
-<!-- Contenu de la premiХre sous-section -->
+&lt;!&hyphen;- Contenu de la premiХre sous-section -&hyphen;&gt;
 
-<h2>C'est le titre de la seconde section</h2>
+&lt;h2&gt;C'est le titre de la seconde section&lt;/h2&gt;
 
-<!-- Contenu de la seconde section -->]]></programlisting>
+&lt;!&hyphen;- Contenu de la seconde section -&hyphen;&gt;</programlisting>
 	</example>
 
 	<para>Une page HTML doit normalement avoir un titre de premier niveau
@@ -191,13 +191,13 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitiona
 	  <para>Use:</para>
 
 	  <programlisting>
-<![CDATA[<h1>PremiХre section</h1>
+&lt;h1&gt;PremiХre section&lt;/h1&gt;
 
-<!-- Introduction du document -->
+&lt;!&hyphen;- Introduction du document -&hyphen;&gt;
 
-<h3>Sous-section</h3>
+&lt;h3&gt;Sous-section&lt;/h3&gt;
 
-<!-- Ce n'est pas bon, <h2> a ИtИ oubliИ -->]]></programlisting>
+&lt;!&hyphen;- Ce n'est pas bon, &lt;h2&gt; a ИtИ oubliИ -&hyphen;&gt;</programlisting>
 	</example>
       </sect3>
 
@@ -470,10 +470,6 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitiona
   </tr>
 
   <tr>
-    <!-- Comme la grande cellule se prolonge
-         sur cette colonne, la premiХre cellule
-         marquИe par <td> se trouvera &agrave; sa droite -->
-
     <td>Cellule du milieu &agrave; droite</td>
   </tr>
 

Modified: projects/db5/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
==============================================================================
--- projects/db5/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml	Wed Jun 19 20:28:08 2013	(r41954)
+++ projects/db5/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml	Thu Jun 20 10:40:37 2013	(r41955)
@@ -856,40 +856,18 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/s
       <programlisting>
 <!-- commentaire de test --></programlisting>
 
-      <programlisting><![CDATA[
-<!-- C'est le texte du commentaire -->
+      <programlisting>
+&lt;!&hyphen;- C'est le texte du commentaire -&hyphen;&gt;
 
-<!-- C'est un autre commentaire -->
+&lt;!&hyphen;- C'est un autre commentaire -&hyphen;&gt;
 
-<!-- Voici une faГon de mettre un commentaire
-     sur plusieurs lignes -->
+&lt;!&hyphen;- Voici une faГon de mettre un commentaire
+     sur plusieurs lignes -&hyphen;&gt;
 
-<!-- Voici une autre faГon --
-  -- de le faire -->]]></programlisting>
+&lt;!&hyphen;- Voici une autre faГon -&hyphen;
+  &hyphen;- de le faire -&hyphen;&gt;</programlisting>
     </example>
 
-<!--
-    <![%output.print;[
-    <important>
-      <title>Utilisez 2 tirets</title>
-
-      <para>Vous aurez un problХme avec les versions PostScript et PDF de ce
-        document. Les exemples prИcИdents n'auront probablement qu'un simple
-        tiret, <literal>-</literal> aprХs <literal>&lt;!</literal> et avant
-	<literal>&gt;</literal>.</para>
-
-      <para>Il <emphasis>faut</emphasis> utiliser deux <literal>-</literal>,
-        et <emphasis>non</emphasis> un seul. Les versions PostScript et PDF
-        ont converti les deux <literal>-</literal> de l'original en un seul
-	<emphasis>double tiret</emphasis> plus professionnel, et dИformИ
-        l'exemple au passage.</para>
-
-      <para>Les versions HTML, texte et RTF de ce document ne sont pas
-	sujettes &agrave; ce problХme.</para>
-    </important>
-    ]]>
--->
-
     <para>Si vous avez dИj&agrave; utilisИ HTML auparavant, on vous a peut-Йtre
       donnИ des rХgles diffИrentes pour les commentaires. En particulier, vous
       pensez peut-Йtre qu'ils commencent par <literal>&lt;!--</literal> et
@@ -903,12 +881,12 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/s
     <example>
       <title>Commentaires SGML erronnИs</title>
 
-      <programlisting><![CDATA[
-<!-- C'est en commentaire --
+      <programlisting>
+&gt;!&hyphen;- C'est en commentaire -&hyphen;
 
      CE N'EST PAS EN COMMENTAIRE!
 
-  -- retour au commentaire -->]]></programlisting>
+  &hyphen;- retour au commentaire -&hyphen;&gt;</programlisting>
 
       <para>L'analyseur SGML traitera cela comme s'il trouvait&nbsp;:</para>
 
@@ -918,14 +896,12 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/s
       <para>Ce qui n'est pas du SGML valide et donnera des messages d'erreur
         source de confusion.</para>
 
-      <programlisting>
-<![CDATA[<!--------------- C'est un trХs mauvaise idИe --------------->]]></programlisting>
+      <programlisting>&lt;!&hyphen;&hyphen;&hyphen;&hyphen;&hyphen; C'est un trХs mauvaise idИe &hyphen;&hyphen;&hyphen;&hyphen;&hyphen;&gt;</programlisting>
 
       <para>Comme l'exemple le suggХre, ne mettez <emphasis>pas</emphasis> de
         commentaires de ce type.</para>
 
-      <programlisting>
-<![CDATA[<!--===================================================-->]]></programlisting>
+      <programlisting>&lt;!&hyphen;-===================================================-&hyphen;&gt;</programlisting>
 
       <para>C'est une (lИgХrement) meilleure idИe, mais c'est toute de mЙme
         une source de confusion potentielle pour les dИbutants en SGML.</para>
@@ -1053,8 +1029,6 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/s
 <!ENTITY % param.du "du">
 <!ENTITY % param.texte "text">
 <!ENTITY % param.encore  "encore %param.du more %param.texte">
-
-<!-- %param.encore contient maintenant "encore du texte" -->
 ]>]]></programlisting>
       </example>
 
@@ -1080,8 +1054,6 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/s
     <title>Exemple de fichier HTML</title>
   </head>
 
-  <!-- Vous pourriez aussi mettre des commentaires ici -->
-
   <body>
     <p>C'est un paragraphe avec du texte.</p>
 
@@ -1175,12 +1147,9 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/s
 <!ENTITY chapitre.1 SYSTEM "chapitre1.xml">
 <!ENTITY chapitre.2 SYSTEM "chapitre2.xml">
 <!ENTITY chapitre.3 SYSTEM "chapitre3.xml">
-<!-- Et ainsi de suite -->
 ]>
 
 <html>
-  <!-- Utilisation des entitИs pour inclure les chapitres -->
-
   &chapitre.1;
   &chapitre.2;
   &chapitre.3;
@@ -1239,13 +1208,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/s
 
 	<programlisting>
 <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!--
-     DИfinissez une entitИ paramХtre pour inclure le fichier
-     des entitИs gИnИrales pour les chapitres
--->
 <!ENTITY % chapitres SYSTEM "chapitres.ent">
-
-<!-- Utilisez maintenant l'entitИ gИnИrale pour inclure ce fichier -->
 %chapitres;
 ]>
 

Modified: projects/db5/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
==============================================================================
--- projects/db5/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml	Wed Jun 19 20:28:08 2013	(r41954)
+++ projects/db5/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml	Thu Jun 20 10:40:37 2013	(r41955)
@@ -583,29 +583,26 @@
 
 	  <para>A hasznАlat mСdja:</para>
 
-	  <programlisting><![CDATA[<p>]]>Egy 3x3-as rАcson a bal felsУ blokk 2x2 egymАsba olvasztott
-  cellАbСl Аll.  A tЖbbi cella normАlis.<![CDATA[</p>
+	  <programlisting><![CDATA[<p>Egy 3x3-as rАcson a bal felsУ blokk 2x2 egymАsba olvasztott
+  cellАbСl Аll.  A tЖbbi cella normАlis.</p>
 
 <table>
   <tr>
-    <td colspan="2" rowspan="2">]]>Bal felsУ nagy cella<![CDATA[</td>
+    <td colspan="2" rowspan="2">Bal felsУ nagy cella</td>
 
-    <td>]]>Jobb felsУ cella<![CDATA[</td>
+    <td>Jobb felsУ cella</td>
   </tr>
 
   <tr>
-    <!--]]> Mivel a bal oldalon levУ nagy cella beleolvad az elsУ sorba,
-         az elsУ <![CDATA[<td>]]> a jobb oldalАn jelenik meg <![CDATA[-->
-
-    <td>]]>Jobb kЖzИpsУ cella<![CDATA[</td>
+    <td>Jobb kЖzИpsУ cella</td>
   </tr>
 
   <tr>
-    <td>]]>Bal alsС cella<![CDATA[</td>
+    <td>Bal alsС cella</td>
 
-    <td>]]>Bal kЖzИpsУ cella<![CDATA[</td>
+    <td>Bal kЖzИpsУ cella</td>
 
-    <td>]]>Jobb alsС cella<![CDATA[</td>
+    <td>Jobb alsС cella</td>
   </tr>
 </table>]]></programlisting>
 	</example>

Modified: projects/db5/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
==============================================================================
--- projects/db5/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml	Wed Jun 19 20:28:08 2013	(r41954)
+++ projects/db5/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml	Thu Jun 20 10:40:37 2013	(r41955)
@@ -1154,16 +1154,16 @@ onsgmls:prСba.xml:6:8:E: end tag for "HE
 
       <programlisting>&lt;!-- prСba megjegyzИs --&gt;</programlisting>
 
-      <programlisting><![CDATA[
-<!--]]> Most a megjegyzИs belsejИben vagyunk <![CDATA[-->
+      <programlisting>
+&lt;!&hyphen;- Most a megjegyzИs belsejИben vagyunk -&hyphen;&gt;
 
-<!--]]> Ez pedig egy mАsik megjegyzИs    <![CDATA[-->
+&lt;!&hyphen;- Ez pedig egy mАsik megjegyzИs    -&hyphen;&gt;
 
-<!--]]> мgy lehet pИldАul
-     tЖbbsoros megjegyzИseket Мrni <![CDATA[-->
+&lt;!&hyphen;- мgy lehet pИldАul
+     tЖbbsoros megjegyzИseket Мrni -&hyphen;&gt;
 
-<!--]]> Ez egy mАsik mСdja a   <![CDATA[--
-  --]]> tЖbbsoros megjegyzИsek МrАsАnak <![CDATA[-->]]></programlisting>
+&lt;!&hyphen;- Ez egy mАsik mСdja a   -&hyphen;
+  &hyphen;- tЖbbsoros megjegyzИsek МrАsАnak -&hyphen;&gt;</programlisting>
     </example>
 
     <para>Ha dolgoztunk mАr korАbban HTML kСddal,
@@ -1184,12 +1184,12 @@ onsgmls:prСba.xml:6:8:E: end tag for "HE
     <example>
       <title>HibАs SGML megjegyzИsek</title>
 
-      <programlisting><![CDATA[
-<!--]]> Most egy megjegyzИs belsejИben vagyunk <![CDATA[--]]>
+      <programlisting>
+&lt;!&hyphen;- Most egy megjegyzИs belsejИben vagyunk -&hyphen;&gt;
 
      KмVэL VAGYUNK A MEGJEGYZиSEN!
 
-  <![CDATA[--]]> ismИt megjegyzИsben vagyunk <![CDATA[-->]]></programlisting>
+  &hyphen;- ismИt megjegyzИsben vagyunk -&hyphen;&gt;</programlisting>
 
       <para>Az SGML elemzУ ezt valahogy Мgy fogja
 	Иrtelmezni:</para>
@@ -1200,12 +1200,12 @@ onsgmls:prСba.xml:6:8:E: end tag for "HE
 	rАadАsul fИlrevezetУ hibaЭzenetet
 	eredmИnyez.</para>
 
-      <programlisting><![CDATA[<!------------------]]> Ez nem szИp dolog! <![CDATA[----------------->]]></programlisting>
+      <programlisting>&lt;!&hyphen;&hyphen;&hyphen;&hyphen;&hyphen; Ez nem szИp dolog! &hyphen;&hyphen;&hyphen;&hyphen;&hyphen;&gt;</programlisting>
 
       <para>A pИlda szЖvege szerint <emphasis>sem</emphasis>
 	javasolt ilyen megjegyzИseket Мrni.</para>
 
-      <programlisting><![CDATA[<!--===================================================-->]]></programlisting>
+      <programlisting>&lt;!&hyphen;-===================================================-&hyphen;&gt;</programlisting>
 
       <para>Ez mАr (valamivel) Иrtelmesebb
 	megoldАs, de mИg felАll a veszИlye,
@@ -1371,12 +1371,10 @@ onsgmls:prСba.xml:6:8:E: end tag for "HE
 	<title>ParamИteregyedek megadАsa</title>
 
 	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!ENTITY % param.valami "]]>valami<![CDATA[">
-<!ENTITY % param.szoveg "]]>szЖveg<![CDATA[">
-<!ENTITY % param.uj  "%param.valami ]]>mАs<![CDATA[ %param.szoveg">
-
-<!--]]> A %param.uj ИrtИke most mАr "valami mАs szЖveg" <![CDATA[-->
-]>]]></programlisting>
+<!ENTITY % param.valami "valami">
+<!ENTITY % param.szoveg "szЖveg">
+<!ENTITY % param.uj  "%param.valami mАs %param.szoveg">
+]]></programlisting>
       </example>
 
       <para>Ez most mИg nem tШnik
@@ -1400,19 +1398,17 @@ onsgmls:prСba.xml:6:8:E: end tag for "HE
 
 <html>
   <head>
-    <title>]]>Egy minta HTML АllomАny<![CDATA[</title>
+    <title>Egy minta HTML АllomАny</title>
   </head>
 
-  <!--]]> Az АllomАnyba rakhatunk azИrt mИg megjegyzИseket <![CDATA[-->
-
   <body>
-    <p>]]>Ebben a bekezdИsben van egy kis szЖveg.<![CDATA[</p>
+    <p>Ebben a bekezdИsben van egy kis szЖveg.</p>
 
-    <p>]]>Ez a bekezdИs mИg tartalmaz nИmi szЖveget.<![CDATA[</p>
+    <p>Ez a bekezdИs mИg tartalmaz nИmi szЖveget.</p>
 
-    <p align="right">]]>Ennek a bekezdИsnek jobbra zАrtnak kellene lennie.<![CDATA[</p>
+    <p align="right">Ennek a bekezdИsnek jobbra zАrtnak kellene lennie.</p>
 
-    <p>]]>A dokumentum jelenlegi vАltozata: <![CDATA[&valtozat;</p>
+    <p>A dokumentum jelenlegi vАltozata: &valtozat;</p>
   </body>
 </html>]]></programlisting>
 	</step>
@@ -1532,11 +1528,9 @@ onsgmls:prСba.xml:6:8:E: end tag for "HE
 <!ENTITY fejezet.1 SYSTEM "fejezet1.xml">
 <!ENTITY fejezet.2 SYSTEM "fejezet2.xml">
 <!ENTITY fejezet.3 SYSTEM "fejezet3.xml">
-<!--]]> иs Мgy tovАbb... <![CDATA[-->
 ]>
 
 <html>
-  <!--]]> Az egyedek segМtsИgИvel vИgЭl betЖltjЭk a fejezeteket <![CDATA[-->
 
   &fejezet.1;
   &fejezet.2;
@@ -1613,10 +1607,7 @@ onsgmls:prСba.xml:6:8:E: end tag for "HE
 	  АltalАnos egyedeket:</para>
 
 	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!--]]> A fejezetekhez tartozС egyedek betЖltИsИhez definiАlunk egy paramИteregyedet <![CDATA[-->
 <!ENTITY % fejezetek SYSTEM "fejezetek.ent">
-
-<!--]]> Most pedig a paramИteregyeddel tЖltsЭk be az АllomАnyt <![CDATA[-->
 %fejezetek;
 ]>
 
@@ -1664,11 +1655,11 @@ onsgmls:prСba.xml:6:8:E: end tag for "HE
 
 <html>
   <head>
-    <title>]]>PrСba HTML АllomАny<![CDATA[</title>
+    <title>PrСba HTML АllomАny</title>
   </head>
 
   <body>
-    <p>]]>A dokumentum jelenlegi vАltozata: <![CDATA[&valtozat;</p>
+    <p>A dokumentum jelenlegi vАltozata: &valtozat;</p>
 
     &bekezd1;
     &bekezd2;

Modified: projects/db5/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
==============================================================================
--- projects/db5/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml	Wed Jun 19 20:28:08 2013	(r41954)
+++ projects/db5/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml	Thu Jun 20 10:40:37 2013	(r41955)
@@ -177,21 +177,21 @@
 
 	  <para>Uso:</para>
 
-	  <programlisting><![CDATA[<h1>Primeira seГЦo</h1>
+	  <programlisting>&lt;h1&gt;Primeira seГЦo&lt;/h1&gt;
 
-<!-- a introduГЦo do documento entra aqui -->
+&lt;!&hyphen;- a introduГЦo do documento entra aqui -&hyphen;&gt;
 
-<h2>Este И o cabeГalho da primeira seГЦo</h2>
+&lt;h2&gt;Este И o cabeГalho da primeira seГЦo&lt;/h2&gt;
 
-<!-- O conteЗdo da primeira seГЦo entra aqui -->
+&lt;!&hyphen;- O conteЗdo da primeira seГЦo entra aqui -&hyphen;&gt;
 
-<h3>Este И o cabeГalho da primeira subseГЦo</h3>
+&lt;h3&gt;Este И o cabeГalho da primeira subseГЦo&lt;/h3&gt;
 
-<!-- O conteЗdo da primeira subseГЦo entra aqui -->
+&lt;!&hyphen;- O conteЗdo da primeira subseГЦo entra aqui -&hyphen;&gt;
 
-<h2>Este И o heading para a segunda seГЦo</h2>
+&lt;h2&gt;Este И o heading para a segunda seГЦo&lt;/h2&gt;
 
-<!-- O conteЗdo da segunda seГЦo entra aqui -->]]></programlisting>	    
+&lt;!&hyphen;- O conteЗdo da segunda seГЦo entra aqui -&hyphen;&gt;</programlisting>	    
 	</example>
 	
 	<para>Geralmente, uma pАgina HTML deveria ter um 
@@ -211,13 +211,13 @@
 
 	  <para>Uso:</para>
 
-	  <programlisting><![CDATA[<h1>Primeira seГЦo</h1>
+	  <programlisting>&lt;h1&gt;Primeira seГЦo&lt;/h1&gt;
 
-<!-- IntroduГЦo do documento -->
+&lt;!&hyphen;- IntroduГЦo do documento -&hyphen;&gt;
 
-<h3>SubseГЦo</h3>
+&lt;h3&gt;SubseГЦo&lt;/h3&gt;
 
-<!-- Isto И ruim, nЦo foi usado <h2> -->]]></programlisting>
+&lt;!&hyphen;- Isto И ruim, nЦo foi usado <h2> -&hyphen;&gt;</programlisting>
 	</example>
       </sect3>
 
@@ -509,8 +509,6 @@ cИlulas pequenas Ю direita.</p>
   </tr>
 
   <tr>
-    <!-- Como a cИlula grande Ю esquerda funde-se com esta linha,
-         o primeiro <td> ocorrerА Ю a sua direita. -->
     <td>CИlula do meio a direita</td>
   </tr>
 

Modified: projects/db5/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
==============================================================================
--- projects/db5/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml	Wed Jun 19 20:28:08 2013	(r41954)
+++ projects/db5/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml	Thu Jun 20 10:40:37 2013	(r41955)
@@ -1008,16 +1008,16 @@ onsgmls:example.xml:6:8:E: end tag for "
 
       <programlisting>&lt;!-- Teste de comentАrio --></programlisting>
 
-      <programlisting><![CDATA[
-<!-- Este И o interior do comentАrio -->
+      <programlisting>
+&lt;!&hyphen;- Este И o interior do comentАrio -&hyphen;&gt;
 
-<!-- Este И outro comentАrio    -->
+&lt;!&hyphen;- Este И outro comentАrio    -&hyphen;&gt;
 
-<!-- Esta И uma forma 
-     de fazer comentАrios de vАrias linhas -->
+&lt;!&hyphen;- Esta И uma forma 
+     de fazer comentАrios de vАrias linhas -&hyphen;&gt;
 
-<!-- Esta И outra forma  --
-  -- de fazer comentАrios de vАrias linhas -->]]></programlisting>
+&lt;!&hyphen;- Esta И outra forma  -&hyphen;
+  &hyphen;- de fazer comentАrios de vАrias linhas -&hyphen;&gt;</programlisting>
     </example>
 
     <para>Se vocЙ jА utilizou HTML antes, vocЙ pode ter 
@@ -1037,12 +1037,12 @@ onsgmls:example.xml:6:8:E: end tag for "
     <example>
       <title>ComentАrios SGML errados</title>
 
-      <programlisting><![CDATA[
-<!-- Este И o comentАrio --
+      <programlisting>
+&lt;!&hyphen;- Este И o comentАrio -&hyphen;
 
      Isto estА fora do comentАrio!
 
-  -- de volta para dentro do comentАrio -->]]></programlisting>
+  &hyphen;- de volta para dentro do comentАrio -&hyphen;&gt;</programlisting>
 
       <para>O interpretador SGML irА tratar isto como ele 
 	И realmente;</para>
@@ -1052,12 +1052,12 @@ onsgmls:example.xml:6:8:E: end tag for "
       <para>Isto nЦo И um SGML vАlido, e pode 
 	dar mensagens de erro confusas.</para>
 
-      <programlisting><![CDATA[<!--------------- Isto И uma idИia muito ruim --------------->]]></programlisting>
+      <programlisting>&lt;!&hyphen;&hyphen;&hyphen;&hyphen;&hyphen; Isto И uma idИia muito ruim &hyphen;&hyphen;&hyphen;&hyphen;&hyphen;&gt;</programlisting>
 
       <para>E como o exemplo sugere, <emphasis>nЦo escreva
 	</emphasis> comentАrios como esse.</para>
 
-      <programlisting><![CDATA[<!--===================================================-->]]></programlisting>
+      <programlisting>&lt;!&hyphen;-===================================================-&hyphen;&gt;</programlisting>
 
       <para>Esta И uma abordagem (ligeiramente) melhor, mas 
 	ele ainda И potencialmente confuso para as pessoas 
@@ -1209,8 +1209,6 @@ onsgmls:example.xml:6:8:E: end tag for "
 <!ENTITY % param.some "some">
 <!ENTITY % param.text "text">
 <!ENTITY % param.new  "%param.some more %param.text">
-
-<!-- %param.new agora contИm "some more text" -->
 ]>]]></programlisting>
       </example>
 	
@@ -1236,8 +1234,6 @@ onsgmls:example.xml:6:8:E: end tag for "
     <title>Um exemplo de arquivo HTML</title>
   </head>
 
-  <!-- VocЙ pode ter alguns comentАrios aqui tambИm -->
-	  
   <body>	    
     <p>Este И um parАgrafo contendo algum texto.</p>
 
@@ -1344,11 +1340,9 @@ onsgmls:example.xml:6:8:E: end tag for "
 <!ENTITY chapter.1 SYSTEM "chapter1.xml">
 <!ENTITY chapter.2 SYSTEM "chapter2.xml">
 <!ENTITY chapter.3 SYSTEM "chapter3.xml">
-<!-- e assim por diante -->
 ]>
 
 <html>
-  <!-- Utilize as entidades para carregar os capМtulos -->
 
   &chapter.1;
   &chapter.2;
@@ -1414,10 +1408,7 @@ onsgmls:example.xml:6:8:E: end tag for "
 	  entidades gerais como antes;</para>
 	
 	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!-- Define uma entidade de parБmetro para carregar as entidades gerais de capitulo -->
 <!ENTITY % chapters SYSTEM "chapters.ent">
-
-<!-- Agora utilize a entidade de parБmetro para carregar neste arquivo -->
 %chapters;
 ]>
 

Modified: projects/db5/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
==============================================================================
--- projects/db5/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml	Wed Jun 19 20:28:08 2013	(r41954)
+++ projects/db5/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml	Thu Jun 20 10:40:37 2013	(r41955)
@@ -158,21 +158,21 @@
 
 	  <para>Использование:</para>
 
-	  <programlisting><![CDATA[<h1>First section</h1>
+	  <programlisting>&lt;h1&gt;First section&lt;/h1&gt;
 
-<!-- Здесь помещается введение документа -->
+&lt;!&hyphen;- Здесь помещается введение документа -&hyphen;&gt;
 
-<h2>Это заголовок первого раздела</h2>
+&lt;h2&gt;Это заголовок первого раздела&lt;/h2&gt;
 
-<!-- Здесь размещается содержимое первого раздела -->
+&lt;!&hyphen;- Здесь размещается содержимое первого раздела -&hyphen;&gt;
 
-<h3>Это заголовок первого подраздела</h3>
+&lt;h3&gt;Это заголовок первого подраздела&lt;/h3&gt;
 
-<!-- Здесь размещается содержимое первого подраздела -->
+&lt;!&hyphen;- Здесь размещается содержимое первого подраздела -&hyphen;&gt;
 
-<h2>Это заголовок второго раздела</h2>
+&lt;h2&gt;Это заголовок второго раздела&lt;/h2&gt;
 
-<!-- Здесь размещается содержимое второго раздела -->]]></programlisting>
+&lt;!&hyphen;- Здесь размещается содержимое второго раздела -&hyphen;&gt;</programlisting>
 	</example>
 
 	<para>Вообще говоря, на странице HTML должен иметься один заголовок
@@ -189,13 +189,13 @@
 
 	  <para>Использование:</para>
 
-	  <programlisting><![CDATA[<h1>Первый раздел</h1>
+	  <programlisting>&lt;h1&gt;Первый раздел&lt;/h1&gt;
 
-<!-- Введение документа -->
+&lt;!&hyphen;- Введение документа -&hyphen;&gt;
 
-<h3>Подраздел</h3>
+&lt;h3&gt;Подраздел&lt;/h3&gt;
 
-<!-- Это плохо, пропущен <h2> -->]]></programlisting>
+&lt;!&hyphen;- Это плохо, пропущен <h2> -&hyphen;&gt;</programlisting>
 	</example>
       </sect3>
 
@@ -458,9 +458,6 @@
   </tr>
 
   <tr>
-    <!-- Из-за того, что большая ячейка слева объединяется в
-	 эту строку, первый <td> появится справа -->
-
     <td>Средняя правая ячейка</td>
   </tr>
 

Modified: projects/db5/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
==============================================================================
--- projects/db5/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml	Wed Jun 19 20:28:08 2013	(r41954)
+++ projects/db5/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml	Thu Jun 20 10:40:37 2013	(r41955)
@@ -148,21 +148,21 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![CDATA[<h1>First section</h1>
+	  <programlisting>&lt;h1&gt;First section&lt;/h1&gt;
 
-<!-- Document introduction goes here -->
+&lt;!&hyphen;- Document introduction goes here -&hyphen;&gt;
 
-<h2>This is the heading for the first section</h2>
+&lt;h2&gt;This is the heading for the first section&lt;/h2&gt;
 
-<!-- Content for the first section goes here -->
+&lt;!&hyphen;- Content for the first section goes here -&hyphen;&gt;
 
-<h3>This is the heading for the first sub-section</h3>
+&lt;h3&gt;This is the heading for the first sub-section&lt;/h3&gt;
 
-<!-- Content for the first sub-section goes here -->
+&lt;!&hyphen;- Content for the first sub-section goes here -&hyphen;&gt;
 
-<h2>This is the heading for the second section</h2>
+&lt;h2&gt;This is the heading for the second section&lt;/h2&gt;
 
-<!-- Content for the second section goes here -->]]></programlisting>
+&lt;!&hyphen;- Content for the second section goes here -&hyphen;&gt;</programlisting>
 	</example>
 
 	<para>Generally, an HTML page should have one first level heading
@@ -179,13 +179,13 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![CDATA[<h1>First section</h1>
+	  <programlisting>&lt;h1&gt;First section&lt;/h1&gt;
 
-<!-- Document introduction -->
+&lt;!&hyphen;- Document introduction -&hyphen;&gt;
 
-<h3>Sub-section</h3>
+&lt;h3&gt;Sub-section&lt;/h3&gt;
 
-<!-- This is bad, <h2> has been left out -->]]></programlisting>
+&lt;!&hyphen;- This is bad, &lt;h2&gt; has been left out -&hyphen;&gt;</programlisting>
 	</example>
       </sect3>
 
@@ -455,10 +455,6 @@
   </tr>
 
   <tr>
-    <!-- Because the large cell on the left merges into
-         this row, the first <td> will occur on its
-         right -->
-
     <td>Middle right cell</td>
   </tr>
 

Modified: projects/db5/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml
==============================================================================
--- projects/db5/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml	Wed Jun 19 20:28:08 2013	(r41954)
+++ projects/db5/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml	Thu Jun 20 10:40:37 2013	(r41955)
@@ -818,40 +818,18 @@ nsgmls:example.xml:6:8:E: end tag for "H
 
       <programlisting>&lt;!-- ╢З╦у╣Ы╦я --></programlisting>
 
-      <programlisting><![CDATA[
-<!-- Ёo╛O╣Ы╦я -->
+      <programlisting>
+&lt;!&hyphen;- Ёo╛O╣Ы╦я -&hyphen;&gt;
 
-<!-- Ёo╓]╛O╣Ы╦я    -->
+&lt;!&hyphen;- Ёo╓]╛O╣Ы╦я    -&hyphen;&gt;
 
-<!-- ╜n╪g╕h╕Ф╣Ы╦я╙╨╦э║A
-     Ёo╛O╗Д╓╓╓╖╓@╙╨╓Х╕║ -->
+&lt;!&hyphen;- ╜n╪g╕h╕Ф╣Ы╦я╙╨╦э║A
+     Ёo╛O╗Д╓╓╓╖╓@╙╨╓Х╕║ -&hyphen;&gt;
 
-<!-- ╜n╪g╕h╕Ф╣Ы╦я║A   --
-  -- ╓]╔i╔HЁo╪к╓l╔н -->]]></programlisting>
+&lt;!&hyphen;- ╜n╪g╕h╕Ф╣Ы╦я║A   -&hyphen;

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

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 10:44:01 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 27CE9358;
 Thu, 20 Jun 2013 10:44:01 +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 1A2971BD7;
 Thu, 20 Jun 2013 10:44:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KAi018077379;
 Thu, 20 Jun 2013 10:44:00 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KAi07a077378;
 Thu, 20 Jun 2013 10:44:00 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201044.r5KAi07a077378@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 10:44:00 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41956 -
 projects/db5/es_ES.ISO8859-1/articles/fbsd-from-scratch
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, 20 Jun 2013 10:44:01 -0000

Author: gabor
Date: Thu Jun 20 10:44:00 2013
New Revision: 41956
URL: http://svnweb.freebsd.org/changeset/doc/41956

Log:
  - Move abstract to articleinfo

Modified:
  projects/db5/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml

Modified: projects/db5/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
==============================================================================
--- projects/db5/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml	Thu Jun 20 10:40:37 2013	(r41955)
+++ projects/db5/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml	Thu Jun 20 10:44:00 2013	(r41956)
@@ -23,7 +23,6 @@
     <pubdate>$FreeBSD$</pubdate>
 
     <releaseinfo>$FreeBSD$</releaseinfo>
-  </articleinfo>
 
     <abstract>
       <para>&scratch.ap; explica la instalaciСn totalmente automatizada
@@ -41,6 +40,7 @@
         aЗn</quote>.  </para>
 	&trans.es.carvay;
     </abstract>
+  </articleinfo>
 
   <sect1 id="introduction">
     <title>IntroducciСn</title>

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 10:45:44 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 C417F3C2;
 Thu, 20 Jun 2013 10:45:44 +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 B5A7D1BEE;
 Thu, 20 Jun 2013 10:45:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KAjixA077677;
 Thu, 20 Jun 2013 10:45:44 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KAjisv077676;
 Thu, 20 Jun 2013 10:45:44 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201045.r5KAjisv077676@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 10:45:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41957 - projects/db5/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, 20 Jun 2013 10:45:44 -0000

Author: gabor
Date: Thu Jun 20 10:45:44 2013
New Revision: 41957
URL: http://svnweb.freebsd.org/changeset/doc/41957

Log:
  - Allow trademark in lineannotation

Modified:
  projects/db5/share/xml/docbook50.dtd

Modified: projects/db5/share/xml/docbook50.dtd
==============================================================================
--- projects/db5/share/xml/docbook50.dtd	Thu Jun 20 10:44:00 2013	(r41956)
+++ projects/db5/share/xml/docbook50.dtd	Thu Jun 20 10:45:44 2013	(r41957)
@@ -1371,7 +1371,8 @@
 
 >
 
-<!ELEMENT lineannotation (#PCDATA|inlinemediaobject|remark|superscript|subscript|xref|link|olink|anchor|biblioref|alt|annotation|indexterm|phrase|replaceable)*>
+<!ELEMENT lineannotation (#PCDATA|inlinemediaobject|remark|superscript|subscript|xref|link|olink|anchor|biblioref|alt|annotation|indexterm|phrase|replaceable|
+	trademark)*>
 
 <!ATTLIST lineannotation
 	xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 13:41: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
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 8CEF7BAE;
 Thu, 20 Jun 2013 13:41:46 +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 7A98D1A09;
 Thu, 20 Jun 2013 13:41: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 r5KDfkPn034387;
 Thu, 20 Jun 2013 13:41:46 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KDfici034377;
 Thu, 20 Jun 2013 13:41:44 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201341.r5KDfici034377@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 13:41:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41958 - in projects/db5: el_GR.ISO8859-7/share/xml
 es_ES.ISO8859-1/share/xml fr_FR.ISO8859-1/share/xml hu_HU.ISO8859-2/share/xml
 mn_MN.UTF-8/share/xml nl_NL.ISO8859-1/share/xml ru_RU.K...
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, 20 Jun 2013 13:41:46 -0000

Author: gabor
Date: Thu Jun 20 13:41:44 2013
New Revision: 41958
URL: http://svnweb.freebsd.org/changeset/doc/41958

Log:
  - Add back two accidentally removed entity definitions

Modified:
  projects/db5/el_GR.ISO8859-7/share/xml/trademarks.ent
  projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent
  projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent
  projects/db5/hu_HU.ISO8859-2/share/xml/trademarks.ent
  projects/db5/mn_MN.UTF-8/share/xml/trademarks.ent
  projects/db5/nl_NL.ISO8859-1/share/xml/trademarks.ent
  projects/db5/ru_RU.KOI8-R/share/xml/trademarks.ent
  projects/db5/zh_CN.GB2312/share/xml/trademarks.ent
  projects/db5/zh_TW.Big5/share/xml/trademarks.ent

Modified: projects/db5/el_GR.ISO8859-7/share/xml/trademarks.ent
==============================================================================
--- projects/db5/el_GR.ISO8859-7/share/xml/trademarks.ent	Thu Jun 20 10:45:44 2013	(r41957)
+++ projects/db5/el_GR.ISO8859-7/share/xml/trademarks.ent	Thu Jun 20 13:41:44 2013	(r41958)
@@ -73,6 +73,9 @@
   ТГР ARM Limited.</para>">
 <!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
 
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
 <!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>оИ КщНЕИР ч ЖЯэСЕИР Cisco, Catalyst, ЙАИ IOS
   ЕъМАИ ЙАТОВУЯЫЛщМА ЕЛПОЯИЙэ СЩЛБОКА ТГР Cisco Systems, Inc. ч/ЙАИ ТЫМ
   СУМЕЯЦАТЧМ ТГР СТИР гМЫЛщМЕР пОКИТЕъЕР ЙАИ СЕ ОЯИСЛщМЕР эККЕР ВЧЯЕР.">
@@ -104,6 +107,10 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>г КщНГ CVSup ЕъМАИ ЙАТОВУЯЫЛщМО ЕЛПОЯИЙЭ
   СЩЛБОКО ТОУ John D. Polstra.</para>">
 
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+  Perfection</trademark>">
+
 <!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>тО FreeBSD ЕъМАИ щМА ЙАТОВУЯЫЛщМО ЕЛПОЯИЙЭ
   СЩЛБОКО ТОУ FreeBSD Foundation.</para>">
 

Modified: projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent
==============================================================================
--- projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent	Thu Jun 20 10:45:44 2013	(r41957)
+++ projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent	Thu Jun 20 13:41:44 2013	(r41958)
@@ -64,6 +64,9 @@
   Limited.</para>">
 <!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
 
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
 <!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, and IOS are
   registered trademarks of Cisco Systems, Inc. and/or its affiliates
   in the United States and certain other countries.</para>">
@@ -93,6 +96,10 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup is a registered trademark of
   John D. Polstra.</para>">
 
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+  Perfection</trademark>">
+
 <!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD is a registered trademark of
   the FreeBSD Foundation.</para>">
 

Modified: projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent
==============================================================================
--- projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent	Thu Jun 20 10:45:44 2013	(r41957)
+++ projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent	Thu Jun 20 13:41:44 2013	(r41958)
@@ -66,6 +66,9 @@
   Limited.</para>">
 <!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
 
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
 <!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, and IOS are
   registered trademarks of Cisco Systems, Inc. and/or its affiliates
   in the United States and certain other countries.</para>">
@@ -87,6 +90,10 @@
 <!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup est une marque dИposИe de
   John D. Polstra.</para>">
 
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+  Perfection</trademark>">
+
 <!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD est une marque
   dИposИe de la fondation FreeBSD.</para>">
 

Modified: projects/db5/hu_HU.ISO8859-2/share/xml/trademarks.ent
==============================================================================
--- projects/db5/hu_HU.ISO8859-2/share/xml/trademarks.ent	Thu Jun 20 10:45:44 2013	(r41957)
+++ projects/db5/hu_HU.ISO8859-2/share/xml/trademarks.ent	Thu Jun 20 13:41:44 2013	(r41958)
@@ -70,6 +70,9 @@
   vИdjegye.</para>">
 <!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
 
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
 <!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>A Cisco, Catalyst Иs IOS
   a Cisco Systems, Inc. Иs/vagy tАrsvАllalatainak
   bejegyzett vИdjegyei az EgyesЭlt аllamokban Иs
@@ -102,6 +105,10 @@
 <!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>A CVSup John D. Polstra bejegyzett
   vИdjegye.</para>">
 
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+  Perfection</trademark>">
+
 <!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>A FreeBSD a FreeBSD Foundation
   bejegyzett vИdjegye.</para>">
 

Modified: projects/db5/mn_MN.UTF-8/share/xml/trademarks.ent
==============================================================================
--- projects/db5/mn_MN.UTF-8/share/xml/trademarks.ent	Thu Jun 20 10:45:44 2013	(r41957)
+++ projects/db5/mn_MN.UTF-8/share/xml/trademarks.ent	Thu Jun 20 13:41:44 2013	(r41958)
@@ -67,6 +67,9 @@
   Limited-п╦п╧п╫ п╠р╞я─я┌пЁя█пЁп╢я│я█п╫ я┘я┐п╢п╟п╩п╢п╟п╟п╫я▀ я┌я█п╪п╢я█пЁ я▌п╪.</para>">
 <!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
 
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
 <!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, п╠п╟ IOS п╫я▄
 	п░п╪п╣я─п╦п╨п╦п╧п╫ п²я█пЁп╢я│я█п╫ пёп╩я│ п╠п╬п╩п╬п╫ п╥п╟я─п╦п╪ п╫я█пЁ я┐п╩я│я┐я┐п╢ п╢п╟я┘я▄ Cisco Systems, Inc.
 	п╠п╟/я█я│п╡я█п╩ я┌р╞р╞п╫п╦п╧ пЁп╦я┬р╞р╞п╢п╦п╧п╫ п╠р╞я─я┌пЁя█пЁп╢я│я█п╫ я┘я┐п╢п╟п╩п╢п╟п╟п╫я▀ я┌я█п╪п╢я█пЁп╫р╞р╞п╢ я▌п╪.</para>">
@@ -97,6 +100,10 @@
 <!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup п╫я▄ п√п╬п╫ п■. п÷п╬п╩я│я┌я─п╟пЁп╦п╧п╫ п╠р╞я─я┌пЁя█пЁп╢я│я█п╫ я┘я┐п╢п╟п╩п╢п╟п╟п╫я▀
 	я┌я█п╪п╢я█пЁ я▌п╪.</para>">
 
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+  Perfection</trademark>">
+
 <!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD п╫я▄ FreeBSD п║п╟п╫пЁп╦п╧п╫ п╠р╞я─я┌пЁя█пЁп╢я│я█п╫ я┘я┐п╢п╟п╩п╢п╟п╟п╫я▀
 	я┌я█п╪п╢я█пЁ я▌п╪.</para>">
 

Modified: projects/db5/nl_NL.ISO8859-1/share/xml/trademarks.ent
==============================================================================
--- projects/db5/nl_NL.ISO8859-1/share/xml/trademarks.ent	Thu Jun 20 10:45:44 2013	(r41957)
+++ projects/db5/nl_NL.ISO8859-1/share/xml/trademarks.ent	Thu Jun 20 13:41:44 2013	(r41958)
@@ -66,6 +66,9 @@
   ARM Limited.</para>">
 <!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
 
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
 <!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, en IOS zijn
   geregistreerde handelsmerken van Cisco Systems, Inc. en/of haar affiliaties
   in de Verenigde Staten en zekere andere landen.</para>">
@@ -97,6 +100,10 @@
 <!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup is een geregistreerd handelsmerk
   van John D. Polstra.</para>">
 
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+  Perfection</trademark>">
+
 <!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>&os; is een geregistreerd
   handelsmerk van de &os; Foundation.</para>">
 

Modified: projects/db5/ru_RU.KOI8-R/share/xml/trademarks.ent
==============================================================================
--- projects/db5/ru_RU.KOI8-R/share/xml/trademarks.ent	Thu Jun 20 10:45:44 2013	(r41957)
+++ projects/db5/ru_RU.KOI8-R/share/xml/trademarks.ent	Thu Jun 20 13:41:44 2013	(r41958)
@@ -68,6 +68,9 @@
   Limited.</para>">
 <!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
 
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
 <!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, и IOS это зарегистрированные
   торговые марки Cisco Systems, Inc. и/или ее компаньонов
   в Соединенных Штатах и других странах.</para>">
@@ -89,6 +92,10 @@
 <!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup это зарегистрированная торговая
   марка John D. Polstra.</para>">
 
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+  Perfection</trademark>">
+
 <!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD это зарегистрированная торговая
   марка FreeBSD Foundation.</para>">
 

Modified: projects/db5/zh_CN.GB2312/share/xml/trademarks.ent
==============================================================================
--- projects/db5/zh_CN.GB2312/share/xml/trademarks.ent	Thu Jun 20 10:45:44 2013	(r41957)
+++ projects/db5/zh_CN.GB2312/share/xml/trademarks.ent	Thu Jun 20 13:41:44 2013	(r41958)
@@ -60,6 +60,9 @@
   Limited. ╣дв╒╡Аил╠Й║ё</para>">
 <!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
 
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
 <!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, ╨м IOS
   йг Cisco Systems, Inc. ╨м/╩РфД╦╫йТ╩З╧╧тзцю╧З╨мр╩п╘фДкШ╧З╪р╣дв╒╡Аил╠Й║ё</para>">
 <!ENTITY cisco "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Cisco</trademark>">
@@ -86,6 +89,10 @@ Coverity Extendё╛ Coverity Prevent ╨м Co
 <!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup йг
   John D. Polstra ╣дв╒╡Аил╠Й║ё</para>">
 
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+  Perfection</trademark>">
+
 <!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD йг FreeBSD╩Ы╫П╩А╣дв╒╡Аил╠Й</para>">
 
 <!ENTITY fujitsu "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Fujitsu</trademark>">

Modified: projects/db5/zh_TW.Big5/share/xml/trademarks.ent
==============================================================================
--- projects/db5/zh_TW.Big5/share/xml/trademarks.ent	Thu Jun 20 10:45:44 2013	(r41957)
+++ projects/db5/zh_TW.Big5/share/xml/trademarks.ent	Thu Jun 20 13:41:44 2013	(r41958)
@@ -59,6 +59,9 @@ AMD Opteron, Athlon, &Eacute;lan, Optero
 <!ENTITY tm-attrib.arm "<para xmlns='http://docbook.org/ns/docbook'>ARM ╛O ARM Limited. ╙╨╣Ы╔U╟с╪п║C</para>">
 <!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
 
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
 <!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, ╘M IOS
   ╛O Cisco Systems, Inc. ╘M/╘н╗Д╙Чдщ╬В╨c╕b╛Э╟Й╘M╓@╗г╗Д╔L╟Й╝a╙╨╣Ы╔U╟с╪п║C</para>">
 <!ENTITY catalyst "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Catalyst</trademark>">
@@ -84,6 +87,10 @@ AMD Opteron, Athlon, &Eacute;lan, Optero
 <!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup ╛O
   John D. Polstra ╙╨╣Ы╔U╟с╪п║C</para>">
 
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+  Perfection</trademark>">
+
 <!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD ╛O FreeBSD╟Р╙В╥|╙╨╣Ы╔U╟с╪п</para>">
 
 <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 14:13:11 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 B9A8965C;
 Thu, 20 Jun 2013 14:13:11 +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 AA58E1BD8;
 Thu, 20 Jun 2013 14:13:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KEDB0G044787;
 Thu, 20 Jun 2013 14:13:11 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KEDAwW044777;
 Thu, 20 Jun 2013 14:13:10 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201413.r5KEDAwW044777@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 14:13:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41959 - in projects/db5:
 el_GR.ISO8859-7/books/handbook/disks es_ES.ISO8859-1/books/handbook/disks
 fr_FR.ISO8859-1/books/handbook/disks ja_JP.eucJP/books/handbook/disks
 pl_PL.ISO8859-2...
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, 20 Jun 2013 14:13:11 -0000

Author: gabor
Date: Thu Jun 20 14:13:10 2013
New Revision: 41959
URL: http://svnweb.freebsd.org/changeset/doc/41959

Log:
  - s/--/-/ in CDATA to help the DB 5.0 conversion script

Modified:
  projects/db5/el_GR.ISO8859-7/books/handbook/disks/chapter.xml
  projects/db5/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
  projects/db5/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml
  projects/db5/ja_JP.eucJP/books/handbook/disks/chapter.xml
  projects/db5/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml
  projects/db5/zh_TW.Big5/books/handbook/disks/chapter.xml

Modified: projects/db5/el_GR.ISO8859-7/books/handbook/disks/chapter.xml
==============================================================================
--- projects/db5/el_GR.ISO8859-7/books/handbook/disks/chapter.xml	Thu Jun 20 13:41:44 2013	(r41958)
+++ projects/db5/el_GR.ISO8859-7/books/handbook/disks/chapter.xml	Thu Jun 20 14:13:10 2013	(r41959)
@@ -2744,7 +2744,7 @@ then
 The MINI kernel does not exist, please create one.
 Here is an example config file:
 #
-# MINI -- A kernel to get FreeBSD onto a disk.
+# MINI - A kernel to get FreeBSD onto a disk.
 #
 machine         "i386"
 cpu             "I486_CPU"

Modified: projects/db5/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
==============================================================================
--- projects/db5/es_ES.ISO8859-1/books/handbook/disks/chapter.xml	Thu Jun 20 13:41:44 2013	(r41958)
+++ projects/db5/es_ES.ISO8859-1/books/handbook/disks/chapter.xml	Thu Jun 20 14:13:10 2013	(r41959)
@@ -2940,7 +2940,7 @@ then
 The MINI kernel does not exist, please create one.
 Here is an example config file:
 #
-# MINI -- A kernel to get FreeBSD onto a disk.
+# MINI - A kernel to get FreeBSD onto a disk.
 #
 machine         "i386"
 cpu             "I486_CPU"

Modified: projects/db5/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml
==============================================================================
--- projects/db5/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml	Thu Jun 20 13:41:44 2013	(r41958)
+++ projects/db5/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml	Thu Jun 20 14:13:10 2013	(r41959)
@@ -3201,7 +3201,7 @@ then
 The MINI kernel does not exist, please create one.
 Here is an example config file:
 #
-# MINI -- A kernel to get FreeBSD onto a disk.
+# MINI - A kernel to get FreeBSD onto a disk.
 #
 machine         "i386"
 cpu             "I486_CPU"

Modified: projects/db5/ja_JP.eucJP/books/handbook/disks/chapter.xml
==============================================================================
--- projects/db5/ja_JP.eucJP/books/handbook/disks/chapter.xml	Thu Jun 20 13:41:44 2013	(r41958)
+++ projects/db5/ja_JP.eucJP/books/handbook/disks/chapter.xml	Thu Jun 20 14:13:10 2013	(r41959)
@@ -2197,7 +2197,7 @@ then
 The MINI kernel does not exist, please create one.
 Here is an example config file:
 #
-# MINI -- A kernel to get FreeBSD onto a disk.
+# MINI - A kernel to get FreeBSD onto a disk.
 #
 machine         "i386"
 cpu             "I486_CPU"

Modified: projects/db5/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml
==============================================================================
--- projects/db5/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml	Thu Jun 20 13:41:44 2013	(r41958)
+++ projects/db5/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml	Thu Jun 20 14:13:10 2013	(r41959)
@@ -2651,7 +2651,7 @@ then
 The MINI kernel does not exist, please create one.
 Here is an example config file:
 #
-# MINI -- A kernel to get FreeBSD onto a disk.
+# MINI - A kernel to get FreeBSD onto a disk.
 #
 machine         "i386"
 cpu             "I486_CPU"

Modified: projects/db5/zh_TW.Big5/books/handbook/disks/chapter.xml
==============================================================================
--- projects/db5/zh_TW.Big5/books/handbook/disks/chapter.xml	Thu Jun 20 13:41:44 2013	(r41958)
+++ projects/db5/zh_TW.Big5/books/handbook/disks/chapter.xml	Thu Jun 20 14:13:10 2013	(r41959)
@@ -2574,7 +2574,7 @@ then
 The MINI kernel does not exist, please create one.
 Here is an example config file:
 #
-# MINI -- A kernel to get FreeBSD onto a disk.
+# MINI - A kernel to get FreeBSD onto a disk.
 #
 machine         "i386"
 cpu             "I486_CPU"

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 14:23:09 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 10F21B9C;
 Thu, 20 Jun 2013 14:23:09 +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 020961C57;
 Thu, 20 Jun 2013 14:23:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KEN8a2047987;
 Thu, 20 Jun 2013 14:23:08 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KEN8Hk047984;
 Thu, 20 Jun 2013 14:23:08 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201423.r5KEN8Hk047984@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 14:23:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41960 - in projects/db5:
 fr_FR.ISO8859-1/books/fdp-primer/translations
 hu_HU.ISO8859-2/books/fdp-primer/sgml-markup
 pt_BR.ISO8859-1/books/fdp-primer/sgml-markup
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, 20 Jun 2013 14:23:09 -0000

Author: gabor
Date: Thu Jun 20 14:23:08 2013
New Revision: 41960
URL: http://svnweb.freebsd.org/changeset/doc/41960

Log:
  - More workarounds for CDATA-related stuff

Modified:
  projects/db5/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml
  projects/db5/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
  projects/db5/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml

Modified: projects/db5/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml
==============================================================================
--- projects/db5/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml	Thu Jun 20 14:13:10 2013	(r41959)
+++ projects/db5/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml	Thu Jun 20 14:23:08 2013	(r41960)
@@ -458,11 +458,11 @@
 	<para>Les en-tЙtes de la version anglaise du document ressembleront &agrave;
           ceci&nbsp;:</para>
 
-	<programlisting><![CDATA[<!--
+	<programlisting>&lt;!&hyphen;-
      The FreeBSD Documentation Project
 
      &dollar;Id: chapter.xml,v 1.11 1999/06/20 21:18:57 billf Exp $
--->]]></programlisting>
+-&hyphen;&gt;</programlisting>
 
 	<para>La forme exacte peut changer, mais elles comporteront toujours
           la ligne &ldquo;Id&rdquo; et la phrase <literal>The FreeBSD
@@ -481,12 +481,12 @@
 	<para>Donc, la version espagnole du prИsent fichier commencerait
           par&nbsp;:</para>
 
-	<programlisting><![CDATA[<!--
+	<programlisting>&lt;&hyphen;-
      The FreeBSD Spanish Documentation Project
 
      &dollar;Id: chapter.xml,v 1.3 1999/06/24 19:12:32 jesusr Exp $
      Original revision: 1.11
--->]]></programlisting>
+-&hyphen;&gt;</programlisting>
       </answer>
     </qandaentry>
   </qandaset>

Modified: projects/db5/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
==============================================================================
--- projects/db5/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml	Thu Jun 20 14:13:10 2013	(r41959)
+++ projects/db5/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml	Thu Jun 20 14:23:08 2013	(r41960)
@@ -197,21 +197,21 @@
 
 	  <para>A hasznАlat mСdja:</para>
 
-	  <programlisting><![CDATA[<h1>]]>ElsУ szakasz<![CDATA[</h1>
+	  <programlisting>&lt;h1&gt;ElsУ szakasz&lt;/h1&gt;
 
-<!--]]> Ide kerЭl a dokumentum bevezetУ rИsze <![CDATA[-->
+&lt;!&hyphen;- Ide kerЭl a dokumentum bevezetУ rИsze -&hyphen;&gt;
 
-<h2>]]>Ez az elsУ szakasz fejlИce<![CDATA[</h2>
+&lt;h2&gt;Ez az elsУ szakasz fejlИce&lt;/h2&gt;
 
-<!--]]> Az elsУ szakasz tartalma kЖvetkezik <![CDATA[-->
+&lt;!&hyphen;- Az elsУ szakasz tartalma kЖvetkezik -&hyphen;&gt;
 
-<h3>]]>Ez az elsУ alszakasz fejlИce<![CDATA[</h3>
+&lt;h3&gt;Ez az elsУ alszakasz fejlИce&lt;/h3&gt;
 
-<!--]]> Az elsУ alszakasz tartalma itt foglal helyet <![CDATA[-->
+&lt;!&hyphen;- Az elsУ alszakasz tartalma itt foglal helyet -&hyphen;&gt;
 
-<h2>]]>Ez a mАsodik szakasz fejlИce<![CDATA[</h2>
+&lt;h2&gt;Ez a mАsodik szakasz fejlИce&lt;/h2&gt;
 
-<!--]]> A mАsodik szakasz tartalma ezen a rИszen lesz <![CDATA[-->]]></programlisting>
+&lt;!&hyphen;- A mАsodik szakasz tartalma ezen a rИszen lesz -&hyphen;&gt;</programlisting>
 	</example>
 
 	<para>A HTML oldalaknak АltalАban
@@ -232,13 +232,13 @@
 
 	  <para>A hasznАlati mСdja:</para>
 
-	  <programlisting><![CDATA[<h1>]]>ElsУ szakasz<![CDATA[</h1>
+	  <programlisting>&lt;h1&gt;ElsУ szakasz&lt;/h1&gt;
 
-<!--]]> A dokumentum bevezetУje <![CDATA[-->
+&lt;!&hyphen;-&gt; A dokumentum bevezetУje -&hyphen;&gt;
 
-<h3>]]>Alszakasz<![CDATA[</h3>
+&lt;h3&gt;Alszakasz&lt;/h3&gt;
 
-<!--]]> Nem jС, mert kimaradt a <![CDATA[<h2>]]> szint! <![CDATA[-->]]></programlisting>
+&lt;!&hyphen;- Nem jС, mert kimaradt a &lt;h2&gt; szint! -&hyphen;&gt;</programlisting>
 	</example>
       </sect3>
 

Modified: projects/db5/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
==============================================================================
--- projects/db5/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml	Thu Jun 20 14:13:10 2013	(r41959)
+++ projects/db5/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml	Thu Jun 20 14:23:08 2013	(r41960)
@@ -217,7 +217,7 @@
 
 &lt;h3&gt;SubseГЦo&lt;/h3&gt;
 
-&lt;!&hyphen;- Isto И ruim, nЦo foi usado <h2> -&hyphen;&gt;</programlisting>
+&lt;!&hyphen;- Isto И ruim, nЦo foi usado &lt;h2&gt; -&hyphen;&gt;</programlisting>
 	</example>
       </sect3>
 

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 14:45: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 [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7F11B917;
 Thu, 20 Jun 2013 14:45:28 +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 586881DE4;
 Thu, 20 Jun 2013 14:45: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 r5KEjSl3054744;
 Thu, 20 Jun 2013 14:45:28 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KEjSdi054743;
 Thu, 20 Jun 2013 14:45:28 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201445.r5KEjSdi054743@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 14:45:28 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41961 - projects/db5/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, 20 Jun 2013 14:45:28 -0000

Author: gabor
Date: Thu Jun 20 14:45:27 2013
New Revision: 41961
URL: http://svnweb.freebsd.org/changeset/doc/41961

Log:
  - Allow email in attribution
  - Allow trademark in screen

Modified:
  projects/db5/share/xml/docbook50.dtd

Modified: projects/db5/share/xml/docbook50.dtd
==============================================================================
--- projects/db5/share/xml/docbook50.dtd	Thu Jun 20 14:23:08 2013	(r41960)
+++ projects/db5/share/xml/docbook50.dtd	Thu Jun 20 14:45:27 2013	(r41961)
@@ -228,7 +228,8 @@
 
 >
 
-<!ELEMENT attribution (#PCDATA|inlinemediaobject|remark|superscript|subscript|xref|link|olink|anchor|biblioref|alt|annotation|indexterm|phrase|replaceable|person|personname|citetitle|citation)*>
+<!ELEMENT attribution (#PCDATA|inlinemediaobject|remark|superscript|subscript|xref|link|olink|anchor|biblioref|alt|annotation|indexterm|phrase|replaceable|person|personname|citetitle|citation|
+	email)*>
 
 <!ATTLIST attribution
 	xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"
@@ -487,7 +488,7 @@
 >
 
 <!ELEMENT screen (#PCDATA|info|textobject|inlinemediaobject|remark|superscript|subscript|xref|link|olink|anchor|biblioref|alt|annotation|indexterm|abbrev|acronym|date|emphasis|footnote|footnoteref|foreignphrase|phrase|quote|wordasword|firstterm|glossterm|coref|trademark|productnumber|productname|database|application|hardware|citation|citerefentry|citetitle|citebiblioid|author|person|personname|org|orgname|editor|jobtitle|replaceable|package|parameter|termdef|nonterminal|systemitem|option|optional|property|inlineequation|tag|markup|token|symbol|literal|code|constant|email|uri|guiicon|guibutton|guimenuitem|guimenu|guisubmenu|guilabel|menuchoice|mousebutton|keycombo|keycap|keycode|keysym|shortcut|accel|prompt|envar|filename|command|computeroutput|userinput|function|varname|returnvalue|type|classname|exceptionname|interfacename|methodname|modifier|initializer|ooclass|ooexception|oointerface|errorcode|errortext|errorname|errortype|lineannotation|co|
-	xi:include)*>
+	trademark|xi:include)*>
 
 <!ATTLIST screen
 	xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 14:50:49 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 E87BCAF9;
 Thu, 20 Jun 2013 14:50:49 +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 D92D71E39;
 Thu, 20 Jun 2013 14:50:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KEon2f057238;
 Thu, 20 Jun 2013 14:50:49 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KEolr8057223;
 Thu, 20 Jun 2013 14:50:47 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201450.r5KEolr8057223@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 14:50:47 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41962 - in projects/db5: de_DE.ISO8859-1/books/faq
 el_GR.ISO8859-7/books/faq en_US.ISO8859-1/articles/fonts
 en_US.ISO8859-1/books/faq hu_HU.ISO8859-2/books/faq
 ja_JP.eucJP/articles/fon...
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, 20 Jun 2013 14:50:50 -0000

Author: gabor
Date: Thu Jun 20 14:50:47 2013
New Revision: 41962
URL: http://svnweb.freebsd.org/changeset/doc/41962

Log:
  - Revert r41797, r41798 and r41867, which were not really good fixes

Modified:
  projects/db5/de_DE.ISO8859-1/books/faq/book.xml
  projects/db5/el_GR.ISO8859-7/books/faq/book.xml
  projects/db5/en_US.ISO8859-1/articles/fonts/article.xml
  projects/db5/en_US.ISO8859-1/books/faq/book.xml
  projects/db5/hu_HU.ISO8859-2/books/faq/book.xml
  projects/db5/ja_JP.eucJP/articles/fonts/article.xml
  projects/db5/pt_BR.ISO8859-1/books/faq/book.xml
  projects/db5/ru_RU.KOI8-R/books/faq/book.xml
  projects/db5/zh_TW.Big5/books/faq/book.xml

Modified: projects/db5/de_DE.ISO8859-1/books/faq/book.xml
==============================================================================
--- projects/db5/de_DE.ISO8859-1/books/faq/book.xml	Thu Jun 20 14:45:27 2013	(r41961)
+++ projects/db5/de_DE.ISO8859-1/books/faq/book.xml	Thu Jun 20 14:50:47 2013	(r41962)
@@ -11303,7 +11303,7 @@ hint.sio.7.irq="12"</programlisting>
             Teile der Nachricht lauteten:</para>
 
           <blockquote>
-            <attribution>Poul-Henning Kamp in &a.hackers.name;,
+            <attribution>&a.phk; in &a.hackers.name;,
               2.10.1999</attribution>
 
             <para>Einige von Euch haben mich gefragt, <quote>Was

Modified: projects/db5/el_GR.ISO8859-7/books/faq/book.xml
==============================================================================
--- projects/db5/el_GR.ISO8859-7/books/faq/book.xml	Thu Jun 20 14:45:27 2013	(r41961)
+++ projects/db5/el_GR.ISO8859-7/books/faq/book.xml	Thu Jun 20 14:50:47 2013	(r41962)
@@ -10950,7 +10950,7 @@ raisechar=^^</programlisting>
             below.</para>
 
           <blockquote>
-            <attribution>Poul-Henning Kamp on freebsd-hackers, October
+            <attribution>&a.phk; on freebsd-hackers, October
               2, 1999</attribution>
 
             <para>

Modified: projects/db5/en_US.ISO8859-1/articles/fonts/article.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/articles/fonts/article.xml	Thu Jun 20 14:45:27 2013	(r41961)
+++ projects/db5/en_US.ISO8859-1/articles/fonts/article.xml	Thu Jun 20 14:50:47 2013	(r41962)
@@ -567,7 +567,7 @@ GS&gt;<userinput>quit</userinput></scree
 
     <informalexample>
       <screen><lineannotation>Many <filename>.afm</filename> files are in Mac format&hellip; ^M delimited lines
-We need to convert them to UNIX&trade; style ^J delimited lines</lineannotation>
+We need to convert them to &unix; style ^J delimited lines</lineannotation>
 &prompt.user; <userinput>cd /tmp</userinput>
 &prompt.user; <userinput>cat /usr/local/share/fonts/type1/showboat.afm |
 	tr '\015' '\012' &gt;showboat.afm</userinput>

Modified: projects/db5/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/faq/book.xml	Thu Jun 20 14:45:27 2013	(r41961)
+++ projects/db5/en_US.ISO8859-1/books/faq/book.xml	Thu Jun 20 14:50:47 2013	(r41962)
@@ -7530,7 +7530,7 @@ hint.sio.7.irq="12"</programlisting>
 	    below.</para>
 
 	  <blockquote>
-	    <attribution>Poul-Henning Kamp; on &a.hackers.name;, October 2,
+	    <attribution>&a.phk; on &a.hackers.name;, October 2,
 	      1999</attribution>
 
 	    <para><quote>What is it about this bike shed?</quote>  Some

Modified: projects/db5/hu_HU.ISO8859-2/books/faq/book.xml
==============================================================================
--- projects/db5/hu_HU.ISO8859-2/books/faq/book.xml	Thu Jun 20 14:45:27 2013	(r41961)
+++ projects/db5/hu_HU.ISO8859-2/books/faq/book.xml	Thu Jun 20 14:50:47 2013	(r41962)
@@ -14091,7 +14091,7 @@ hint.sio.7.irq="12"</programlisting>
 	    idИzni:</para>
 
 	  <blockquote>
-	    <attribution>Poul-Henning Kamp, &a.hackers.name;, 1999.
+	    <attribution>&a.phk;, &a.hackers.name;, 1999.
 	      oktСber 2.</attribution>
 
 	    <para><quote>MirУl is szСl ez a

Modified: projects/db5/ja_JP.eucJP/articles/fonts/article.xml
==============================================================================
--- projects/db5/ja_JP.eucJP/articles/fonts/article.xml	Thu Jun 20 14:45:27 2013	(r41961)
+++ projects/db5/ja_JP.eucJP/articles/fonts/article.xml	Thu Jun 20 14:50:47 2013	(r41962)
@@ -598,7 +598,7 @@ GS&gt;<userinput>quit</userinput></scree
 
     <informalexample>
       <screen><lineannotation><filename>.afm</filename> ╔у╔║╔╓╔К╓нб©╓╞╓о Mac ╥а╪╟&hellip; ╓╧╓й╓О╓а╧т╓╛ ^M ╓г╤Хюз╓И╓Л╓ф╓╓╓ч╓╧║ё
-╓Ё╓Л╓Р╧т╓Р ^J ╓г╤Хюз╓К UNIX&trade; ╔╧╔©╔╓╔К╓кйя╢╧╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё</lineannotation>
+╓Ё╓Л╓Р╧т╓Р ^J ╓г╤Хюз╓К &unix; ╔╧╔©╔╓╔К╓кйя╢╧╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё</lineannotation>
 &prompt.user; <userinput>cd /tmp</userinput>
 &prompt.user; <userinput>cat /usr/local/share/fonts/type1/showboat.afm |
 	tr '\015' '\012' &gt;showboat.afm</userinput>

Modified: projects/db5/pt_BR.ISO8859-1/books/faq/book.xml
==============================================================================
--- projects/db5/pt_BR.ISO8859-1/books/faq/book.xml	Thu Jun 20 14:45:27 2013	(r41961)
+++ projects/db5/pt_BR.ISO8859-1/books/faq/book.xml	Thu Jun 20 14:50:47 2013	(r41962)
@@ -14351,7 +14351,7 @@ raisechar=^^</programlisting>
 	    mensagem estЦo citadas abaixo.</para>
 
 	  <blockquote>
-	    <attribution>Poul-Henning Kamp na freebsd-hackers, em 2 de Outubro
+	    <attribution>&a.phk; na freebsd-hackers, em 2 de Outubro
 	      de 1999</attribution>
 
 	    <para><quote>O que И isso sobre a cor do quartinho

Modified: projects/db5/ru_RU.KOI8-R/books/faq/book.xml
==============================================================================
--- projects/db5/ru_RU.KOI8-R/books/faq/book.xml	Thu Jun 20 14:45:27 2013	(r41961)
+++ projects/db5/ru_RU.KOI8-R/books/faq/book.xml	Thu Jun 20 14:50:47 2013	(r41962)
@@ -10357,7 +10357,7 @@ hint.sio.7.irq="12"</programlisting>
 	    Соответствующие части этого сообщения цитируются ниже.</para>
 
 	    <blockquote>
-	      <attribution>Poul-Henning Kamp on freebsd-hackers,
+	      <attribution>&a.phk; on freebsd-hackers,
 		October 2, 1999</attribution>
 
 	      <para><quote>Что это за история с навесом для велосипеда?</quote> Кто-то

Modified: projects/db5/zh_TW.Big5/books/faq/book.xml
==============================================================================
--- projects/db5/zh_TW.Big5/books/faq/book.xml	Thu Jun 20 14:45:27 2013	(r41961)
+++ projects/db5/zh_TW.Big5/books/faq/book.xml	Thu Jun 20 14:50:47 2013	(r41962)
@@ -10326,7 +10326,7 @@ raisechar=^^</programlisting>
             ╕b╚C╩A╞С╕a╓W╙╨╦}╫Я╗╝╗╝╢в(╔Т╕СцC╕Б╙╨)...</ulink></quote>║C╔H╓U║A╤х╨K╜n╦с╚h╓ЕЁ╧Ё║╓ю╓╨╝e║G</para>
 
           <blockquote>
-            <attribution>Poul-Henning Kamp on freebsd-hackers, October
+            <attribution>&a.phk; on freebsd-hackers, October
               2, 1999</attribution>
 
             <para><quote>╓╟╩Р╛OцЖ╘СЁo╜с╦}╫Я╗╝╗╝╢в?</quote> Ё║╓ю╙╨╓HЁo╪к╙╨╦ъ╟щ╖з║C</para>

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 14:58:05 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 A7DFEF64;
 Thu, 20 Jun 2013 14:58:05 +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 9A8F81EC0;
 Thu, 20 Jun 2013 14:58:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KEw52d058263;
 Thu, 20 Jun 2013 14:58:05 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KEw5xP058262;
 Thu, 20 Jun 2013 14:58:05 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201458.r5KEw5xP058262@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 14:58:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41963 - projects/db5/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, 20 Jun 2013 14:58:05 -0000

Author: gabor
Date: Thu Jun 20 14:58:04 2013
New Revision: 41963
URL: http://svnweb.freebsd.org/changeset/doc/41963

Log:
  - Add back two accidentally removed entity definitions

Modified:
  projects/db5/share/xml/trademarks.ent

Modified: projects/db5/share/xml/trademarks.ent
==============================================================================
--- projects/db5/share/xml/trademarks.ent	Thu Jun 20 14:50:47 2013	(r41962)
+++ projects/db5/share/xml/trademarks.ent	Thu Jun 20 14:58:04 2013	(r41963)
@@ -62,6 +62,9 @@
   Limited.</para>">
 <!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>ARM</trademark>">
 
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Bluetooth</trademark>">
+
 <!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>Cisco, Catalyst, and IOS are
   registered trademarks of Cisco Systems, Inc. and/or its affiliates
   in the United States and certain other countries.</para>">
@@ -93,6 +96,10 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup is a registered trademark of
   John D. Polstra.</para>">
 
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
+  Perfection</trademark>">
+
 <!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD is a registered trademark of
   the FreeBSD Foundation.</para>">
 

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 14:58: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 30D30FAB;
 Thu, 20 Jun 2013 14:58:28 +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 23D9A1EC8;
 Thu, 20 Jun 2013 14:58: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 r5KEwSJ1058345;
 Thu, 20 Jun 2013 14:58:28 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KEwSKo058344;
 Thu, 20 Jun 2013 14:58:28 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201458.r5KEwSKo058344@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 14:58:28 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41964 - projects/db5/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, 20 Jun 2013 14:58:28 -0000

Author: gabor
Date: Thu Jun 20 14:58:27 2013
New Revision: 41964
URL: http://svnweb.freebsd.org/changeset/doc/41964

Log:
  - Fix previous commit

Modified:
  projects/db5/share/xml/docbook50.dtd

Modified: projects/db5/share/xml/docbook50.dtd
==============================================================================
--- projects/db5/share/xml/docbook50.dtd	Thu Jun 20 14:58:04 2013	(r41963)
+++ projects/db5/share/xml/docbook50.dtd	Thu Jun 20 14:58:27 2013	(r41964)
@@ -488,7 +488,7 @@
 >
 
 <!ELEMENT screen (#PCDATA|info|textobject|inlinemediaobject|remark|superscript|subscript|xref|link|olink|anchor|biblioref|alt|annotation|indexterm|abbrev|acronym|date|emphasis|footnote|footnoteref|foreignphrase|phrase|quote|wordasword|firstterm|glossterm|coref|trademark|productnumber|productname|database|application|hardware|citation|citerefentry|citetitle|citebiblioid|author|person|personname|org|orgname|editor|jobtitle|replaceable|package|parameter|termdef|nonterminal|systemitem|option|optional|property|inlineequation|tag|markup|token|symbol|literal|code|constant|email|uri|guiicon|guibutton|guimenuitem|guimenu|guisubmenu|guilabel|menuchoice|mousebutton|keycombo|keycap|keycode|keysym|shortcut|accel|prompt|envar|filename|command|computeroutput|userinput|function|varname|returnvalue|type|classname|exceptionname|interfacename|methodname|modifier|initializer|ooclass|ooexception|oointerface|errorcode|errortext|errorname|errortype|lineannotation|co|
-	trademark|xi:include)*>
+	xi:include)*>
 
 <!ATTLIST screen
 	xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 16:12:07 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 2B5BD8AD;
 Thu, 20 Jun 2013 16:12:07 +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 1BE931326;
 Thu, 20 Jun 2013 16:12:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KGC62k083203;
 Thu, 20 Jun 2013 16:12:06 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KGBt2O083108;
 Thu, 20 Jun 2013 16:11:55 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201611.r5KGBt2O083108@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 16:11:55 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41967 - projects/db5/share/pgpkeys
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, 20 Jun 2013 16:12:07 -0000

Author: gabor
Date: Thu Jun 20 16:11:54 2013
New Revision: 41967
URL: http://svnweb.freebsd.org/changeset/doc/41967

Log:
  - Convert PGP key entities to DB 5.0

Modified:
  projects/db5/share/pgpkeys/aaron.key
  projects/db5/share/pgpkeys/ache.key
  projects/db5/share/pgpkeys/achim.key
  projects/db5/share/pgpkeys/acm.key
  projects/db5/share/pgpkeys/adamw.key
  projects/db5/share/pgpkeys/addkey.sh
  projects/db5/share/pgpkeys/ae.key
  projects/db5/share/pgpkeys/ahze.key
  projects/db5/share/pgpkeys/ak.key
  projects/db5/share/pgpkeys/ale.key
  projects/db5/share/pgpkeys/alepulver.key
  projects/db5/share/pgpkeys/alex.key
  projects/db5/share/pgpkeys/alexbl.key
  projects/db5/share/pgpkeys/amdmi3.key
  projects/db5/share/pgpkeys/anchie.key
  projects/db5/share/pgpkeys/anders.key
  projects/db5/share/pgpkeys/andreas.key
  projects/db5/share/pgpkeys/andrew.key
  projects/db5/share/pgpkeys/anholt.key
  projects/db5/share/pgpkeys/anray.key
  projects/db5/share/pgpkeys/antoine.key
  projects/db5/share/pgpkeys/araujo.key
  projects/db5/share/pgpkeys/ariff.key
  projects/db5/share/pgpkeys/art.key
  projects/db5/share/pgpkeys/arun.key
  projects/db5/share/pgpkeys/arved.key
  projects/db5/share/pgpkeys/asami.key
  projects/db5/share/pgpkeys/ashish.key
  projects/db5/share/pgpkeys/asomers.key
  projects/db5/share/pgpkeys/avatar.key
  projects/db5/share/pgpkeys/avg.key
  projects/db5/share/pgpkeys/avilla.key
  projects/db5/share/pgpkeys/avl.key
  projects/db5/share/pgpkeys/bakul.key
  projects/db5/share/pgpkeys/bapt.key
  projects/db5/share/pgpkeys/bar.key
  projects/db5/share/pgpkeys/barner.key
  projects/db5/share/pgpkeys/bcr.key
  projects/db5/share/pgpkeys/bdrewery.key
  projects/db5/share/pgpkeys/beat.key
  projects/db5/share/pgpkeys/beech.key
  projects/db5/share/pgpkeys/ben.key
  projects/db5/share/pgpkeys/benjsc.key
  projects/db5/share/pgpkeys/benno.key
  projects/db5/share/pgpkeys/bf.key
  projects/db5/share/pgpkeys/bhaga.key
  projects/db5/share/pgpkeys/billf.key
  projects/db5/share/pgpkeys/bjk.key
  projects/db5/share/pgpkeys/bk.key
  projects/db5/share/pgpkeys/blackend.key
  projects/db5/share/pgpkeys/bland.key
  projects/db5/share/pgpkeys/bmah.key
  projects/db5/share/pgpkeys/bms.key
  projects/db5/share/pgpkeys/brd.key
  projects/db5/share/pgpkeys/brian.key
  projects/db5/share/pgpkeys/brix.key
  projects/db5/share/pgpkeys/brooks.key
  projects/db5/share/pgpkeys/brucec.key
  projects/db5/share/pgpkeys/brueffer.key
  projects/db5/share/pgpkeys/bruno.key
  projects/db5/share/pgpkeys/bryanv.key
  projects/db5/share/pgpkeys/bsam.key
  projects/db5/share/pgpkeys/bschmidt.key
  projects/db5/share/pgpkeys/bsd.key
  projects/db5/share/pgpkeys/bushman.key
  projects/db5/share/pgpkeys/bvs.key
  projects/db5/share/pgpkeys/bz.key
  projects/db5/share/pgpkeys/carl.key
  projects/db5/share/pgpkeys/cel.key
  projects/db5/share/pgpkeys/ceri.key
  projects/db5/share/pgpkeys/cherry.key
  projects/db5/share/pgpkeys/chinsan.key
  projects/db5/share/pgpkeys/cjc.key
  projects/db5/share/pgpkeys/cjh.key
  projects/db5/share/pgpkeys/clement.key
  projects/db5/share/pgpkeys/clive.key
  projects/db5/share/pgpkeys/clsung.key
  projects/db5/share/pgpkeys/cokane.key
  projects/db5/share/pgpkeys/core-secretary.key
  projects/db5/share/pgpkeys/cperciva.key
  projects/db5/share/pgpkeys/crees.key
  projects/db5/share/pgpkeys/cs.key
  projects/db5/share/pgpkeys/cshumway.key
  projects/db5/share/pgpkeys/csjp.key
  projects/db5/share/pgpkeys/culot.key
  projects/db5/share/pgpkeys/daichi.key
  projects/db5/share/pgpkeys/damien.key
  projects/db5/share/pgpkeys/danfe.key
  projects/db5/share/pgpkeys/danger.key
  projects/db5/share/pgpkeys/dannyboy.key
  projects/db5/share/pgpkeys/das.key
  projects/db5/share/pgpkeys/davide.key
  projects/db5/share/pgpkeys/davidxu.key
  projects/db5/share/pgpkeys/db.key
  projects/db5/share/pgpkeys/dbn.key
  projects/db5/share/pgpkeys/dchagin.key
  projects/db5/share/pgpkeys/dcs.key
  projects/db5/share/pgpkeys/dd.key
  projects/db5/share/pgpkeys/deb.key
  projects/db5/share/pgpkeys/decke.key
  projects/db5/share/pgpkeys/deischen.key
  projects/db5/share/pgpkeys/delphij.key
  projects/db5/share/pgpkeys/demon.key
  projects/db5/share/pgpkeys/den.key
  projects/db5/share/pgpkeys/des.key
  projects/db5/share/pgpkeys/dfr.key
  projects/db5/share/pgpkeys/dhartmei.key
  projects/db5/share/pgpkeys/dhn.key
  projects/db5/share/pgpkeys/dhw.key
  projects/db5/share/pgpkeys/dim.key
  projects/db5/share/pgpkeys/dinoex.key
  projects/db5/share/pgpkeys/dru.key
  projects/db5/share/pgpkeys/dryice.key
  projects/db5/share/pgpkeys/dutchdaemon.key
  projects/db5/share/pgpkeys/dwmalone.key
  projects/db5/share/pgpkeys/eadler.key
  projects/db5/share/pgpkeys/ebrandi.key
  projects/db5/share/pgpkeys/ed.key
  projects/db5/share/pgpkeys/ehaupt.key
  projects/db5/share/pgpkeys/emaste.key
  projects/db5/share/pgpkeys/emax.key
  projects/db5/share/pgpkeys/erwin.key
  projects/db5/share/pgpkeys/fabient.key
  projects/db5/share/pgpkeys/fanf.key
  projects/db5/share/pgpkeys/farrokhi.key
  projects/db5/share/pgpkeys/fjoe.key
  projects/db5/share/pgpkeys/flo.key
  projects/db5/share/pgpkeys/fluffy.key
  projects/db5/share/pgpkeys/flz.key
  projects/db5/share/pgpkeys/foxfair.key
  projects/db5/share/pgpkeys/gabor.key
  projects/db5/share/pgpkeys/gahr.key
  projects/db5/share/pgpkeys/ganbold.key
  projects/db5/share/pgpkeys/garga.key
  projects/db5/share/pgpkeys/garys.key
  projects/db5/share/pgpkeys/gavin.key
  projects/db5/share/pgpkeys/gblach.key
  projects/db5/share/pgpkeys/gerald.key
  projects/db5/share/pgpkeys/ghelmer.key
  projects/db5/share/pgpkeys/gibbs.key
  projects/db5/share/pgpkeys/girgen.key
  projects/db5/share/pgpkeys/gjb.key
  projects/db5/share/pgpkeys/glarkin.key
  projects/db5/share/pgpkeys/glebius.key
  projects/db5/share/pgpkeys/glewis.key
  projects/db5/share/pgpkeys/gnn.key
  projects/db5/share/pgpkeys/gordon.key
  projects/db5/share/pgpkeys/green.key
  projects/db5/share/pgpkeys/grehan.key
  projects/db5/share/pgpkeys/gshapiro.key
  projects/db5/share/pgpkeys/gsutter.key
  projects/db5/share/pgpkeys/guido.key
  projects/db5/share/pgpkeys/harti.key
  projects/db5/share/pgpkeys/hiren.key
  projects/db5/share/pgpkeys/hmp.key
  projects/db5/share/pgpkeys/hq.key
  projects/db5/share/pgpkeys/hrs.key
  projects/db5/share/pgpkeys/ijliao.key
  projects/db5/share/pgpkeys/imp.key
  projects/db5/share/pgpkeys/issyl0.key
  projects/db5/share/pgpkeys/itetcu.key
  projects/db5/share/pgpkeys/ivoras.key
  projects/db5/share/pgpkeys/jacula.key
  projects/db5/share/pgpkeys/jadawin.key
  projects/db5/share/pgpkeys/jamie.key
  projects/db5/share/pgpkeys/jase.key
  projects/db5/share/pgpkeys/jcamou.key
  projects/db5/share/pgpkeys/jceel.key
  projects/db5/share/pgpkeys/jchandra.key
  projects/db5/share/pgpkeys/jdp.key
  projects/db5/share/pgpkeys/jedgar.key
  projects/db5/share/pgpkeys/jesper.key
  projects/db5/share/pgpkeys/jgh.key
  projects/db5/share/pgpkeys/jh.key
  projects/db5/share/pgpkeys/jhale.key
  projects/db5/share/pgpkeys/jhay.key
  projects/db5/share/pgpkeys/jhb.key
  projects/db5/share/pgpkeys/jhibbits.key
  projects/db5/share/pgpkeys/jilles.key
  projects/db5/share/pgpkeys/jim.key
  projects/db5/share/pgpkeys/jinmei.key
  projects/db5/share/pgpkeys/jkh.key
  projects/db5/share/pgpkeys/jkim.key
  projects/db5/share/pgpkeys/jkois.key
  projects/db5/share/pgpkeys/jkoshy.key
  projects/db5/share/pgpkeys/jlaffaye.key
  projects/db5/share/pgpkeys/jlh.key
  projects/db5/share/pgpkeys/jmb.key
  projects/db5/share/pgpkeys/jmelo.key
  projects/db5/share/pgpkeys/jmg.key
  projects/db5/share/pgpkeys/joe.key
  projects/db5/share/pgpkeys/joerg.key
  projects/db5/share/pgpkeys/johans.key
  projects/db5/share/pgpkeys/jon.key
  projects/db5/share/pgpkeys/jonathan.key
  projects/db5/share/pgpkeys/josef.key
  projects/db5/share/pgpkeys/jpaetzel.key
  projects/db5/share/pgpkeys/jsa.key
  projects/db5/share/pgpkeys/jylefort.key
  projects/db5/share/pgpkeys/kaiw.key
  projects/db5/share/pgpkeys/kato.key
  projects/db5/share/pgpkeys/ken.key
  projects/db5/share/pgpkeys/kensmith.key
  projects/db5/share/pgpkeys/keramida.key
  projects/db5/share/pgpkeys/kib.key
  projects/db5/share/pgpkeys/kmoore.key
  projects/db5/share/pgpkeys/knu.key
  projects/db5/share/pgpkeys/koitsu.key
  projects/db5/share/pgpkeys/krion.key
  projects/db5/share/pgpkeys/kris.key
  projects/db5/share/pgpkeys/kuriyama.key
  projects/db5/share/pgpkeys/kwm.key
  projects/db5/share/pgpkeys/laszlof.key
  projects/db5/share/pgpkeys/lawrance.key
  projects/db5/share/pgpkeys/lbr.key
  projects/db5/share/pgpkeys/le.key
  projects/db5/share/pgpkeys/leeym.key
  projects/db5/share/pgpkeys/lesi.key
  projects/db5/share/pgpkeys/linimon.key
  projects/db5/share/pgpkeys/lioux.key
  projects/db5/share/pgpkeys/lippe.key
  projects/db5/share/pgpkeys/lme.key
  projects/db5/share/pgpkeys/loader.key
  projects/db5/share/pgpkeys/lofi.key
  projects/db5/share/pgpkeys/lth.key
  projects/db5/share/pgpkeys/lulf.key
  projects/db5/share/pgpkeys/luoqi.key
  projects/db5/share/pgpkeys/lwhsu.key
  projects/db5/share/pgpkeys/lx.key
  projects/db5/share/pgpkeys/madpilot.key
  projects/db5/share/pgpkeys/maho.key
  projects/db5/share/pgpkeys/makc.key
  projects/db5/share/pgpkeys/mandree.key
  projects/db5/share/pgpkeys/manolis.key
  projects/db5/share/pgpkeys/marcel.key
  projects/db5/share/pgpkeys/marck.key
  projects/db5/share/pgpkeys/marcus.key
  projects/db5/share/pgpkeys/marius.key
  projects/db5/share/pgpkeys/markj.key
  projects/db5/share/pgpkeys/markp.key
  projects/db5/share/pgpkeys/marks.key
  projects/db5/share/pgpkeys/markus.key
  projects/db5/share/pgpkeys/martymac.key
  projects/db5/share/pgpkeys/mat.key
  projects/db5/share/pgpkeys/matteo.key
  projects/db5/share/pgpkeys/matthew.key
  projects/db5/share/pgpkeys/matusita.key
  projects/db5/share/pgpkeys/mav.key
  projects/db5/share/pgpkeys/max.key
  projects/db5/share/pgpkeys/maxim.key
  projects/db5/share/pgpkeys/mbr.key
  projects/db5/share/pgpkeys/mdf.key
  projects/db5/share/pgpkeys/melifaro.key
  projects/db5/share/pgpkeys/metal.key
  projects/db5/share/pgpkeys/mheinen.key
  projects/db5/share/pgpkeys/mi.key
  projects/db5/share/pgpkeys/mich.key
  projects/db5/share/pgpkeys/mikeh.key
  projects/db5/share/pgpkeys/miwi.key
  projects/db5/share/pgpkeys/mjg.key
  projects/db5/share/pgpkeys/mlaier.key
  projects/db5/share/pgpkeys/mm.key
  projects/db5/share/pgpkeys/mnag.key
  projects/db5/share/pgpkeys/mp.key
  projects/db5/share/pgpkeys/mtm.key
  projects/db5/share/pgpkeys/murray.key
  projects/db5/share/pgpkeys/mux.key
  projects/db5/share/pgpkeys/mva.key
  projects/db5/share/pgpkeys/nate.key
  projects/db5/share/pgpkeys/nectar.key
  projects/db5/share/pgpkeys/nemoliu.key
  projects/db5/share/pgpkeys/netchild.key
  projects/db5/share/pgpkeys/niels.key
  projects/db5/share/pgpkeys/nik.key
  projects/db5/share/pgpkeys/niklas.key
  projects/db5/share/pgpkeys/nivit.key
  projects/db5/share/pgpkeys/njl.key
  projects/db5/share/pgpkeys/nork.key
  projects/db5/share/pgpkeys/novel.key
  projects/db5/share/pgpkeys/nox.key
  projects/db5/share/pgpkeys/np.key
  projects/db5/share/pgpkeys/nsouch.key
  projects/db5/share/pgpkeys/nwhitehorn.key
  projects/db5/share/pgpkeys/nyan.key
  projects/db5/share/pgpkeys/obraun.key
  projects/db5/share/pgpkeys/obrien.key
  projects/db5/share/pgpkeys/ohauer.key
  projects/db5/share/pgpkeys/oleg.key
  projects/db5/share/pgpkeys/olgeni.key
  projects/db5/share/pgpkeys/olivierd.key
  projects/db5/share/pgpkeys/patrick.key
  projects/db5/share/pgpkeys/paul.key
  projects/db5/share/pgpkeys/pav.key
  projects/db5/share/pgpkeys/pclin.key
  projects/db5/share/pgpkeys/peadar.key
  projects/db5/share/pgpkeys/perky.key
  projects/db5/share/pgpkeys/petef.key
  projects/db5/share/pgpkeys/peter.key
  projects/db5/share/pgpkeys/peterj.key
  projects/db5/share/pgpkeys/pfg.key
  projects/db5/share/pgpkeys/pgj.key
  projects/db5/share/pgpkeys/pgollucci.key
  projects/db5/share/pgpkeys/pgpkeys-core.xml
  projects/db5/share/pgpkeys/pgpkeys-developers.xml
  projects/db5/share/pgpkeys/pgpkeys-officers.xml
  projects/db5/share/pgpkeys/pgpkeys-other.xml
  projects/db5/share/pgpkeys/phantom.key
  projects/db5/share/pgpkeys/philip.key
  projects/db5/share/pgpkeys/phk.key
  projects/db5/share/pgpkeys/pho.key
  projects/db5/share/pgpkeys/pirzyk.key
  projects/db5/share/pgpkeys/pjd.key
  projects/db5/share/pgpkeys/pluknet.key
  projects/db5/share/pgpkeys/portmgr-secretary.key
  projects/db5/share/pgpkeys/rafan.key
  projects/db5/share/pgpkeys/rakuco.key
  projects/db5/share/pgpkeys/ray.key
  projects/db5/share/pgpkeys/rdivacky.key
  projects/db5/share/pgpkeys/rea.key
  projects/db5/share/pgpkeys/rees.key
  projects/db5/share/pgpkeys/remko.key
  projects/db5/share/pgpkeys/rene.key
  projects/db5/share/pgpkeys/rich.key
  projects/db5/share/pgpkeys/rik.key
  projects/db5/share/pgpkeys/rink.key
  projects/db5/share/pgpkeys/rm.key
  projects/db5/share/pgpkeys/rmacklem.key
  projects/db5/share/pgpkeys/rmh.key
  projects/db5/share/pgpkeys/rnoland.key
  projects/db5/share/pgpkeys/roam.key
  projects/db5/share/pgpkeys/roberto.key
  projects/db5/share/pgpkeys/rodrigc.key
  projects/db5/share/pgpkeys/romain.key
  projects/db5/share/pgpkeys/rpaulo.key
  projects/db5/share/pgpkeys/rrs.key
  projects/db5/share/pgpkeys/rstone.key
  projects/db5/share/pgpkeys/ru.key
  projects/db5/share/pgpkeys/rushani.key
  projects/db5/share/pgpkeys/ryusuke.key
  projects/db5/share/pgpkeys/sahil.key
  projects/db5/share/pgpkeys/sam.key
  projects/db5/share/pgpkeys/sanpei.key
  projects/db5/share/pgpkeys/sat.key
  projects/db5/share/pgpkeys/sbruno.key
  projects/db5/share/pgpkeys/sbz.key
  projects/db5/share/pgpkeys/scheidell.key
  projects/db5/share/pgpkeys/schweikh.key
  projects/db5/share/pgpkeys/scop.key
  projects/db5/share/pgpkeys/scottl.key
  projects/db5/share/pgpkeys/seanc.key
  projects/db5/share/pgpkeys/security-officer.key
  projects/db5/share/pgpkeys/sem.key
  projects/db5/share/pgpkeys/sephe.key
  projects/db5/share/pgpkeys/sepotvin.key
  projects/db5/share/pgpkeys/sergei.key
  projects/db5/share/pgpkeys/shaun.key
  projects/db5/share/pgpkeys/sheldonh.key
  projects/db5/share/pgpkeys/simon.key
  projects/db5/share/pgpkeys/sjg.key
  projects/db5/share/pgpkeys/skreuzer.key
  projects/db5/share/pgpkeys/snb.key
  projects/db5/share/pgpkeys/sobomax.key
  projects/db5/share/pgpkeys/sson.key
  projects/db5/share/pgpkeys/ssouhlal.key
  projects/db5/share/pgpkeys/stas.key
  projects/db5/share/pgpkeys/stefan.key
  projects/db5/share/pgpkeys/stefanf.key
  projects/db5/share/pgpkeys/stephane.key
  projects/db5/share/pgpkeys/stephen.key
  projects/db5/share/pgpkeys/sunpoet.key
  projects/db5/share/pgpkeys/swills.key
  projects/db5/share/pgpkeys/sylvio.key
  projects/db5/share/pgpkeys/syrinx.key
  projects/db5/share/pgpkeys/syuu.key
  projects/db5/share/pgpkeys/tabthorpe.key
  projects/db5/share/pgpkeys/taras.key
  projects/db5/share/pgpkeys/tdb.key
  projects/db5/share/pgpkeys/theraven.key
  projects/db5/share/pgpkeys/thierry.key
  projects/db5/share/pgpkeys/thomas.key
  projects/db5/share/pgpkeys/thompsa.key
  projects/db5/share/pgpkeys/tijl.key
  projects/db5/share/pgpkeys/timur.key
  projects/db5/share/pgpkeys/tj.key
  projects/db5/share/pgpkeys/tmclaugh.key
  projects/db5/share/pgpkeys/tmm.key
  projects/db5/share/pgpkeys/tmseck.key
  projects/db5/share/pgpkeys/tobez.key
  projects/db5/share/pgpkeys/tota.key
  projects/db5/share/pgpkeys/trasz.key
  projects/db5/share/pgpkeys/trevor.key
  projects/db5/share/pgpkeys/trhodes.key
  projects/db5/share/pgpkeys/tuexen.key
  projects/db5/share/pgpkeys/twinterg.key
  projects/db5/share/pgpkeys/ue.key
  projects/db5/share/pgpkeys/ume.key
  projects/db5/share/pgpkeys/ups.key
  projects/db5/share/pgpkeys/uqs.key
  projects/db5/share/pgpkeys/vanilla.key
  projects/db5/share/pgpkeys/vd.key
  projects/db5/share/pgpkeys/versus.key
  projects/db5/share/pgpkeys/viny.key
  projects/db5/share/pgpkeys/vkashyap.key
  projects/db5/share/pgpkeys/vs.key
  projects/db5/share/pgpkeys/vsevolod.key
  projects/db5/share/pgpkeys/wblock.key
  projects/db5/share/pgpkeys/wen.key
  projects/db5/share/pgpkeys/weongyo.key
  projects/db5/share/pgpkeys/wes.key
  projects/db5/share/pgpkeys/wg.key
  projects/db5/share/pgpkeys/wilko.key
  projects/db5/share/pgpkeys/will.key
  projects/db5/share/pgpkeys/wkoszek.key
  projects/db5/share/pgpkeys/wollman.key
  projects/db5/share/pgpkeys/wosch.key
  projects/db5/share/pgpkeys/wxs.key
  projects/db5/share/pgpkeys/xride.key
  projects/db5/share/pgpkeys/yoichi.key
  projects/db5/share/pgpkeys/yzlin.key
  projects/db5/share/pgpkeys/zack.key
  projects/db5/share/pgpkeys/zeising.key
  projects/db5/share/pgpkeys/zi.key
  projects/db5/share/pgpkeys/zml.key
  projects/db5/share/pgpkeys/zont.key

Modified: projects/db5/share/pgpkeys/aaron.key
==============================================================================
--- projects/db5/share/pgpkeys/aaron.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/aaron.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh aaron 8811D2A4;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/8811D2A4 2006-06-21 [expires: 2011-06-20]
       Key fingerprint = 8DE0 3CBB 3692 992F 53EF  ACC7 BE56 0A4D 8811 D2A4
 uid                  Aaron Dalton <aaron@freebsd.org>
 sub   2048g/304EE8E5 2006-06-21 [expires: 2011-06-20]
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBESZZ5YRBADZ18WQp9eda97kmLEVNkYUkTbWn90/9ViXP5lWhWDvdIwXXa+S

Modified: projects/db5/share/pgpkeys/ache.key
==============================================================================
--- projects/db5/share/pgpkeys/ache.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/ache.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,14 +2,14 @@
 <!--
 sh addkey.sh ache 964474DD;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/964474DD 2006-12-26
       Key fingerprint = 0F63 1B61 D76D AA23 1591  EA09 560E 582B 9644 74DD
 uid                  Andrey Chernov <ache@freebsd.org>
 uid                  [jpeg image of size 4092]
 sub   2048g/08331894 2006-12-26
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v2.0.16 (FreeBSD)
 

Modified: projects/db5/share/pgpkeys/achim.key
==============================================================================
--- projects/db5/share/pgpkeys/achim.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/achim.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh achim 2E15B3C1;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   2048R/2E15B3C1 2013-01-22
       Key fingerprint = 2A48 0317 D477 2A07 2AD9  CF1C 7C1D 832E 2E15 B3C1
 uid                  Achim Leubner <achim@freebsd.org>
 sub   2048R/E275EF01 2013-01-22
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQENBFD+q6cBCAD8XsjHzsyljaRIF8Qz8NeXaiZWq0KZ8NHRJ4ahZLN5kvhk2D3+

Modified: projects/db5/share/pgpkeys/acm.key
==============================================================================
--- projects/db5/share/pgpkeys/acm.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/acm.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh acm 9B21BC19;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/9B21BC19 2006-07-18
       Key fingerprint = 4156 2EAC A11C 9651 713B  3FC1 195F D4A8 9B21 BC19
 uid                  Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 sub   2048g/ADA16C52 2006-07-18
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBES8etwRBADeB8shuQ3GGp/AozsOggqLnSmFwCS8nGN+rnE+4LHuRzkL4Kh0

Modified: projects/db5/share/pgpkeys/adamw.key
==============================================================================
--- projects/db5/share/pgpkeys/adamw.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/adamw.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,14 +2,14 @@
 <!--
 sh addkey.sh adamw C57CF3A8;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   2048D/C57CF3A8 2012-11-15
       Key fingerprint = CCD9 F28A BD1D 50A1 8D08  18A7 F48B B195 C57C F3A8
 uid                  Adam Weinberger (FreeBSD) <adamw@FreeBSD.org>
 uid                  Adam Weinberger (adamw.org) <adamw@adamw.org>
 sub   2048g/9C6D0E30 2012-11-15
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQMuBFCkUjkRCACqWld1dYoNJjLlFZW1xjt524wQNaeDzl3GdNX81kkGUzsyseYg

Modified: projects/db5/share/pgpkeys/addkey.sh
==============================================================================
--- projects/db5/share/pgpkeys/addkey.sh	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/addkey.sh	Thu Jun 20 16:11:54 2013	(r41967)
@@ -55,10 +55,10 @@ echo "Generating ${keyfile}..."
     echo '<!--'
     echo "sh $0 ${me} ${id};"
     echo '-->'
-    echo '<programlisting role="pgpfingerprint"><![CDATA['
+    echo '<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA['
     echo "${fp}"
     echo ']]></programlisting>'
-    echo '<programlisting role="pgpkey"><![CDATA['
+    echo '<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA['
     echo "${key}"
     echo ']]></programlisting>'
 ) >"${keyfile}"
@@ -77,7 +77,7 @@ echo "role key or you are a core member.
 echo "pgpkeys-officers.xml or pgpkeys-core.xml)."
 echo "Remember to keep the list sorted by last name!"
 echo
-echo "    <sect2 id=\"pgpkey-${me}\">"
+echo "    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id=\"pgpkey-${me}\">"
 echo "      <title>&a.${me};</title>"
 echo "      &pgpkey.${me};"
 echo "    </sect2>"

Modified: projects/db5/share/pgpkeys/ae.key
==============================================================================
--- projects/db5/share/pgpkeys/ae.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/ae.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,14 +2,14 @@
 <!--
 sh addkey.sh ae 10C8A17A;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   2048R/10C8A17A 2010-05-29
       Key fingerprint = E659 1E1B 41DA 1516 F0C9  BC00 01C5 EA04 10C8 A17A
 uid                  Andrey V. Elsukov <ae@freebsd.org>
 uid                  Andrey V. Elsukov <bu7cher@yandex.ru>
 sub   2048R/0F6D64C5 2010-05-29
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQENBEwBF1kBCADB9sXFhBEUy8qQ4X63Y8eBatYMHGEFWN9ypS5lI3RE6qQW2EYb

Modified: projects/db5/share/pgpkeys/ahze.key
==============================================================================
--- projects/db5/share/pgpkeys/ahze.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/ahze.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh ahze 3C046FD6;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub  1024D/3C046FD6 2004-10-29 Michael Johnson (FreeBSD key) <ahze@FreeBSD.org>
      Key fingerprint = 363C 6ABA ED24 C23B 5F0C  3AB4 9F8B AA7D 3C04 6FD6
 uid                            Michael Johnson (pgp key) <ahze@ahze.net>
 sub  2048g/FA334AE3 2004-10-29
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBEGCy1ARBAD/K2SbL6XiTJ3Rn/weuN/L78ROUltIoRGOkZE4971fLcAbtIsf

Modified: projects/db5/share/pgpkeys/ak.key
==============================================================================
--- projects/db5/share/pgpkeys/ak.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/ak.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh /var/doc/share/pgpkeys/addkey.sh ak 0D1D29A0;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   2048R/0D1D29A0 2012-03-01 [expires: 2024-02-27]
       Key fingerprint = 7774 4FCF 6AC9 126B BD0E  DBF3 5EBF 4968 0D1D 29A0
 uid                  Alex Kozlov <ak@freebsd.org>
 sub   2048R/2DD82C65 2012-03-01 [expires: 2024-02-27]
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQENBE9PQzABCADlsyzEaEjFoIM3Z0ob7pYdIDXZD9T1p1+4o3AMTlS1Bq4WWJb9

Modified: projects/db5/share/pgpkeys/ale.key
==============================================================================
--- projects/db5/share/pgpkeys/ale.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/ale.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,7 +2,7 @@
 <!--
 sh addkey.sh ale CE5F554D;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub  1024D/CE5F554D 1999-06-27 Alex Dupre <sysadmin@alexdupre.com>
      Key fingerprint = DE23 02EA 5927 D5A9 D793  2BA2 8115 E9D8 CE5F 554D
 uid                            Alex Dupre <ale@FreeBSD.org>
@@ -10,7 +10,7 @@ uid                            [jpeg ima
 uid                            Alex Dupre <ICQ:5431856>
 sub  2048g/FD5E2D21 1999-06-27
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBDd2Z60RBADHdQ8600NP2/sBbuIW87WqWXZyzDX0Q6AA/czBlV2PKiEhCgTJ

Modified: projects/db5/share/pgpkeys/alepulver.key
==============================================================================
--- projects/db5/share/pgpkeys/alepulver.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/alepulver.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,14 +2,14 @@
 <!--
 sh addkey.sh alepulver 945C3F61;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/945C3F61 2005-11-13
       Key fingerprint = 085F E8A2 4896 4B19 42A4  4179 895D 3912 945C 3F61
 uid                  Alejandro Pulver (Ale's GPG key pair) <alepulver@FreeBSD.org>
 uid                  Alejandro Pulver (Ale's GPG key pair) <alejandro@varnet.biz>
 sub   2048g/6890C6CA 2005-11-13
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBEN3W2YRBACt8uucrC3Gv8Q2PoAppL0Gdmy+ufJkvp+e3QpNnEvYPU7jivtZ

Modified: projects/db5/share/pgpkeys/alex.key
==============================================================================
--- projects/db5/share/pgpkeys/alex.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/alex.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,12 +2,12 @@
 <!--
 sh addkey.sh alex 8E2523FD;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub  1024D/8E2523FD 2003-01-28 Alexander Langer <alex@FreeBSD.org>
      Key fingerprint = B757 5ABF 691F 4011 F565  3765 BFBB 3506 8E25 23FD
 sub  1024g/16C3B12D 2003-01-28
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.2.1 (FreeBSD)
 

Modified: projects/db5/share/pgpkeys/alexbl.key
==============================================================================
--- projects/db5/share/pgpkeys/alexbl.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/alexbl.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh alexbl 12A95A7B;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/12A95A7B 2006-09-13
       Key fingerprint = D0C3 47F8 AE87 C829 0613  3586 24DF F52B 12A9 5A7B
 uid                  Alexander Botero-Lowry <alexbl@FreeBSD.org>
 sub   2048g/CA287923 2006-09-13
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBEUHm3YRBAC/bBl9E1saFAVuS5wtnBQ7BbXPOr21SBExZ3t+f8k2PG2SsKYL

Modified: projects/db5/share/pgpkeys/amdmi3.key
==============================================================================
--- projects/db5/share/pgpkeys/amdmi3.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/amdmi3.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,14 +2,14 @@
 <!--
 sh addkey.sh amdmi3 F9D2F77D;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/F9D2F77D 2008-06-15 [expires: 2010-06-15]
       Key fingerprint = 55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
 uid                  Dmitry Marakasov <amdmi3@amdmi3.ru>
 uid                  Dmitry Marakasov <amdmi3@FreeBSD.org>
 sub   2048g/2042CDD8 2008-06-15
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBEhVTssRBADF9Mfvn18A7k1V8XOzgZGrqf2jbzWMklD5IgPtziN2vla1gTk4

Modified: projects/db5/share/pgpkeys/anchie.key
==============================================================================
--- projects/db5/share/pgpkeys/anchie.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/anchie.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh ./addkey.sh anchie 510D23BB;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   2048R/510D23BB 2010-04-18
       Key fingerprint = 0A9B 0ABB 0E1C B5A4 3408  398F 778A C3B4 510D 23BB
 uid                  Ana Kukec <anchie@FreeBSD.org>
 sub   2048R/699E4DDA 2010-04-18
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQENBEvLStoBCACxnU/0ujcU5D0Ph4eGJhRfFSxoH/CBIH1AnaQyrsmzMCfdFav+

Modified: projects/db5/share/pgpkeys/anders.key
==============================================================================
--- projects/db5/share/pgpkeys/anders.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/anders.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh anders 00835956;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub  1024D/00835956 2000-08-13 Anders Nordby <anders@fix.no>
      Key fingerprint = 1E0F C53C D8DF 6A8F EAAD  19C5 D12A BC9F 0083 5956
 uid                            Anders Nordby <anders@FreeBSD.org>
 sub  2048g/4B160901 2000-08-13
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.0.6 (FreeBSD)
 Comment: For info see http://www.gnupg.org

Modified: projects/db5/share/pgpkeys/andreas.key
==============================================================================
--- projects/db5/share/pgpkeys/andreas.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/andreas.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,7 +2,7 @@
 <!--
 sh addkey.sh andreas 6C6F6CBA;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub  1024D/6C6F6CBA 2001-01-06 Andreas Klemm <andreas.klemm@eu.didata.com>
      Key fingerprint = F028 D51A 0D42 DD67 4109  19A3 777A 3E94 6C6F 6CBA
 uid                            Andreas Klemm <andreas@klemm.gtn.com>
@@ -10,7 +10,7 @@ uid                            Andreas K
 uid                            Andreas Klemm <andreas@apsfilter.org>
 sub  2048g/FE23F866 2001-01-06
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.0.6 (FreeBSD)
 Comment: For info see http://www.gnupg.org

Modified: projects/db5/share/pgpkeys/andrew.key
==============================================================================
--- projects/db5/share/pgpkeys/andrew.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/andrew.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,14 +2,14 @@
 <!--
 sh addkey.sh andrew 31B31614;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   2048R/31B31614 2010-07-01
       Key fingerprint = 08AC 2C57 F14F FDD1 2232  B5CD AA16 EFB8 31B3 1614
 uid                  Andrew Turner <andrew@freebsd.org>
 uid                  Andrew Turner <andrew@fubar.geek.nz>
 sub   2048R/9ACBF138 2010-07-01
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQENBEwtKAIBCADBws3xAl7jWnOOAlcH/7Vv72z8eZyzSs8VqriCGftQNju024OM

Modified: projects/db5/share/pgpkeys/anholt.key
==============================================================================
--- projects/db5/share/pgpkeys/anholt.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/anholt.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,14 +2,14 @@
 <!--
 sh addkey.sh anholt 6CF0EAF7;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/6CF0EAF7 2003-09-08
       Key fingerprint = 76FE 2475 820B B75F DCA4  0F3E 1D47 6F60 6CF0 EAF7
 uid                  Eric Anholt <eta@lclark.edu>
 uid                  Eric Anholt <anholt@FreeBSD.org>
 sub   1024g/80B404C1 2003-09-08
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBD9dFQARBACzmGtuaKFqQwoRV32TI4ANBPHPlXkKXJ1WYQQkahzP/VfzNOUH

Modified: projects/db5/share/pgpkeys/anray.key
==============================================================================
--- projects/db5/share/pgpkeys/anray.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/anray.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,7 +2,7 @@
 <!--
 sh addkey.sh anray AE7B5418;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/AE7B5418 2005-12-12
       Key fingerprint = DE70 C24B 55A0 4A06 68A1  D425 3C59 9A9B AE7B 5418
 uid                  Andrey Slusar <anray@ext.by>
@@ -10,7 +10,7 @@ uid                  Andrey Slusar <anra
 uid                  Andrey Slusar <anray@FreeBSD.org>
 sub   2048g/7D0EB77D 2005-12-12
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBEOdg/YRBACkP7DeG+wypqbAvKYmIYMBHsYFCmIf5928MvpCgwO4idtg76IX

Modified: projects/db5/share/pgpkeys/antoine.key
==============================================================================
--- projects/db5/share/pgpkeys/antoine.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/antoine.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh antoine 50CC2671;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/50CC2671 2008-02-03
       Key fingerprint = F3F7 72F0 9C4C 9E56 4BE9  44EA 1B80 31F3 50CC 2671
 uid                  Antoine Brodin <antoine@FreeBSD.org>
 sub   2048g/6F4AFBE5 2008-02-03
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBEelsqARBAC37tcs27BitWt9YeIYmpRNgtRH/ndAm8ecJK+7IuEqo1t9IglY

Modified: projects/db5/share/pgpkeys/araujo.key
==============================================================================
--- projects/db5/share/pgpkeys/araujo.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/araujo.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh araujo 53E4CFA8;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/53E4CFA8 2007-04-27
       Key fingerprint = 9D6A 2339 925C 4F61 ED88  ED8B A2FC 4977 53E4 CFA8
 uid                  Marcelo Araujo (Ports Committer) <araujo@FreeBSD.org>
 sub   2048g/63CC012D 2007-04-27
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBEYxSRMRBACUOhoJNgNPJtP5AcENhALcif0n7o785oCDaTGrMNPV75DdnR8o

Modified: projects/db5/share/pgpkeys/ariff.key
==============================================================================
--- projects/db5/share/pgpkeys/ariff.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/ariff.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,7 +2,7 @@
 <!--
 sh addkey.sh ariff C5304CDA;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/C5304CDA 2005-10-01
       Key fingerprint = 5C7C 6BF4 8293 DE76 27D9  FD57 96BF 9D78 C530 4CDA
 uid                  Ariff Abdullah <skywizard@MyBSD.org.my>
@@ -10,7 +10,7 @@ uid                  Ariff Abdullah <ari
 uid                  Ariff Abdullah <ariff@FreeBSD.org>
 sub   2048g/8958C1D3 2005-10-01
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBEM+MioRBACP2lgLXXL1cIqZ8sdgUMaon8gBQWTn40tjTV3N6GtR+NUYbQI2

Modified: projects/db5/share/pgpkeys/art.key
==============================================================================
--- projects/db5/share/pgpkeys/art.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/art.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,14 +2,14 @@
 <!--
 sh ./addkey.sh art 9ED4C836;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   2048R/9ED4C836 2011-03-28
       Key fingerprint = 7400 D541 07ED 3DF3 3E97  F2D5 8BDF 101C 9ED4 C836
 uid                  Artem Belevich <artemb@gmail.com>
 uid                  Artem Belevich <art@freebsd.org>
 sub   2048R/55B0E4EB 2011-03-28
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQENBE2QwLUBCADc/D9RfANjFOApCDIAcYU4QeKmbk+kMvSHrKgesr1OFuIMdQRE

Modified: projects/db5/share/pgpkeys/arun.key
==============================================================================
--- projects/db5/share/pgpkeys/arun.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/arun.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,14 +2,14 @@
 <!--
 sh addkey.sh arun 7D112181;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub  1024D/7D112181 2003-03-06 Arun Sharma <arun@sharma-home.net>
      Key fingerprint = A074 41D6 8537 C7D5 070E  0F78 0247 1AE2 7D11 2181
 uid                            Arun Sharma <arun@freebsd.org>
 uid                            Arun Sharma <arun.sharma@intel.com>
 sub  1024g/ACAD98DA 2003-03-06 [expires: 2005-03-05]
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBD5my2cRBADKOgeJz+IX/4UT65iwvAMoR5SMctMAEGNHvTk96H0DSYmDmqPE

Modified: projects/db5/share/pgpkeys/arved.key
==============================================================================
--- projects/db5/share/pgpkeys/arved.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/arved.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,14 +2,14 @@
 <!--
 sh addkey.sh arved 807AC53A;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/807AC53A 2002-06-03 [expires: 2013-09-07]
       Key fingerprint = A92F 344F 31A8 B8DE DDFA  7FB4 7C22 C39F 807A C53A
 uid                  Tilman Keskinц╤z <arved@arved.at>
 uid                  Tilman Keskinц╤z <arved@FreeBSD.org>
 sub   1024g/FA351986 2002-06-03 [expires: 2013-09-07]
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBDz715ERBACtUda6yExghzQAimIJ+aH4fKEXDYUXk07t8KURPZD+LOCuQkwG

Modified: projects/db5/share/pgpkeys/asami.key
==============================================================================
--- projects/db5/share/pgpkeys/asami.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/asami.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,12 +2,12 @@
 <!--
 sh addkey.sh asami 1E08D889;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub  1024R/1E08D889 1997-07-23 Satoshi Asami <asami@cs.berkeley.edu>
      Key fingerprint = EB 3C 68 9E FB 6C EB 3F  DB 2E 0F 10 8F CE 79 CA
 uid                            Satoshi Asami <asami@FreeBSD.ORG>
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.0.6 (FreeBSD)
 Comment: For info see http://www.gnupg.org

Modified: projects/db5/share/pgpkeys/ashish.key
==============================================================================
--- projects/db5/share/pgpkeys/ashish.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/ashish.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,7 +2,7 @@
 <!--
 sh addkey.sh ashish E74FA4B0;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   4096R/E74FA4B0 2010-04-13
       Key fingerprint = F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0
 uid                  Ashish SHUKLA <wahjava@gmail.com>
@@ -19,7 +19,7 @@ uid                  [jpeg image of size
 uid                  Ashish SHUKLA (FreeBSD Committer Address) <ashish@FreeBSD.ORG>
 sub   4096R/F20D202D 2010-04-13
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQINBEvEpmoBEADC/TCfHmfI1iGpH2KxYsSgBBI/Z7IObcg8q45FoO8K8Q1Nzx90

Modified: projects/db5/share/pgpkeys/asomers.key
==============================================================================
--- projects/db5/share/pgpkeys/asomers.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/asomers.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,14 +2,14 @@
 <!--
 sh addkey.sh asomers DA05FCE8;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   4096R/DA05FCE8 2013-04-25 [expires: 2018-04-24]
       Key fingerprint = 9CD4 C982 738F 8B90 25E8  E6B3 5F74 63BC DA05 FCE8
 uid                  Alan Somers <asomers@freebsd.org>
 uid                  Alan Somers <asomers@gmail.com>
 sub   4096R/4E121B3E 2013-04-25 [expires: 2018-04-24]
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQINBFF4d50BEADVb5G+FnjaElp6CxKhu7XfifjHJ1pj6B4xc+YnT9+ZamriGwg2

Modified: projects/db5/share/pgpkeys/avatar.key
==============================================================================
--- projects/db5/share/pgpkeys/avatar.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/avatar.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,12 +2,12 @@
 <!--
 sh addkey.sh avatar F4013AB1;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub  1024R/F4013AB1 1998-05-13 Tai-hwa Liang <avatar@FreeBSD.org>
      Key fingerprint = 5B 05 1D 37 7F 35 31 4E  5D 38 BD 07 10 32 B9 D0
 uid                            Tai-hwa Liang <avatar@mmlab.cse.yzu.edu.tw>
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQCNAzVZoYQAAAEEANP5N0PqWEDO1ml4yfxXCQ+hEhaXyaGyNboh6uLX7uNPXQTI

Modified: projects/db5/share/pgpkeys/avg.key
==============================================================================
--- projects/db5/share/pgpkeys/avg.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/avg.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,7 +2,7 @@
 <!--
 sh addkey.sh avg A651FE2F;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   2048R/A651FE2F 2009-02-16
       Key fingerprint = F234 4D58 DEFF 5E3A 4E0F  13BC 74A5 2D27 A651 FE2F
 uid                  Andriy Gapon (FreeBSD) <avg@FreeBSD.org>
@@ -10,7 +10,7 @@ uid                  Andriy Gapon (FreeB
 uid                  Andriy Gapon (FreeBSD) <avg@icyb.net.ua>
 sub   4096R/F9A4D312 2009-02-16
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQENBEmZYYwBCADCrWmjbSj/846S7irndSa66XI//DVoOrTu/thqFyluQQmhhRuB

Modified: projects/db5/share/pgpkeys/avilla.key
==============================================================================
--- projects/db5/share/pgpkeys/avilla.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/avilla.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh avilla 44350A8B;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024R/44350A8B 2010-01-24
       Key fingerprint = F740 CE4E EDDD DA9B 4A1B  1445 DF18 82EA 4435 0A8B
 uid                  Alberto Villa <avilla@FreeBSD.org>
 sub   1024R/F7C8254C 2010-01-24
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mI0ES1vM6gEEAMBJJFEzIesoeff/XaJ5baSLJwdZ87H26x51KPodOiCK4pvhSOvA

Modified: projects/db5/share/pgpkeys/avl.key
==============================================================================
--- projects/db5/share/pgpkeys/avl.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/avl.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,7 +2,7 @@
 <!--
 sh addkey.sh avl 1C47D5C0;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/1C47D5C0 2009-05-28
       Key fingerprint = 8B5F 880A 382B 075E E707  9DB2 E135 4176 1C47 D5C0
 uid                  Alexander Logvinov <alexander@logvinov.com>
@@ -12,7 +12,7 @@ uid                  Alexander Logvinov 
 uid                  Alexander Logvinov <logvinov@yandex.ru>
 sub   2048g/60BDD4BB 2009-05-28
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBEoeNvgRBADOJSDLfbgPuLl4Y1QO/1BjX2MFveYtMacSLpaJURRewkBmoKBz

Modified: projects/db5/share/pgpkeys/bakul.key
==============================================================================
--- projects/db5/share/pgpkeys/bakul.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/bakul.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh bakul 86AEE4CB;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/86AEE4CB 2006-04-20
       Key fingerprint = 0389 26E8 381C 6980 AEC0  10A5 E540 A157 86AE E4CB
 uid                  Bakul Shah <bakul@freebsd.org>
 sub   2048g/5C3DCC24 2006-04-20
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBERHS6MRBAC60MHcIa5gqGjSmHLxJeZTkLTDK0zEo7MRJuMeF90Py7wdP9Fy

Modified: projects/db5/share/pgpkeys/bapt.key
==============================================================================
--- projects/db5/share/pgpkeys/bapt.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/bapt.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,7 +2,7 @@
 <!--
 sh addkey.sh bapt 49A4E84C;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/49A4E84C 2008-11-19
       Key fingerprint = A14B A5FC B860 86DE 73E2  B24C F244 ED31 49A4 E84C
 uid                  Baptiste Daroussin <bapt@etoilebsd.net>
@@ -10,7 +10,7 @@ uid                  Baptiste Daroussin 
 uid                  Baptiste Daroussin <bapt@FreeBSD.org>
 sub   2048g/54AB46B4 2008-11-19
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBEkkLyARBACYi5Qr3qvyrpp0rgqK4cAwteOZbhB3Jt2uxuzrKnKeTw3y4DrG

Modified: projects/db5/share/pgpkeys/bar.key
==============================================================================
--- projects/db5/share/pgpkeys/bar.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/bar.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,14 +2,14 @@
 <!--
 sh addkey.sh bar 3DF5F750;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   2048R/3DF5F750 2012-11-13
       Key fingerprint = D367 F6C8 2A5F 2921 70D2  B446 27DD 6FD6 3DF5 F750
 uid                  Barbara Guida <bar@FreeBSD.org>
 uid                  Barbara Guida <barbara.freebsd@gmail.com>
 sub   2048R/1DF7506C 2012-11-13
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQENBFChmNUBCAD6H/nOlsSUv1C4GJUHns+0YmdcqwpoF06+mcfJXQ9ZIYz0mNqd

Modified: projects/db5/share/pgpkeys/barner.key
==============================================================================
--- projects/db5/share/pgpkeys/barner.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/barner.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,7 +2,7 @@
 <!--
 sh ./addkey.sh barner EBADA82A;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/EBADA82A 2000-11-10
       Key fingerprint = 67D1 3562 9A2F 3177 E46A  35ED 0A49 FEFD EBAD A82A
 uid                  Simon Barner <barner@FreeBSD.org>
@@ -11,7 +11,7 @@ uid                  Simon Barner <barne
 uid                  Simon Barner <barner@gmx.de>
 sub   2048g/F63052DE 2000-11-10
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBDoMJEMRBAD9C2z1pr1D+V0OgztcnlU7sBqGQyjYFmzWhEDPquPdMQwIDtMs

Modified: projects/db5/share/pgpkeys/bcr.key
==============================================================================
--- projects/db5/share/pgpkeys/bcr.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/bcr.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh bcr 4A819348;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/4A819348 2009-05-24
       Key fingerprint = 2D8C BDF9 30FA 75A5 A0DF  D724 4D26 502E 4A81 9348
 uid                  Benedict Reuschling <bcr@FreeBSD.org>
 sub   2048g/8DA16EDD 2009-05-24
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBEoZOPQRBADIhhxLB7VS78ooK4j9HuEjamF7QZTXvti7rtJdnJRZtpHW2Tzo

Modified: projects/db5/share/pgpkeys/bdrewery.key
==============================================================================
--- projects/db5/share/pgpkeys/bdrewery.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/bdrewery.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,7 +2,7 @@
 <!--
 sh addkey.sh bdrewery 3C9B0CF9;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   4096R/3C9B0CF9 2012-04-06 [expires: 2017-04-05]
       Key fingerprint = 36FE BE99 2F52 80DF 4811  362A 6E78 2AC0 3C9B 0CF9
 uid                  Bryan Drewery <bryan@shatow.net>
@@ -11,7 +11,7 @@ uid                  Bryan Drewery <brya
 uid                  Bryan Drewery <bdrewery@FreeBSD.org>
 sub   4096R/9E2CE2D3 2012-04-06 [expires: 2017-04-05]
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQINBE9/K2UBEAC9jcJzDtt7Lih/ccwv71FHyVL8X23Fsoa0oMHKhw7o5P2PqRfz

Modified: projects/db5/share/pgpkeys/beat.key
==============================================================================
--- projects/db5/share/pgpkeys/beat.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/beat.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh beat 774249DB;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/774249DB 2009-01-28 [expires: 2014-01-27]
       Key fingerprint = C410 3187 5B29 DD02 745F  0890 40C5 BCF7 7742 49DB
 uid                  Beat Gaetzi <beat@FreeBSD.org>
 sub   2048g/173CFFCA 2009-01-28 [expires: 2014-01-27]
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBEmAbU8RBACOi7LAumjK/zBMpQDMrR55L9xJh1vTYpiKayLth9ZPlsg57pa8

Modified: projects/db5/share/pgpkeys/beech.key
==============================================================================
--- projects/db5/share/pgpkeys/beech.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/beech.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh beech 68DFAE1F;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   2048D/68DFAE1F 2013-02-26
       Key fingerprint = D58B 3E9D B0E3 E081 EC6F  69D9 CDA3 51DD 68DF AE1F
 uid                  Beech Rintoul <beech@freebsd.org>
 sub   2048g/960F45D9 2013-02-26
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQMuBFEsS9ARCACeJJ0k7CU+53G9GGNcDfJil1iS3QZlgIgCRXnH6zkyWrwCOL0V

Modified: projects/db5/share/pgpkeys/ben.key
==============================================================================
--- projects/db5/share/pgpkeys/ben.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/ben.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,7 +2,7 @@
 <!--
 sh addkey.sh ben 2CEF442C;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub  1024D/2CEF442C 2001-07-11 Ben Smithurst <ben@LSRfm.com>
      Key fingerprint = 355D 0FFF B83A 90A9 D648  E409 6CFC C9FB 2CEF 442C
 uid                            Ben Smithurst <ben@vinosystems.com>
@@ -12,7 +12,7 @@ uid                            Ben Smith
 uid                            Ben Smithurst <ben@scientia.demon.co.uk>
 sub  1024g/347071FF 2001-07-11
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.0.6 (FreeBSD)
 Comment: For info see http://www.gnupg.org

Modified: projects/db5/share/pgpkeys/benjsc.key
==============================================================================
--- projects/db5/share/pgpkeys/benjsc.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/benjsc.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,7 +2,7 @@
 <!--
 sh addkey.sh benjsc 4842B5B4;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/4842B5B4 2002-04-10
       Key fingerprint = F00D C83D 5F7E 5561 DF91  B74D E602 CAA3 4842 B5B4
 uid                  Benjamin Simon Close <Benjamin.Close@clearchain.com>
@@ -10,7 +10,7 @@ uid                  Benjamin Simon Clos
 uid                  Benjamin Simon Close <benjsc@clearchain.com>
 sub   2048g/3FA8A57E 2002-04-10
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBDy0zIgRBACh/FYaouoKpVZdsPe6buzrEmX4WcsR8iPjQVmwQ4lgsfZpWq1o

Modified: projects/db5/share/pgpkeys/benno.key
==============================================================================
--- projects/db5/share/pgpkeys/benno.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/benno.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,14 +2,14 @@
 <!--
 sh addkey.sh benno C5F10BED;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   4096R/C5F10BED 2013-05-21 [expires: 2017-05-21]
       Key fingerprint = 77EB 5A9E 97C7 2D2D 6D0A  1B6C C619 4C61 C5F1 0BED
 uid                  Benno Rice <benno@FreeBSD.org>
 uid                  Benno Rice <benno@jeamland.net>
 sub   4096R/408068BC 2013-05-21 [expires: 2017-05-21]
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Comment: GPGTools - http://gpgtools.org
 

Modified: projects/db5/share/pgpkeys/bf.key
==============================================================================
--- projects/db5/share/pgpkeys/bf.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/bf.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh bf 9806EBC1;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   2048R/9806EBC1 2010-06-08 [expires: 2012-06-07]
       Key fingerprint = 2075 ADD3 7634 A4F9 5357  D934 08E7 06D9 9806 EBC1
 uid                  b. f. <bf@freebsd.org>
 sub   2048R/1CD0AD79 2010-06-08 [expires: 2012-06-07]
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQENBEwNjXUBCACWeNjUFZ8rzqxrEIdL3wVrvkWVwaf5HW0YwoIMq7ba3hRcPWuv

Modified: projects/db5/share/pgpkeys/bhaga.key
==============================================================================
--- projects/db5/share/pgpkeys/bhaga.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/bhaga.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh bhaga 1FA0DA9D;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   4096R/1FA0DA9D 2013-04-12 [expires: 2017-04-11]
       Key fingerprint = 82FB 3180 8C3E CEA9 66ED  7FE5 2840 F0C9 1FA0 DA9D
 uid                  Ben Haga <bhaga@FreeBSD.org>
 sub   4096R/33BE4D62 2013-04-12 [expires: 2017-04-11]
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQINBFFoQsQBEACg2/o93TuLqw+umkqPhEw2dP2XgogJs+S1yT52BivmLc0N5/yh

Modified: projects/db5/share/pgpkeys/billf.key
==============================================================================
--- projects/db5/share/pgpkeys/billf.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/billf.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh ./addkey.sh billf 7F868268;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub  1024D/7F868268 2000-12-07 Bill Fumerola (FreeBSD Developer) <billf@FreeBSD.org>
      Key fingerprint = 5B2D 908E 4C2B F253 DAEB  FC01 8436 B70B 7F86 8268
 uid                            Bill Fumerola (Security Yahoo) <fumerola@yahoo-inc.com>
 sub  1024g/43980DA9 2000-12-07
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.0.6 (FreeBSD)
 Comment: For info see http://www.gnupg.org

Modified: projects/db5/share/pgpkeys/bjk.key
==============================================================================
--- projects/db5/share/pgpkeys/bjk.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/bjk.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh bjk 8302FE9F;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   4096R/8302FE9F 2011-08-20 [expires: 2013-07-21]
       Key fingerprint = 9FD9 F966 D914 5101 BE59  FE13 2D29 EEED 8302 FE9F
 uid                  Benjamin Kaduk <bjk@FreeBSD.org>
 sub   4096R/28698ABE 2011-08-20 [expires: 2013-08-19]
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQINBE5QM/IBEAD4VgPZlyj/d8iPgLAUdW/bOXUe6yY04TBmrf9V2q4U7bzpa1/a

Modified: projects/db5/share/pgpkeys/bk.key
==============================================================================
--- projects/db5/share/pgpkeys/bk.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/bk.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,13 +2,13 @@
 <!--
 sh addkey.sh bk 7E8DEA51;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   4096R/7E8DEA51 2013-04-08
       Key fingerprint = 41E7 7678 9F57 D52E 73DF  731F A77E 8C7A 7E8D EA51
 uid                  Boris Kochergin <bk@isis.poly.edu>
 sub   4096R/DD7B3E04 2013-04-08
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQINBFFjLrkBEADjqi/iqY2qZlzd1cfrvWS+eVmNhiZzqs8fdF0mxC+wLTwU14x6

Modified: projects/db5/share/pgpkeys/blackend.key
==============================================================================
--- projects/db5/share/pgpkeys/blackend.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/blackend.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,14 +2,14 @@
 <!--
 sh addkey.sh blackend 4F8E74E8;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub  1024D/4F8E74E8 2004-12-25 Marc Fonvieille <blackend@FreeBSD.org>
      Key fingerprint = 55D3 4883 4A04 828A A139  A5CF CD0F 51C0 4F8E 74E8
 uid                            Marc Fonvieille <marc@blackend.org>
 uid                            Marc Fonvieille <marc@freebsd-fr.org>
 sub  1024g/37AD4E7D 2004-12-25
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBEHNnEURBADK+anixdFH+aSxIGLw1soiwMXSiVPD56dmoA/VAFqrE3XVo/y6

Modified: projects/db5/share/pgpkeys/bland.key
==============================================================================
--- projects/db5/share/pgpkeys/bland.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/bland.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,12 +2,12 @@
 <!--
 sh addkey.sh bland D004116C;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub  1024D/D004116C 2003-08-14 Alexander Nedotsukov <bland@FreeBSD.org>
      Key fingerprint = 35E2 5020 55FC 2071 4ADD  1A4A 86B6 8A5D D004 116C
 sub  1024g/1CCA8D46 2003-08-14
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBD87tOARBACkfv0/19ar/kUNsj2vL+APjo/cx0A0bubEmaPhwNuLOjtafdNm

Modified: projects/db5/share/pgpkeys/bmah.key
==============================================================================
--- projects/db5/share/pgpkeys/bmah.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/bmah.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,7 +2,7 @@
 <!--
 sh addkey.sh bmah 5BA052C3;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub   1024D/5BA052C3 1997-12-08
       Key fingerprint = F829 B805 207D 14C7 7197  7832 D8CA 3171 5BA0 52C3
 uid                  Bruce A. Mah <bmah@acm.org>
@@ -15,7 +15,7 @@ uid                  Bruce A. Mah <bmah@
 uid                  Bruce A. Mah <bmah@kitchenlab.org>
 sub   2048g/B4E60EA1 1997-12-08
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBDSMdS0RBADQE42S0MDRcjiuM4mPH4NL2m60OMHgq3mYuIzrNkRE4jSzZJiG

Modified: projects/db5/share/pgpkeys/bms.key
==============================================================================
--- projects/db5/share/pgpkeys/bms.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/bms.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,12 +2,12 @@
 <!--
 sh /usr/doc/share/pgpkeys/addkey.sh bms 860DB53B;
 -->
-<programlisting role="pgpfingerprint"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
 pub  1024D/860DB53B 2003-08-06 Bruce M Simpson <bms@freebsd.org>
      Key fingerprint = 0D5F 1571 44DF 51B7 8B12  041E B9E5 2901 860D B53B
 sub  2048g/A2A32D8B 2003-08-06 [expires: 2006-08-05]
 ]]></programlisting>
-<programlisting role="pgpkey"><![CDATA[
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBD8xcj4RBADp/ttN/vrU8xXimyZDEJ3NbJXMRAdWin8hhY5cVDT6n6t6Kih2

Modified: projects/db5/share/pgpkeys/brd.key
==============================================================================
--- projects/db5/share/pgpkeys/brd.key	Thu Jun 20 15:36:33 2013	(r41966)
+++ projects/db5/share/pgpkeys/brd.key	Thu Jun 20 16:11:54 2013	(r41967)
@@ -2,14 +2,14 @@
 <!--
 sh ./addkey.sh brd ED0A754D;

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

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 16:22:41 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 7BB90CE5;
 Thu, 20 Jun 2013 16:22:41 +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 5C4DF139E;
 Thu, 20 Jun 2013 16:22:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KGMflg086569;
 Thu, 20 Jun 2013 16:22:41 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KGMcwF086554;
 Thu, 20 Jun 2013 16:22:38 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201622.r5KGMcwF086554@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 16:22:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41968 - in projects/db5: de_DE.ISO8859-1/books/handbook
 el_GR.ISO8859-7/books/handbook en_US.ISO8859-1/books/handbook
 es_ES.ISO8859-1/books/handbook fr_FR.ISO8859-1/books/handbook it_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, 20 Jun 2013 16:22:41 -0000

Author: gabor
Date: Thu Jun 20 16:22:38 2013
New Revision: 41968
URL: http://svnweb.freebsd.org/changeset/doc/41968

Log:
  - Eliminate double application element

Modified:
  projects/db5/de_DE.ISO8859-1/books/handbook/colophon.xml
  projects/db5/el_GR.ISO8859-7/books/handbook/colophon.xml
  projects/db5/en_US.ISO8859-1/books/handbook/colophon.xml
  projects/db5/es_ES.ISO8859-1/books/handbook/colophon.xml
  projects/db5/fr_FR.ISO8859-1/books/handbook/colophon.xml
  projects/db5/it_IT.ISO8859-15/books/handbook/colophon.xml
  projects/db5/ja_JP.eucJP/books/handbook/colophon.xml
  projects/db5/nl_NL.ISO8859-1/books/handbook/colophon.xml
  projects/db5/pl_PL.ISO8859-2/books/handbook/colophon.xml
  projects/db5/ru_RU.KOI8-R/books/handbook/colophon.xml
  projects/db5/zh_CN.GB2312/books/handbook/colophon.xml
  projects/db5/zh_TW.Big5/books/handbook/colophon.xml

Modified: projects/db5/de_DE.ISO8859-1/books/handbook/colophon.xml
==============================================================================
--- projects/db5/de_DE.ISO8859-1/books/handbook/colophon.xml	Thu Jun 20 16:11:54 2013	(r41967)
+++ projects/db5/de_DE.ISO8859-1/books/handbook/colophon.xml	Thu Jun 20 16:22:38 2013	(r41968)
@@ -15,7 +15,7 @@
     DSSSL-Prozessor, wird er in verschiedene Formate umgewandelt.  Die
     Umwandlung wird von Norm Walsh's DSSSL Stylesheets und eigens
     entwickelten Stylesheets gesteuert.  Die gedruckte Ausgabe des Buchs
-    wДre ohne die Satzbeschreibungssprache <application>&tex;</application>
+    wДre ohne die Satzbeschreibungssprache &tex;
     von Donald Knuth, <application>LaTeX</application> von Leslie Lamport
     oder den <application>JadeTeX</application>-Makros von Sebastian Rahtz
     nicht mЖglich.</para>

Modified: projects/db5/el_GR.ISO8859-7/books/handbook/colophon.xml
==============================================================================
--- projects/db5/el_GR.ISO8859-7/books/handbook/colophon.xml	Thu Jun 20 16:11:54 2013	(r41967)
+++ projects/db5/el_GR.ISO8859-7/books/handbook/colophon.xml	Thu Jun 20 16:22:38 2013	(r41968)
@@ -21,7 +21,7 @@
     DSSSL АМОИВТОЩ ЙЧДИЙА.  вЯГСИЛОПОИчХГЙАМ ТА DSSSL stylesheets ТОУ Norm Walsh ЛЕ щМА
     ЕПИПКщОМ ЕПъПЕДО ТЯОПОПОъГСГР ЦИА МА ДЧСОУМ ТИР ОДГЦъЕР ПАЯОУСъАСГР СТГМ
     <application>Jade</application>.  г щМТУПГ ЛОЯЖч АУТОЩ ТОУ ЙЕИЛщМОУ ДЕМ ХА
-    УПчЯВЕ ВЫЯъР ТГМ ЦКЧССА СТОИВЕИОХЕСъАР <application>&tex;</application>
+    УПчЯВЕ ВЫЯъР ТГМ ЦКЧССА СТОИВЕИОХЕСъАР &tex;
     ТОУ Donald Knuth, ТО <application>LaTeX</application> ТОУ Leslie Lamport,
     ч ТО macro package <application>JadeTeX</application> ТОУ Sebastian
     Rahtz.</para>

Modified: projects/db5/en_US.ISO8859-1/books/handbook/colophon.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/handbook/colophon.xml	Thu Jun 20 16:11:54 2013	(r41967)
+++ projects/db5/en_US.ISO8859-1/books/handbook/colophon.xml	Thu Jun 20 16:22:38 2013	(r41968)
@@ -12,7 +12,7 @@
     from XML into many different presentation formats using
     XSLT.  The printed version of this
     document would not be possible without Donald Knuth's
-    <application>&tex;</application> typesetting language, Leslie
+    &tex; typesetting language, Leslie
     Lamport's <application>LaTeX</application>, or Sebastian Rahtz's
     <application>JadeTeX</application> macro package.</para>
 </colophon>

Modified: projects/db5/es_ES.ISO8859-1/books/handbook/colophon.xml
==============================================================================
--- projects/db5/es_ES.ISO8859-1/books/handbook/colophon.xml	Thu Jun 20 16:11:54 2013	(r41967)
+++ projects/db5/es_ES.ISO8859-1/books/handbook/colophon.xml	Thu Jun 20 16:22:38 2013	(r41968)
@@ -21,7 +21,7 @@
     con personalizaciСn de niveles para las instrucciones de
     presentaciСn de Jade.  La versiСn impresa de este
     documento no hubiese sido posible sin los programas
-    <application>&tex;</application> de Donald Knuth,
+    &tex; de Donald Knuth,
     <application>LaTeX</application> de Leslie Lamport y
     <application>JadeTeX</application> de Sebastian Rahtz.</para>
 </colophon>

Modified: projects/db5/fr_FR.ISO8859-1/books/handbook/colophon.xml
==============================================================================
--- projects/db5/fr_FR.ISO8859-1/books/handbook/colophon.xml	Thu Jun 20 16:11:54 2013	(r41967)
+++ projects/db5/fr_FR.ISO8859-1/books/handbook/colophon.xml	Thu Jun 20 16:22:38 2013	(r41968)
@@ -18,7 +18,7 @@
     de personnalisation pour fournir la prИsentation des instructions
     pour <application>Jade</application>.  La version imprimИe de ce document n'aurait pas
     ИtИ possible sans le langage de formatage de
-    Donald Knuth <application>&tex;</application>,
+    Donald Knuth &tex;,
     <application>LaTeX</application> de Leslie Lamport, ou l'ensemble de
     macro <application>JadeTeX</application> de Sebastian Rahtz.</para>
 </colophon>

Modified: projects/db5/it_IT.ISO8859-15/books/handbook/colophon.xml
==============================================================================
--- projects/db5/it_IT.ISO8859-15/books/handbook/colophon.xml	Thu Jun 20 16:11:54 2013	(r41967)
+++ projects/db5/it_IT.ISO8859-15/books/handbook/colophon.xml	Thu Jun 20 16:22:38 2013	(r41968)
@@ -17,7 +17,7 @@
     <application>Jade</application> le istruzioni di presentazione.
     La versione stampata di questo documento
     non sarebbe stata possibile senza il linguaggio di composizione
-    <application>&tex;</application> di Donald Knuth,
+    &tex; di Donald Knuth,
     <application>LaTeX</application> di Leslie Lamport, o il pacchetto di macro
     <application>JadeTeX</application> di Sebastian Rahtz.</para>
 </colophon>

Modified: projects/db5/ja_JP.eucJP/books/handbook/colophon.xml
==============================================================================
--- projects/db5/ja_JP.eucJP/books/handbook/colophon.xml	Thu Jun 20 16:11:54 2013	(r41967)
+++ projects/db5/ja_JP.eucJP/books/handbook/colophon.xml	Thu Jun 20 16:22:38 2013	(r41968)
@@ -13,7 +13,7 @@
     й╦╫Я╓о DocBook DTD ╓Рмя╓╓╓© XML ╥а╪╟╓г╢имЩ╓╣╓Л╓ф╓╙╓Й║╒
     XSLT ╓Р╩х╓ц╓ф XML ╓╚╓И╓╣╓ч╓╤╓ч╓й╡дфи╥а╪╟╓каххг╓╣╓Л╓ф╓╓╓ч╓╧║ё
     ╓Б╓╥║╒Donald Knuth ╩А╓к╓Х╓К
-    аххг╦ю╦Л <application>&tex;</application>║╒
+    аххг╦ю╦Л &tex;║╒
     Leslie Lamport ╩А╓к╓Х╓К <application>LaTeX</application> ╓╙╓Х╓с
     Sebastian Rahtz ╩А╓к╓Х╓К <application>JadeTeX</application>
     ╔ч╔╞╔М╔я╔ц╔╠║╪╔╦╓╛╓й╓╚╓ц╓©╓И║╒

Modified: projects/db5/nl_NL.ISO8859-1/books/handbook/colophon.xml
==============================================================================
--- projects/db5/nl_NL.ISO8859-1/books/handbook/colophon.xml	Thu Jun 20 16:11:54 2013	(r41967)
+++ projects/db5/nl_NL.ISO8859-1/books/handbook/colophon.xml	Thu Jun 20 16:22:38 2013	(r41968)
@@ -18,7 +18,7 @@
     presentatie-instructies voor <application>Jade</application> zijn
     verkregen door uitbreiding van Norm Walsh's DSSSL stijlbladen.  De
     gedrukte versie van dit boek was niet mogelijk geweest zonder
-    Donald Knuth's <application>&tex;</application> typesetting taal,
+    Donald Knuth's &tex; typesetting taal,
     Leslie Lamport's <application>LaTeX</application>, of Sebastian
     Rahtz's <application>JadeTeX</application> macropakket.</para>
 </colophon>

Modified: projects/db5/pl_PL.ISO8859-2/books/handbook/colophon.xml
==============================================================================
--- projects/db5/pl_PL.ISO8859-2/books/handbook/colophon.xml	Thu Jun 20 16:11:54 2013	(r41967)
+++ projects/db5/pl_PL.ISO8859-2/books/handbook/colophon.xml	Thu Jun 20 16:22:38 2013	(r41968)
@@ -14,7 +14,7 @@
     <application>Jade</application>. Instrukcje formatowania tekstu
     zostaЁy przygotowane przy wykorzystaniu arkuszy styli DSSSL Norma
     Walsha. Przygotowanie wersji do wydruku nie byЁoby mo©liwe gdyby nie
-    jЙzyk skЁadu tekstu <application>&tex;</application> Donalda Knutha,
+    jЙzyk skЁadu tekstu &tex; Donalda Knutha,
     <application>LaTeX</application> Lesliego Lamporta, czy makra
     <application>JadeTeX</application> Sebastiana Rahtza.</para>
 </colophon>

Modified: projects/db5/ru_RU.KOI8-R/books/handbook/colophon.xml
==============================================================================
--- projects/db5/ru_RU.KOI8-R/books/handbook/colophon.xml	Thu Jun 20 16:11:54 2013	(r41967)
+++ projects/db5/ru_RU.KOI8-R/books/handbook/colophon.xml	Thu Jun 20 16:22:38 2013	(r41968)
@@ -18,7 +18,7 @@
     c допольнительными стилями разработанными в рамках проекта для
     создания презентационных инструкций для <application>Jade</application>.
     Создание печатной версии этого документа было бы невозможно без
-    языка <application>&tex;</application> Девида Кнута,
+    языка &tex; Девида Кнута,
     <application>LaTeX</application> Лисли Лэмпорта, и
     макро пакета <application>JadeTeX</application> Себастьяна Ратца.</para>
 </colophon>

Modified: projects/db5/zh_CN.GB2312/books/handbook/colophon.xml
==============================================================================
--- projects/db5/zh_CN.GB2312/books/handbook/colophon.xml	Thu Jun 20 16:11:54 2013	(r41967)
+++ projects/db5/zh_CN.GB2312/books/handbook/colophon.xml	Thu Jun 20 16:22:38 2013	(r41968)
@@ -14,7 +14,7 @@
     <application>Jade</application> ю╢в╙╩╩н╙пМ╤ЮфДкШ╣д╠Можпнй╫║ё
     нрцгй╧сцак Norm Walsh ╣д DSSSL яЫй╫╠Мсцсзн╙ <application>Jade</application>
     лА╧╘иЗЁи╡╩м╛╠Можпнй╫╣дж╦рЩё╛ ╡╒тЖ╪сакр╩вИвт╤╗рЕ╣д╦д╤╞║ё ╦ъ╣бди (Donald
-    Knuth) ╣д <application>&tex;</application> ее╟ФсОят║╒
+    Knuth) ╣д &tex; ее╟ФсОят║╒
     Leslie Lamport ╣д <application>LaTeX</application>ё╛ рт╪╟ Sebastian
     Rahtz ╣д <application>JadeTeX</application> ╨Й╪╞ё╛
     н╙уБ╥щнд╣╣╣дс║к╒╟Ф╠╬╥╒╩сакжа╧ьжьр╙╣двВсц║ё</para>

Modified: projects/db5/zh_TW.Big5/books/handbook/colophon.xml
==============================================================================
--- projects/db5/zh_TW.Big5/books/handbook/colophon.xml	Thu Jun 20 16:11:54 2013	(r41967)
+++ projects/db5/zh_TW.Big5/books/handbook/colophon.xml	Thu Jun 20 16:22:38 2013	(r41968)
@@ -16,7 +16,7 @@
     additional customization layer to provide the presentation
     instructions for <application>Jade</application>.  The printed
     version of this document would not be possible without Donald
-    Knuth's <application>&tex;</application> typesetting language,
+    Knuth's &tex; typesetting language,
     Leslie Lamport's <application>LaTeX</application>, or Sebastian
     Rahtz's <application>JadeTeX</application> macro package.</para>
 </colophon>

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 16:39: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
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 90A714C0;
 Thu, 20 Jun 2013 16:39:20 +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 7FBF415EA;
 Thu, 20 Jun 2013 16:39: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 r5KGdK8J090763;
 Thu, 20 Jun 2013 16:39:20 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KGdBwM090707;
 Thu, 20 Jun 2013 16:39:11 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201639.r5KGdBwM090707@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 16:39:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41969 - in projects/db5: de_DE.ISO8859-1/books/handbook
 de_DE.ISO8859-1/share/xml el_GR.ISO8859-7/books/handbook
 el_GR.ISO8859-7/share/xml en_US.ISO8859-1/books/handbook en_US.ISO8859-...
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, 20 Jun 2013 16:39:20 -0000

Author: gabor
Date: Thu Jun 20 16:39:11 2013
New Revision: 41969
URL: http://svnweb.freebsd.org/changeset/doc/41969

Log:
  - Convert glossary to normal include file instead of entity so that it can be
    transformed with XSLT

Modified:
  projects/db5/de_DE.ISO8859-1/books/handbook/chapters.ent
  projects/db5/de_DE.ISO8859-1/share/xml/entities.ent
  projects/db5/de_DE.ISO8859-1/share/xml/glossary.ent
  projects/db5/el_GR.ISO8859-7/books/handbook/chapters.ent
  projects/db5/el_GR.ISO8859-7/share/xml/entities.ent
  projects/db5/el_GR.ISO8859-7/share/xml/glossary.ent
  projects/db5/en_US.ISO8859-1/books/handbook/chapters.ent
  projects/db5/en_US.ISO8859-1/share/xml/entities.ent
  projects/db5/en_US.ISO8859-1/share/xml/glossary.ent
  projects/db5/es_ES.ISO8859-1/books/handbook/chapters.ent
  projects/db5/es_ES.ISO8859-1/share/xml/entities.ent
  projects/db5/es_ES.ISO8859-1/share/xml/glossary.ent
  projects/db5/fr_FR.ISO8859-1/books/handbook/chapters.ent
  projects/db5/fr_FR.ISO8859-1/share/xml/entities.ent
  projects/db5/fr_FR.ISO8859-1/share/xml/glossary.ent
  projects/db5/hu_HU.ISO8859-2/books/handbook/chapters.ent
  projects/db5/hu_HU.ISO8859-2/share/xml/entities.ent
  projects/db5/hu_HU.ISO8859-2/share/xml/glossary.ent
  projects/db5/it_IT.ISO8859-15/books/handbook/chapters.ent
  projects/db5/it_IT.ISO8859-15/share/xml/entities.ent
  projects/db5/it_IT.ISO8859-15/share/xml/glossary.ent
  projects/db5/ja_JP.eucJP/books/handbook/chapters.ent
  projects/db5/ja_JP.eucJP/share/xml/entities.ent
  projects/db5/mn_MN.UTF-8/books/handbook/chapters.ent
  projects/db5/mn_MN.UTF-8/share/xml/entities.ent
  projects/db5/mn_MN.UTF-8/share/xml/glossary.ent
  projects/db5/nl_NL.ISO8859-1/books/handbook/chapters.ent
  projects/db5/nl_NL.ISO8859-1/share/xml/entities.ent
  projects/db5/nl_NL.ISO8859-1/share/xml/glossary.ent
  projects/db5/pl_PL.ISO8859-2/books/handbook/chapters.ent
  projects/db5/pl_PL.ISO8859-2/share/xml/entities.ent
  projects/db5/pt_BR.ISO8859-1/books/handbook/chapters.ent
  projects/db5/ru_RU.KOI8-R/books/handbook/chapters.ent
  projects/db5/ru_RU.KOI8-R/share/xml/entities.ent
  projects/db5/ru_RU.KOI8-R/share/xml/glossary.ent
  projects/db5/share/xml/catalog.xml
  projects/db5/zh_CN.GB2312/books/handbook/chapters.ent
  projects/db5/zh_CN.GB2312/share/xml/entities.ent
  projects/db5/zh_CN.GB2312/share/xml/glossary.ent
  projects/db5/zh_TW.Big5/books/handbook/chapters.ent
  projects/db5/zh_TW.Big5/share/xml/entities.ent
  projects/db5/zh_TW.Big5/share/xml/glossary.ent

Modified: projects/db5/de_DE.ISO8859-1/books/handbook/chapters.ent
==============================================================================
--- projects/db5/de_DE.ISO8859-1/books/handbook/chapters.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/de_DE.ISO8859-1/books/handbook/chapters.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -66,7 +66,7 @@
   <!ENTITY chap.eresources	SYSTEM "eresources/chapter.xml">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-  <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
+  <!ENTITY chap.freebsd-glossary	SYSTEM "../../share/xml/glossary.ent">
   <!ENTITY chap.index		"">
 
 <!ENTITY chap.mirrors.lastmod.inc	SYSTEM "mirrors.lastmod.inc">

Modified: projects/db5/de_DE.ISO8859-1/share/xml/entities.ent
==============================================================================
--- projects/db5/de_DE.ISO8859-1/share/xml/entities.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/de_DE.ISO8859-1/share/xml/entities.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -31,6 +31,3 @@
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
 	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//DE"
-	"glossary.ent">
-%glossary;

Modified: projects/db5/de_DE.ISO8859-1/share/xml/glossary.ent
==============================================================================
--- projects/db5/de_DE.ISO8859-1/share/xml/glossary.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/de_DE.ISO8859-1/share/xml/glossary.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -34,7 +34,6 @@
     basiert auf: 1.37
 -->
 
-<!ENTITY freebsd-glossary '
 <glossary status="draft" id="freebsd-glossary">
   <title>&os; Glossar</title>
 
@@ -2115,4 +2114,3 @@
     </glossentry>
   </glossdiv>
 </glossary>
-'>

Modified: projects/db5/el_GR.ISO8859-7/books/handbook/chapters.ent
==============================================================================
--- projects/db5/el_GR.ISO8859-7/books/handbook/chapters.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/el_GR.ISO8859-7/books/handbook/chapters.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -72,7 +72,7 @@
   <!ENTITY chap.eresources.www.index.inc      SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc      SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys         SYSTEM "pgpkeys/chapter.xml">
-  <!ENTITY chap.freebsd-glossary        "&freebsd-glossary;">
+  <!ENTITY chap.freebsd-glossary        SYSTEM "../../share/xml/glossary.ent">
   <!ENTITY chap.index		"">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">

Modified: projects/db5/el_GR.ISO8859-7/share/xml/entities.ent
==============================================================================
--- projects/db5/el_GR.ISO8859-7/share/xml/entities.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/el_GR.ISO8859-7/share/xml/entities.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -28,9 +28,6 @@
 <!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL"
 	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EL"
-	"glossary.ent">
-%glossary;
 
 <!-- г СЕИЯэ ТЫМ %freebsd.el; ЙАИ %freebsd; ЕъМАИ СГЛАМТИЙч.
      пЯОТЕЯАИЭТГТА щВОУМ ТА entities ПОУ ОЯъФОМТАИ ПЯЧТА.  пЯЧТА ОЯъФОМТАИ

Modified: projects/db5/el_GR.ISO8859-7/share/xml/glossary.ent
==============================================================================
--- projects/db5/el_GR.ISO8859-7/share/xml/glossary.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/el_GR.ISO8859-7/share/xml/glossary.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -41,7 +41,6 @@
 
 -->
 
-<!ENTITY freebsd-glossary '
 <glossary status="draft" id="freebsd-glossary">
   <title>кЕНИЙЭ ТОУ &os;</title>
   <para>аУТЭ ТО КЕНИЙЭ ПЕЯИщВЕИ ЭЯОУР ЙАИ АЙЯЫМЩЛИА ПОУ ВЯГСИЛОПОИОЩМТАИ
@@ -2099,4 +2098,3 @@
     </glossentry>
   </glossdiv>
 </glossary>
-'>

Modified: projects/db5/en_US.ISO8859-1/books/handbook/chapters.ent
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/handbook/chapters.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/en_US.ISO8859-1/books/handbook/chapters.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -65,7 +65,7 @@
   <!ENTITY chap.eresources.www.index.inc      SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-  <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
+  <!ENTITY chap.freebsd-glossary	SYSTEM "../../share/xml/glossary.ent">
   <!ENTITY chap.index		SYSTEM "index.xml">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">

Modified: projects/db5/en_US.ISO8859-1/share/xml/entities.ent
==============================================================================
--- projects/db5/en_US.ISO8859-1/share/xml/entities.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/en_US.ISO8859-1/share/xml/entities.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -6,9 +6,6 @@
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"../../../share/xml/freebsd.ent">
 %freebsd;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
-	"glossary.ent">
-%glossary;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
 	"teams.ent">
 %teams;

Modified: projects/db5/en_US.ISO8859-1/share/xml/glossary.ent
==============================================================================
--- projects/db5/en_US.ISO8859-1/share/xml/glossary.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/en_US.ISO8859-1/share/xml/glossary.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -32,7 +32,6 @@
 
 -->
 
-<!ENTITY freebsd-glossary '
 <glossary status="draft" id="freebsd-glossary">
   <title>&os; Glossary</title>
   <para>This glossary contains terms and acronyms used within the &os;
@@ -2032,4 +2031,3 @@
     </glossentry>
   </glossdiv>
 </glossary>
-'>

Modified: projects/db5/es_ES.ISO8859-1/books/handbook/chapters.ent
==============================================================================
--- projects/db5/es_ES.ISO8859-1/books/handbook/chapters.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/es_ES.ISO8859-1/books/handbook/chapters.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -73,7 +73,7 @@
   <!ENTITY chap.eresources.www.index.inc      SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc      SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys         SYSTEM "pgpkeys/chapter.xml">
-  <!ENTITY chap.freebsd-glossary        "&freebsd-glossary;">
+  <!ENTITY chap.freebsd-glossary        SYSTEM "../../share/xml/glossary.ent">
   <!ENTITY chap.index		"">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">

Modified: projects/db5/es_ES.ISO8859-1/share/xml/entities.ent
==============================================================================
--- projects/db5/es_ES.ISO8859-1/share/xml/entities.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/es_ES.ISO8859-1/share/xml/entities.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -29,6 +29,3 @@
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
 	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ES"
-	"glossary.ent">
-%glossary;

Modified: projects/db5/es_ES.ISO8859-1/share/xml/glossary.ent
==============================================================================
--- projects/db5/es_ES.ISO8859-1/share/xml/glossary.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/es_ES.ISO8859-1/share/xml/glossary.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -37,7 +37,6 @@
 
 -->
 
-<!ENTITY freebsd-glossary '
 <glossary status="draft" id="freebsd-glossary">
   <title>Glosario de &os;</title>
   <para>Este glosario contiene tИrminos y acrСnimos usados en la
@@ -1930,4 +1929,3 @@
     </glossentry>
   </glossdiv>
 </glossary>
-'>

Modified: projects/db5/fr_FR.ISO8859-1/books/handbook/chapters.ent
==============================================================================
--- projects/db5/fr_FR.ISO8859-1/books/handbook/chapters.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/fr_FR.ISO8859-1/books/handbook/chapters.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -67,7 +67,7 @@
   <!ENTITY chap.eresources.www.index.inc      SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc      SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys         SYSTEM "pgpkeys/chapter.xml">
-  <!ENTITY chap.freebsd-glossary        "&freebsd-glossary;">
+  <!ENTITY chap.freebsd-glossary        SYSTEM "../../share/xml/glossary.ent">
   <!ENTITY chap.index		"">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">

Modified: projects/db5/fr_FR.ISO8859-1/share/xml/entities.ent
==============================================================================
--- projects/db5/fr_FR.ISO8859-1/share/xml/entities.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/fr_FR.ISO8859-1/share/xml/entities.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -20,9 +20,6 @@
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//FR"
-	"glossary.ent">
-%glossary;
 <!--
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
 	"nonexistent">

Modified: projects/db5/fr_FR.ISO8859-1/share/xml/glossary.ent
==============================================================================
--- projects/db5/fr_FR.ISO8859-1/share/xml/glossary.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/fr_FR.ISO8859-1/share/xml/glossary.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -8,7 +8,6 @@
     Original Revision: 1.5
 -->
 
-<!ENTITY freebsd-glossary '
 <glossary status="draft" id="freebsd-glossary">
   <title>Glossaire &os;</title>
   <para>Ce glossaire dИfinit des termes et des acronymes
@@ -139,4 +138,3 @@
     </glossentry>
   </glossdiv>
 </glossary>
-'>

Modified: projects/db5/hu_HU.ISO8859-2/books/handbook/chapters.ent
==============================================================================
--- projects/db5/hu_HU.ISO8859-2/books/handbook/chapters.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/hu_HU.ISO8859-2/books/handbook/chapters.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -69,7 +69,7 @@
   <!ENTITY chap.eresources.www.index.inc      SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc      SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys         SYSTEM "pgpkeys/chapter.xml">
-  <!ENTITY chap.freebsd-glossary        "&freebsd-glossary;">
+  <!ENTITY chap.freebsd-glossary        SYSTEM "../../share/xml/glossary.ent">
   <!ENTITY chap.index		"">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">

Modified: projects/db5/hu_HU.ISO8859-2/share/xml/entities.ent
==============================================================================
--- projects/db5/hu_HU.ISO8859-2/share/xml/entities.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/hu_HU.ISO8859-2/share/xml/entities.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -29,6 +29,3 @@
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
 	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//HU"
-	"glossary.ent">
-%glossary;

Modified: projects/db5/hu_HU.ISO8859-2/share/xml/glossary.ent
==============================================================================
--- projects/db5/hu_HU.ISO8859-2/share/xml/glossary.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/hu_HU.ISO8859-2/share/xml/glossary.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -37,7 +37,6 @@
      %SRCID%	1.36
 -->
 
-<!ENTITY freebsd-glossary '
 <glossary status="draft" id="freebsd-glossary" lang="hu">
   <title>A &os;-s szakkifejezИsek gyШjtemИnye</title>
 
@@ -2305,4 +2304,3 @@
     </glossentry>
   </glossdiv>
 </glossary>
-'>

Modified: projects/db5/it_IT.ISO8859-15/books/handbook/chapters.ent
==============================================================================
--- projects/db5/it_IT.ISO8859-15/books/handbook/chapters.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/it_IT.ISO8859-15/books/handbook/chapters.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -67,7 +67,7 @@
   <!ENTITY chap.eresources.www.index.inc      SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc      SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-  <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
+  <!ENTITY chap.freebsd-glossary	SYSTEM "../../share/xml/glossary.ent">
   <!ENTITY chap.index		"">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">

Modified: projects/db5/it_IT.ISO8859-15/share/xml/entities.ent
==============================================================================
--- projects/db5/it_IT.ISO8859-15/share/xml/entities.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/it_IT.ISO8859-15/share/xml/entities.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -31,6 +31,3 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//IT"
 	"translators.ent">
 %translators;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//IT"
-	"glossary.ent">
-%glossary;

Modified: projects/db5/it_IT.ISO8859-15/share/xml/glossary.ent
==============================================================================
--- projects/db5/it_IT.ISO8859-15/share/xml/glossary.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/it_IT.ISO8859-15/share/xml/glossary.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -6,7 +6,6 @@
      Original revision: 1.20
 -->
 
-<!ENTITY freebsd-glossary '
 <glossary status="draft" id="freebsd-glossary">
   <title>Glossario di &os;</title>
 
@@ -1766,4 +1765,3 @@
     </glossentry>
   </glossdiv>
 </glossary>
-'>

Modified: projects/db5/ja_JP.eucJP/books/handbook/chapters.ent
==============================================================================
--- projects/db5/ja_JP.eucJP/books/handbook/chapters.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/ja_JP.eucJP/books/handbook/chapters.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -64,7 +64,7 @@
   <!ENTITY chap.eresources.www.index.inc      SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc      SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-  <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
+  <!ENTITY chap.freebsd-glossary	SYSTEM "../../../en_US.ISO8859-1/share/xml/glossary.ent">
   <!ENTITY chap.index		"">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">

Modified: projects/db5/ja_JP.eucJP/share/xml/entities.ent
==============================================================================
--- projects/db5/ja_JP.eucJP/share/xml/entities.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/ja_JP.eucJP/share/xml/entities.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -40,6 +40,3 @@
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
 	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
-	"nonexistent">
-%glossary;

Modified: projects/db5/mn_MN.UTF-8/books/handbook/chapters.ent
==============================================================================
--- projects/db5/mn_MN.UTF-8/books/handbook/chapters.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/mn_MN.UTF-8/books/handbook/chapters.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -71,7 +71,7 @@
   <!ENTITY chap.eresources.www.index.inc	SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-  <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
+  <!ENTITY chap.freebsd-glossary	SYSTEM "../../share/xml/glossary.ent">
   <!ENTITY chap.index		"">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">

Modified: projects/db5/mn_MN.UTF-8/share/xml/entities.ent
==============================================================================
--- projects/db5/mn_MN.UTF-8/share/xml/entities.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/mn_MN.UTF-8/share/xml/entities.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -27,6 +27,3 @@
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
 	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//MN"
-	"glossary.ent">
-%glossary;

Modified: projects/db5/mn_MN.UTF-8/share/xml/glossary.ent
==============================================================================
--- projects/db5/mn_MN.UTF-8/share/xml/glossary.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/mn_MN.UTF-8/share/xml/glossary.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -36,7 +36,6 @@
 
 -->
 
-<!ENTITY freebsd-glossary '
 <glossary status="draft" id="freebsd-glossary">
   <title>&os; п²я█я─ я┌п╬п╪я┼я▒п╬</title>
   <para>п╜п╫я█ п╫я█я─ я┌п╬п╪я┼я▒п╬ п╫я▄ &os;-п╦п╧п╫ я┘р╞я─я█я█п╫п╦п╧я┘я█п╫ п╠п╬п╩п╬п╫ п╠п╟я─п╦п╪я┌п╤я┐я┐п╩п╟п╩я┌п╟п╢ п╟я┬п╦пЁп╩п╟я│п╟п╫
@@ -2023,4 +2022,3 @@
     </glossentry>
   </glossdiv>
 </glossary>
-'>

Modified: projects/db5/nl_NL.ISO8859-1/books/handbook/chapters.ent
==============================================================================
--- projects/db5/nl_NL.ISO8859-1/books/handbook/chapters.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/nl_NL.ISO8859-1/books/handbook/chapters.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -69,7 +69,7 @@
   <!ENTITY chap.eresources.www.index.inc	SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-  <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
+  <!ENTITY chap.freebsd-glossary	SYSTEM "../../share/xml/glossary.ent">
   <!ENTITY chap.index		"">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">

Modified: projects/db5/nl_NL.ISO8859-1/share/xml/entities.ent
==============================================================================
--- projects/db5/nl_NL.ISO8859-1/share/xml/entities.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/nl_NL.ISO8859-1/share/xml/entities.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -30,6 +30,3 @@
 <!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent">
 %l10n;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//NL"
-	"glossary.ent">
-%glossary;

Modified: projects/db5/nl_NL.ISO8859-1/share/xml/glossary.ent
==============================================================================
--- projects/db5/nl_NL.ISO8859-1/share/xml/glossary.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/nl_NL.ISO8859-1/share/xml/glossary.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -39,7 +39,6 @@
 
 -->
 
-<!ENTITY freebsd-glossary '
 <glossary status="draft" id="freebsd-glossary">
   <title>&os; begrippenlijst</title>
   <para>Deze begrippenlijst bevat de termen en acroniemen die binnen
@@ -2091,4 +2090,3 @@
     </glossentry>
   </glossdiv>
 </glossary>
-'>

Modified: projects/db5/pl_PL.ISO8859-2/books/handbook/chapters.ent
==============================================================================
--- projects/db5/pl_PL.ISO8859-2/books/handbook/chapters.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/pl_PL.ISO8859-2/books/handbook/chapters.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -64,7 +64,7 @@
   <!ENTITY chap.eresources.www.index.inc	SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-  <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
+  <!ENTITY chap.freebsd-glossary	SYSTEM "../../../en_US.ISO8859-1/share/xml/glossary.ent">
   <!ENTITY chap.index		"">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">

Modified: projects/db5/pl_PL.ISO8859-2/share/xml/entities.ent
==============================================================================
--- projects/db5/pl_PL.ISO8859-2/share/xml/entities.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/pl_PL.ISO8859-2/share/xml/entities.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -29,6 +29,3 @@
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
 	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
-	"nonexistent">
-%glossary;

Modified: projects/db5/pt_BR.ISO8859-1/books/handbook/chapters.ent
==============================================================================
--- projects/db5/pt_BR.ISO8859-1/books/handbook/chapters.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/pt_BR.ISO8859-1/books/handbook/chapters.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -63,7 +63,7 @@
   <!ENTITY chap.eresources	SYSTEM "eresources/chapter.xml">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-  <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
+  <!ENTITY chap.freebsd-glossary	SYSTEM "../../../en_US.ISO8859-1/share/xml/glossary.ent">
   <!ENTITY chap.index		"">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">

Modified: projects/db5/ru_RU.KOI8-R/books/handbook/chapters.ent
==============================================================================
--- projects/db5/ru_RU.KOI8-R/books/handbook/chapters.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/ru_RU.KOI8-R/books/handbook/chapters.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -70,7 +70,7 @@
   <!ENTITY chap.eresources.www.index.inc	SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-  <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
+  <!ENTITY chap.freebsd-glossary	SYSTEM "../../share/xml/glossary.ent">
   <!ENTITY chap.index		"">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">

Modified: projects/db5/ru_RU.KOI8-R/share/xml/entities.ent
==============================================================================
--- projects/db5/ru_RU.KOI8-R/share/xml/entities.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/ru_RU.KOI8-R/share/xml/entities.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -31,6 +31,3 @@
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
 	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//RU"
-	"glossary.ent">
-%glossary;

Modified: projects/db5/ru_RU.KOI8-R/share/xml/glossary.ent
==============================================================================
--- projects/db5/ru_RU.KOI8-R/share/xml/glossary.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/ru_RU.KOI8-R/share/xml/glossary.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -14,7 +14,6 @@
 	Please keep this file sorted.
 -->
 
-<!ENTITY freebsd-glossary '
 <glossary status="draft" id="freebsd-glossary">
   <title>Глоссарий &os;</title>
   <para>Этот глоссарий содержит специфичные для документации и
@@ -1736,4 +1735,3 @@
   </glossdiv>
 
 </glossary>
-'>

Modified: projects/db5/share/xml/catalog.xml
==============================================================================
--- projects/db5/share/xml/catalog.xml	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/share/xml/catalog.xml	Thu Jun 20 16:39:11 2013	(r41969)
@@ -103,9 +103,6 @@ uri="xhtml10-freebsd.dtd" />
 	publicId="-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
 	uri="../../en_US.ISO8859-1/share/xml/newsgroups.ent"/>
   <public
-	publicId="-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
-	uri="../../en_US.ISO8859-1/share/xml/glossary.ent"/>
-  <public
 	publicId="-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
 	uri="../../en_US.ISO8859-1/share/xml/mailing-lists.ent"/>
 </catalog>

Modified: projects/db5/zh_CN.GB2312/books/handbook/chapters.ent
==============================================================================
--- projects/db5/zh_CN.GB2312/books/handbook/chapters.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/zh_CN.GB2312/books/handbook/chapters.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -66,7 +66,7 @@
   <!ENTITY chap.eresources.www.index.inc	SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-  <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
+  <!ENTITY chap.freebsd-glossary	SYSTEM "../../share/xml/glossary.ent">
   <!ENTITY chap.index		"">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">

Modified: projects/db5/zh_CN.GB2312/share/xml/entities.ent
==============================================================================
--- projects/db5/zh_CN.GB2312/share/xml/entities.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/zh_CN.GB2312/share/xml/entities.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -27,6 +27,3 @@
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
 	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
-	"glossary.ent">
-%glossary;

Modified: projects/db5/zh_CN.GB2312/share/xml/glossary.ent
==============================================================================
--- projects/db5/zh_CN.GB2312/share/xml/glossary.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/zh_CN.GB2312/share/xml/glossary.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -33,7 +33,6 @@
 
 -->
 
-<!ENTITY freebsd-glossary '
 <glossary status="draft" id="freebsd-glossary">
   <title>&os; йУсО╠М</title>
   <para>╠╬йУсО╠М╟Э╨╛ак &os; иГгЬ╨мнд╣╣й╧сц╣дйУсО╨мкУбтсО║ё</para>
@@ -1983,4 +1982,3 @@
     </glossentry>
   </glossdiv>
 </glossary>
-'>

Modified: projects/db5/zh_TW.Big5/books/handbook/chapters.ent
==============================================================================
--- projects/db5/zh_TW.Big5/books/handbook/chapters.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/zh_TW.Big5/books/handbook/chapters.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -65,7 +65,7 @@
   <!ENTITY chap.eresources.www.index.inc	SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-  <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
+  <!ENTITY chap.freebsd-glossary	SYSTEM "../../share/xml/glossary.ent">
   <!ENTITY chap.index		"">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">

Modified: projects/db5/zh_TW.Big5/share/xml/entities.ent
==============================================================================
--- projects/db5/zh_TW.Big5/share/xml/entities.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/zh_TW.Big5/share/xml/entities.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -27,6 +27,3 @@
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//ZH"
 	"urls.ent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
-	"glossary.ent">
-%glossary;

Modified: projects/db5/zh_TW.Big5/share/xml/glossary.ent
==============================================================================
--- projects/db5/zh_TW.Big5/share/xml/glossary.ent	Thu Jun 20 16:22:38 2013	(r41968)
+++ projects/db5/zh_TW.Big5/share/xml/glossary.ent	Thu Jun 20 16:39:11 2013	(r41969)
@@ -32,7 +32,6 @@
 
 -->
 
-<!ENTITY freebsd-glossary '
 <glossary status="draft" id="freebsd-glossary">
   <title>&os; Glossary</title>
   <para>This glossary contains terms and acronyms used within the &os;
@@ -1922,4 +1921,3 @@
     </glossentry>
   </glossdiv>
 </glossary>
-'>

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 16:51:26 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 421779DF;
 Thu, 20 Jun 2013 16:51:26 +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 30C26167E;
 Thu, 20 Jun 2013 16:51:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KGpQ8a095889;
 Thu, 20 Jun 2013 16:51:26 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KGpNhU095846;
 Thu, 20 Jun 2013 16:51:23 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201651.r5KGpNhU095846@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 16:51:23 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41972 - in projects/db5: el_GR.ISO8859-7/books/handbook
 en_US.ISO8859-1/books/handbook fr_FR.ISO8859-1/books/handbook
 hu_HU.ISO8859-2/books/handbook it_IT.ISO8859-15/books/handbook ja_...
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, 20 Jun 2013 16:51:26 -0000

Author: gabor
Date: Thu Jun 20 16:51:23 2013
New Revision: 41972
URL: http://svnweb.freebsd.org/changeset/doc/41972

Log:
  - Properly refer to the glossary

Modified:
  projects/db5/el_GR.ISO8859-7/books/handbook/book.xml
  projects/db5/en_US.ISO8859-1/books/handbook/book.xml
  projects/db5/fr_FR.ISO8859-1/books/handbook/book.xml
  projects/db5/hu_HU.ISO8859-2/books/handbook/book.xml
  projects/db5/it_IT.ISO8859-15/books/handbook/book.xml
  projects/db5/ja_JP.eucJP/books/handbook/book.xml
  projects/db5/mn_MN.UTF-8/books/handbook/book.xml
  projects/db5/nl_NL.ISO8859-1/books/handbook/book.xml
  projects/db5/pl_PL.ISO8859-2/books/handbook/book.xml
  projects/db5/ru_RU.KOI8-R/books/handbook/book.xml
  projects/db5/zh_CN.GB2312/books/handbook/book.xml
  projects/db5/zh_TW.Big5/books/handbook/book.xml

Modified: projects/db5/el_GR.ISO8859-7/books/handbook/book.xml
==============================================================================
--- projects/db5/el_GR.ISO8859-7/books/handbook/book.xml	Thu Jun 20 16:46:55 2013	(r41971)
+++ projects/db5/el_GR.ISO8859-7/books/handbook/book.xml	Thu Jun 20 16:51:23 2013	(r41972)
@@ -328,7 +328,7 @@
     &chap.pgpkeys;
   </part>
 
-  &freebsd-glossary;
+  &chap.freebsd-glossary;
   &chap.index;
   &chap.colophon;
 </book>

Modified: projects/db5/en_US.ISO8859-1/books/handbook/book.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/handbook/book.xml	Thu Jun 20 16:46:55 2013	(r41971)
+++ projects/db5/en_US.ISO8859-1/books/handbook/book.xml	Thu Jun 20 16:51:23 2013	(r41972)
@@ -302,7 +302,7 @@
     &chap.eresources;
     &chap.pgpkeys;
   </part>
-  &freebsd-glossary;
+  &chap.freebsd-glossary;
   &chap.index;
   &chap.colophon;
 </book>

Modified: projects/db5/fr_FR.ISO8859-1/books/handbook/book.xml
==============================================================================
--- projects/db5/fr_FR.ISO8859-1/books/handbook/book.xml	Thu Jun 20 16:46:55 2013	(r41971)
+++ projects/db5/fr_FR.ISO8859-1/books/handbook/book.xml	Thu Jun 20 16:51:23 2013	(r41972)
@@ -317,7 +317,7 @@
     &chap.eresources;
     &chap.pgpkeys;
   </part>
-    &freebsd-glossary;
+    &chap.freebsd-glossary;
     &chap.index;
   &chap.colophon;
 </book>

Modified: projects/db5/hu_HU.ISO8859-2/books/handbook/book.xml
==============================================================================
--- projects/db5/hu_HU.ISO8859-2/books/handbook/book.xml	Thu Jun 20 16:46:55 2013	(r41971)
+++ projects/db5/hu_HU.ISO8859-2/books/handbook/book.xml	Thu Jun 20 16:51:23 2013	(r41972)
@@ -356,7 +356,7 @@
     &chap.eresources;
     &chap.pgpkeys;
   </part>
-  &freebsd-glossary;
+  &chap.freebsd-glossary;
   &chap.index;
   &chap.colophon;
 </book>

Modified: projects/db5/it_IT.ISO8859-15/books/handbook/book.xml
==============================================================================
--- projects/db5/it_IT.ISO8859-15/books/handbook/book.xml	Thu Jun 20 16:46:55 2013	(r41971)
+++ projects/db5/it_IT.ISO8859-15/books/handbook/book.xml	Thu Jun 20 16:51:23 2013	(r41972)
@@ -310,7 +310,7 @@
     &chap.eresources;
     &chap.pgpkeys;
   </part>
-  &freebsd-glossary;
+  &chap.freebsd-glossary;
   &chap.index;
   &chap.colophon;
 </book>

Modified: projects/db5/ja_JP.eucJP/books/handbook/book.xml
==============================================================================
--- projects/db5/ja_JP.eucJP/books/handbook/book.xml	Thu Jun 20 16:46:55 2013	(r41971)
+++ projects/db5/ja_JP.eucJP/books/handbook/book.xml	Thu Jun 20 16:51:23 2013	(r41972)
@@ -315,7 +315,7 @@
     &chap.eresources;
     &chap.pgpkeys;
   </part>
-  &freebsd-glossary;
+  &chap.freebsd-glossary;
   &chap.index;
   &chap.colophon;
 </book>

Modified: projects/db5/mn_MN.UTF-8/books/handbook/book.xml
==============================================================================
--- projects/db5/mn_MN.UTF-8/books/handbook/book.xml	Thu Jun 20 16:46:55 2013	(r41971)
+++ projects/db5/mn_MN.UTF-8/books/handbook/book.xml	Thu Jun 20 16:51:23 2013	(r41972)
@@ -309,7 +309,7 @@
     &chap.eresources;
     &chap.pgpkeys;
   </part>
-  &freebsd-glossary;
+  &chap.freebsd-glossary;
   &chap.index;
   &chap.colophon;
 </book>

Modified: projects/db5/nl_NL.ISO8859-1/books/handbook/book.xml
==============================================================================
--- projects/db5/nl_NL.ISO8859-1/books/handbook/book.xml	Thu Jun 20 16:46:55 2013	(r41971)
+++ projects/db5/nl_NL.ISO8859-1/books/handbook/book.xml	Thu Jun 20 16:51:23 2013	(r41972)
@@ -307,7 +307,7 @@
     &chap.pgpkeys;
   </part>
 
-  &freebsd-glossary;
+  &chap.freebsd-glossary;
   &chap.index;
   &chap.colophon;
 </book>

Modified: projects/db5/pl_PL.ISO8859-2/books/handbook/book.xml
==============================================================================
--- projects/db5/pl_PL.ISO8859-2/books/handbook/book.xml	Thu Jun 20 16:46:55 2013	(r41971)
+++ projects/db5/pl_PL.ISO8859-2/books/handbook/book.xml	Thu Jun 20 16:51:23 2013	(r41972)
@@ -288,7 +288,7 @@
     &chap.eresources;
     &chap.pgpkeys;
   </part>
-  &freebsd-glossary;
+  &chap.freebsd-glossary;
   &chap.index;
   &chap.colophon;
 </book>

Modified: projects/db5/ru_RU.KOI8-R/books/handbook/book.xml
==============================================================================
--- projects/db5/ru_RU.KOI8-R/books/handbook/book.xml	Thu Jun 20 16:46:55 2013	(r41971)
+++ projects/db5/ru_RU.KOI8-R/books/handbook/book.xml	Thu Jun 20 16:51:23 2013	(r41972)
@@ -309,7 +309,7 @@
     &chap.pgpkeys;
 
   </part>
-  &freebsd-glossary;
+  &chap.freebsd-glossary;
   &chap.index;
   &chap.colophon;
 </book>

Modified: projects/db5/zh_CN.GB2312/books/handbook/book.xml
==============================================================================
--- projects/db5/zh_CN.GB2312/books/handbook/book.xml	Thu Jun 20 16:46:55 2013	(r41971)
+++ projects/db5/zh_CN.GB2312/books/handbook/book.xml	Thu Jun 20 16:51:23 2013	(r41972)
@@ -304,7 +304,7 @@
     &chap.eresources;
     &chap.pgpkeys;
   </part>
-  &freebsd-glossary;
+  &chap.freebsd-glossary;
   &chap.index;
   &chap.colophon;
 </book>

Modified: projects/db5/zh_TW.Big5/books/handbook/book.xml
==============================================================================
--- projects/db5/zh_TW.Big5/books/handbook/book.xml	Thu Jun 20 16:46:55 2013	(r41971)
+++ projects/db5/zh_TW.Big5/books/handbook/book.xml	Thu Jun 20 16:51:23 2013	(r41972)
@@ -272,7 +272,7 @@
     &chap.eresources;
     &chap.pgpkeys;
   </part>
-  &freebsd-glossary;
+  &chap.freebsd-glossary;
   &chap.index;
   &chap.colophon;
 </book>

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 16:53:52 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 1E8E2E48;
 Thu, 20 Jun 2013 16:53:52 +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 10BC316A0;
 Thu, 20 Jun 2013 16:53:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KGrpoH096338;
 Thu, 20 Jun 2013 16:53:51 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KGrpNU096337;
 Thu, 20 Jun 2013 16:53:51 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201653.r5KGrpNU096337@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 16:53:51 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41973 - projects/db5/es_ES.ISO8859-1/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, 20 Jun 2013 16:53:52 -0000

Author: gabor
Date: Thu Jun 20 16:53:51 2013
New Revision: 41973
URL: http://svnweb.freebsd.org/changeset/doc/41973

Log:
  - Close two unclosed elements

Modified:
  projects/db5/es_ES.ISO8859-1/share/xml/glossary.ent

Modified: projects/db5/es_ES.ISO8859-1/share/xml/glossary.ent
==============================================================================
--- projects/db5/es_ES.ISO8859-1/share/xml/glossary.ent	Thu Jun 20 16:51:23 2013	(r41972)
+++ projects/db5/es_ES.ISO8859-1/share/xml/glossary.ent	Thu Jun 20 16:53:51 2013	(r41973)
@@ -601,6 +601,7 @@
       <glossdef>
         <para></para>
       </glossdef>
+    </glossentry>
   </glossdiv>
 
   <glossdiv>
@@ -797,6 +798,7 @@
       <glossdef>
         <para></para>
       </glossdef>
+    </glossentry>
   </glossdiv>
 
   <glossdiv>

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 17:09: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 E69D7594;
 Thu, 20 Jun 2013 17:09: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 D58BE1756;
 Thu, 20 Jun 2013 17:09: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 r5KH9rJZ000991;
 Thu, 20 Jun 2013 17:09:53 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KH9rhn000985;
 Thu, 20 Jun 2013 17:09:53 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201709.r5KH9rhn000985@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 17:09:53 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41974 - in projects/db5: es_ES.ISO8859-1/share/xml
 fr_FR.ISO8859-1/share/xml hu_HU.ISO8859-2/share/xml zh_TW.Big5/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, 20 Jun 2013 17:09:54 -0000

Author: gabor
Date: Thu Jun 20 17:09:52 2013
New Revision: 41974
URL: http://svnweb.freebsd.org/changeset/doc/41974

Log:
  - Readd mistakently deleted entity definitions

Modified:
  projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent
  projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent
  projects/db5/hu_HU.ISO8859-2/share/xml/trademarks.ent
  projects/db5/zh_TW.Big5/share/xml/trademarks.ent

Modified: projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent
==============================================================================
--- projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent	Thu Jun 20 16:53:51 2013	(r41973)
+++ projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent	Thu Jun 20 17:09:52 2013	(r41974)
@@ -96,6 +96,10 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup is a registered trademark of
   John D. Polstra.</para>">
 
+<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
+<!ENTITY dell "<trademark xmlns='http://docbook.org/ns/docbook'>Dell</trademark>">
+<!ENTITY poweredge "<trademark xmlns='http://docbook.org/ns/docbook'>PowerEdge</trademark>">
+
 <!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
 <!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
   Perfection</trademark>">

Modified: projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent
==============================================================================
--- projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent	Thu Jun 20 16:53:51 2013	(r41973)
+++ projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent	Thu Jun 20 17:09:52 2013	(r41974)
@@ -90,6 +90,10 @@
 <!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup est une marque dИposИe de
   John D. Polstra.</para>">
 
+<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
+<!ENTITY dell "<trademark xmlns='http://docbook.org/ns/docbook'>Dell</trademark>">
+<!ENTITY poweredge "<trademark xmlns='http://docbook.org/ns/docbook'>PowerEdge</trademark>">
+
 <!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
 <!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
   Perfection</trademark>">

Modified: projects/db5/hu_HU.ISO8859-2/share/xml/trademarks.ent
==============================================================================
--- projects/db5/hu_HU.ISO8859-2/share/xml/trademarks.ent	Thu Jun 20 16:53:51 2013	(r41973)
+++ projects/db5/hu_HU.ISO8859-2/share/xml/trademarks.ent	Thu Jun 20 17:09:52 2013	(r41974)
@@ -105,6 +105,10 @@
 <!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>A CVSup John D. Polstra bejegyzett
   vИdjegye.</para>">
 
+<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
+<!ENTITY dell "<trademark xmlns='http://docbook.org/ns/docbook'>Dell</trademark>">
+<!ENTITY poweredge "<trademark xmlns='http://docbook.org/ns/docbook'>PowerEdge</trademark>">
+
 <!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
 <!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
   Perfection</trademark>">

Modified: projects/db5/zh_TW.Big5/share/xml/trademarks.ent
==============================================================================
--- projects/db5/zh_TW.Big5/share/xml/trademarks.ent	Thu Jun 20 16:53:51 2013	(r41973)
+++ projects/db5/zh_TW.Big5/share/xml/trademarks.ent	Thu Jun 20 17:09:52 2013	(r41974)
@@ -87,6 +87,10 @@ AMD Opteron, Athlon, &Eacute;lan, Optero
 <!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup ╛O
   John D. Polstra ╙╨╣Ы╔U╟с╪п║C</para>">
 
+<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
+<!ENTITY dell "<trademark xmlns='http://docbook.org/ns/docbook'>Dell</trademark>">
+<!ENTITY poweredge "<trademark xmlns='http://docbook.org/ns/docbook'>PowerEdge</trademark>">
+
 <!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
 <!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
   Perfection</trademark>">

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 17:11:17 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 76F9B613;
 Thu, 20 Jun 2013 17:11:17 +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 68FBD1766;
 Thu, 20 Jun 2013 17:11:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KHBHiY002957;
 Thu, 20 Jun 2013 17:11:17 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KHBHri002955;
 Thu, 20 Jun 2013 17:11:17 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201711.r5KHBHri002955@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 17:11:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41975 - projects/db5/pt_BR.ISO8859-1/books/faq
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, 20 Jun 2013 17:11:17 -0000

Author: gabor
Date: Thu Jun 20 17:11:16 2013
New Revision: 41975
URL: http://svnweb.freebsd.org/changeset/doc/41975

Log:
  - Remove literal from attribution

Modified:
  projects/db5/pt_BR.ISO8859-1/books/faq/book.xml

Modified: projects/db5/pt_BR.ISO8859-1/books/faq/book.xml
==============================================================================
--- projects/db5/pt_BR.ISO8859-1/books/faq/book.xml	Thu Jun 20 17:09:52 2013	(r41974)
+++ projects/db5/pt_BR.ISO8859-1/books/faq/book.xml	Thu Jun 20 17:11:16 2013	(r41975)
@@ -15583,8 +15583,8 @@ SECTIONS
     <title>Reconhecimentos</title>
 
     <blockquote>
-      <attribution>Grupo Central (<literal>FreeBSD Core
-	  Team</literal>)</attribution>
+      <attribution>Grupo Central (FreeBSD Core
+	  Team)</attribution>
 
       <para>Se vocЙ encontrar algum problema no
 	<literal>FAQ</literal> ou se desejar submeter uma nova

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 17:12:31 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 EABDC665;
 Thu, 20 Jun 2013 17:12:31 +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 DD4361772;
 Thu, 20 Jun 2013 17:12:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KHCVJg003218;
 Thu, 20 Jun 2013 17:12:31 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KHCVEf003217;
 Thu, 20 Jun 2013 17:12:31 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201712.r5KHCVEf003217@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 17:12:31 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41976 - projects/db5/mn_MN.UTF-8/books/handbook
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, 20 Jun 2013 17:12:32 -0000

Author: gabor
Date: Thu Jun 20 17:12:31 2013
New Revision: 41976
URL: http://svnweb.freebsd.org/changeset/doc/41976

Log:
  - Fix double application element

Modified:
  projects/db5/mn_MN.UTF-8/books/handbook/colophon.xml

Modified: projects/db5/mn_MN.UTF-8/books/handbook/colophon.xml
==============================================================================
--- projects/db5/mn_MN.UTF-8/books/handbook/colophon.xml	Thu Jun 20 17:11:16 2013	(r41975)
+++ projects/db5/mn_MN.UTF-8/books/handbook/colophon.xml	Thu Jun 20 17:12:31 2013	(r41976)
@@ -16,7 +16,7 @@
     с╘с╘я─ р╞п╥р╞р╞п╩я█я┘ я┘я█п╩п╠я█я─я┌ я┘я█п╩п╠я█я─п╤п╤я█я█. п²п╬п╬я─п╪ п▓п╬п╩я┬п╦п╧п╫ DSSSL п╥п╟пЁп╡п╟я─я┤п╩п╟я┘ я┘я┐я┐п╢я│я┐я┐п╢,
     п╫я█п╪я█п╩я┌ с╘с╘я─я┤п╩с╘п╩я┌ п╢п╟п╡я┘я─п╟п╟я┌п╟п╧ я├я┐пЁ <application>Jade</application>-п╢
     п╥п╬я─п╦я┐п╩я│п╟п╫ р╞п╥р╞р╞п╩я█я┘ п╥п╟п╟п╡я─я┐я┐п╢я▀пЁ п╠п╦п╧ п╠п╬п╩пЁп╬я┘п╬п╢ п╟я┬п╦пЁп╩п╟пЁп╢я│п╟п╫. п╜п╫я█ п╠п╟я─п╦п╪я┌я▀п╫
-    я┘я█п╡п╩я█я│я█п╫ я┘я┐п╡п╦п╩п╠п╟я─ п╫я▄ п■п╬п╫п╟п╩п╢ п п╫я┐я┌я▀п╫ <application>&tex;</application>
+    я┘я█п╡п╩я█я│я█п╫ я┘я┐п╡п╦п╩п╠п╟я─ п╫я▄ п■п╬п╫п╟п╩п╢ п п╫я┐я┌я▀п╫ &tex;
     я┌п╟п╧п©я│п╣я┌ я┘я█п╩, п⌡я█я│п╩п╦ п⌡я█п╪п©п╬я─я┌я▀п╫ <application>LaTeX</application>,
     я█я│п╡я█п╩ п║п╣п╠п╟я│я┌я▄я▐п╫ п═п╟я┌я├я▀п╫ <application>JadeTeX</application> п╪п╟п╨я─п╬
     п╠п╟пЁя├пЁр╞п╧пЁя█я█я─ п╠р╞я┌я█я┘пЁр╞п╧ п╠п╟п╧я│п╟п╫ п╠п╦п╩я█я█.</para>

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 17:14: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 B7B4F853;
 Thu, 20 Jun 2013 17:14: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 A9B521787;
 Thu, 20 Jun 2013 17:14: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 r5KHEInR003627;
 Thu, 20 Jun 2013 17:14:18 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KHEIYG003626;
 Thu, 20 Jun 2013 17:14:18 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201714.r5KHEIYG003626@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 17:14:18 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41977 - projects/db5/zh_CN.GB2312/books/arch-handbook
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, 20 Jun 2013 17:14:18 -0000

Author: gabor
Date: Thu Jun 20 17:14:18 2013
New Revision: 41977
URL: http://svnweb.freebsd.org/changeset/doc/41977

Log:
  - These entities have been changed to include <para>; track this change here

Modified:
  projects/db5/zh_CN.GB2312/books/arch-handbook/book.xml

Modified: projects/db5/zh_CN.GB2312/books/arch-handbook/book.xml
==============================================================================
--- projects/db5/zh_CN.GB2312/books/arch-handbook/book.xml	Thu Jun 20 17:12:31 2013	(r41976)
+++ projects/db5/zh_CN.GB2312/books/arch-handbook/book.xml	Thu Jun 20 17:14:18 2013	(r41977)
@@ -57,9 +57,9 @@
 	"getting.freebsd.doc" are defined in zh_CN.GB2312/share/xml/l10n.ent
 	-->
 
-      <para>╩╤с╜дЗтд╤а║╤&os;о╣мЁ╫А╧╧йж╡А║╥║ё&cnproj.contributing.to.freebsd.doc;</para>
+      &cnproj.contributing.to.freebsd.doc;
 
-      <para>&cnproj.getting.freebsd.doc;</para>
+      &cnproj.getting.freebsd.doc;
     </abstract>
   </bookinfo>
 

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 17:29:29 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 82BEBBBA;
 Thu, 20 Jun 2013 17:29:29 +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 750C71822;
 Thu, 20 Jun 2013 17:29:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KHTTlB007465;
 Thu, 20 Jun 2013 17:29:29 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KHTTNg007464;
 Thu, 20 Jun 2013 17:29:29 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201729.r5KHTTNg007464@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 17:29:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41978 - projects/db5/hu_HU.ISO8859-2/books/handbook
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, 20 Jun 2013 17:29:29 -0000

Author: gabor
Date: Thu Jun 20 17:29:28 2013
New Revision: 41978
URL: http://svnweb.freebsd.org/changeset/doc/41978

Log:
  - Fix double application element

Modified:
  projects/db5/hu_HU.ISO8859-2/books/handbook/colophon.xml

Modified: projects/db5/hu_HU.ISO8859-2/books/handbook/colophon.xml
==============================================================================
--- projects/db5/hu_HU.ISO8859-2/books/handbook/colophon.xml	Thu Jun 20 17:14:18 2013	(r41977)
+++ projects/db5/hu_HU.ISO8859-2/books/handbook/colophon.xml	Thu Jun 20 17:29:28 2013	(r41978)
@@ -26,9 +26,9 @@
     stМluslapjait hasznАltuk fel a
     <application>Jade</application> vezИrlИsИre.  A
     dokumentum nyomtatott vАltozata nem jЖhetett volna
-    lИtre Donald Knuth <application>&tex;</application>
+    lИtre Donald Knuth &tex;
     betШszedУ rendszere, illetve Leslie Lamport
-    <application>&latex;</application>, valamint Sebastian Rahtz
+    &latex;, valamint Sebastian Rahtz
     <application>JadeTeX</application> makrСcsomagja
     nИlkЭl.</para>
 </colophon>

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 17:30:15 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 8EE8EC02;
 Thu, 20 Jun 2013 17:30:15 +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 80E931829;
 Thu, 20 Jun 2013 17:30:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KHUFQf007679;
 Thu, 20 Jun 2013 17:30:15 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KHUF8v007678;
 Thu, 20 Jun 2013 17:30:15 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201730.r5KHUF8v007678@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 17:30:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41979 -
 projects/db5/hu_HU.ISO8859-2/books/handbook/introduction
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, 20 Jun 2013 17:30:15 -0000

Author: gabor
Date: Thu Jun 20 17:30:15 2013
New Revision: 41979
URL: http://svnweb.freebsd.org/changeset/doc/41979

Log:
  - Remove type attribute from ulink

Modified:
  projects/db5/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml

Modified: projects/db5/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml
==============================================================================
--- projects/db5/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml	Thu Jun 20 17:29:28 2013	(r41978)
+++ projects/db5/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml	Thu Jun 20 17:30:15 2013	(r41979)
@@ -1381,7 +1381,7 @@
 	  <term>A &os; GYIK</term>
 
 	  <listitem>
-	    <para><ulink type="html"
+	    <para><ulink
 	      url="file://localhost/usr/share/doc/faq/index.html"><filename>/usr/share/doc/faq/index.html</filename></ulink></para>
 	  </listitem>
 	</varlistentry>

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 17:31:10 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 BF702C52;
 Thu, 20 Jun 2013 17:31:10 +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 B02BF1832;
 Thu, 20 Jun 2013 17:31:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KHVAZh009408;
 Thu, 20 Jun 2013 17:31:10 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KHVArs009407;
 Thu, 20 Jun 2013 17:31:10 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201731.r5KHVArs009407@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 17:31:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41980 - projects/db5/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, 20 Jun 2013 17:31:10 -0000

Author: gabor
Date: Thu Jun 20 17:31:10 2013
New Revision: 41980
URL: http://svnweb.freebsd.org/changeset/doc/41980

Log:
  - Readd mistakently deleted entity definitions

Modified:
  projects/db5/share/xml/trademarks.ent

Modified: projects/db5/share/xml/trademarks.ent
==============================================================================
--- projects/db5/share/xml/trademarks.ent	Thu Jun 20 17:30:15 2013	(r41979)
+++ projects/db5/share/xml/trademarks.ent	Thu Jun 20 17:31:10 2013	(r41980)
@@ -96,6 +96,10 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup is a registered trademark of
   John D. Polstra.</para>">
 
+<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
+<!ENTITY dell "<trademark xmlns='http://docbook.org/ns/docbook'>Dell</trademark>">
+<!ENTITY poweredge "<trademark xmlns='http://docbook.org/ns/docbook'>PowerEdge</trademark>">
+
 <!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
 <!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
   Perfection</trademark>">

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 17:37:29 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 E288FD00;
 Thu, 20 Jun 2013 17:37:29 +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 D4A9E186A;
 Thu, 20 Jun 2013 17:37:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KHbT4I010342;
 Thu, 20 Jun 2013 17:37:29 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KHbTFY010341;
 Thu, 20 Jun 2013 17:37:29 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201737.r5KHbTFY010341@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 17:37:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41981 - projects/db5/de_DE.ISO8859-1/books/faq
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, 20 Jun 2013 17:37:30 -0000

Author: gabor
Date: Thu Jun 20 17:37:29 2013
New Revision: 41981
URL: http://svnweb.freebsd.org/changeset/doc/41981

Log:
  - Change the author section to the form how it is used in most cases

Modified:
  projects/db5/de_DE.ISO8859-1/books/faq/book.xml

Modified: projects/db5/de_DE.ISO8859-1/books/faq/book.xml
==============================================================================
--- projects/db5/de_DE.ISO8859-1/books/faq/book.xml	Thu Jun 20 17:31:10 2013	(r41980)
+++ projects/db5/de_DE.ISO8859-1/books/faq/book.xml	Thu Jun 20 17:37:29 2013	(r41981)
@@ -46,12 +46,34 @@ $FreeBSDde$
     <authorgroup>
       <corpauthor>The &os; German Documentation
         Project</corpauthor>
+    </authorgroup>
+
+    <authorgroup>
+      <author>
+	<firstname>Robert S. F.</firstname>
+	<surname>Drehmel</surname>
+	<contrib>эbersetzt von </contrib>
+      </author>
+
+      <author>
+	<firstname>Dirk</firstname>
+	<surname>Gouders</surname>
+      </author>
 
-      <collab>
-        <collabname>Deutsche эbersetzung von Robert S. F.
-          Drehmel, Dirk Gouders, Udo Erdelhoff, Johann Kois
-          und Benedict Reuschling</collabname>
-      </collab>
+      <author>
+	<firstname>Udo</firstname>
+	<surname>Erdhoff</surname>
+      </author>
+
+      <author>
+	<firstname>Johann</firstname>
+	<surname>Kois</surname>
+      </author>
+
+      <author>
+	<firstname>Benedict</firstname>
+	<surname>Reuschling</surname>
+      </author>
     </authorgroup>
 
     <copyright>

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 17:38:05 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 C67A0D4A;
 Thu, 20 Jun 2013 17:38:05 +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 B94561871;
 Thu, 20 Jun 2013 17:38:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KHc5Wm010455;
 Thu, 20 Jun 2013 17:38:05 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KHc5d8010454;
 Thu, 20 Jun 2013 17:38:05 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201738.r5KHc5d8010454@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 17:38:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41982 - projects/db5/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, 20 Jun 2013 17:38:05 -0000

Author: gabor
Date: Thu Jun 20 17:38:05 2013
New Revision: 41982
URL: http://svnweb.freebsd.org/changeset/doc/41982

Log:
  - Allow trademark in contrib

Modified:
  projects/db5/share/xml/docbook50.dtd

Modified: projects/db5/share/xml/docbook50.dtd
==============================================================================
--- projects/db5/share/xml/docbook50.dtd	Thu Jun 20 17:37:29 2013	(r41981)
+++ projects/db5/share/xml/docbook50.dtd	Thu Jun 20 17:38:05 2013	(r41982)
@@ -1162,7 +1162,8 @@
 
 >
 
-<!ELEMENT contrib (#PCDATA|inlinemediaobject|remark|superscript|subscript|xref|link|olink|anchor|biblioref|alt|annotation|indexterm|phrase|replaceable)*>
+<!ELEMENT contrib (#PCDATA|inlinemediaobject|remark|superscript|subscript|xref|link|olink|anchor|biblioref|alt|annotation|indexterm|phrase|replaceable|
+	trademark)*>
 
 <!ATTLIST contrib
 	xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 18:10:39 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 A7010746;
 Thu, 20 Jun 2013 18:10:39 +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 88EB91A25;
 Thu, 20 Jun 2013 18:10:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KIAdqu021570;
 Thu, 20 Jun 2013 18:10:39 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KIAduP021569;
 Thu, 20 Jun 2013 18:10:39 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201810.r5KIAduP021569@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 18:10:39 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41983 - projects/db5/de_DE.ISO8859-1/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, 20 Jun 2013 18:10:39 -0000

Author: gabor
Date: Thu Jun 20 18:10:39 2013
New Revision: 41983
URL: http://svnweb.freebsd.org/changeset/doc/41983

Log:
  - Convert more markup to DB 5.0 that was not caught by the sed script because
    of the line breaks

Modified:
  projects/db5/de_DE.ISO8859-1/share/xml/mailing-lists.ent

Modified: projects/db5/de_DE.ISO8859-1/share/xml/mailing-lists.ent
==============================================================================
--- projects/db5/de_DE.ISO8859-1/share/xml/mailing-lists.ent	Thu Jun 20 17:38:05 2013	(r41982)
+++ projects/db5/de_DE.ISO8859-1/share/xml/mailing-lists.ent	Thu Jun 20 18:10:39 2013	(r41983)
@@ -49,8 +49,8 @@
 <!ENTITY a.announce.url "&a.mailman.listinfo;/freebsd-announce">
 <!ENTITY a.announce "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.announce.url;'>FreeBSD
   announcements</link>">
-<!ENTITY a.announce.name "<ulink
-  url='&a.announce.url;'>freebsd-announce</link>">
+<!ENTITY a.announce.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.announce.url;'>freebsd-announce</link>">
 
 <!ENTITY a.apache.url "&a.mailman.listinfo;/freebsd-apache">
 <!ENTITY a.apache "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.apache.url;'>FreeBSD Apache</link>">
@@ -81,8 +81,8 @@
 <!ENTITY a.bugbusters.url "&a.mailman.listinfo;/freebsd-bugbusters">
 <!ENTITY a.bugbusters "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bugbusters.url;'>FreeBSD
   bugbusters</link>">
-<!ENTITY a.bugbusters.name "<ulink
-  url='&a.bugbusters.url;'>freebsd-bugbusters</link>">
+<!ENTITY a.bugbusters.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bugbusters.url;'>freebsd-bugbusters</link>">
 
 <!ENTITY a.bugs.url "&a.mailman.listinfo;/freebsd-bugs">
 <!ENTITY a.bugs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bugs.url;'>FreeBSD problem reports</link>">
@@ -113,14 +113,14 @@
 <!ENTITY a.ctm-announce.url "&a.mailman.listinfo;/ctm-announce">
 <!ENTITY a.ctm-announce "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-announce.url;'>CTM
   announcements</link>">
-<!ENTITY a.ctm-announce.name "<ulink
-  url='&a.ctm-announce.url;'>ctm-announce</link>">
+<!ENTITY a.ctm-announce.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-announce.url;'>ctm-announce</link>">
 
 <!ENTITY a.ctm-cvs-cur.url "&a.mailman.listinfo;/ctm-cvs-cur">
 <!ENTITY a.ctm-cvs-cur "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-cvs-cur.url;'>CTM
   distribution of CVS files</link>">
-<!ENTITY a.ctm-cvs-cur.name "<ulink
-  url='&a.ctm-cvs-cur.url;'>ctm-cvs-cur</link>">
+<!ENTITY a.ctm-cvs-cur.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-cvs-cur.url;'>ctm-cvs-cur</link>">
 
 <!ENTITY a.ctm-src-4.url "&a.mailman.listinfo;/ctm-src-4">
 <!ENTITY a.ctm-src-4 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-4.url;'>CTM 4-STABLE
@@ -150,8 +150,8 @@
 <!ENTITY a.ctm-src-cur.url "&a.mailman.listinfo;/ctm-src-cur">
 <!ENTITY a.ctm-src-cur "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-cur.url;'>CTM -CURRENT
   src branch distribution</link>">
-<!ENTITY a.ctm-src-cur.name "<ulink
-  url='&a.ctm-src-cur.url;'>ctm-src-cur</link>">
+<!ENTITY a.ctm-src-cur.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-cur.url;'>ctm-src-cur</link>">
 
 <!ENTITY a.ctm-users.url "&a.mailman.listinfo;/ctm-users">
 <!ENTITY a.ctm-users "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-users.url;'>CTM user
@@ -176,8 +176,8 @@
 <!ENTITY a.cvs-projects.url "&a.mailman.listinfo;/cvs-projects">
 <!ENTITY a.cvs-projects "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-projects.url;'>FreeBSD CVS
   projects commit</link>">
-<!ENTITY a.cvs-projects.name "<ulink
-  url='&a.cvs-projects.url;'>cvs-projects</link>">
+<!ENTITY a.cvs-projects.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-projects.url;'>cvs-projects</link>">
 
 <!ENTITY a.cvs-src.url "&a.mailman.listinfo;/cvs-src">
 <!ENTITY a.cvs-src "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-src.url;'>FreeBSD CVS src
@@ -192,14 +192,14 @@
 <!ENTITY a.database.url "&a.mailman.listinfo;/freebsd-database">
 <!ENTITY a.database "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.database.url;'>FreeBSD based
   Databases</link>">
-<!ENTITY a.database.name "<ulink
-  url='&a.database.url;'>freebsd-database</link>">
+<!ENTITY a.database.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.database.url;'>freebsd-database</link>">
 
 <!ENTITY a.desktop.url "&a.mailman.listinfo;/freebsd-desktop">
 <!ENTITY a.desktop "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.desktop.url;'>FreeBSD als Desktop
   verwenden und verbessern</link>">
-<!ENTITY a.desktop.name "<ulink
-  url='&a.desktop.url;'>freebsd-desktop</link>">
+<!ENTITY a.desktop.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.desktop.url;'>freebsd-desktop</link>">
 
 <!ENTITY a.developers "<quote>FreeBSD developers</quote>">
 <!ENTITY a.developers.name "freebsd-developers">
@@ -230,8 +230,8 @@
 
 <!ENTITY a.emulation.url "&a.mailman.listinfo;/freebsd-emulation">
 <!ENTITY a.emulation "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.emulation.url;'>FreeBSD-emulation</link>">
-<!ENTITY a.emulation.name "<ulink
-  url='&a.emulation.url;'>freebsd-emulation</link>">
+<!ENTITY a.emulation.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.emulation.url;'>freebsd-emulation</link>">
 
 <!ENTITY a.eol.url "&a.mailman.listinfo;/freebsd-eol">
 <!ENTITY a.eol "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.eol.url;'>FreeBSD-eol mailing list</link>">
@@ -240,8 +240,8 @@
 <!ENTITY a.firewire.url "&a.mailman.listinfo;/freebsd-firewire">
 <!ENTITY a.firewire "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.firewire.url;'>FreeBSD FireWire
   (IEEE 1394) discussion</link>">
-<!ENTITY a.firewire.name "<ulink
-  url='&a.firewire.url;'>freebsd-firewire</link>">
+<!ENTITY a.firewire.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.firewire.url;'>freebsd-firewire</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 filesystem project</link>">
@@ -269,8 +269,8 @@
 <!ENTITY a.hardware.url "&a.mailman.listinfo;/freebsd-hardware">
 <!ENTITY a.hardware "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hardware.url;'>FreeBSD hardware
   and equipment</link>">
-<!ENTITY a.hardware.name "<ulink
-  url='&a.hardware.url;'>freebsd-hardware</link>">
+<!ENTITY a.hardware.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hardware.url;'>freebsd-hardware</link>">
 
 <!ENTITY a.hubs.url "&a.mailman.listinfo;/freebsd-hubs">
 <!ENTITY a.hubs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hubs.url;'>FreeBSD mirror sites</link>">
@@ -335,8 +335,8 @@
 <!ENTITY a.mirror-announce.url "&a.mailman.listinfo;/mirror-announce">
 <!ENTITY a.mirror-announce "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mirror-announce.url;'>FreeBSD
   mirror site administrators</link>">
-<!ENTITY a.mirror-announce.name "<ulink
-  url='&a.mirror-announce.url;'>mirror-announce</link>">
+<!ENTITY a.mirror-announce.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mirror-announce.url;'>mirror-announce</link>">
 
 <!ENTITY a.mobile.url "&a.mailman.listinfo;/freebsd-mobile">
 <!ENTITY a.mobile "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mobile.url;'>FreeBSD laptop computer</link>">
@@ -355,8 +355,8 @@
 <!ENTITY a.multimedia.url "&a.mailman.listinfo;/freebsd-multimedia">
 <!ENTITY a.multimedia "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.multimedia.url;'>FreeBSD
   multimedia</link>">
-<!ENTITY a.multimedia.name "<ulink
-  url='&a.multimedia.url;'>freebsd-multimedia</link>">
+<!ENTITY a.multimedia.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.multimedia.url;'>freebsd-multimedia</link>">
 
 <!ENTITY a.net.url "&a.mailman.listinfo;/freebsd-net">
 <!ENTITY a.net "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.net.url;'>FreeBSD networking</link>">
@@ -377,8 +377,8 @@
 <!ENTITY a.performance.url "&a.mailman.listinfo;/freebsd-performance">
 <!ENTITY a.performance "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.performance.url;'>FreeBSD
   performance</link>">
-<!ENTITY a.performance.name "<ulink
-  url='&a.performance.url;'>freebsd-performance</link>">
+<!ENTITY a.performance.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.performance.url;'>freebsd-performance</link>">
 
 <!ENTITY a.perl.url "&a.mailman.listinfo;/freebsd-perl">
 <!ENTITY a.perl "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.perl.url;'>FreeBSD Perl</link>">
@@ -391,8 +391,8 @@
 <!ENTITY a.platforms.url "&a.mailman.listinfo;/freebsd-platforms">
 <!ENTITY a.platforms "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.platforms.url;'>FreeBSD non-Intel
   platforms porting</link>">
-<!ENTITY a.platforms.name "<ulink
-  url='&a.platforms.url;'>freebsd-platforms</link>">
+<!ENTITY a.platforms.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.platforms.url;'>freebsd-platforms</link>">
 
 <!ENTITY a.ports.url "&a.mailman.listinfo;/freebsd-ports">
 <!ENTITY a.ports "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports.url;'>FreeBSD ports</link>">
@@ -408,8 +408,8 @@
 <!ENTITY a.ports-bugs.url "&a.mailman.listinfo;/freebsd-ports-bugs">
 <!ENTITY a.ports-bugs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports-bugs.url;'>FreeBSD
   ports bugs</link>">
-<!ENTITY a.ports-bugs.name "<ulink
-  url='&a.ports-bugs.url;'>freebsd-ports-bugs</link>">
+<!ENTITY a.ports-bugs.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports-bugs.url;'>freebsd-ports-bugs</link>">
 
 <!ENTITY a.ports-committers "<quote>FreeBSD ports/ Committer</quote>">
 <!ENTITY a.ports-committers.name "ports-committers">
@@ -430,8 +430,8 @@
 <!ENTITY a.questions.url "&a.mailman.listinfo;/freebsd-questions">
 <!ENTITY a.questions "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.questions.url;'>FreeBSD general
   questions</link>">
-<!ENTITY a.questions.name "<ulink
-  url='&a.questions.url;'>freebsd-questions</link>">
+<!ENTITY a.questions.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.questions.url;'>freebsd-questions</link>">
 
 <!ENTITY a.rc.url "&a.mailman.listinfo;/freebsd-rc">
 <!ENTITY a.rc "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.rc.url;'>FreeBSD boot script system mailing list</link>">
@@ -440,8 +440,8 @@
 <!ENTITY a.realtime.url "&a.mailman.listinfo;/freebsd-realtime">
 <!ENTITY a.realtime "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.realtime.url;'>FreeBSD realtime
   extensions</link>">
-<!ENTITY a.realtime.name "<ulink
-  url='&a.realtime.url;'>freebsd-realtime</link>">
+<!ENTITY a.realtime.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.realtime.url;'>freebsd-realtime</link>">
 
 <!ENTITY a.ruby.url "&a.mailman.listinfo;/freebsd-ruby">
 <!ENTITY a.ruby "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ruby.url;'>FreeBSD Ruby mailing list</link>">
@@ -453,15 +453,15 @@
 
 <!ENTITY a.security.url "&a.mailman.listinfo;/freebsd-security">
 <!ENTITY a.security "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.security.url;'>FreeBSD security</link>">
-<!ENTITY a.security.name "<ulink
-  url='&a.security.url;'>freebsd-security</link>">
+<!ENTITY a.security.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.security.url;'>freebsd-security</link>">
 
 <!ENTITY a.security-notifications.url
   "&a.mailman.listinfo;/freebsd-security-notifications">
-<!ENTITY a.security-notifications "<ulink
-  url='&a.security-notifications.url;'>FreeBSD security notifications</link>">
-<!ENTITY a.security-notifications.name "<ulink
-  url='&a.security-notifications.url;'>freebsd-security-notifications</link>">
+<!ENTITY a.security-notifications "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.security-notifications.url;'>FreeBSD security notifications</link>">
+<!ENTITY a.security-notifications.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.security-notifications.url;'>freebsd-security-notifications</link>">
 
 <!ENTITY a.small.url "&a.mailman.listinfo;/freebsd-small">
 <!ENTITY a.small "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.small.url;'>FreeBSD-small</link>">
@@ -484,8 +484,8 @@
 <!ENTITY a.standards.url "&a.mailman.listinfo;/freebsd-standards">
 <!ENTITY a.standards "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.standards.url;'>FreeBSD C99 and
   POSIX compliance</link>">
-<!ENTITY a.standards.name "<ulink
-  url='&a.standards.url;'>freebsd-standards</link>">
+<!ENTITY a.standards.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.standards.url;'>freebsd-standards</link>">
 
 <!ENTITY a.sun4v.url "&a.mailman.listinfo;/freebsd-sun4v">
 <!ENTITY a.sun4v "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sun4v.url;'>FreeBSD sun4v porting mailing list</link>">
@@ -495,51 +495,51 @@
 <!ENTITY a.svn-src-all "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-all.url;'>SVN commit messages
   for the entire src tree (except for <quote>user</quote> and
   <quote>projects</quote>)</link>">
-<!ENTITY a.svn-src-all.name "<ulink
-  url='&a.svn-src-all.url;'>svn-src-all</link>">
+<!ENTITY a.svn-src-all.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-all.url;'>svn-src-all</link>">
 
 <!ENTITY a.svn-src-head.url "&a.mailman.listinfo;/svn-src-head">
 <!ENTITY a.svn-src-head "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-head.url;'>SVN commit messages
   for the src tree for head/-current</link>">
-<!ENTITY a.svn-src-head.name "<ulink
-  url='&a.svn-src-head.url;'>svn-src-head</link>">
+<!ENTITY a.svn-src-head.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-head.url;'>svn-src-head</link>">
 
 <!ENTITY a.svn-src-projects.url "&a.mailman.listinfo;/svn-src-projects">
 <!ENTITY a.svn-src-projects "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-projects.url;'>SVN commit
   messages for the src <quote>projects</quote> tree</link>">
-<!ENTITY a.svn-src-projects.name "<ulink
-  url='&a.svn-src-projects.url;'>svn-src-projects</link>">
+<!ENTITY a.svn-src-projects.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-projects.url;'>svn-src-projects</link>">
 
 <!ENTITY a.svn-src-release.url "&a.mailman.listinfo;/svn-src-release">
 <!ENTITY a.svn-src-release "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-release.url;'>SVN commit
   messages for releases in the src tree</link>">
-<!ENTITY a.svn-src-release.name "<ulink
-  url='&a.svn-src-release.url;'>svn-src-release</link>">
+<!ENTITY a.svn-src-release.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-release.url;'>svn-src-release</link>">
 
 <!ENTITY a.svn-src-releng.url "&a.mailman.listinfo;/svn-src-releng">
 <!ENTITY a.svn-src-releng "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-releng.url;'>SVN commit
   messages for the release engineering&nbsp;/ security commits to the src tree</link>">
-<!ENTITY a.svn-src-releng.name "<ulink
-  url='&a.svn-src-releng.url;'>svn-src-releng</link>">
+<!ENTITY a.svn-src-releng.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-releng.url;'>svn-src-releng</link>">
 
 <!ENTITY a.svn-src-stable.url "&a.mailman.listinfo;/svn-src-stable">
-<!ENTITY a.svn-src-stable "<ulink
-  url='&a.svn-src-stable.url;'>SVN commit messages for all the -stable branches
+<!ENTITY a.svn-src-stable "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable.url;'>SVN commit messages for all the -stable branches
   of the src tree</link>">
-<!ENTITY a.svn-src-stable.name "<ulink
-  url='&a.svn-src-stable.url;'>svn-src-stable</link>">
+<!ENTITY a.svn-src-stable.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable.url;'>svn-src-stable</link>">
 
 <!ENTITY a.svn-src-stable-6.url "&a.mailman.listinfo;/svn-src-stable-6">
 <!ENTITY a.svn-src-stable-6 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-6.url;'>SVN commit
   messages for only the 6-stable src tree</link>">
-<!ENTITY a.svn-src-stable-6.name "<ulink
-  url='&a.svn-src-stable-6.url;'>svn-src-stable-6</link>">
+<!ENTITY a.svn-src-stable-6.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-6.url;'>svn-src-stable-6</link>">
 
 <!ENTITY a.svn-src-stable-7.url "&a.mailman.listinfo;/svn-src-stable-7">
 <!ENTITY a.svn-src-stable-7 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-7.url;'>SVN commit
   messages for only the 7-stable src tree</link>">
-<!ENTITY a.svn-src-stable-7.name "<ulink
-  url='&a.svn-src-stable-7.url;'>svn-src-stable-7</link>">
+<!ENTITY a.svn-src-stable-7.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-7.url;'>svn-src-stable-7</link>">
 
 <!ENTITY a.svn-src-stable-8.url "&a.mailman.listinfo;/svn-src-stable-8">
 <!ENTITY a.svn-src-stable-8 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-8.url;'>SVN commit
@@ -550,38 +550,38 @@
 <!ENTITY a.svn-src-stable-9.url "&a.mailman.listinfo;/svn-src-stable-9">
 <!ENTITY a.svn-src-stable-9 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-9.url;'>SVN commit
   messages for only the 9-stable src tree</link>">
-<!ENTITY a.svn-src-stable-9.name "<ulink
-  url='&a.svn-src-stable-9.url;'>svn-src-stable-9</link>">
+<!ENTITY a.svn-src-stable-9.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-9.url;'>svn-src-stable-9</link>">
 
 <!ENTITY a.svn-src-stable-other.url "&a.mailman.listinfo;/svn-src-stable-other">
 <!ENTITY a.svn-src-stable-other "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-other.url;'>SVN
   commit messages for the old stable src trees</link>">
-<!ENTITY a.svn-src-stable-other.name "<ulink
-  url='&a.svn-src-stable-other.url;'>svn-src-stable-other</link>">
+<!ENTITY a.svn-src-stable-other.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-other.url;'>svn-src-stable-other</link>">
 
 <!ENTITY a.svn-src-svnadmin.url "&a.mailman.listinfo;/svn-src-svnadmin">
 <!ENTITY a.svn-src-svnadmin "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-svnadmin.url;'>SVN commit
   messages for the admin&nbsp;/ configuration tree</link>">
-<!ENTITY a.svn-src-svnadmin.name "<ulink
-  url='&a.svn-src-svnadmin.url;'>svn-src-svnadmin</link>">
+<!ENTITY a.svn-src-svnadmin.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-svnadmin.url;'>svn-src-svnadmin</link>">
 
 <!ENTITY a.svn-src-user.url "&a.mailman.listinfo;/svn-src-user">
 <!ENTITY a.svn-src-user "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-user.url;'>SVN commit messages
   for the experimental <quote>user</quote> src tree</link>">
-<!ENTITY a.svn-src-user.name "<ulink
-  url='&a.svn-src-user.url;'>svn-src-user</link>">
+<!ENTITY a.svn-src-user.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-user.url;'>svn-src-user</link>">
 
 <!ENTITY a.svn-src-vendor.url "&a.mailman.listinfo;/svn-src-vendor">
 <!ENTITY a.svn-src-vendor "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-vendor.url;'>SVN commit
   messages for the vendor work area tree</link>">
-<!ENTITY a.svn-src-vendor.name "<ulink
-  url='&a.svn-src-vendor.url;'>svn-src-vendor</link>">
+<!ENTITY a.svn-src-vendor.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-vendor.url;'>svn-src-vendor</link>">
 
 <!ENTITY a.sysinstall.url "&a.mailman.listinfo;/freebsd-sysinstall">
 <!ENTITY a.sysinstall "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sysinstall.url;'>Sysinstall
   development mailing list</link>">
-<!ENTITY a.sysinstall.name "<ulink
-  url='&a.sysinstall.url;'>freebsd-sysinstall</link>">
+<!ENTITY a.sysinstall.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sysinstall.url;'>freebsd-sysinstall</link>">
 
 <!ENTITY a.test.url "&a.mailman.listinfo;/freebsd-test">
 <!ENTITY a.test "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.test.url;'>FreeBSD test</link>">
@@ -598,8 +598,8 @@
 <!ENTITY a.tokenring.url "&a.mailman.listinfo;/freebsd-tokenring">
 <!ENTITY a.tokenring "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.tokenring.url;'>FreeBSD
   tokenring</link>">
-<!ENTITY a.tokenring.name "<ulink
-  url='&a.tokenring.url;'>freebsd-tokenring</link>">
+<!ENTITY a.tokenring.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.tokenring.url;'>freebsd-tokenring</link>">
 
 <!ENTITY a.toolchain.url "&a.mailman.listinfo;/freebsd-toolchain">
 <!ENTITY a.toolchain "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.toolchain.url;'>FreeBSD integrated toolchain</link>">
@@ -612,20 +612,20 @@
 <!ENTITY a.usergroups.url "&a.mailman.listinfo;/freebsd-user-groups">
 <!ENTITY a.usergroups "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.usergroups.url;'>FreeBSD user group
   coordination</link>">
-<!ENTITY a.usergroups.name "<ulink
-  url='&a.usergroups.url;'>freebsd-user-groups</link>">
+<!ENTITY a.usergroups.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.usergroups.url;'>freebsd-user-groups</link>">
 
 <!ENTITY a.vendors.url "&a.mailman.listinfo;/freebsd-vendors">
 <!ENTITY a.vendors "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.vendors.url;'>FreeBSD vendors
   pre-release coordination</link>">
-<!ENTITY a.vendors.name "<ulink
-  url='&a.vendors.url;'>freebsd-vendors</link>">
+<!ENTITY a.vendors.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.vendors.url;'>freebsd-vendors</link>">
 
 <!ENTITY a.virtualization.url "&a.mailman.listinfo;/freebsd-virtualization">
 <!ENTITY a.virtualization "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.virtualization.url;'>Discussion of
   various virtualization techniques supported by FreeBSD</link>">
-<!ENTITY a.virtualization.name "<ulink
-  url='&a.virtualization.url;'>freebsd-virtualization</link>">
+<!ENTITY a.virtualization.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.virtualization.url;'>freebsd-virtualization</link>">
 
 <!ENTITY a.vuxml.url "&a.mailman.listinfo;/freebsd-vuxml">
 <!ENTITY a.vuxml "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.vuxml.url;'>Diskussion Эber
@@ -635,8 +635,8 @@
 <!ENTITY a.wip-status.url "&a.mailman.listinfo;/freebsd-wip-status">
 <!ENTITY a.wip-status "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.wip-status.url;'>FreeBSD
   Work-In-Progress Status</link>">
-<!ENTITY a.wip-status.name "<ulink
-  url='&a.wip-status.url;'>freebsd-wip-status</link>">
+<!ENTITY a.wip-status.name "<link
+  xmlns='http://docbook.org/ns/docbook' xlink:href='&a.wip-status.url;'>freebsd-wip-status</link>">
 
 <!ENTITY a.wireless.url "&a.mailman.listinfo;/freebsd-wireless">
 <!ENTITY a.wireless "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.wireless.url;'>Discussions of 802.11

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 18:21:27 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 465CBB26;
 Thu, 20 Jun 2013 18:21:27 +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 386E61AD1;
 Thu, 20 Jun 2013 18:21:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KILRkp024838;
 Thu, 20 Jun 2013 18:21:27 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KILQqL024837;
 Thu, 20 Jun 2013 18:21:26 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201821.r5KILQqL024837@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 18:21:26 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41984 -
 projects/db5/it_IT.ISO8859-15/books/handbook/network-servers
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, 20 Jun 2013 18:21:27 -0000

Author: gabor
Date: Thu Jun 20 18:21:26 2013
New Revision: 41984
URL: http://svnweb.freebsd.org/changeset/doc/41984

Log:
  - Do not enclose manpage entities into application

Modified:
  projects/db5/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml

Modified: projects/db5/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
==============================================================================
--- projects/db5/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml	Thu Jun 20 18:10:39 2013	(r41983)
+++ projects/db5/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml	Thu Jun 20 18:21:26 2013	(r41984)
@@ -3703,13 +3703,13 @@ dhcpd_ifaces="dc0"</programlisting>
 
           <tbody>
             <row>
-              <entry><application>&man.named.8;</application></entry>
+              <entry>&man.named.8;</entry>
 
               <entry>Il demone BIND.</entry>
             </row>
 
             <row>
-              <entry><application>&man.rndc.8;</application></entry>
+              <entry>&man.rndc.8;</entry>
 
               <entry>Programma di controllo del name server.</entry>
             </row>

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 18:31: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
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 7E2AC13A;
 Thu, 20 Jun 2013 18:31: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 702941BAA;
 Thu, 20 Jun 2013 18:31: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 r5KIVCZU028007;
 Thu, 20 Jun 2013 18:31:12 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KIVCIo028006;
 Thu, 20 Jun 2013 18:31:12 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201831.r5KIVCIo028006@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 18:31:12 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41985 - projects/db5/ru_RU.KOI8-R/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, 20 Jun 2013 18:31:12 -0000

Author: gabor
Date: Thu Jun 20 18:31:11 2013
New Revision: 41985
URL: http://svnweb.freebsd.org/changeset/doc/41985

Log:
  - Readd mistakently deleted entity definitions

Modified:
  projects/db5/ru_RU.KOI8-R/share/xml/trademarks.ent

Modified: projects/db5/ru_RU.KOI8-R/share/xml/trademarks.ent
==============================================================================
--- projects/db5/ru_RU.KOI8-R/share/xml/trademarks.ent	Thu Jun 20 18:21:26 2013	(r41984)
+++ projects/db5/ru_RU.KOI8-R/share/xml/trademarks.ent	Thu Jun 20 18:31:11 2013	(r41985)
@@ -92,6 +92,10 @@
 <!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup это зарегистрированная торговая
   марка John D. Polstra.</para>">
 
+<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
+<!ENTITY dell "<trademark xmlns='http://docbook.org/ns/docbook'>Dell</trademark>">
+<!ENTITY poweredge "<trademark xmlns='http://docbook.org/ns/docbook'>PowerEdge</trademark>">
+
 <!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
 <!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
   Perfection</trademark>">

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 18:36:10 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 9B7AE2B9;
 Thu, 20 Jun 2013 18:36:10 +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 8DB1B1C07;
 Thu, 20 Jun 2013 18:36:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KIaAD9028767;
 Thu, 20 Jun 2013 18:36:10 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KIaA3v028766;
 Thu, 20 Jun 2013 18:36:10 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201836.r5KIaA3v028766@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 18:36:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41986 -
 projects/db5/ru_RU.KOI8-R/books/handbook/eresources
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, 20 Jun 2013 18:36:10 -0000

Author: gabor
Date: Thu Jun 20 18:36:10 2013
New Revision: 41986
URL: http://svnweb.freebsd.org/changeset/doc/41986

Log:
  - Move title to appendixinfo

Modified:
  projects/db5/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml

Modified: projects/db5/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml
==============================================================================
--- projects/db5/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml	Thu Jun 20 18:31:11 2013	(r41985)
+++ projects/db5/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml	Thu Jun 20 18:36:10 2013	(r41986)
@@ -10,6 +10,8 @@
 
 <appendix id="eresources">
   <appendixinfo>
+    <title>Ресурсы в интернет</title>
+
     <authorgroup>
       <author>
 	<firstname>Денис</firstname>
@@ -18,7 +20,6 @@
       </author>
     </authorgroup>
   </appendixinfo>
-  <title>Ресурсы в интернет</title>
 
   <para>Высокая скорость прогресса FreeBSD делает непрактичным использование
     печатных изданий для информирования о последних разработках.  Электронные

From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 18:52:01 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 421196C0;
 Thu, 20 Jun 2013 18:52:01 +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 34D9B1D0E;
 Thu, 20 Jun 2013 18:52:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KIq1hn034234;
 Thu, 20 Jun 2013 18:52:01 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KIq172034231;
 Thu, 20 Jun 2013 18:52:01 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201852.r5KIq172034231@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 18:52:01 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41987 - projects/db5/ru_RU.KOI8-R/books/handbook/mirrors
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, 20 Jun 2013 18:52:01 -0000

Author: gabor
Date: Thu Jun 20 18:52:00 2013
New Revision: 41987
URL: http://svnweb.freebsd.org/changeset/doc/41987

Log:
  - Move title to appendixinfo

Modified:
  projects/db5/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml

Modified: projects/db5/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
==============================================================================
--- projects/db5/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml	Thu Jun 20 18:36:10 2013	(r41986)
+++ projects/db5/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml	Thu Jun 20 18:52:00 2013	(r41987)
@@ -10,6 +10,8 @@
 
 <appendix id="mirrors">
   <appendixinfo>
+    <title>Получение FreeBSD</title>
+
     <authorgroup>
       <author>
 	<firstname>Денис</firstname>
@@ -18,7 +20,6 @@
       </author>
     </authorgroup>
   </appendixinfo>
-  <title>Получение FreeBSD</title>
 
   <sect1 id="mirrors-cdrom">
     <title>Издатели CDROM и DVD</title>

From owner-svn-doc-projects@FreeBSD.ORG  Fri Jun 21 07:27: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 [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BEE9DC6A;
 Fri, 21 Jun 2013 07:27:28 +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 A03851ED8;
 Fri, 21 Jun 2013 07:27: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 r5L7RSDH076863;
 Fri, 21 Jun 2013 07:27:28 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5L7RSMF076862;
 Fri, 21 Jun 2013 07:27:28 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306210727.r5L7RSMF076862@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 21 Jun 2013 07:27:28 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41992 - projects/db5/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: Fri, 21 Jun 2013 07:27:28 -0000

Author: gabor
Date: Fri Jun 21 07:27:27 2013
New Revision: 41992
URL: http://svnweb.freebsd.org/changeset/doc/41992

Log:
  - Add namespace to the elements
  - Remove backported DB 5.0 constraints since they can now directly be used

Modified:
  projects/db5/share/xml/freebsd.sch

Modified: projects/db5/share/xml/freebsd.sch
==============================================================================
--- projects/db5/share/xml/freebsd.sch	Thu Jun 20 21:59:54 2013	(r41991)
+++ projects/db5/share/xml/freebsd.sch	Fri Jun 21 07:27:27 2013	(r41992)
@@ -2,31 +2,33 @@
 
 <!-- $FreeBSD$ -->
 
-<schema xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<schema xmlns="http://purl.oclc.org/dsdl/schematron"
+  xmlns:db="http://docbook.org/ns/docbook"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <pattern name="Check file reference validity">
-    <rule context="//imagedata|//graphic">
+    <rule context="//db:imagedata|//db:graphic">
       <report test="contains(@fileref, '.')">Image reference (<xsl:value-of select="@fileref"/>) cannot have an extension; the proper format is inferred by the output type to generate.</report>
       <report test="@format">Image reference (<xsl:value-of select="@fileref"/>) format must not be specified; it is inferred by the output type to generate.</report>
     </rule>
   </pattern>
 
   <pattern name="Check filenames">
-    <rule context="//filename">
+    <rule context="//db:filename">
       <report test="@role = 'directory'">Filename (<xsl:value-of select="."/>) has role="directory"; use class="directory"</report>
     </rule>
   </pattern>
 
   <pattern name="Check cross-reference validity">
-    <rule context="//link">
+    <rule context="//db:link">
       <assert test="* or normalize-space()">Link (<xsl:value-of select="@linkend"/>) element must have a content; or use xref to auto-generate the linking text.</assert>
     </rule>
   </pattern>
 
   <pattern name="Check callout validity">
     <rule context="/">
-      <report test="//screenco">Callouts with screenco are not supported; use screen and co instead.</report>
-      <report test="//programlistingco">Callouts with programlistingco are not supported; use programlisting and co instead.</report>
-      <report test="//graphicco">Callouts on graphics are not supported.</report>
+      <report test="//db:screenco">Callouts with screenco are not supported; use screen and co instead.</report>
+      <report test="//db:programlistingco">Callouts with programlistingco are not supported; use programlisting and co instead.</report>
+      <report test="//db:graphicco">Callouts on graphics are not supported.</report>
     </rule>
   </pattern>
 
@@ -38,173 +40,4 @@
       <assert test="(. = 'freebsd8') or (. = 'freebsd9') or (. = 'freebsd10')">Invalid os value (<xsl:value-of select="."/>); must be either 'freebsd8', 'freebsd9' or 'freebsd10'.</assert>
     </rule>
   </pattern>
-
-<!--
-	Backported constraints from DocBook 5.0
--->
-
-   <pattern name="Glossary 'firstterm' type constraint">
-      <rule context="firstterm[@linkend]">
-         <assert test="name(//*[@id=current()/@linkend]) = 'glossentry'">@linkend on firstterm must point to a glossentry.</assert>
-      </rule>
-   </pattern>
-
-   <pattern name="Footnote reference type constraint">
-      <rule context="footnoteref">
-         <assert test="name(//*[@id=current()/@linkend]) = 'footnote'">@linkend on footnoteref must point to a footnote.</assert>
-      </rule>
-   </pattern>
-
-   <pattern name="Glossary 'glossterm' type constraint">
-      <rule context="glossterm[@linkend]">
-         <assert test="name(//*[@id=current()/@linkend]) = 'glossentry'">@linkend on glossterm must point to a glossentry.</assert>
-      </rule>
-   </pattern>
-
-   <pattern name="Synopsis fragment type constraint">
-      <rule context="synopfragmentref">
-         <assert test="name(//*[@id=current()/@linkend]) = 'synopfragment'">@linkend on synopfragmentref must point to a synopfragment.</assert>
-      </rule>
-   </pattern>
-
-   <pattern name="Glosssary 'see' type constraint">
-      <rule context="glosssee[@otherterm]">
-         <assert test="name(//*[@id=current()/@otherterm]) = 'glossentry'">@otherterm on glosssee must point to a glossentry.</assert>
-      </rule>
-   </pattern>
-
-   <pattern name="Glossary 'seealso' type constraint">
-      <rule context="glossseealso[@otherterm]">
-         <assert test="name(//*[@id=current()/@otherterm]) = 'glossentry'">@otherterm on glossseealso must point to a glossentry.</assert>
-      </rule>
-   </pattern>
-
-   <pattern name="Glossary term definition constraint">
-      <rule context="termdef">
-         <assert test="count(firstterm) = 1">A termdef must contain exactly one firstterm</assert>
-      </rule>
-   </pattern>
-
-   <pattern name="Cardinality of segments and titles">
-      <rule context="seglistitem">
-         <assert test="count(seg) = count(../segtitle)">The number of seg elements must be the same as the number of segtitle elements in the parent segmentedlist</assert>
-      </rule>
-   </pattern>
-
-   <pattern name="Element exclusion">
-      <rule context="annotation">
-         <assert test="not(.//annotation)">annotation must not occur in the descendants of annotation</assert>
-      </rule>
-      <rule context="caution">
-         <assert test="not(.//caution)">caution must not occur in the descendants of caution</assert>
-         <assert test="not(.//important)">important must not occur in the descendants of caution</assert>
-         <assert test="not(.//note)">note must not occur in the descendants of caution</assert>
-         <assert test="not(.//tip)">tip must not occur in the descendants of caution</assert>
-         <assert test="not(.//warning)">warning must not occur in the descendants of caution</assert>
-      </rule>
-      <rule context="important">
-         <assert test="not(.//caution)">caution must not occur in the descendants of important</assert>
-         <assert test="not(.//important)">important must not occur in the descendants of important</assert>
-         <assert test="not(.//note)">note must not occur in the descendants of important</assert>
-         <assert test="not(.//tip)">tip must not occur in the descendants of important</assert>
-         <assert test="not(.//warning)">warning must not occur in the descendants of important</assert>
-      </rule>
-      <rule context="note">
-         <assert test="not(.//caution)">caution must not occur in the descendants of note</assert>
-         <assert test="not(.//important)">important must not occur in the descendants of note</assert>
-         <assert test="not(.//note)">note must not occur in the descendants of note</assert>
-         <assert test="not(.//tip)">tip must not occur in the descendants of note</assert>
-         <assert test="not(.//warning)">warning must not occur in the descendants of note</assert>
-      </rule>
-      <rule context="tip">
-         <assert test="not(.//caution)">caution must not occur in the descendants of tip</assert>
-         <assert test="not(.//important)">important must not occur in the descendants of tip</assert>
-         <assert test="not(.//note)">note must not occur in the descendants of tip</assert>
-         <assert test="not(.//tip)">tip must not occur in the descendants of tip</assert>
-         <assert test="not(.//warning)">warning must not occur in the descendants of tip</assert>
-      </rule>
-      <rule context="warning">
-         <assert test="not(.//caution)">caution must not occur in the descendants of warning</assert>
-         <assert test="not(.//important)">important must not occur in the descendants of warning</assert>
-         <assert test="not(.//note)">note must not occur in the descendants of warning</assert>
-         <assert test="not(.//tip)">tip must not occur in the descendants of warning</assert>
-         <assert test="not(.//warning)">warning must not occur in the descendants of warning</assert>
-      </rule>
-      <rule context="caption">
-         <assert test="not(.//caution)">caution must not occur in the descendants of caption</assert>
-         <assert test="not(.//equation)">equation must not occur in the descendants of caption</assert>
-         <assert test="not(.//example)">example must not occur in the descendants of caption</assert>
-         <assert test="not(.//figure)">figure must not occur in the descendants of caption</assert>
-         <assert test="not(.//important)">important must not occur in the descendants of caption</assert>
-         <assert test="not(.//note)">note must not occur in the descendants of caption</assert>
-         <assert test="not(.//sidebar)">sidebar must not occur in the descendants of caption</assert>
-         <assert test="not(.//table)">table must not occur in the descendants of caption</assert>
-         <assert test="not(.//task)">task must not occur in the descendants of caption</assert>
-         <assert test="not(.//tip)">tip must not occur in the descendants of caption</assert>
-         <assert test="not(.//warning)">warning must not occur in the descendants of caption</assert>
-      </rule>
-      <rule context="equation">
-         <assert test="not(.//caution)">caution must not occur in the descendants of equation</assert>
-         <assert test="not(.//equation)">equation must not occur in the descendants of equation</assert>
-         <assert test="not(.//example)">example must not occur in the descendants of equation</assert>
-         <assert test="not(.//figure)">figure must not occur in the descendants of equation</assert>
-         <assert test="not(.//important)">important must not occur in the descendants of equation</assert>
-         <assert test="not(.//note)">note must not occur in the descendants of equation</assert>
-         <assert test="not(.//table)">table must not occur in the descendants of equation</assert>
-         <assert test="not(.//tip)">tip must not occur in the descendants of equation</assert>
-         <assert test="not(.//warning)">warning must not occur in the descendants of equation</assert>
-      </rule>
-      <rule context="example">
-         <assert test="not(.//caution)">caution must not occur in the descendants of example</assert>
-         <assert test="not(.//equation)">equation must not occur in the descendants of example</assert>
-         <assert test="not(.//example)">example must not occur in the descendants of example</assert>
-         <assert test="not(.//figure)">figure must not occur in the descendants of example</assert>
-         <assert test="not(.//important)">important must not occur in the descendants of example</assert>
-         <assert test="not(.//note)">note must not occur in the descendants of example</assert>
-         <assert test="not(.//table)">table must not occur in the descendants of example</assert>
-         <assert test="not(.//tip)">tip must not occur in the descendants of example</assert>
-         <assert test="not(.//warning)">warning must not occur in the descendants of example</assert>
-      </rule>
-      <rule context="figure">
-         <assert test="not(.//caution)">caution must not occur in the descendants of figure</assert>
-         <assert test="not(.//equation)">equation must not occur in the descendants of figure</assert>
-         <assert test="not(.//example)">example must not occur in the descendants of figure</assert>
-         <assert test="not(.//figure)">figure must not occur in the descendants of figure</assert>
-         <assert test="not(.//important)">important must not occur in the descendants of figure</assert>
-         <assert test="not(.//note)">note must not occur in the descendants of figure</assert>
-         <assert test="not(.//table)">table must not occur in the descendants of figure</assert>
-         <assert test="not(.//tip)">tip must not occur in the descendants of figure</assert>
-         <assert test="not(.//warning)">warning must not occur in the descendants of figure</assert>
-      </rule>
-      <rule context="table">
-         <assert test="not(.//caution)">caution must not occur in the descendants of table</assert>
-         <assert test="not(.//equation)">equation must not occur in the descendants of table</assert>
-         <assert test="not(.//example)">example must not occur in the descendants of table</assert>
-         <assert test="not(.//figure)">figure must not occur in the descendants of table</assert>
-         <assert test="not(.//important)">important must not occur in the descendants of table</assert>
-         <assert test="not(.//informaltable)">informaltable must not occur in the descendants of table</assert>
-         <assert test="not(.//note)">note must not occur in the descendants of table</assert>
-         <assert test="not(.//tip)">tip must not occur in the descendants of table</assert>
-         <assert test="not(.//warning)">warning must not occur in the descendants of table</assert>
-      </rule>
-      <rule context="footnote">
-         <assert test="not(.//caution)">caution must not occur in the descendants of footnote</assert>
-         <assert test="not(.//epigraph)">epigraph must not occur in the descendants of footnote</assert>
-         <assert test="not(.//equation)">equation must not occur in the descendants of footnote</assert>
-         <assert test="not(.//example)">example must not occur in the descendants of footnote</assert>
-         <assert test="not(.//figure)">figure must not occur in the descendants of footnote</assert>
-         <assert test="not(.//footnote)">footnote must not occur in the descendants of footnote</assert>
-         <assert test="not(.//important)">important must not occur in the descendants of footnote</assert>
-         <assert test="not(.//indexterm)">indexterm must not occur in the descendants of footnote</assert>
-         <assert test="not(.//note)">note must not occur in the descendants of footnote</assert>
-         <assert test="not(.//sidebar)">sidebar must not occur in the descendants of footnote</assert>
-         <assert test="not(.//table)">table must not occur in the descendants of footnote</assert>
-         <assert test="not(.//task)">task must not occur in the descendants of footnote</assert>
-         <assert test="not(.//tip)">tip must not occur in the descendants of footnote</assert>
-         <assert test="not(.//warning)">warning must not occur in the descendants of footnote</assert>
-      </rule>
-      <rule context="sidebar">
-         <assert test="not(.//sidebar)">sidebar must not occur in the descendants of sidebar</assert>
-      </rule>
-   </pattern>
 </schema>

From owner-svn-doc-projects@FreeBSD.ORG  Fri Jun 21 11:38: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
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 4A74F3C2;
 Fri, 21 Jun 2013 11:38:46 +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 3A5741B33;
 Fri, 21 Jun 2013 11:38: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 r5LBckpL055824;
 Fri, 21 Jun 2013 11:38:46 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5LBckEj055821;
 Fri, 21 Jun 2013 11:38:46 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306211138.r5LBckEj055821@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 21 Jun 2013 11:38:46 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41993 - projects/db5/share/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: Fri, 21 Jun 2013 11:38:46 -0000

Author: gabor
Date: Fri Jun 21 11:38:45 2013
New Revision: 41993
URL: http://svnweb.freebsd.org/changeset/doc/41993

Log:
  - Create the Schematron XSLT in the current directory
  - Properly clean up after validation

Modified:
  projects/db5/share/mk/doc.docbook.mk

Modified: projects/db5/share/mk/doc.docbook.mk
==============================================================================
--- projects/db5/share/mk/doc.docbook.mk	Fri Jun 21 07:27:27 2013	(r41992)
+++ projects/db5/share/mk/doc.docbook.mk	Fri Jun 21 11:38:45 2013	(r41993)
@@ -244,9 +244,10 @@ all: ${SRCS} ${_docs}
 
 .if defined(SCHEMATRONS)
 .for sch in ${SCHEMATRONS}
-schxslts+=	${sch}.xsl
+schxslts+=	${sch:C@.*/@@}.xsl
+CLEANFILES+=	${sch:C@.*/@@}.xsl
 
-${sch}.xsl: ${sch}
+${sch:C@.*/@@}.xsl: ${sch}
 	${XSLTPROC} --param allow-foreign "true" ${XSLSCH} ${.ALLSRC} > ${.TARGET}
 .endfor
 .endif

From owner-svn-doc-projects@FreeBSD.ORG  Fri Jun 21 11:40:44 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 861F6414;
 Fri, 21 Jun 2013 11:40:44 +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 68A6F1B3E;
 Fri, 21 Jun 2013 11:40:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5LBeiIj056182;
 Fri, 21 Jun 2013 11:40:44 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5LBeivc056181;
 Fri, 21 Jun 2013 11:40:44 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306211140.r5LBeivc056181@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 21 Jun 2013 11:40:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41994 - projects/db5/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: Fri, 21 Jun 2013 11:40:44 -0000

Author: gabor
Date: Fri Jun 21 11:40:43 2013
New Revision: 41994
URL: http://svnweb.freebsd.org/changeset/doc/41994

Log:
  - Add a Schematron namespace declaration
  - Stock DocBook schematron constaints use different Schematron namespace
    so copy-paste them here because they cannot be processed with the
    ISO Schematron stylesheets

Modified:
  projects/db5/share/xml/freebsd.sch

Modified: projects/db5/share/xml/freebsd.sch
==============================================================================
--- projects/db5/share/xml/freebsd.sch	Fri Jun 21 11:38:45 2013	(r41993)
+++ projects/db5/share/xml/freebsd.sch	Fri Jun 21 11:40:43 2013	(r41994)
@@ -5,6 +5,9 @@
 <schema xmlns="http://purl.oclc.org/dsdl/schematron"
   xmlns:db="http://docbook.org/ns/docbook"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <ns prefix="db" uri="http://docbook.org/ns/docbook"/>
+
   <pattern name="Check file reference validity">
     <rule context="//db:imagedata|//db:graphic">
       <report test="contains(@fileref, '.')">Image reference (<xsl:value-of select="@fileref"/>) cannot have an extension; the proper format is inferred by the output type to generate.</report>
@@ -40,4 +43,249 @@
       <assert test="(. = 'freebsd8') or (. = 'freebsd9') or (. = 'freebsd10')">Invalid os value (<xsl:value-of select="."/>); must be either 'freebsd8', 'freebsd9' or 'freebsd10'.</assert>
     </rule>
   </pattern>
+
+  <!-- DB 5.0 constraints -->
+
+  <pattern name="Glossary 'firstterm' type constraint">
+     <rule context="db:firstterm[@linkend]">
+        <assert test="local-name(//*[@xml:id=current()/@linkend]) = 'glossentry' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'">@linkend on firstterm must point to a glossentry.</assert>
+     </rule>
+  </pattern>
+  <pattern name="Footnote reference type constraint">
+     <rule context="db:footnoteref">
+        <assert test="local-name(//*[@xml:id=current()/@linkend]) = 'footnote' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'">@linkend on footnoteref must point to a footnote.</assert>
+     </rule>
+  </pattern>
+  <pattern name="Glossary 'glossterm' type constraint">
+     <rule context="db:glossterm[@linkend]">
+        <assert test="local-name(//*[@xml:id=current()/@linkend]) = 'glossentry' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'">@linkend on glossterm must point to a glossentry.</assert>
+     </rule>
+  </pattern>
+  <pattern name="Synopsis fragment type constraint">
+     <rule context="db:synopfragmentref">
+        <assert test="local-name(//*[@xml:id=current()/@linkend]) = 'synopfragment' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'">@linkend on synopfragmentref must point to a synopfragment.</assert>
+     </rule>
+  </pattern>
+  <pattern name="Glosssary 'see' type constraint">
+     <rule context="db:glosssee[@otherterm]">
+        <assert test="local-name(//*[@xml:id=current()/@otherterm]) = 'glossentry' and namespace-uri(//*[@xml:id=current()/@otherterm]) = 'http://docbook.org/ns/docbook'">@otherterm on glosssee must point to a glossentry.</assert>
+     </rule>
+  </pattern>
+  <pattern name="Glossary 'seealso' type constraint">
+     <rule context="db:glossseealso[@otherterm]">
+        <assert test="local-name(//*[@xml:id=current()/@otherterm]) = 'glossentry' and namespace-uri(//*[@xml:id=current()/@otherterm]) = 'http://docbook.org/ns/docbook'">@otherterm on glossseealso must point to a glossentry.</assert>
+     </rule>
+  </pattern>
+  <pattern name="Glossary term definition constraint">
+     <rule context="db:termdef">
+        <assert test="count(db:firstterm) = 1">A termdef must contain exactly one firstterm</assert>
+     </rule>
+  </pattern>
+  <pattern name="Cardinality of segments and titles">
+     <rule context="db:seglistitem">
+        <assert test="count(db:seg) = count(../db:segtitle)">The number of seg elements must be the same as the number of segtitle elements in the parent segmentedlist</assert>
+     </rule>
+  </pattern>
+  <pattern name="Root must have version">
+     <rule context="/db:para">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:set">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:book">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:dedication">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:acknowledgements">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:colophon">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:appendix">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:chapter">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:part">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:preface">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:section">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:article">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:sect1">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:sect2">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:sect3">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:sect4">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:sect5">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:reference">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:refentry">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:refsection">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:refsect1">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:refsect2">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:refsect3">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:glossary">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:bibliography">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:index">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:setindex">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+     <rule context="/db:toc">
+        <assert test="@version">The root element must have a version attribute.</assert>
+     </rule>
+  </pattern>
+  <pattern name="Element exclusion">
+     <rule context="db:annotation">
+        <assert test="not(.//db:annotation)">annotation must not occur in the descendants of annotation</assert>
+     </rule>
+     <rule context="db:caution">
+        <assert test="not(.//db:caution)">caution must not occur in the descendants of caution</assert>
+        <assert test="not(.//db:important)">important must not occur in the descendants of caution</assert>
+        <assert test="not(.//db:note)">note must not occur in the descendants of caution</assert>
+        <assert test="not(.//db:tip)">tip must not occur in the descendants of caution</assert>
+        <assert test="not(.//db:warning)">warning must not occur in the descendants of caution</assert>
+     </rule>
+     <rule context="db:important">
+        <assert test="not(.//db:caution)">caution must not occur in the descendants of important</assert>
+        <assert test="not(.//db:important)">important must not occur in the descendants of important</assert>
+        <assert test="not(.//db:note)">note must not occur in the descendants of important</assert>
+        <assert test="not(.//db:tip)">tip must not occur in the descendants of important</assert>
+        <assert test="not(.//db:warning)">warning must not occur in the descendants of important</assert>
+     </rule>
+     <rule context="db:note">
+        <assert test="not(.//db:caution)">caution must not occur in the descendants of note</assert>
+        <assert test="not(.//db:important)">important must not occur in the descendants of note</assert>
+        <assert test="not(.//db:note)">note must not occur in the descendants of note</assert>
+        <assert test="not(.//db:tip)">tip must not occur in the descendants of note</assert>
+        <assert test="not(.//db:warning)">warning must not occur in the descendants of note</assert>
+     </rule>
+     <rule context="db:tip">
+        <assert test="not(.//db:caution)">caution must not occur in the descendants of tip</assert>
+        <assert test="not(.//db:important)">important must not occur in the descendants of tip</assert>
+        <assert test="not(.//db:note)">note must not occur in the descendants of tip</assert>
+        <assert test="not(.//db:tip)">tip must not occur in the descendants of tip</assert>
+        <assert test="not(.//db:warning)">warning must not occur in the descendants of tip</assert>
+     </rule>
+     <rule context="db:warning">
+        <assert test="not(.//db:caution)">caution must not occur in the descendants of warning</assert>
+        <assert test="not(.//db:important)">important must not occur in the descendants of warning</assert>
+        <assert test="not(.//db:note)">note must not occur in the descendants of warning</assert>
+        <assert test="not(.//db:tip)">tip must not occur in the descendants of warning</assert>
+        <assert test="not(.//db:warning)">warning must not occur in the descendants of warning</assert>
+     </rule>
+     <rule context="db:caption">
+        <assert test="not(.//db:caution)">caution must not occur in the descendants of caption</assert>
+        <assert test="not(.//db:equation)">equation must not occur in the descendants of caption</assert>
+        <assert test="not(.//db:example)">example must not occur in the descendants of caption</assert>
+        <assert test="not(.//db:figure)">figure must not occur in the descendants of caption</assert>
+        <assert test="not(.//db:important)">important must not occur in the descendants of caption</assert>
+        <assert test="not(.//db:note)">note must not occur in the descendants of caption</assert>
+        <assert test="not(.//db:sidebar)">sidebar must not occur in the descendants of caption</assert>
+        <assert test="not(.//db:table)">table must not occur in the descendants of caption</assert>
+        <assert test="not(.//db:task)">task must not occur in the descendants of caption</assert>
+        <assert test="not(.//db:tip)">tip must not occur in the descendants of caption</assert>
+        <assert test="not(.//db:warning)">warning must not occur in the descendants of caption</assert>
+     </rule>
+     <rule context="db:equation">
+        <assert test="not(.//db:caution)">caution must not occur in the descendants of equation</assert>
+        <assert test="not(.//db:equation)">equation must not occur in the descendants of equation</assert>
+        <assert test="not(.//db:example)">example must not occur in the descendants of equation</assert>
+        <assert test="not(.//db:figure)">figure must not occur in the descendants of equation</assert>
+        <assert test="not(.//db:important)">important must not occur in the descendants of equation</assert>
+        <assert test="not(.//db:note)">note must not occur in the descendants of equation</assert>
+        <assert test="not(.//db:table)">table must not occur in the descendants of equation</assert>
+        <assert test="not(.//db:tip)">tip must not occur in the descendants of equation</assert>
+        <assert test="not(.//db:warning)">warning must not occur in the descendants of equation</assert>
+     </rule>
+     <rule context="db:example">
+        <assert test="not(.//db:caution)">caution must not occur in the descendants of example</assert>
+        <assert test="not(.//db:equation)">equation must not occur in the descendants of example</assert>
+        <assert test="not(.//db:example)">example must not occur in the descendants of example</assert>
+        <assert test="not(.//db:figure)">figure must not occur in the descendants of example</assert>
+        <assert test="not(.//db:important)">important must not occur in the descendants of example</assert>
+        <assert test="not(.//db:note)">note must not occur in the descendants of example</assert>
+        <assert test="not(.//db:table)">table must not occur in the descendants of example</assert>
+        <assert test="not(.//db:tip)">tip must not occur in the descendants of example</assert>
+        <assert test="not(.//db:warning)">warning must not occur in the descendants of example</assert>
+     </rule>
+     <rule context="db:figure">
+        <assert test="not(.//db:caution)">caution must not occur in the descendants of figure</assert>
+        <assert test="not(.//db:equation)">equation must not occur in the descendants of figure</assert>
+        <assert test="not(.//db:example)">example must not occur in the descendants of figure</assert>
+        <assert test="not(.//db:figure)">figure must not occur in the descendants of figure</assert>
+        <assert test="not(.//db:important)">important must not occur in the descendants of figure</assert>
+        <assert test="not(.//db:note)">note must not occur in the descendants of figure</assert>
+        <assert test="not(.//db:table)">table must not occur in the descendants of figure</assert>
+        <assert test="not(.//db:tip)">tip must not occur in the descendants of figure</assert>
+        <assert test="not(.//db:warning)">warning must not occur in the descendants of figure</assert>
+     </rule>
+     <rule context="db:table">
+        <assert test="not(.//db:caution)">caution must not occur in the descendants of table</assert>
+        <assert test="not(.//db:equation)">equation must not occur in the descendants of table</assert>
+        <assert test="not(.//db:example)">example must not occur in the descendants of table</assert>
+        <assert test="not(.//db:figure)">figure must not occur in the descendants of table</assert>
+        <assert test="not(.//db:important)">important must not occur in the descendants of table</assert>
+        <assert test="not(.//db:informaltable)">informaltable must not occur in the descendants of table</assert>
+        <assert test="not(.//db:note)">note must not occur in the descendants of table</assert>
+        <assert test="not(.//db:tip)">tip must not occur in the descendants of table</assert>
+        <assert test="not(.//db:warning)">warning must not occur in the descendants of table</assert>
+     </rule>
+     <rule context="db:footnote">
+        <assert test="not(.//db:caution)">caution must not occur in the descendants of footnote</assert>
+        <assert test="not(.//db:epigraph)">epigraph must not occur in the descendants of footnote</assert>
+        <assert test="not(.//db:equation)">equation must not occur in the descendants of footnote</assert>
+        <assert test="not(.//db:example)">example must not occur in the descendants of footnote</assert>
+        <assert test="not(.//db:figure)">figure must not occur in the descendants of footnote</assert>
+        <assert test="not(.//db:footnote)">footnote must not occur in the descendants of footnote</assert>
+        <assert test="not(.//db:important)">important must not occur in the descendants of footnote</assert>
+        <assert test="not(.//db:indexterm)">indexterm must not occur in the descendants of footnote</assert>
+        <assert test="not(.//db:note)">note must not occur in the descendants of footnote</assert>
+        <assert test="not(.//db:sidebar)">sidebar must not occur in the descendants of footnote</assert>
+        <assert test="not(.//db:table)">table must not occur in the descendants of footnote</assert>
+        <assert test="not(.//db:task)">task must not occur in the descendants of footnote</assert>
+        <assert test="not(.//db:tip)">tip must not occur in the descendants of footnote</assert>
+        <assert test="not(.//db:warning)">warning must not occur in the descendants of footnote</assert>
+     </rule>
+     <rule context="db:sidebar">
+        <assert test="not(.//db:sidebar)">sidebar must not occur in the descendants of sidebar</assert>
+     </rule>
+  </pattern>
 </schema>

From owner-svn-doc-projects@FreeBSD.ORG  Fri Jun 21 11:55:57 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 892FD880;
 Fri, 21 Jun 2013 11:55:57 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from mail.allbsd.org (gatekeeper.allbsd.org
 [IPv6:2001:2f0:104:e001::32])
 by mx1.freebsd.org (Postfix) with ESMTP id 06E661BF2;
 Fri, 21 Jun 2013 11:55:56 +0000 (UTC)
Received: from alph.d.allbsd.org (p3086-ipbf906funabasi.chiba.ocn.ne.jp
 [122.26.46.86]) (authenticated bits=128)
 by mail.allbsd.org (8.14.5/8.14.5) with ESMTP id r5LBtdA5078562
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Fri, 21 Jun 2013 20:55:49 +0900 (JST) (envelope-from hrs@FreeBSD.org)
Received: from localhost (localhost [127.0.0.1]) (authenticated bits=0)
 by alph.d.allbsd.org (8.14.5/8.14.5) with ESMTP id r5LBtbbl086745;
 Fri, 21 Jun 2013 20:55:39 +0900 (JST) (envelope-from hrs@FreeBSD.org)
Date: Fri, 21 Jun 2013 20:55:13 +0900 (JST)
Message-Id: <20130621.205513.1254885557192480816.hrs@allbsd.org>
To: gabor@FreeBSD.org
Subject: Re: svn commit: r41993 - projects/db5/share/mk
From: Hiroki Sato <hrs@FreeBSD.org>
In-Reply-To: <201306211138.r5LBckEj055821@svn.freebsd.org>
References: <201306211138.r5LBckEj055821@svn.freebsd.org>
X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530  FFD7 4F2C D3D8 2793 CF2D
X-Mailer: Mew version 6.5 on Emacs 24.3 / Mule 6.0 (HANACHIRUSATO)
Mime-Version: 1.0
Content-Type: Multipart/Signed; protocol="application/pgp-signature";
 micalg=pgp-sha1;
 boundary="--Security_Multipart(Fri_Jun_21_20_55_13_2013_649)--"
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: clamav-milter 0.97.4 at gatekeeper.allbsd.org
X-Virus-Status: Clean
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (mail.allbsd.org [133.31.130.32]); Fri, 21 Jun 2013 20:55:49 +0900 (JST)
X-Spam-Status: No, score=-89.5 required=13.0 tests=CONTENT_TYPE_PRESENT,
 DIRECTOCNDYN,DYN_PBL,ONLY1HOPDIRECT,RCVD_IN_PBL,SAMEHELOBY2HOP,
 USER_IN_WHITELIST autolearn=no version=3.3.2
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
 gatekeeper.allbsd.org
Cc: svn-doc-projects@FreeBSD.org, doc-committers@FreeBSD.org
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: Fri, 21 Jun 2013 11:55:57 -0000

----Security_Multipart(Fri_Jun_21_20_55_13_2013_649)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Gabor Kovesdan <gabor@FreeBSD.org> wrote
  in <201306211138.r5LBckEj055821@svn.freebsd.org>:

ga> Author: gabor
ga> Date: Fri Jun 21 11:38:45 2013
ga> New Revision: 41993
ga> URL: http://svnweb.freebsd.org/changeset/doc/41993
ga>
ga> Log:
ga>   - Create the Schematron XSLT in the current directory
ga>   - Properly clean up after validation
ga>
ga> Modified:
ga>   projects/db5/share/mk/doc.docbook.mk
ga>
ga> Modified: projects/db5/share/mk/doc.docbook.mk
ga> ==============================================================================
ga> --- projects/db5/share/mk/doc.docbook.mk	Fri Jun 21 07:27:27 2013	(r41992)
ga> +++ projects/db5/share/mk/doc.docbook.mk	Fri Jun 21 11:38:45 2013	(r41993)
ga> @@ -244,9 +244,10 @@ all: ${SRCS} ${_docs}
ga>
ga>  .if defined(SCHEMATRONS)
ga>  .for sch in ${SCHEMATRONS}
ga> -schxslts+=	${sch}.xsl
ga> +schxslts+=	${sch:C@.*/@@}.xsl
ga> +CLEANFILES+=	${sch:C@.*/@@}.xsl
ga>
ga> -${sch}.xsl: ${sch}
ga> +${sch:C@.*/@@}.xsl: ${sch}
ga>  	${XSLTPROC} --param allow-foreign "true" ${XSLSCH} ${.ALLSRC} > ${.TARGET}
ga>  .endfor
ga>  .endif

 Please use ${sch:T} instead of ${sch:C@.*/@@}.

-- Hiroki

----Security_Multipart(Fri_Jun_21_20_55_13_2013_649)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (FreeBSD)

iEYEABECAAYFAlHEPyEACgkQTyzT2CeTzy0KMACfZlompYWOKiKgtkPJ99ImZzJN
R4IAnA/RbYIwobjPonMk8BMDABV+J+zW
=q4Fv
-----END PGP SIGNATURE-----

----Security_Multipart(Fri_Jun_21_20_55_13_2013_649)----

From owner-svn-doc-projects@FreeBSD.ORG  Fri Jun 21 17:57:27 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 6A81B5CC;
 Fri, 21 Jun 2013 17:57:27 +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 5E5FC1CEC;
 Fri, 21 Jun 2013 17:57:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5LHvReF076630;
 Fri, 21 Jun 2013 17:57:27 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5LHvRBZ076629;
 Fri, 21 Jun 2013 17:57:27 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306211757.r5LHvRBZ076629@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 21 Jun 2013 17:57:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41997 - projects/db5/share/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: Fri, 21 Jun 2013 17:57:27 -0000

Author: gabor
Date: Fri Jun 21 17:57:26 2013
New Revision: 41997
URL: http://svnweb.freebsd.org/changeset/doc/41997

Log:
  - Use the :T modifier instead of :C
  
  Submitted by:	hrs

Modified:
  projects/db5/share/mk/doc.docbook.mk

Modified: projects/db5/share/mk/doc.docbook.mk
==============================================================================
--- projects/db5/share/mk/doc.docbook.mk	Fri Jun 21 14:57:08 2013	(r41996)
+++ projects/db5/share/mk/doc.docbook.mk	Fri Jun 21 17:57:26 2013	(r41997)
@@ -244,10 +244,10 @@ all: ${SRCS} ${_docs}
 
 .if defined(SCHEMATRONS)
 .for sch in ${SCHEMATRONS}
-schxslts+=	${sch:C@.*/@@}.xsl
-CLEANFILES+=	${sch:C@.*/@@}.xsl
+schxslts+=	${sch:T}.xsl
+CLEANFILES+=	${sch:T}.xsl
 
-${sch:C@.*/@@}.xsl: ${sch}
+${sch:T}.xsl: ${sch}
 	${XSLTPROC} --param allow-foreign "true" ${XSLSCH} ${.ALLSRC} > ${.TARGET}
 .endfor
 .endif