- Port some of the customizations to DocBook 5.0

- Add namespace declaration to DocBook elements in entities since DocBook 5.0 uses a namespace - Drop Jade-specific compatibility nits
svn path=/projects/db5/; revision=41780
2013-05-30 20:09:44 +00:00 · 2013-05-30 20:09:44 +00:00 · 97ece4326c · 2020-12-08 03:00:23 +00:00
commit 97ece4326c
parent a7b70eb4e8
6 changed files with 5666 additions and 5742 deletions
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@ -254,21 +254,11 @@ ${sch}.xsl: ${sch}
 # Parsed XML  -------------------------------------------------------

 ${DOC}.parsed.xml: ${SRCS}
-	${GREP} '^<?xml version=.*?>' ${DOC}.xml > ${.TARGET}.tmp
-.if ${DOC} == "book"
-	${ECHO_CMD} '<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${.TARGET}.tmp
-.else
-	${ECHO_CMD} '<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${.TARGET}.tmp
-.endif
-	@${ECHO} "==> Basic validation"
-	${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} | \
-	${GREP} -v '^<?xml version=.*?>' >> ${.TARGET}.tmp
+	${XMLLINT} --nonet --noent --valid --xinclude ${MASTERDOC} > ${.TARGET}
 .if defined(PROFILING)
 	@${ECHO} "==> Profiling"
 	${XSLTPROC} ${PROFILING} ${XSLPROF} ${.TARGET}.tmp > ${.TARGET}
-	${RM} ${.TARGET}.tmp
 .else
-	${MV} ${.TARGET}.tmp ${.TARGET}
 	${SED} 's|@@URL_RELPREFIX@@|http://www.FreeBSD.org|g' < ${.TARGET} > ${DOC}.parsed.print.xml
 	${SED} -i '' 's|@@URL_RELPREFIX@@|../../../..|g' ${.TARGET}
 .endif
@ -385,15 +375,8 @@ ${DOC}.${_curformat}:
 #

 lint validate: ${SRCS} ${schxslts}
-	@${GREP} '^<?xml version=.*?>' ${DOC}.xml > ${DOC}.parsed.xml
-.if ${DOC} == "book"
-	@${ECHO_CMD} '<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${DOC}.parsed.xml
-.else
-	@${ECHO_CMD} '<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${DOC}.parsed.xml
-.endif
 	@${ECHO} "==> Basic validation"
-	@${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} | \
-	${GREP} -v '^<?xml version=.*?>' >>${DOC}.parsed.xml
+	@${XMLLINT} --nonet --noent --valid --xinclude ${MASTERDOC} > ${DOC}.parsed.xml
 .if defined(schxslts)
 	@${ECHO} "==> Validating with Schematron constraints"
 .for sch in ${schxslts}
--- a/share/xml/freebsd.ent
+++ b/share/xml/freebsd.ent
@ -11,8 +11,8 @@ used in both environments.

 <!-- These are used in screen elements -->

-<!ENTITY prompt.root "<prompt>#</prompt>">
-<!ENTITY prompt.user "<prompt>&#37;</prompt>">
+<!ENTITY prompt.root '<prompt xmlns="http://docbook.org/ns/docbook">#</prompt>'>
+<!ENTITY prompt.user '<prompt xmlns="http://docbook.org/ns/docbook">&#37;</prompt>'>

 <!-- These will almost certainly remain the same, but are here for
     consistency and in case we ever want to make hyperlinks out of
@ -41,15 +41,15 @@ used in both environments.
 <!--
  Use this entity when referring to 'UNIX' in your document.
 -->
-<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
-<!ENTITY nis "<acronym role='Network Information System'>NIS</acronym>">
+<!ENTITY unix '<trademark xmlns="http://docbook.org/ns/docbook" class="registered">UNIX</trademark>'>
+<!ENTITY nis '<acronym xmlns="http://docbook.org/ns/docbook" role="Network Information System">NIS</acronym>'>

 <!-- Use an entity to define these exactly so that the print output
     stylesheets know what to look for and can format these properly with
     TeX commands. -->

-<!ENTITY tex '<application>TeX</application>'>
-<!ENTITY latex '<application>LaTeX</application>'>
+<!ENTITY tex '<application xmlns="http://docbook.org/ns/docbook">TeX</application>'>
+<!ENTITY latex '<application xmlns="http://docbook.org/ns/docbook">LaTeX</application>'>

 <!-- Use an entity for the X.Org X server -->

@ -102,7 +102,7 @@ used in both environments.
 <!ENTITY team.re "&a.kib;, &a.blackend;, &a.jpaetzel;, &a.hrs;, &a.kensmith;">

 <!-- GUI-buttons -->
-<!ENTITY gui.ok "<guibutton>[&nbsp;OK&nbsp;]</guibutton>">
-<!ENTITY gui.cancel "<guibutton>[&nbsp;Cancel&nbsp;]</guibutton>">
-<!ENTITY gui.yes "<guibutton>[&nbsp;Yes&nbsp;]</guibutton>">
-<!ENTITY gui.no "<guibutton>[&nbsp;No&nbsp;]</guibutton>">
+<!ENTITY gui.ok '<guibutton xmlns="http://docbook.org/ns/docbook">[&nbsp;OK&nbsp;]</guibutton>'>
+<!ENTITY gui.cancel '<guibutton xmlns="http://docbook.org/ns/docbook">[&nbsp;Cancel&nbsp;]</guibutton>'>
+<!ENTITY gui.yes '<guibutton xmlns="http://docbook.org/ns/docbook">[&nbsp;Yes&nbsp;]</guibutton>'>
+<!ENTITY gui.no '<guibutton xmlns="http://docbook.org/ns/docbook">[&nbsp;No&nbsp;]</guibutton>'>
--- a/share/xml/freebsd45.dtd
+++ b/share/xml/freebsd45.dtd
@ -1,121 +0,0 @@
-<!ENTITY % output.html  "IGNORE">    <!-- HTML output is being generated   -->
-<!ENTITY % output.html.images "IGNORE"> <!-- HTML with images -->
-<!ENTITY % output.print "IGNORE">    <!-- Print output is being generated  -->
-
-<!--  XXX: Jade is given a totally parsed document with XML tools
-      so it does not need to pull in entity sets and catalogs
-      are only provided in XML format, yet this compatibility
-      nit is necessary otherwise it would look for the entity sets
-      and fail, lacking SGML catalogs.
-->
-<!ENTITY % jade.compat "IGNORE">
-<![%jade.compat;[
-<!ENTITY % freebsd.entities "IGNORE">
-]]>
-<!ENTITY % freebsd.entities "INCLUDE">
-
-<!ENTITY % local.tech.char.class "|hostid|username|groupname|devicename|maketarget|makevar|svnref|xi:include">
-
-<!ENTITY % filename.element "IGNORE">
-
-<!ENTITY % ISOgrk4.module "IGNORE">
-
-<!ENTITY % xmlns.attrib
-	"xmlns		CDATA		#IMPLIED">
-
-<!ENTITY % xmlns.xi.attrib
-	"xmlns:xi	CDATA		#IMPLIED">
-
-<!ENTITY % local.common.attrib "%xmlns.attrib;
-				%xmlns.xi.attrib;">
-
-<!ENTITY % edition.attrib
-	"edition	CDATA		#IMPLIED">
-
-<!ENTITY % releasetype.attrib
-	"releasetype	CDATA		#IMPLIED">
-
-<!ENTITY % local.effectivity.attrib "%edition.attrib;
-				     %releasetype.attrib;">
-
-<!ELEMENT xi:include (xi:fallback?)>
-
-<!ATTLIST xi:include
-    xmlns:xi        CDATA       #FIXED    "http://www.w3.org/2001/XInclude"
-    href            CDATA       #IMPLIED
-    parse           (xml|text)  "xml"
-    xpointer        CDATA       #IMPLIED
-    encoding        CDATA       #IMPLIED
-    accept          CDATA       #IMPLIED
-    accept-language CDATA       #IMPLIED
->
-
-<!ELEMENT xi:fallback ANY>
-<!ATTLIST xi:fallback
-    xmlns:xi   CDATA   #FIXED   "http://www.w3.org/2001/XInclude"
->
-
-<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-	"/usr/local/share/xml/docbook/4.5/docbookx.dtd">
-%orig-docbook;
-
-<![%freebsd.entities;[
-<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"authors.ent">
-%authors;
-
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"man-refs.ent">
-%man;
-
-<!ENTITY % orig-entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
-	"entities.ent">
-%orig-entities;
-]]>
-
-<!ELEMENT hostid (%cptr.char.mix;)*>
-<!ATTLIST hostid
-                role    (hostname
-                        |domainname
-                        |fqdn
-                        |ipaddr
-                        |ip6addr
-                        |netmask
-                        |mac)      #IMPLIED
-                %common.attrib;
->
-
-<!ELEMENT username (%cptr.char.mix;)*>
-<!ATTLIST username
-                %common.attrib;
->
-
-<!ELEMENT groupname (%cptr.char.mix;)*>
-<!ATTLIST groupname
-                %common.attrib;
->
-
-<!ELEMENT devicename (%cptr.char.mix;)*>
-<!ATTLIST devicename
-                %common.attrib;
->
-
-<!ELEMENT maketarget (%cptr.char.mix;)*>
-<!ATTLIST maketarget
-                %common.attrib;
->
-
-<!ELEMENT makevar (%cptr.char.mix;)*>
-<!ATTLIST makevar
-                %common.attrib;
->
-
-<!ELEMENT svnref (%cptr.char.mix;)*>
-<!ATTLIST svnref
-		%common.attrib;
->
-
-<!ELEMENT filename (%cptr.char.mix;)*>
-
-<!ENTITY prompt.root		"<prompt>#</prompt>">
-<!ENTITY prompt.user		"<prompt>&#x25;</prompt>">
--- a/share/xml/freebsd50.dtd
+++ b/share/xml/freebsd50.dtd
@ -0,0 +1,62 @@
+<!ENTITY % local.tech.char.class "maketarget|makevar|svnref|xi:include">
+
+<!ENTITY % db.common.attributes "
+        xml:id  ID      #IMPLIED
+        version CDATA   #IMPLIED
+        xml:lang        CDATA   #IMPLIED
+        xml:base        CDATA   #IMPLIED
+        remap   CDATA   #IMPLIED
+        xreflabel       CDATA   #IMPLIED
+        revisionflag    (changed|added|deleted|off)     #IMPLIED
+        dir     (ltr|rtl|lro|rlo)       #IMPLIED
+        arch    CDATA   #IMPLIED
+        audience        CDATA   #IMPLIED
+        condition       CDATA   #IMPLIED
+        conformance     CDATA   #IMPLIED
+        os      CDATA   #IMPLIED
+        revision        CDATA   #IMPLIED
+        security        CDATA   #IMPLIED
+        userlevel       CDATA   #IMPLIED
+        vendor  CDATA   #IMPLIED
+        wordsize        CDATA   #IMPLIED
+        annotations     CDATA   #IMPLIED
+	edition		CDATA	#IMPLIED
+	releasetype	CDATA	#IMPLIED
+">
+
+<!ELEMENT xi:include (xi:fallback?)>
+
+<!ATTLIST xi:include
+    xmlns:xi        CDATA       #FIXED    "http://www.w3.org/2001/XInclude"
+    href            CDATA       #IMPLIED
+    parse           (xml|text)  "xml"
+    xpointer        CDATA       #IMPLIED
+    encoding        CDATA       #IMPLIED
+    accept          CDATA       #IMPLIED
+    accept-language CDATA       #IMPLIED
+>
+
+<!ELEMENT xi:fallback ANY>
+<!ATTLIST xi:fallback
+    xmlns:xi   CDATA   #FIXED   "http://www.w3.org/2001/XInclude"
+>
+
+<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
+	"/usr/local/share/xml/docbook/5.0/dtd/docbook.dtd">
+%orig-docbook;
+
+<!ENTITY % iso8879.ent PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
+	"http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
+%iso8879.ent;
+
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"authors.ent">
+%authors;
+
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"man-refs.ent">
+%man;
+
+<!ENTITY % orig-entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+	"entities.ent">
+%orig-entities;
--- a/share/xml/man-refs.ent
+++ b/share/xml/man-refs.ent
--- a/share/xml/trademarks.ent
+++ b/share/xml/trademarks.ent
@ -11,413 +11,413 @@
     $FreeBSD$
 -->

-<!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered
+<!ENTITY tm-attrib.3com "<para xmlns='http://docbook.org/ns/docbook'>3Com and HomeConnect are registered
  trademarks of 3Com Corporation.</para>">
 <!-- An XML entity can't start with a number... -->
-<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
+<!ENTITY tm.3com "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>3Com</trademark>">

-<!ENTITY tm-attrib.3ware "<para>3ware and Escalade are registered
+<!ENTITY tm-attrib.3ware "<para xmlns='http://docbook.org/ns/docbook'>3ware and Escalade are registered
  trademarks of 3ware Inc.</para>">
-<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
-<!ENTITY escalade "<trademark class='registered'>Escalade</trademark>">
+<!ENTITY tm.3ware "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>3ware</trademark>">
+<!ENTITY escalade "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Escalade</trademark>">

 <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
-<!ENTITY tm-attrib.adaptec "<para>Adaptec is a registered trademark of
+<!ENTITY tm-attrib.adaptec "<para xmlns='http://docbook.org/ns/docbook'>Adaptec is a registered trademark of
  Adaptec, Inc.</para>">
-<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
+<!ENTITY adaptec "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Adaptec</trademark>">

-<!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, and
+<!ENTITY tm-attrib.adobe "<para xmlns='http://docbook.org/ns/docbook'>Adobe, Acrobat, Acrobat Reader, and
  PostScript are either registered trademarks or trademarks of Adobe
  Systems Incorporated in the United States and/or other
  countries.</para>">
-<!ENTITY acrobat "<trademark class='registered'>Acrobat</trademark>">
-<!ENTITY acrobat.reader "<trademark class='registered'>Acrobat&nbsp;Reader</trademark>">
-<!ENTITY adobe "<trademark class='registered'>Adobe</trademark>">
-<!ENTITY postscript "<trademark class='registered'>PostScript</trademark>">
+<!ENTITY acrobat "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Acrobat</trademark>">
+<!ENTITY acrobat.reader "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Acrobat&nbsp;Reader</trademark>">
+<!ENTITY adobe "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Adobe</trademark>">
+<!ENTITY postscript "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>PostScript</trademark>">

 <!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
-<!ENTITY tm-attrib.amd "<para>AMD, Am486, Am5X86, AMD Athlon, AMD
+<!ENTITY tm-attrib.amd "<para xmlns='http://docbook.org/ns/docbook'>AMD, Am486, Am5X86, AMD Athlon, AMD
  Duron, AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, and PCnet are
  trademarks of Advanced Micro Devices, Inc.</para>">
-<!ENTITY am486 "<trademark class='registered'>Am486</trademark>">
-<!ENTITY am5x86 "<trademark class='registered'>Am5x86</trademark>">
-<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.duron "<trademark>AMD&nbsp;Duron</trademark>">
-<!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
-<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
-<!ENTITY amd.sempron "<trademark>AMD&nbsp;Sempron</trademark>">
-<!ENTITY amd.turion "<trademark>AMD&nbsp;Turion</trademark>">
-<!ENTITY athlon "<trademark>Athlon</trademark>">
-<!ENTITY elan "<trademark>&Eacute;lan</trademark>">
-<!ENTITY opteron "<trademark>Opteron</trademark>">
+<!ENTITY am486 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Am486</trademark>">
+<!ENTITY am5x86 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Am5x86</trademark>">
+<!ENTITY amd.athlon "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Athlon</trademark>">
+<!ENTITY amd.duron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Duron</trademark>">
+<!ENTITY amd.k6 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>AMD-K6</trademark>">
+<!ENTITY amd.opteron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Opteron</trademark>">
+<!ENTITY amd.sempron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Sempron</trademark>">
+<!ENTITY amd.turion "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Turion</trademark>">
+<!ENTITY athlon "<trademark xmlns='http://docbook.org/ns/docbook'>Athlon</trademark>">
+<!ENTITY elan "<trademark xmlns='http://docbook.org/ns/docbook'>&Eacute;lan</trademark>">
+<!ENTITY opteron "<trademark xmlns='http://docbook.org/ns/docbook'>Opteron</trademark>">

 <!-- http://www.apple.com/legal/trademark/appletmlist.html -->
-<!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS,
+<!ENTITY tm-attrib.apple "<para xmlns='http://docbook.org/ns/docbook'>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS,
  Quicktime, and TrueType are trademarks of Apple Computer, Inc.,
  registered in the United States and other countries.</para>">
-<!ENTITY airport "<trademark class='registered'>AirPort</trademark>">
-<!ENTITY apple "<trademark class='registered'>Apple</trademark>">
-<!ENTITY firewire "<trademark class='registered'>FireWire</trademark>">
-<!ENTITY imac "<trademark class='registered'>iMac</trademark>">
-<!ENTITY mac "<trademark class='registered'>Mac</trademark>">
-<!ENTITY macintosh "<trademark class='registered'>Macintosh</trademark>">
-<!ENTITY macos "<trademark class='registered'>Mac&nbsp;OS</trademark>">
-<!ENTITY quicktime "<trademark class='registered'>Quicktime</trademark>">
-<!ENTITY truetype "<trademark class='registered'>TrueType</trademark>">
+<!ENTITY airport "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>AirPort</trademark>">
+<!ENTITY apple "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Apple</trademark>">
+<!ENTITY firewire "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>FireWire</trademark>">
+<!ENTITY imac "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>iMac</trademark>">
+<!ENTITY mac "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Mac</trademark>">
+<!ENTITY macintosh "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Macintosh</trademark>">
+<!ENTITY macos "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Mac&nbsp;OS</trademark>">
+<!ENTITY quicktime "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Quicktime</trademark>">
+<!ENTITY truetype "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>TrueType</trademark>">

-<!ENTITY tm-attrib.arm "<para>ARM is a registered trademark of ARM
+<!ENTITY tm-attrib.arm "<para xmlns='http://docbook.org/ns/docbook'>ARM is a registered trademark of ARM
  Limited.</para>">
-<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
+<!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>ARM</trademark>">

 <!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para>The Bluetooth word mark is owned
+<!ENTITY tm-attrib.bluetooth "<para xmlns='http://docbook.org/ns/docbook'>The Bluetooth word mark is owned
  by the Bluetooth SIG, Inc.</para>">
-<!ENTITY bluetooth "<trademark class='registered'>Bluetooth</trademark>">
+<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Bluetooth</trademark>">

-<!ENTITY tm-attrib.broadcom "<para>Broadcom is a registered trademark
+<!ENTITY tm-attrib.broadcom "<para xmlns='http://docbook.org/ns/docbook'>Broadcom is a registered trademark
  of Broadcom Corporation and/or its subsidiaries.</para>">
-<!ENTITY broadcom "<trademark class='registered'>Broadcom</trademark>">
+<!ENTITY broadcom "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Broadcom</trademark>">

 <!-- http://www.checkpoint.com/copyright.html -->
-<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1, and
+<!ENTITY tm-attrib.check-point "<para xmlns='http://docbook.org/ns/docbook'>Check Point, Firewall-1, and
  VPN-1 are trademarks of Check Point Software Technologies
  Ltd.</para>">

-<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, and IOS are
+<!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>">
-<!ENTITY cisco "<trademark class='registered'>Cisco</trademark>">
-<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
-<!ENTITY etherchannel "<trademark class='registered'>EtherChannel</trademark>">
-<!ENTITY ios "<trademark class='registered'>IOS</trademark>">
+<!ENTITY cisco "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Cisco</trademark>">
+<!ENTITY catalyst "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Catalyst</trademark>">
+<!ENTITY etherchannel "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>EtherChannel</trademark>">
+<!ENTITY ios "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>IOS</trademark>">

-<!ENTITY tm-attrib.corel "<para>Corel and WordPerfect are trademarks
+<!ENTITY tm-attrib.corel "<para xmlns='http://docbook.org/ns/docbook'>Corel and WordPerfect are trademarks
  or registered trademarks of Corel Corporation and/or its
  subsidiaries in Canada, the United States and/or other
  countries.</para>">
-<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>">
+<!ENTITY wordperfect "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>WordPerfect</trademark>">

 <!-- http://www.coverity.com/html/press_story45_07_25_07.html -->
-<!ENTITY tm-attrib.coverity "<para>Coverity is a registered trademark;
+<!ENTITY tm-attrib.coverity "<para xmlns='http://docbook.org/ns/docbook'>Coverity is a registered trademark;
 Coverity Extend, Coverity Prevent and Coverity Prevent SQS are trademarks of
 Coverity, Inc.</para>">
-<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>">
-<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>">
+<!ENTITY coverity "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Coverity</trademark>">
+<!ENTITY coverity.prevent "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Coverity Prevent</trademark>">

 <!-- http://www.creative.com/legal.asp -->
-<!ENTITY tm-attrib.creative "<para>Sound Blaster is a trademark of
+<!ENTITY tm-attrib.creative "<para xmlns='http://docbook.org/ns/docbook'>Sound Blaster is a trademark of
  Creative Technology Ltd. in the United States and/or other
  countries.</para>">
-<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
+<!ENTITY soundblaster "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>SoundBlaster</trademark>">

 <!-- http://www.cvsup.org/ -->
-<!ENTITY tm-attrib.cvsup "<para>CVSup is a registered trademark of
+<!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 tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
+<!ENTITY tm-attrib.dell "<para xmlns='http://docbook.org/ns/docbook'>Dell, Dell Precision, Latitude,
  Optiplex, PowerEdge are trademarks or registered trademarks of Dell
  Computer Corporation</para>">
-<!ENTITY dell "<trademark>Dell</trademark>">
-<!ENTITY poweredge "<trademark>PowerEdge</trademark>">
+<!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 tm-attrib.epson "<para>EPSON, EPSON Perfection are registered
+<!ENTITY tm-attrib.epson "<para xmlns='http://docbook.org/ns/docbook'>EPSON, EPSON Perfection are registered
  trademarks of Seiko Epson Corporation.</para>">
-<!ENTITY epson "<trademark class='registered'>EPSON</trademark>">
-<!ENTITY epson.perfection "<trademark class='registered'>EPSON
+<!ENTITY epson "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>EPSON</trademark>">
+<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>EPSON
  Perfection</trademark>">

-<!ENTITY tm-attrib.freebsd "<para>FreeBSD is a registered trademark of
+<!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD is a registered trademark of
  the FreeBSD Foundation.</para>">

 <!-- http://www.fpc.fujitsu.com/www/content/legal_resources/trademarks.php -->
-<!ENTITY tm-attrib.fujitsu "<para>Fujitsu, the Fujitsu logo, LifeBook,
+<!ENTITY tm-attrib.fujitsu "<para xmlns='http://docbook.org/ns/docbook'>Fujitsu, the Fujitsu logo, LifeBook,
  Stylistic, PRIMEPOWER, PRIMEQUEST, PRIMECLUSTER, ETERNUS, TRIOLE,
  ESPRIMO, BioMedCAChe, CAChe, CELLINJECTOR, isS, Materials Explorer,
  SystemWalker, and Interstage are trademarks or registered trademarks
  of Fujitsu Limited in the United States and other countries.</para>">
-<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>">
-<!ENTITY primepower "<trademark class='registered'>PRIMEPOWER</trademark>">
+<!ENTITY fujitsu "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Fujitsu</trademark>">
+<!ENTITY primepower "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>PRIMEPOWER</trademark>">

 <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
-<!ENTITY tm-attrib.heidelberger "<para>Heidelberg, Helvetica,
+<!ENTITY tm-attrib.heidelberger "<para xmlns='http://docbook.org/ns/docbook'>Heidelberg, Helvetica,
  Palatino, and Times Roman are either registered trademarks or
  trademarks of Heidelberger Druckmaschinen AG in the U.S. and other
  countries.</para>">

-<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2,
+<!ENTITY tm-attrib.ibm "<para xmlns='http://docbook.org/ns/docbook'>IBM, AIX, EtherJet, Netfinity, OS/2,
  PowerPC, PS/2, S/390, and ThinkPad are
  trademarks of International Business Machines Corporation in the
  United States, other countries, or both.</para>">
-<!ENTITY aix "<trademark class='registered'>AIX</trademark>">
-<!ENTITY etherjet "<trademark>EtherJet</trademark>">
-<!ENTITY netfinity "<trademark class='registered'>Netfinity</trademark>">
-<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>">
-<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>">
-<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>">
-<!ENTITY s390 "<trademark class='registered'>S/390</trademark>">
-<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>">
+<!ENTITY aix "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>AIX</trademark>">
+<!ENTITY etherjet "<trademark xmlns='http://docbook.org/ns/docbook'>EtherJet</trademark>">
+<!ENTITY netfinity "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Netfinity</trademark>">
+<!ENTITY os2 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>OS/2</trademark>">
+<!ENTITY powerpc "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>PowerPC</trademark>">
+<!ENTITY ps2 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>PS/2</trademark>">
+<!ENTITY s390 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>S/390</trademark>">
+<!ENTITY thinkpad "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>ThinkPad</trademark>">

-<!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, and 802 are registered
+<!ENTITY tm-attrib.ieee "<para xmlns='http://docbook.org/ns/docbook'>IEEE, POSIX, and 802 are registered
  trademarks of Institute of Electrical and Electronics Engineers,
  Inc. in the United States.</para>">
-<!ENTITY ieee "<trademark class='registered'>IEEE</trademark>">
-<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
+<!ENTITY ieee "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>IEEE</trademark>">
+<!ENTITY posix "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>POSIX</trademark>">

 <!-- http://www.intel.com/intel/legal/tmnouns2.htm -->
-<!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386,
+<!ENTITY tm-attrib.intel "<para xmlns='http://docbook.org/ns/docbook'>Intel, Celeron, EtherExpress, i386,
  i486, Itanium, Pentium, and Xeon are trademarks or registered
  trademarks of Intel Corporation or its subsidiaries in the United
  States and other countries.</para>">
-<!ENTITY celeron "<trademark class='registered'>Celeron</trademark>">
-<!ENTITY etherexpress "<trademark>EtherExpress</trademark>">
-<!ENTITY i386 "<trademark>i386</trademark>">
-<!ENTITY i486 "<trademark>i486</trademark>">
-<!ENTITY intel "<trademark class='registered'>Intel</trademark>">
-<!ENTITY itanium "<trademark class='registered'>Itanium</trademark>">
-<!ENTITY pentium "<trademark class='registered'>Pentium</trademark>">
-<!ENTITY xeon "<trademark>Xeon</trademark>">
-<!ENTITY core "<trademark>Core</trademark>">
+<!ENTITY celeron "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Celeron</trademark>">
+<!ENTITY etherexpress "<trademark xmlns='http://docbook.org/ns/docbook'>EtherExpress</trademark>">
+<!ENTITY i386 "<trademark xmlns='http://docbook.org/ns/docbook'>i386</trademark>">
+<!ENTITY i486 "<trademark xmlns='http://docbook.org/ns/docbook'>i486</trademark>">
+<!ENTITY intel "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Intel</trademark>">
+<!ENTITY itanium "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Itanium</trademark>">
+<!ENTITY pentium "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Pentium</trademark>">
+<!ENTITY xeon "<trademark xmlns='http://docbook.org/ns/docbook'>Xeon</trademark>">
+<!ENTITY core "<trademark xmlns='http://docbook.org/ns/docbook'>Core</trademark>">

 <!-- http://www.quicken.com/support/trademark/ -->
-<!ENTITY tm-attrib.intuit "<para>Intuit and Quicken are registered
+<!ENTITY tm-attrib.intuit "<para xmlns='http://docbook.org/ns/docbook'>Intuit and Quicken are registered
  trademarks and/or registered service marks of Intuit Inc., or one of
  its subsidiaries, in the United States and other countries.</para>">

-<!ENTITY tm-attrib.iomega "<para>Iomega, Zip, and Jaz are either
+<!ENTITY tm-attrib.iomega "<para xmlns='http://docbook.org/ns/docbook'>Iomega, Zip, and Jaz are either
  registered trademarks or trademarks of Iomega Corporation in the
  United States and/or other countries.</para>">
-<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>">
-<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>">
+<!ENTITY iomegazip "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Zip</trademark>">
+<!ENTITY jaz "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Jaz</trademark>">

-<!ENTITY tm-attrib.lantronix "<para>Lantronix and EasyIO are
+<!ENTITY tm-attrib.lantronix "<para xmlns='http://docbook.org/ns/docbook'>Lantronix and EasyIO are
  trademarks of Lantronix Corporation.</para>">
-<!ENTITY easyio "<trademark>EasyIO</trademark>">
+<!ENTITY easyio "<trademark xmlns='http://docbook.org/ns/docbook'>EasyIO</trademark>">

 <!-- http://www.linuxmark.org/ -->
-<!ENTITY tm-attrib.linux "<para>Linux is a registered trademark of
+<!ENTITY tm-attrib.linux "<para xmlns='http://docbook.org/ns/docbook'>Linux is a registered trademark of
  Linus Torvalds.</para>">
-<!ENTITY linux "<trademark class='registered'>Linux</trademark>">
+<!ENTITY linux "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Linux</trademark>">

 <!-- http://www.lsilogic.com/trademrk.html -->
-<!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID,
+<!ENTITY tm-attrib.lsilogic "<para xmlns='http://docbook.org/ns/docbook'>LSI Logic, AcceleRAID, eXtremeRAID,
  MegaRAID and Mylex are trademarks or registered trademarks of LSI
  Logic Corp.</para>">
-<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>">
-<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
-<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
+<!ENTITY acceleraid "<trademark xmlns='http://docbook.org/ns/docbook'>AcceleRAID</trademark>">
+<!ENTITY megaraid "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>MegaRAID</trademark>">
+<!ENTITY mylex "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Mylex</trademark>">

-<!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, and Shockwave are
+<!ENTITY tm-attrib.macromedia "<para xmlns='http://docbook.org/ns/docbook'>Macromedia, Flash, and Shockwave are
  trademarks or registered trademarks of Macromedia, Inc. in the
  United States and/or other countries.</para>">
-<!ENTITY flash "<trademark>Flash</trademark>">
-<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
-<!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
+<!ENTITY flash "<trademark xmlns='http://docbook.org/ns/docbook'>Flash</trademark>">
+<!ENTITY macromedia "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Macromedia</trademark>">
+<!ENTITY shockwave "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Shockwave</trademark>">

-<!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
+<!ENTITY tm-attrib.microsoft "<para xmlns='http://docbook.org/ns/docbook'>Microsoft, IntelliMouse, MS-DOS,
  Outlook, Windows, Windows Media and Windows NT are either
  registered trademarks or trademarks of Microsoft Corporation in the
  United States and/or other countries.</para>">
-<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
-<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
+<!ENTITY intellimouse "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>IntelliMouse</trademark>">
+<!ENTITY microsoft "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Microsoft</trademark>">
 <!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
-<!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>">
-<!ENTITY outlook "<trademark class='registered'>Outlook</trademark>">
-<!ENTITY windows "<trademark class='registered'>Windows</trademark>">
-<!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>">
+<!ENTITY ms-dos "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>MS-DOS</trademark>">
+<!ENTITY outlook "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Outlook</trademark>">
+<!ENTITY windows "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Windows</trademark>">
+<!ENTITY windows.media "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Windows Media</trademark>">
 <!ENTITY windows2k "&windows;&nbsp;2000">
-<!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
+<!ENTITY windowsnt "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Windows&nbsp;NT</trademark>">
 <!ENTITY windowsxp "&windows;&nbsp;XP">

-<!ENTITY tm-attrib.mips "<para>MIPS and R4000 are registered
+<!ENTITY tm-attrib.mips "<para xmlns='http://docbook.org/ns/docbook'>MIPS and R4000 are registered
  trademarks of MIPS Technologies, Inc. in the United States and other
  countries.</para>">
-<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
+<!ENTITY mips "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>MIPS</trademark>">

 <!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY tm-attrib.mysql "<para>MySQL is a registered trademark of
+<!ENTITY tm-attrib.mysql "<para xmlns='http://docbook.org/ns/docbook'>MySQL is a registered trademark of
  MySQL AB in the United States, the European Union and other
  countries.</para>">
-<!ENTITY mysql "<trademark>MySQL</trademark>">
+<!ENTITY mysql "<trademark xmlns='http://docbook.org/ns/docbook'>MySQL</trademark>">

 <!-- http://www.m-sys.com/content/LegalTerms.asp -->
-<!ENTITY tm-attrib.m-systems "<para>M-Systems and DiskOnChip are
+<!ENTITY tm-attrib.m-systems "<para xmlns='http://docbook.org/ns/docbook'>M-Systems and DiskOnChip are
  trademarks or registered trademarks of M-Systems Flash Disk
  Pioneers, Ltd.</para>">
-<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
+<!ENTITY diskonchip "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>DiskOnChip</trademark>">

 <!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ -->
-<!ENTITY tm-attrib.netbsd "<para>NetBSD is a registered trademark of
+<!ENTITY tm-attrib.netbsd "<para xmlns='http://docbook.org/ns/docbook'>NetBSD is a registered trademark of
  the NetBSD Foundation.</para>">

-<!ENTITY tm-attrib.netscape "<para>Netscape and the Netscape Navigator
+<!ENTITY tm-attrib.netscape "<para xmlns='http://docbook.org/ns/docbook'>Netscape and the Netscape Navigator
  are registered trademarks of Netscape Communications Corporation in
  the U.S. and other countries.</para>">
-<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>">
-<!ENTITY netscape.navigator "<trademark class='registered'>Netscape&nbsp;Navigator</trademark>">
+<!ENTITY netscape "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Netscape</trademark>">
+<!ENTITY netscape.navigator "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Netscape&nbsp;Navigator</trademark>">

 <!-- http://www.nexthop.com/legal.shtml -->
-<!ENTITY tm-attrib.nexthop "<para>GateD and NextHop are registered and
+<!ENTITY tm-attrib.nexthop "<para xmlns='http://docbook.org/ns/docbook'>GateD and NextHop are registered and
  unregistered trademarks of NextHop in the U.S. and other
  countries.</para>">
-<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
+<!ENTITY gated "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>GateD</trademark>">

 <!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
-<!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module, and
+<!ENTITY tm-attrib.novell "<para xmlns='http://docbook.org/ns/docbook'>NetWare, NetWare Loadable Module, and
  NLM are either registered trademarks or trademarks of Novell,
  Inc. in the United States and other countries.</para>">

-<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, and UNIX are
+<!ENTITY tm-attrib.opengroup "<para xmlns='http://docbook.org/ns/docbook'>Motif, OSF/1, and UNIX are
  registered trademarks and IT DialTone and The Open Group are
  trademarks of The Open Group in the United States and other
  countries.</para>">
-<!ENTITY tm-attrib.unix "<para>UNIX is a registered trademark of The
+<!ENTITY tm-attrib.unix "<para xmlns='http://docbook.org/ns/docbook'>UNIX is a registered trademark of The
  Open Group in the United States and other countries.</para>">
-<!ENTITY motif "<trademark class='registered'>Motif</trademark>">
-<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
+<!ENTITY motif "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Motif</trademark>">
+<!ENTITY unix "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>UNIX</trademark>">

 <!-- http://www.oracle.com/html/trademark.html -->
 <!-- http://www.oracle.com/html/3party.html -->
-<!ENTITY tm-attrib.oracle "<para>Oracle is a registered trademark
+<!ENTITY tm-attrib.oracle "<para xmlns='http://docbook.org/ns/docbook'>Oracle is a registered trademark
  of Oracle Corporation.</para>">
-<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
+<!ENTITY oracle "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Oracle</trademark>">

-<!ENTITY tm-attrib.parallels "<para>Parallels is a trademark of
+<!ENTITY tm-attrib.parallels "<para xmlns='http://docbook.org/ns/docbook'>Parallels is a trademark of
  Parallels Software International Inc.</para>">

 <!-- http://www.powerquest.com/legal/ -->
-<!ENTITY tm-attrib.powerquest "<para>PowerQuest and PartitionMagic are
+<!ENTITY tm-attrib.powerquest "<para xmlns='http://docbook.org/ns/docbook'>PowerQuest and PartitionMagic are
  registered trademarks of PowerQuest Corporation in the United States
  and/or other countries.</para>">
-<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>">
+<!ENTITY partitionmagic "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>PartitionMagic</trademark>">

 <!-- http://www.qualcomm.com/main/legal.html -->
-<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM and Eudora are registered
+<!ENTITY tm-attrib.qualcomm "<para xmlns='http://docbook.org/ns/docbook'>QUALCOMM and Eudora are registered
  trademarks of QUALCOMM Incorporated.</para>">
-<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
+<!ENTITY eudora "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Eudora</trademark>">

 <!-- http://www.realnetworks.com/company/logos/policy.html -->
-<!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, and
+<!ENTITY tm-attrib.realnetworks "<para xmlns='http://docbook.org/ns/docbook'>RealNetworks, RealPlayer, and
  RealAudio are the registered trademarks of RealNetworks,
  Inc.</para>">
-<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>">
+<!ENTITY realplayer "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>RealPlayer</trademark>">

 <!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks -->
 <!-- http://www.redhat.com/legal/legal_statement.html -->
-<!ENTITY tm-attrib.redhat "<para>Red Hat, RPM, are trademarks or
+<!ENTITY tm-attrib.redhat "<para xmlns='http://docbook.org/ns/docbook'>Red Hat, RPM, are trademarks or
  registered trademarks of Red Hat, Inc. in the United States and
  other countries.</para>">

-<!ENTITY tm-attrib.sap "<para>SAP, R/3, and mySAP are trademarks or
+<!ENTITY tm-attrib.sap "<para xmlns='http://docbook.org/ns/docbook'>SAP, R/3, and mySAP are trademarks or
  registered trademarks of SAP AG in Germany and in several other
  countries all over the world.</para>">
-<!ENTITY r3 "<trademark class='registered'>R/3</trademark>">
-<!ENTITY sap "<trademark class='registered'>SAP</trademark>">
+<!ENTITY r3 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>R/3</trademark>">
+<!ENTITY sap "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>SAP</trademark>">
 <!ENTITY sap.r3 "&sap;&nbsp;&r3;">

-<!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, and OpenGL are
+<!ENTITY tm-attrib.sgi "<para xmlns='http://docbook.org/ns/docbook'>Silicon Graphics, SGI, and OpenGL are
  registered trademarks of Silicon Graphics, Inc., in the United
  States and/or other countries worldwide.</para>">
-<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
+<!ENTITY opengl "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>OpenGL</trademark>">

 <!-- http://slackware.com/trademark/trademark.php -->
-<!ENTITY tm-attrib.slackware "<para>Slackware is a registered trademark
+<!ENTITY tm-attrib.slackware "<para xmlns='http://docbook.org/ns/docbook'>Slackware is a registered trademark
  of Patrick Volkerding and Slackware Linux, Inc.</para>">

 <!-- http://www.sparc.org/trademarksListing.html -->
-<!ENTITY tm-attrib.sparc "<para>SPARC, SPARC64, SPARCengine, and
+<!ENTITY tm-attrib.sparc "<para xmlns='http://docbook.org/ns/docbook'>SPARC, SPARC64, SPARCengine, and
  UltraSPARC are trademarks of SPARC International, Inc in the United
  States and other countries.  SPARC International, Inc owns all of the
  SPARC trademarks and under licensing agreements allows the proper use
  of these trademarks by its members.</para>">
-<!ENTITY sparc "<trademark class='registered'>SPARC</trademark>">
-<!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>">
-<!ENTITY sparcengine "<trademark class='registered'>SPARCengine</trademark>">
-<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
+<!ENTITY sparc "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>SPARC</trademark>">
+<!ENTITY sparc64 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>SPARC64</trademark>">
+<!ENTITY sparcengine "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>SPARCengine</trademark>">
+<!ENTITY ultrasparc "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>UltraSPARC</trademark>">

 <!-- http://www.sun.com/suntrademarks/ -->

-<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java
+<!ENTITY tm-attrib.sun "<para xmlns='http://docbook.org/ns/docbook'>Sun, Sun Microsystems, Java, Java
  Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, OpenJDK,
  Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS,
  Ultra and VirtualBox are trademarks or registered trademarks of
  Sun Microsystems, Inc. in the United States and other countries.</para>">
-<!ENTITY java "<trademark>Java</trademark>">
-<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
-<!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>">
-<!ENTITY jdk "<trademark>JDK</trademark>">
-<!ENTITY jre "<trademark>JRE</trademark>">
-<!ENTITY jsp "<trademark>JSP</trademark>">
-<!ENTITY jvm "<trademark>JVM</trademark>">
-<!ENTITY netra "<trademark>Netra</trademark>">
-<!ENTITY openjdk "<trademark>OpenJDK</trademark>">
-<!ENTITY solaris "<trademark>Solaris</trademark>">
-<!ENTITY staroffice "<trademark>StarOffice</trademark>">
-<!ENTITY sun "<trademark>Sun</trademark>">
-<!ENTITY sun.blade "<trademark>Sun&nbsp;Blade</trademark>">
-<!ENTITY sun.enterprise "<trademark>Sun&nbsp;Enterprise</trademark>">
-<!ENTITY sun.fire "<trademark>Sun&nbsp;Fire</trademark>">
-<!ENTITY sun.ultra "Sun&nbsp;<trademark>Ultra</trademark>">
-<!ENTITY sunos "<trademark>SunOS</trademark>">
-<!ENTITY virtualbox "<trademark>VirtualBox</trademark>">
+<!ENTITY java "<trademark xmlns='http://docbook.org/ns/docbook'>Java</trademark>">
+<!ENTITY java.virtual.machine "<trademark xmlns='http://docbook.org/ns/docbook'>Java Virtual Machine</trademark>">
+<!ENTITY javaserver.pages "<trademark xmlns='http://docbook.org/ns/docbook'>JavaServer Pages</trademark>">
+<!ENTITY jdk "<trademark xmlns='http://docbook.org/ns/docbook'>JDK</trademark>">
+<!ENTITY jre "<trademark xmlns='http://docbook.org/ns/docbook'>JRE</trademark>">
+<!ENTITY jsp "<trademark xmlns='http://docbook.org/ns/docbook'>JSP</trademark>">
+<!ENTITY jvm "<trademark xmlns='http://docbook.org/ns/docbook'>JVM</trademark>">
+<!ENTITY netra "<trademark xmlns='http://docbook.org/ns/docbook'>Netra</trademark>">
+<!ENTITY openjdk "<trademark xmlns='http://docbook.org/ns/docbook'>OpenJDK</trademark>">
+<!ENTITY solaris "<trademark xmlns='http://docbook.org/ns/docbook'>Solaris</trademark>">
+<!ENTITY staroffice "<trademark xmlns='http://docbook.org/ns/docbook'>StarOffice</trademark>">
+<!ENTITY sun "<trademark xmlns='http://docbook.org/ns/docbook'>Sun</trademark>">
+<!ENTITY sun.blade "<trademark xmlns='http://docbook.org/ns/docbook'>Sun&nbsp;Blade</trademark>">
+<!ENTITY sun.enterprise "<trademark xmlns='http://docbook.org/ns/docbook'>Sun&nbsp;Enterprise</trademark>">
+<!ENTITY sun.fire "<trademark xmlns='http://docbook.org/ns/docbook'>Sun&nbsp;Fire</trademark>">
+<!ENTITY sun.ultra "Sun&nbsp;<trademark xmlns='http://docbook.org/ns/docbook'>Ultra</trademark>">
+<!ENTITY sunos "<trademark xmlns='http://docbook.org/ns/docbook'>SunOS</trademark>">
+<!ENTITY virtualbox "<trademark xmlns='http://docbook.org/ns/docbook'>VirtualBox</trademark>">

 <!-- http://www.symantec.com/legal/legal_note.html -->
-<!ENTITY tm-attrib.symantec "<para>Symantec and Ghost are registered
+<!ENTITY tm-attrib.symantec "<para xmlns='http://docbook.org/ns/docbook'>Symantec and Ghost are registered
  trademarks of Symantec Corporation in the United States and other
  countries.</para>">

 <!-- http://www.mathworks.com/company/trademarks.shtml -->
-<!ENTITY tm-attrib.themathworks "<para>MATLAB is a registered trademark
+<!ENTITY tm-attrib.themathworks "<para xmlns='http://docbook.org/ns/docbook'>MATLAB is a registered trademark
  of The MathWorks, Inc.</para>">
-<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
+<!ENTITY matlab "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>MATLAB</trademark>">

-<!ENTITY tm-attrib.thomson "<para>SpeedTouch is a trademark of
+<!ENTITY tm-attrib.thomson "<para xmlns='http://docbook.org/ns/docbook'>SpeedTouch is a trademark of
  Thomson.</para>">
-<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
+<!ENTITY speedtouch "<trademark xmlns='http://docbook.org/ns/docbook'>SpeedTouch</trademark>">

 <!-- http://www.transmeta.com/about/legal.html -->
-<!ENTITY tm-attrib.transmeta "<para>Transmeta and Crusoe are either
+<!ENTITY tm-attrib.transmeta "<para xmlns='http://docbook.org/ns/docbook'>Transmeta and Crusoe are either
  trademarks or registered trademarks of Transmeta Corporation in the
  United States and/or other countries.</para>">
-<!ENTITY crusoe "<trademark>Crusoe</trademark>">
-<!ENTITY transmeta "<trademark>Transmeta</trademark>">
+<!ENTITY crusoe "<trademark xmlns='http://docbook.org/ns/docbook'>Crusoe</trademark>">
+<!ENTITY transmeta "<trademark xmlns='http://docbook.org/ns/docbook'>Transmeta</trademark>">

 <!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp -->
 <!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp -->
-<!ENTITY tm-attrib.usrobotics "<para>U.S. Robotics and Sportster are
+<!ENTITY tm-attrib.usrobotics "<para xmlns='http://docbook.org/ns/docbook'>U.S. Robotics and Sportster are
  registered trademarks of U.S. Robotics Corporation.</para>">
-<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
-<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
+<!ENTITY sportster "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Sportster</trademark>">
+<!ENTITY usrobotics "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>U.S. Robotics</trademark>">

 <!-- http://www.maplesoft.com/trademarks.shtml -->
-<!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple and Maple are
+<!ENTITY tm-attrib.waterloomaple "<para xmlns='http://docbook.org/ns/docbook'>Waterloo Maple and Maple are
  trademarks or registered trademarks of Waterloo Maple Inc.</para>">
-<!ENTITY maple "<trademark>Maple</trademark>">
+<!ENTITY maple "<trademark xmlns='http://docbook.org/ns/docbook'>Maple</trademark>">

 <!-- http://www.wolfram.com/company/terms.html -->
-<!ENTITY tm-attrib.wolframresearch "<para>Mathematica is a registered
+<!ENTITY tm-attrib.wolframresearch "<para xmlns='http://docbook.org/ns/docbook'>Mathematica is a registered
  trademark of Wolfram Research, Inc.</para>">
-<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
+<!ENTITY mathematica "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Mathematica</trademark>">

 <!-- http://www.vmware.com/legal.html -->
-<!ENTITY tm-attrib.vmware "<para>VMware is a trademark of VMware,
+<!ENTITY tm-attrib.vmware "<para xmlns='http://docbook.org/ns/docbook'>VMware is a trademark of VMware,
  Inc.</para>">

 <!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY tm-attrib.xen "<para>Xen is a trademark of XenSource, Inc. in
+<!ENTITY tm-attrib.xen "<para xmlns='http://docbook.org/ns/docbook'>Xen is a trademark of XenSource, Inc. in
  the United States and other countries.</para>">
-<!ENTITY xen "<trademark>Xen</trademark>">
+<!ENTITY xen "<trademark xmlns='http://docbook.org/ns/docbook'>Xen</trademark>">

-<!ENTITY tm-attrib.xfree86 "<para>XFree86 is a trademark of The
+<!ENTITY tm-attrib.xfree86 "<para xmlns='http://docbook.org/ns/docbook'>XFree86 is a trademark of The
  XFree86 Project, Inc.</para>">
-<!ENTITY xfree86 "<trademark>XFree86</trademark>">
+<!ENTITY xfree86 "<trademark xmlns='http://docbook.org/ns/docbook'>XFree86</trademark>">

 <!-- http://www.xiph.org/ -->
-<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis and Xiph.Org are trademarks
+<!ENTITY tm-attrib.xiph "<para xmlns='http://docbook.org/ns/docbook'>Ogg Vorbis and Xiph.Org are trademarks
  of Xiph.Org.</para>">

-<!ENTITY tm-attrib.general "<para>Many of the designations used by
+<!ENTITY tm-attrib.general "<para xmlns='http://docbook.org/ns/docbook'>Many of the designations used by
  manufacturers and sellers to distinguish their products are claimed
  as trademarks.  Where those designations appear in this document,
  and the FreeBSD Project was aware of the trademark claim, the