svn commit: r41889 - in projects/db5: de_DE.ISO8859-1/books/handbook/desktop de_DE.ISO8859-1/books/handbook/install el_GR.ISO8859-7/books/handbook/desktop el_GR.ISO8859-7/books/handbook/install el_...

Mon Jun 10 09:40:41 UTC 2013

Author: gabor
Date: Mon Jun 10 09:40:37 2013
New Revision: 41889
URL: http://svnweb.freebsd.org/changeset/doc/41889

Log:
  - Revert r41880 and r41881 since they resulted in loss of semantic
    information
  
  Pointed out by:	hrs

Modified:
  projects/db5/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml
  projects/db5/de_DE.ISO8859-1/books/handbook/install/chapter.xml
  projects/db5/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml
  projects/db5/el_GR.ISO8859-7/books/handbook/install/chapter.xml
  projects/db5/el_GR.ISO8859-7/share/xml/trademarks.ent
  projects/db5/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
  projects/db5/en_US.ISO8859-1/books/handbook/install/chapter.xml
  projects/db5/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml
  projects/db5/es_ES.ISO8859-1/books/handbook/install/chapter.xml
  projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent
  projects/db5/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml
  projects/db5/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
  projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent
  projects/db5/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml
  projects/db5/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
  projects/db5/hu_HU.ISO8859-2/share/xml/trademarks.ent
  projects/db5/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml
  projects/db5/it_IT.ISO8859-15/books/handbook/install/chapter.xml
  projects/db5/ja_JP.eucJP/books/handbook/desktop/chapter.xml
  projects/db5/ja_JP.eucJP/books/handbook/install/chapter.xml
  projects/db5/mn_MN.UTF-8/books/handbook/desktop/chapter.xml
  projects/db5/mn_MN.UTF-8/books/handbook/install/chapter.xml
  projects/db5/mn_MN.UTF-8/share/xml/trademarks.ent
  projects/db5/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml
  projects/db5/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
  projects/db5/nl_NL.ISO8859-1/share/xml/trademarks.ent
  projects/db5/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml
  projects/db5/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
  projects/db5/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml
  projects/db5/ru_RU.KOI8-R/books/handbook/install/chapter.xml
  projects/db5/ru_RU.KOI8-R/share/xml/trademarks.ent
  projects/db5/share/xml/trademarks.ent
  projects/db5/zh_CN.GB2312/books/handbook/desktop/chapter.xml
  projects/db5/zh_CN.GB2312/books/handbook/install/chapter.xml
  projects/db5/zh_CN.GB2312/share/xml/trademarks.ent
  projects/db5/zh_TW.Big5/books/handbook/desktop/chapter.xml
  projects/db5/zh_TW.Big5/books/handbook/install/chapter.xml
  projects/db5/zh_TW.Big5/share/xml/trademarks.ent
Directory Properties:
  projects/db5/nl_NL.ISO8859-1/share/xml/entities.ent   (props changed)

Modified: projects/db5/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml
==============================================================================

--- projects/db5/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml	Sun Jun  9 19:09:52 2013	(r41888)
+++ projects/db5/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml	Mon Jun 10 09:40:37 2013	(r41889)
@@ -1106,7 +1106,7 @@
       Arbeitsplatz verwalten wollen, stehen Ihnen verschiedene Anwendungen
       zur Verfügung.  Einige von ihnen unterstützen verbreitete
       Formate, darunter Dateiformate, die von
-      <application>Quicken®</application>
+      <application><trademark class="registered">Quicken</trademark></application>
       oder <application>Excel</application> verwendet werden.</para>
 
     <para>Dieser Abschnitt behandelt die folgenden Anwendungen:</para>

Modified: projects/db5/de_DE.ISO8859-1/books/handbook/install/chapter.xml
==============================================================================
--- projects/db5/de_DE.ISO8859-1/books/handbook/install/chapter.xml	Sun Jun  9 19:09:52 2013	(r41888)
+++ projects/db5/de_DE.ISO8859-1/books/handbook/install/chapter.xml	Mon Jun 10 09:40:37 2013	(r41889)
@@ -1538,8 +1538,9 @@ Mounting root from ufs:/dev/md0c
 	Die Funktion ist sehr zweckmäßig für Benutzer,
 	die Datensicherungen auf einer zweiten Platte erstellen
 	und dafür Werkzeuge wie
-	<application>Ghost®</application>
-	oder <application>xcopy</application>
+	<application>
+	  <trademark class="registered">Ghost</trademark>
+	</application> oder <application>xcopy</application>
 	einsetzen.  Wenn die erste Platte ausfällt, von einem
 	Virus befallen wird oder durch einen Fehler des
 	Betriebssystems verunstaltet wird, können die

Modified: projects/db5/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml
==============================================================================
--- projects/db5/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml	Sun Jun  9 19:09:52 2013	(r41888)
+++ projects/db5/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml	Mon Jun 10 09:40:37 2013	(r41889)
@@ -1096,7 +1096,7 @@
       éó÷õñÝò êáé åýêïëåò óôç ÷ñÞóç åöáñìïãÝò, Ýôïéìåò ðñïò åãêáôÜóôáóç.
       ÏñéóìÝíåò áðü áõôÝò åßíáé óõìâáôÝò ìå äéáäåäïìÝíåò ìïñöÝò áñ÷åßùí, üðùò
       áõôÝò ðïõ ÷ñçóéìïðïéïýíôáé óôá Ýããñáöá ôïõ
-      <application>Quicken®</application> Þ ôïõ <application>Excel</application>.</para>
+      <application><trademark class="registered">Quicken</trademark></application> Þ ôïõ <application>Excel</application>.</para>
 
     <para>Ôï ôìÞìá áõôü êáëýðôåé ôéò åöáñìïãÝò:</para>
 

Modified: projects/db5/el_GR.ISO8859-7/books/handbook/install/chapter.xml
==============================================================================
--- projects/db5/el_GR.ISO8859-7/books/handbook/install/chapter.xml	Sun Jun  9 19:09:52 2013	(r41888)
+++ projects/db5/el_GR.ISO8859-7/books/handbook/install/chapter.xml	Mon Jun 10 09:40:37 2013	(r41889)
@@ -1467,7 +1467,7 @@ Mounting root from ufs:/dev/md0c
 	áãïñÜóïõí Ýíá äåýôåñï üìïéï óêëçñü äßóêï, êáé íá áíôéãñÜöïõí áíÜ ôáêôÜ
 	äéáóôÞìáôá ôïí ðñþôï ôïõò äßóêï óôï äåýôåñï ÷ñçóéìïðïéþíôáò
 	ðñïãñÜììáôá üðùò ôï
-	<application>Ghost®</application> Þ ôï <application>XCOPY</application>.
+	<application><trademark class="registered">Ghost</trademark></application> Þ ôï <application>XCOPY</application>.
 	¸ôóé, áí ï ðñþôïò äßóêïò ÷áëÜóåé, Þ äå÷èåß åðßèåóç áðü éü, Þ
 	ðáñïõóéÜóåé ðñüâëçìá åîáéôßáò êÜðïéïõ åëáôôþìáôïò ôïõ ëåéôïõñãéêïý
 	óõóôÞìáôïò, ï ÷ñÞóôçò ìðïñåß åýêïëá íá åðáíáöÝñåé ôï óýóôçìá

Modified: projects/db5/el_GR.ISO8859-7/share/xml/trademarks.ent
==============================================================================
--- projects/db5/el_GR.ISO8859-7/share/xml/trademarks.ent	Sun Jun  9 19:09:52 2013	(r41888)
+++ projects/db5/el_GR.ISO8859-7/share/xml/trademarks.ent	Mon Jun 10 09:40:37 2013	(r41889)
@@ -25,80 +25,80 @@
 <!ENTITY tm-attrib.3com "<para>Ïé ëÝîåéò 3Com êáé HomeConnect åßíáé
   êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò 3Com Corporation.</para>">
 <!-- An SGML entity can't start with a number... -->
-<!ENTITY tm.3com "3Com®">
+<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
 
 <!ENTITY tm-attrib.3ware "<para>Ïé ëÝîåéò 3ware êáé Escalade åßíáé
   êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò 3ware Inc.</para>">
-<!ENTITY tm.3ware "3ware®">
+<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
 
 <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
 <!ENTITY tm-attrib.adaptec "<para>Ç ëÝîç Adaptec åßíáé êáôï÷õñùìÝíï åìðïñéêü
   óýìâïëï ôçò Adaptec, Inc.</para>">
-<!ENTITY adaptec "Adaptec®">
+<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
 
 <!ENTITY tm-attrib.adobe "<para>Ïé ëÝîåéò Þ öñÜóåéò Adobe, Acrobat, Acrobat
   Reader, êáé PostScript åßíáé åßôå êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá Þ åìðïñéêÜ
   óýìâïëá ôçò Adobe Systems Incorporated óôéò ÇíùìÝíåò Ðïëéôåßåò Þ/êáé óå
   Üëëåò ÷þñåò.</para>">
-<!ENTITY acrobat "Acrobat®">
-<!ENTITY acrobat.reader "Acrobat Reader®">
-<!ENTITY adobe "Adobe®">
-<!ENTITY postscript "PostScript®">
+<!ENTITY acrobat "<trademark class='registered'>Acrobat</trademark>">
+<!ENTITY acrobat.reader "<trademark class='registered'>Acrobat Reader</trademark>">
+<!ENTITY adobe "<trademark class='registered'>Adobe</trademark>">
+<!ENTITY postscript "<trademark class='registered'>PostScript</trademark>">
 
 <!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
 <!ENTITY tm-attrib.amd "<para>Ïé ëÝîåéò Þ öñÜóåéò AMD, AMD
   Athlon, AMD Opteron, Élan, êáé PCnet åßíáé
   åìðïñéêÜ óýìâïëá ôçò Advanced Micro Devices, Inc.</para>">
-<!ENTITY amd.athlon "AMD Athlon™">
-<!ENTITY amd.opteron "AMD Opteron™">
-<!ENTITY athlon "Athlon™">
-<!ENTITY elan "Élan™">
-<!ENTITY opteron "Opteron™">
+<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>">
+<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>">
+<!ENTITY athlon "<trademark>Athlon</trademark>">
+<!ENTITY elan "<trademark>Élan</trademark>">
+<!ENTITY opteron "<trademark>Opteron</trademark>">
 
 <!ENTITY tm-attrib.apple "<para>Ïé ëÝîåéò Þ öñÜóåéò Apple, AirPort, FireWire, Mac,
   Macintosh, Mac OS, Quicktime, êáé TrueType åßíáé åìðïñéêÜ óýìâïëá ôçò Apple
   Computer, Inc., êáôï÷õñùìÝíá óôéò ÇíùìÝíåò Ðïëéôåßåò êáé óå Üëëåò
   ÷þñåò.</para>">
-<!ENTITY airport "AirPort®">
-<!ENTITY apple "Apple®">
-<!ENTITY firewire "FireWire®">
-<!ENTITY imac "iMac®">
-<!ENTITY mac "Mac®">
-<!ENTITY macintosh "Macintosh®">
-<!ENTITY macos "Mac OS®">
-<!ENTITY quicktime "Quicktime®">
-<!ENTITY truetype "TrueType®">
+<!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 OS</trademark>">
+<!ENTITY quicktime "<trademark class='registered'>Quicktime</trademark>">
+<!ENTITY truetype "<trademark class='registered'>TrueType</trademark>">
 
 <!ENTITY tm-attrib.arm "<para>Ç ëÝîç ARM åßíáé êáôï÷õñùìÝíï åìðïñéêü óýìâïëï
   ôçò ARM Limited.</para>">
-<!ENTITY arm "ARM®">
+<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
 
 <!ENTITY tm-attrib.cisco "<para>Ïé ëÝîåéò Þ öñÜóåéò Cisco, Catalyst, êáé IOS
   åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Cisco Systems, Inc. Þ/êáé ôùí
   óõíåñãáôþí ôçò óôéò ÇíùìÝíåò Ðïëéôåßåò êáé óå ïñéóìÝíåò Üëëåò ÷þñåò.">
-<!ENTITY cisco "Cisco®">
-<!ENTITY catalyst "Catalyst®">
-<!ENTITY etherchannel "EtherChannel®">
-<!ENTITY ios "IOS®">
+<!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 tm-attrib.corel "<para>Ïé ëÝîåéò Corel êáé WordPerfect åßíáé åìðïñéêÜ
   óýìâïëá Þ êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Corel Corporation Þ/êáé ôùí
   èõãáôñéêþí ôçò óôïí ÊáíáäÜ, ôéò ÇíùìÝíåò Ðïëéôåßåò Þ/êáé óå Üëëåò
   ÷þñåò.</para>">
-<!ENTITY wordperfect "WordPerfect®">
+<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>">
 <!-- http://www.coverity.com/html/press_story45_07_25_07.html -->
 <!ENTITY tm-attrib.coverity "<para>Ç ëÝîç Coverity åßíáé Ýíá
 êáôï÷õñùìÝíï åìðïñéêü óýìâïëï.  Ïé ëÝîåéò Þ öñÜóåéò Coverity Extend,
 Coverity Prevent êáé Coverity Prevent SQS åßíáé åìðïñéêÜ óýìâïëá ôçò
 Coverity, Inc.</para>">
-<!ENTITY coverity "Coverity®">
-<!ENTITY coverity.prevent "Coverity Prevent®">
+<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>">
+<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>">
 
 <!-- http://www.creative.com/legal.asp -->
 <!ENTITY tm-attrib.creative "<para>Ç öñÜóç Sound Blaster åßíáé åìðïñéêü
   óýìâïëï ôçò Creative Technology Ltd. óôéò ÇíùìÝíåò Ðïëéôåßåò Þ/êáé óå Üëëåò
   ÷þñåò.</para>">
-<!ENTITY soundblaster "SoundBlaster®">
+<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
 
 <!-- http://www.cvsup.org/ -->
 <!ENTITY tm-attrib.cvsup "<para>Ç ëÝîç CVSup åßíáé êáôï÷õñùìÝíï åìðïñéêü
@@ -107,7 +107,7 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.freebsd "<para>Ôï FreeBSD åßíáé Ýíá êáôï÷õñùìÝíï åìðïñéêü
   óýìâïëï ôïõ FreeBSD Foundation.</para>">
 
-<!ENTITY fujitsu "Fujitsu®">
+<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>">
 
 <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
 <!ENTITY tm-attrib.heidelberger "<para>Ïé ëÝîåéò Þ öñÜóåéò Heidelberg,
@@ -119,32 +119,32 @@ Coverity, Inc.</para>">
   OS/2, PowerPC, PS/2, S/390, êáé ThinkPad åßíáé åìðïñéêÜ óýìâïëá
   ôçò International Business Machines Corporation óôéò ÇíùìÝíåò Ðïëéôåßåò,
   Üëëåò ÷þñåò, Þ êáé óôá äýï ôáõôü÷ñïíá.</para>">
-<!ENTITY aix "AIX®">
-<!ENTITY os2 "OS/2®">
-<!ENTITY powerpc "PowerPC®">
-<!ENTITY ps2 "PS/2®">
-<!ENTITY s390 "S/390®">
-<!ENTITY thinkpad "ThinkPad®">
+<!ENTITY aix "<trademark class='registered'>AIX</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 tm-attrib.ieee "<para>Ïé ëÝîåéò IEEE, POSIX, êáé 802 åßíáé
   êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôïõ Institute of Electrical and Electronics
   Engineers, Inc. óôéò ÇíùìÝíåò Ðïëéôåßåò.</para>">
-<!ENTITY ieee "IEEE®">
-<!ENTITY posix "POSIX®">
+<!ENTITY ieee "<trademark class='registered'>IEEE</trademark>">
+<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
 
 <!ENTITY tm-attrib.intel "<para>Ïé ëÝîåéò Intel, Celeron, EtherExpress,
   i386, i486, Itanium, Pentium, êáé Xeon åßíáé åìðïñéêÜ óýìâïëá Þ
   êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Intel Corporation êáé ôùí èõãáôñéêþí
   ôçò óôéò ÇíùìÝíåò Ðïëéôåßåò êáé óå Üëëåò ÷þñåò.</para>">
-<!ENTITY celeron "Celeron®">
-<!ENTITY etherexpress "EtherExpress™">
-<!ENTITY i386 "i386™">
-<!ENTITY i486 "i486™">
-<!ENTITY intel "Intel®">
-<!ENTITY itanium "Itanium®">
-<!ENTITY pentium "Pentium®">
-<!ENTITY core "Core™">
-<!ENTITY xeon "Xeon™">
+<!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 core "<trademark>Core</trademark>">
+<!ENTITY xeon "<trademark>Xeon</trademark>">
 
 <!-- http://www.quicken.com/support/trademark/ -->
 <!ENTITY tm-attrib.intuit "<para>Ïé ëÝîåéò Intuit êáé Quicken åßíáé
@@ -155,60 +155,60 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.iomega "<para>Ïé ëÝîåéò Iomega, Zip, êáé Jaz åßíáé
   åßôå êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá Þ åìðïñéêÜ óýìâïëá ôçò Iomega
   Corporation óôéò ÇíùìÝíåò Ðïëéôåßåò Þ/êáé óå Üëëåò ÷þñåò.</para>">
-<!ENTITY iomegazip "Zip®">
-<!ENTITY jaz "Jaz®">
+<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>">
+<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>">
 
 <!ENTITY tm-attrib.lantronix "<para>Ïé ëÝîåéò Lantronix êáé EasyIO åßíáé
   åìðïñéêÜ óýìâïëá ôçò Lantronix Corporation.</para>">
-<!ENTITY easyio "EasyIO™">
+<!ENTITY easyio "<trademark>EasyIO</trademark>">
 
 <!-- http://www.linuxmark.org/ -->
 <!ENTITY tm-attrib.linux "<para>Ôï Linux åßíáé Ýíá êáôï÷õñùìÝíá åìðïñéêü
   óýìâïëï ôïõ Linus Torvalds óôéò ÇíùìÝíåò Ðïëéôåßåò.</para>">
-<!ENTITY linux "Linux®">
+<!ENTITY linux "<trademark class='registered'>Linux</trademark>">
 
 <!-- http://www.lsilogic.com/trademrk.html -->
 <!ENTITY tm-attrib.lsilogic "<para>Ïé ëÝîåéò LSI Logic, AcceleRAID,
   eXtremeRAID, MegaRAID êáé Mylex åßíáé åìðïñéêÜ óýìâïëá Þ êáôï÷õñùìÝíá
   åìðïñéêÜ óýìâïëá ôçò LSI Logic Corp.</para>">
-<!ENTITY acceleraid "AcceleRAID™">
-<!ENTITY megaraid "MegaRAID®">
-<!ENTITY mylex "Mylex®">
+<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>">
+<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
+<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
 
 <!ENTITY tm-attrib.macromedia "<para>Ïé ëÝîåéò Macromedia, Flash, êáé
   Shockwave åßíáé åìðïñéêÜ óýìâïëá Þ êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò
   Macromedia, Inc. óôéò ÇíùìÝíåò Ðïëéôåßåò êáé/Þ óå Üëëåò ÷þñåò.</para>">
-<!ENTITY flash "Flash™">
-<!ENTITY macromedia "Macromedia®">
+<!ENTITY flash "<trademark>Flash</trademark>">
+<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
 
 <!ENTITY tm-attrib.microsoft "<para>Ïé ëÝîåéò Microsoft, IntelliMouse, MS-DOS,
   Outlook, Windows, Windows Media, êáé Windows NT åßíáé åßôå êáôï÷õñùìÝíá
   åìðïñéêÜ óýìâïëá Þ åìðïñéêÜ óýìâïëá ôçò Microsoft Corporation óôéò ÇíùìÝíåò
   Ðïëéôåßåò êáé/Þ óå Üëëåò ÷þñåò.</para>">
-<!ENTITY intellimouse "IntelliMouse®">
-<!ENTITY microsoft "Microsoft®">
+<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
+<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
 <!ENTITY microsoft.windows "µsoft; &windows;">
-<!ENTITY ms-dos "MS-DOS®">
-<!ENTITY outlook "Outlook®">
-<!ENTITY windows "Windows®">
-<!ENTITY windows.media "Windows Media®">
+<!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 windows2k "&windows; 2000">
-<!ENTITY windowsnt "Windows NT®">
+<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>">
 <!ENTITY windowsxp "&windows; XP">
 
 <!ENTITY tm-attrib.mips "<para>Ïé ëÝîåéò MIPS êáé R4000 åßíáé êáôï÷õñùìÝíá
   åìðïñéêÜ óýìâïëá ôçò MIPS Technologies, Inc. óôéò ÇíùìÝíåò Ðïëéôåßåò êáé óå
   Üëëåò ÷þñåò.</para>">
-<!ENTITY mips "MIPS®">
+<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
 
 <!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY mysql "MySQL™">
+<!ENTITY mysql "<trademark>MySQL</trademark>">
 
 <!-- http://www.m-sys.com/content/LegalTerms.asp -->
 <!ENTITY tm-attrib.m-systems "<para>Ïé ëÝîåéò M-Systems êáé DiskOnChip åßíáé
   åìðïñéêÜ óýìâïëá Þ êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò M-Systems Flash Disk
   Pioneers, Ltd.</para>">
-<!ENTITY diskonchip "DiskOnChip®">
+<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
 
 <!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ -->
 <!ENTITY tm-attrib.netbsd "<para>Ç ëÝîç NetBSD åßíáé Ýíá êáôï÷õñùìÝíï åìðïñéêü
@@ -217,14 +217,14 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.netscape "<para>Ïé ëÝîåéò Netscape êáé Netscape Navigator
   åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Netscape Communications Corporation
   óôéò Ç.Ð.Á êáé Üëëåò ÷þñåò.</para>">
-<!ENTITY netscape "Netscape®">
-<!ENTITY netscape.navigator "Netscape Navigator®">
+<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>">
+<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>">
 
 <!-- http://www.nexthop.com/legal.shtml -->
 <!ENTITY tm-attrib.nexthop "<para>Ïé ëÝîåéò GateD êáé NextHop åßíáé
   êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá êáé åìðïñéêÜ óýìâïëá ôçò NextHop óôéò
   Ç.Ð.Á. êáé Üëëåò ÷þñåò.</para>">
-<!ENTITY gated "GateD®">
+<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
 
 <!ENTITY tm-attrib.opengroup "<para>Ïé ëÝîåéò Motif, OSF/1, êáé UNIX
   åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá êáé ïé ëÝîåéò Þ öñÜóåéò IT
@@ -233,31 +233,31 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.unix "<para>Ç ëÝîç UNIX åßíáé êáôï÷õñùìÝíï åìðïñéêü
   óýìâïëï ôïõ Open Group óôéò ÇíùìÝíåò Ðïëéôåßåò êáé óå Üëëåò
   ÷þñåò.</para>">
-<!ENTITY motif "Motif®">
-<!ENTITY unix "UNIX®">
+<!ENTITY motif "<trademark class='registered'>Motif</trademark>">
+<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
 
 <!-- http://www.oracle.com/html/trademark.html -->
 <!-- http://www.oracle.com/html/3party.html -->
 <!ENTITY tm-attrib.oracle "<para>Ç ëÝîç Oracle åßíáé êáôï÷õñùìÝíï
   åìðïñéêü óýìâïëï ôçò Oracle Corporation.</para>">
-<!ENTITY oracle "Oracle®">
+<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
 
 <!-- http://www.powerquest.com/legal/ -->
 <!ENTITY tm-attrib.powerquest "<para>Ïé ëÝîåéò PowerQuest êáé PartitionMagic
   åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò PowerQuest Corporation óôéò ÇíùìÝíåò
   Ðïëéôåßåò êáé/Þ óå Üëëåò ÷þñåò.</para>">
-<!ENTITY partitionmagic "PartitionMagic®">
+<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>">
 
 <!-- http://www.qualcomm.com/main/legal.html -->
 <!ENTITY tm-attrib.qualcomm "<para>Ïé ëÝîåéò QUALCOMM êáé Eudora åßíáé
   êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò QUALCOMM Incorporated.</para>">
-<!ENTITY eudora "Eudora®">
+<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
 
 <!-- http://www.realnetworks.com/company/logos/policy.html -->
 <!ENTITY tm-attrib.realnetworks "<para>Ïé ëÝîåéò RealNetworks, RealPlayer êáé
   RealAudio åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò RealNetworks,
   Inc.</para>">
-<!ENTITY realplayer "RealPlayer®">
+<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>">
 
 <!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks -->
 <!-- http://www.redhat.com/legal/legal_statement.html -->
@@ -268,23 +268,23 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.sap "<para>Ïé ëÝîåéò SAP, R/3, êáé mySAP åßíáé åìðïñéêÜ
   óýìâïëá Þ êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò SAP AG óôç Ãåñìáíßá êáé óå
   ðïëëÝò Üëëåò ÷þñåò ôïõ êüóìïõ.</para>">
-<!ENTITY r3 "R/3®">
-<!ENTITY sap "SAP®">
+<!ENTITY r3 "<trademark class='registered'>R/3</trademark>">
+<!ENTITY sap "<trademark class='registered'>SAP</trademark>">
 <!ENTITY sap.r3 "&sap; &r3;">
 
 <!ENTITY tm-attrib.sgi "<para>Ïé ëÝîåéò ïé öñÜóåéò Silicon Graphics, SGI, êáé
   OpenGL åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Silicon Graphics, Inc. óôéò
   ÇíùìÝíåò Ðïëéôåßåò êáé/Þ óå Üëëåò ÷þñåò óôïí êüóìï.</para>">
-<!ENTITY opengl "OpenGL®">
+<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
 
 <!ENTITY tm-attrib.sparc "<para>Ïé ëÝîåéò Þ öñÜóåéò SPARC, SPARC64,
   êáé UltraSPARC åßíáé åìðïñéêÜ óýìâïëá ôçò SPARC International,
   Inc. óôéò ÇíùìÝíåò Ðïëéôåßåò êáé óå Üëëåò ÷þñåò.  Ç SPARC International
   Inc. êáôÝ÷åé üëá ôá åìðïñéêÜ äéêáéþìáôá ôùí óõìâüëùí SPARC êáé åðéôñÝðåé
   ôçí ïñèÞ ÷ñÞóç ôïõò áðü üëá ôá ìÝëç ôçò, êáôüðéí ó÷åôéêÞò Üäåéáò.</para>">
-<!ENTITY sparc "SPARC®">
-<!ENTITY sparc64 "SPARC64®">
-<!ENTITY ultrasparc "UltraSPARC®">
+<!ENTITY sparc "<trademark class='registered'>SPARC</trademark>">
+<!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>">
+<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
 
 <!-- http://www.sun.com/suntrademarks/ -->
 
@@ -293,19 +293,19 @@ Coverity, Inc.</para>">
   Solaris, StarOffice, SunOS êáé
   VirtualBox åßíáé åìðïñéêÜ óýìâïëá Þ êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Sun
   Microsystems, Inc.  óôéò ÇíùìÝíåò Ðïëéôåßåò êáé óå Üëëåò ÷þñåò.</para>">
-<!ENTITY java "Java™">
-<!ENTITY java.virtual.machine "Java Virtual Machine™">
-<!ENTITY jdk "JDK™">
-<!ENTITY jre "JRE™">
-<!ENTITY jsp "JSP™">
-<!ENTITY jvm "JVM™">
-<!ENTITY netra "Netra™">
-<!ENTITY openjdk "OpenJDK™">
-<!ENTITY solaris "Solaris™">
-<!ENTITY staroffice "StarOffice™">
-<!ENTITY sun "Sun™">
-<!ENTITY sunos "SunOS™">
-<!ENTITY virtualbox "VirtualBox™">
+<!ENTITY java "<trademark>Java</trademark>">
+<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</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 sunos "<trademark>SunOS</trademark>">
+<!ENTITY virtualbox "<trademark>VirtualBox</trademark>">
 
 <!-- http://www.symantec.com/legal/legal_note.html -->
 <!ENTITY tm-attrib.symantec "<para>Ïé ëÝîåéò Symantec êáé Ghost åßíáé
@@ -315,40 +315,40 @@ Coverity, Inc.</para>">
 <!-- http://www.mathworks.com/company/trademarks.shtml -->
 <!ENTITY tm-attrib.themathworks "<para>Ç ëÝîç MATLAB åßíáé Ýíá êáôï÷õñùìÝíï
   åìðïñéêü óýìâïëï ôçò The MathWorks, Inc.</para>">
-<!ENTITY matlab "MATLAB®">
+<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
 
 <!ENTITY tm-attrib.thomson "<para>Ç ëÝîç SpeedTouch åßíáé Ýíá åìðïñéêü óýìâïëï
   ôçò Thomson</para>">
-<!ENTITY speedtouch "SpeedTouch™">
+<!ENTITY speedtouch "<trademark>SpeedTouch</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 êáé
   Sportster åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò U.S. Robotics
   Corporation.</para>">
-<!ENTITY sportster "Sportster®">
-<!ENTITY usrobotics "U.S. Robotics®">
+<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
+<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
 
 <!-- http://www.maplesoft.com/trademarks.shtml -->
 <!ENTITY tm-attrib.waterloomaple "<para>Ïé ëÝîåéò Þ öñÜóåéò Waterloo Maple êáé
   Maple åßíáé åìðïñéêÜ Þ êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Waterloo Maple Inc.</para>">
-<!ENTITY maple "Maple™">
+<!ENTITY maple "<trademark>Maple</trademark>">
 
 <!-- http://www.wolfram.com/company/terms.html -->
 <!ENTITY tm-attrib.wolframresearch "<para>Ç ëÝîç Mathematica åßíáé
   êáôï÷õñùìÝíï åìðïñéêü óýìâïëï ôçò Wolfram Research, Inc.</para>">
-<!ENTITY mathematica "Mathematica®">
+<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
 
 <!-- http://www.vmware.com/legal.html -->
 <!ENTITY tm-attrib.vmware "<para>Ç ëÝîç VMware åßíáé åìðïñéêü óýìâïëï ôçò
   VMware, Inc.</para>">
 
 <!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY xen "Xen™">
+<!ENTITY xen "<trademark>Xen</trademark>">
 
 <!ENTITY tm-attrib.xfree86 "<para>Ç ëÝîç XFree86 åßíáé Ýíá åìðïñéêü óýìâïëï
   ôïõ The XFree86 Project, Inc.</para>">
-<!ENTITY xfree86 "XFree86™">
+<!ENTITY xfree86 "<trademark>XFree86</trademark>">
 
 <!-- http://www.xiph.org/ -->
 <!ENTITY tm-attrib.xiph "<para>Ïé ëÝîåéò Þ öñÜóåéò Ogg Vorbis êáé Xiph.Org

Modified: projects/db5/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/handbook/desktop/chapter.xml	Sun Jun  9 19:09:52 2013	(r41888)
+++ projects/db5/en_US.ISO8859-1/books/handbook/desktop/chapter.xml	Mon Jun 10 09:40:37 2013	(r41889)
@@ -1146,7 +1146,8 @@
     <para>For managing personal finances on a &os; desktop, some
       powerful and easy-to-use applications can be installed.  Some
       are compatible with widespread file formats, such as the formats
-      used by <application>Quicken®</application> and
+      used by <application><trademark
+	class="registered">Quicken</trademark></application> and
       <application>Excel</application>.</para>
 
     <para>This section covers these programs:</para>

Modified: projects/db5/en_US.ISO8859-1/books/handbook/install/chapter.xml
==============================================================================
--- projects/db5/en_US.ISO8859-1/books/handbook/install/chapter.xml	Sun Jun  9 19:09:52 2013	(r41888)
+++ projects/db5/en_US.ISO8859-1/books/handbook/install/chapter.xml	Mon Jun 10 09:40:37 2013	(r41889)
@@ -1379,7 +1379,7 @@ Mounting root from ufs:/dev/md0c
 	found that the simplest and cheapest way to keep a system backup is to
 	buy an identical second hard drive, and perform routine copies of the
 	first drive to the second drive using
-	<application>Ghost®</application> or <application>XCOPY</application>
+	<application><trademark class="registered">Ghost</trademark></application> or <application>XCOPY</application>
 	.  Then, if the
 	first drive fails, or is attacked by a virus, or is scribbled upon by an
 	operating system defect, he can easily recover by instructing the BIOS

Modified: projects/db5/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml
==============================================================================
--- projects/db5/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml	Sun Jun  9 19:09:52 2013	(r41888)
+++ projects/db5/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml	Mon Jun 10 09:40:37 2013	(r41889)
@@ -844,7 +844,8 @@
       personales en su escritorio &os; hay algunas aplicaciones
       potentes y sencillas de utilizar que puede instalar.  Algunas
       de ellas son compatibles con formatos muy extendidos
-      como documentos de <application>Quicken®</application> o
+      como documentos de <application><trademark
+      class="registered">Quicken</trademark></application> o
       <application>Excel</application>.</para>
 
     <para>Esta sección cubre las siguientes aplicaciones:</para>

Modified: projects/db5/es_ES.ISO8859-1/books/handbook/install/chapter.xml
==============================================================================
--- projects/db5/es_ES.ISO8859-1/books/handbook/install/chapter.xml	Sun Jun  9 19:09:52 2013	(r41888)
+++ projects/db5/es_ES.ISO8859-1/books/handbook/install/chapter.xml	Mon Jun 10 09:40:37 2013	(r41889)
@@ -1552,7 +1552,7 @@ Mounting root from ufs:/dev/md0c
 	usuarios que tienen el «backup» del sistema más
 	barato que existe, comprar un disco duro idéntico al primero y
 	copiar periódicamente la primera unidad en la segunda mediante
-	<application>Ghost®</application> o <application>XCOPY</application>.
+	<application><trademark class="registered">Ghost</trademark></application> o <application>XCOPY</application>.
 	De este modo si la primera unidad falla, sufre el ataque de un virus o
 	sufre las consecuencias de un fallo del sistema operativo sólo hay
 	que decirle a la BIOS que interpole lógicamente las unidades.  Es

Modified: projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent
==============================================================================
--- projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent	Sun Jun  9 19:09:52 2013	(r41888)
+++ projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent	Mon Jun 10 09:40:37 2013	(r41889)
@@ -16,78 +16,78 @@
 <!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered
   trademarks of 3Com Corporation.</para>">
 <!-- An SGML entity can't start with a number... -->
-<!ENTITY tm.3com "3Com®">
+<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
 
 <!ENTITY tm-attrib.3ware "<para>3ware is a registered
   trademarks of 3ware Inc.</para>">
-<!ENTITY tm.3ware "3ware®">
+<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
 
 <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
 <!ENTITY tm-attrib.adaptec "<para>Adaptec is a registered trademark of
   Adaptec, Inc.</para>">
-<!ENTITY adaptec "Adaptec®">
+<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
 
 <!ENTITY tm-attrib.adobe "<para>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 "Acrobat®">
-<!ENTITY acrobat.reader "Acrobat Reader®">
-<!ENTITY adobe "Adobe®">
-<!ENTITY postscript "PostScript®">
+<!ENTITY acrobat "<trademark class='registered'>Acrobat</trademark>">
+<!ENTITY acrobat.reader "<trademark class='registered'>Acrobat Reader</trademark>">
+<!ENTITY adobe "<trademark class='registered'>Adobe</trademark>">
+<!ENTITY postscript "<trademark class='registered'>PostScript</trademark>">
 
 <!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
 <!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon,
   AMD Opteron, Athlon, Élan, Opteron, and PCnet are
   trademarks of Advanced Micro Devices, Inc.</para>">
-<!ENTITY amd.athlon "AMD Athlon™">
-<!ENTITY amd.opteron "AMD Opteron™">
-<!ENTITY athlon "Athlon™">
-<!ENTITY elan "Élan™">
-<!ENTITY opteron "Opteron™">
+<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>">
+<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>">
+<!ENTITY athlon "<trademark>Athlon</trademark>">
+<!ENTITY elan "<trademark>Élan</trademark>">
+<!ENTITY opteron "<trademark>Opteron</trademark>">
 
 <!-- http://www.apple.com/legal/trademark/appletmlist.html -->
 <!ENTITY tm-attrib.apple "<para>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 "AirPort®">
-<!ENTITY apple "Apple®">
-<!ENTITY firewire "FireWire®">
-<!ENTITY imac "iMac®">
-<!ENTITY mac "Mac®">
-<!ENTITY macintosh "Macintosh®">
-<!ENTITY macos "Mac OS®">
-<!ENTITY quicktime "Quicktime®">
-<!ENTITY truetype "TrueType®">
+<!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 OS</trademark>">
+<!ENTITY quicktime "<trademark class='registered'>Quicktime</trademark>">
+<!ENTITY truetype "<trademark class='registered'>TrueType</trademark>">
 
 <!ENTITY tm-attrib.arm "<para>ARM is a registered trademark of ARM
   Limited.</para>">
-<!ENTITY arm "ARM®">
+<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
 
 <!ENTITY tm-attrib.cisco "<para>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 catalyst "Catalyst®">
-<!ENTITY ios "IOS®">
+<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
+<!ENTITY ios "<trademark class='registered'>IOS</trademark>">
 
 <!ENTITY tm-attrib.corel "<para>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 "WordPerfect®">
+<!ENTITY wordperfect "<trademark 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;
 Coverity Extend, Coverity Prevent and Coverity Prevent SQS are trademarks of
 Coverity, Inc.</para>">
-<!ENTITY coverity "Coverity®">
-<!ENTITY coverity.prevent "Coverity Prevent®">
+<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>">
+<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>">
 
 <!-- http://www.creative.com/legal.asp -->
 <!ENTITY tm-attrib.creative "<para>Sound Blaster is a trademark of
   Creative Technology Ltd. in the United States and/or other
   countries.</para>">
-<!ENTITY soundblaster "SoundBlaster®">
+<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
 
 <!-- http://www.cvsup.org/ -->
 <!ENTITY tm-attrib.cvsup "<para>CVSup is a registered trademark of
@@ -106,32 +106,32 @@ Coverity, Inc.</para>">
   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 "AIX®">
-<!ENTITY os2 "OS/2®">
-<!ENTITY powerpc "PowerPC®">
-<!ENTITY ps2 "PS/2®">
-<!ENTITY s390 "S/390®">
-<!ENTITY thinkpad "ThinkPad®">
+<!ENTITY aix "<trademark class='registered'>AIX</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 tm-attrib.ieee "<para>IEEE, POSIX, and 802 are registered
   trademarks of Institute of Electrical and Electronics Engineers,
   Inc. in the United States.</para>">
-<!ENTITY posix "POSIX®">
+<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
 
 <!-- http://www.intel.com/intel/legal/tmnouns2.htm -->
 <!ENTITY tm-attrib.intel "<para>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 "Celeron®">
-<!ENTITY etherexpress "EtherExpress™">
-<!ENTITY i386 "i386™">
-<!ENTITY i486 "i486™">
-<!ENTITY intel "Intel®">
-<!ENTITY itanium "Itanium®">
-<!ENTITY pentium "Pentium®">
-<!ENTITY xeon "Xeon™">
-<!ENTITY core "Core™">
+<!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>">
 
 <!-- http://www.quicken.com/support/trademark/ -->
 <!ENTITY tm-attrib.intuit "<para>Intuit and Quicken are registered
@@ -141,60 +141,60 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.iomega "<para>Iomega, Zip, and Jaz are either
   registered trademarks or trademarks of Iomega Corporation in the
   United States and/or other countries.</para>">
-<!ENTITY iomegazip "Zip®">
-<!ENTITY jaz "Jaz®">
+<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>">
+<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>">
 
 <!ENTITY tm-attrib.lantronix "<para>Lantronix and EasyIO are
   trademarks of Lantronix Corporation.</para>">
-<!ENTITY easyio "EasyIO™">
+<!ENTITY easyio "<trademark>EasyIO</trademark>">
 
 <!-- http://www.linuxmark.org/ -->
 <!ENTITY tm-attrib.linux "<para>Linux is a registered trademark of
   Linus Torvalds.</para>">
-<!ENTITY linux "Linux®">
+<!ENTITY linux "<trademark class='registered'>Linux</trademark>">
 
 <!-- http://www.lsilogic.com/trademrk.html -->
 <!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID,
   MegaRAID and Mylex are trademarks or registered trademarks of LSI
   Logic Corp.</para>">
-<!ENTITY acceleraid "AcceleRAID™">
-<!ENTITY megaraid "MegaRAID®">
-<!ENTITY mylex "Mylex®">
+<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>">
+<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
+<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
 
 <!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, and Shockwave are
   trademarks or registered trademarks of Macromedia, Inc. in the
   United States and/or other countries.</para>">
-<!ENTITY flash "Flash™">
-<!ENTITY macromedia "Macromedia®">
+<!ENTITY flash "<trademark>Flash</trademark>">
+<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
 
 <!ENTITY tm-attrib.microsoft "<para>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 "IntelliMouse®">
-<!ENTITY microsoft "Microsoft®">
+<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
+<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
 <!ENTITY microsoft.windows "µsoft; &windows;">
-<!ENTITY ms-dos "MS-DOS®">
-<!ENTITY outlook "Outlook®">
-<!ENTITY windows "Windows®">
-<!ENTITY windows.media "Windows Media®">
+<!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 windows2k "&windows; 2000">
-<!ENTITY windowsnt "Windows NT®">
+<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>">
 <!ENTITY windowsxp "&windows; XP">
 
 <!ENTITY tm-attrib.mips "<para>MIPS and R4000 are registered
   trademarks of MIPS Technologies, Inc. in the United States and other
   countries.</para>">
-<!ENTITY mips "MIPS®">
+<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
 
 <!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY mysql "MySQL™">
+<!ENTITY mysql "<trademark>MySQL</trademark>">
 
 <!-- http://www.m-sys.com/content/LegalTerms.asp -->
 <!ENTITY tm-attrib.m-systems "<para>M-Systems and DiskOnChip are
   trademarks or registered trademarks of M-Systems Flash Disk
   Pioneers, Ltd.</para>">
-<!ENTITY diskonchip "DiskOnChip®">
+<!ENTITY diskonchip "<trademark 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
@@ -203,14 +203,14 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.netscape "<para>Netscape and the Netscape Navigator
   are registered trademarks of Netscape Communications Corporation in
   the U.S. and other countries.</para>">
-<!ENTITY netscape "Netscape®">
-<!ENTITY netscape.navigator "Netscape Navigator®">
+<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>">
+<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>">
 
 <!-- http://www.nexthop.com/legal.shtml -->
 <!ENTITY tm-attrib.nexthop "<para>GateD and NextHop are registered and
   unregistered trademarks of NextHop in the U.S. and other
   countries.</para>">
-<!ENTITY gated "GateD®">
+<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
 
 <!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, and UNIX are
   registered trademarks and IT DialTone and The Open Group are
@@ -218,31 +218,31 @@ Coverity, Inc.</para>">
   countries.</para>">
 <!ENTITY tm-attrib.unix "<para>UNIX is a registered trademarks of The
   Open Group in the United States and other countries.</para>">
-<!ENTITY motif "Motif®">
-<!ENTITY unix "UNIX®">
+<!ENTITY motif "<trademark class='registered'>Motif</trademark>">
+<!ENTITY unix "<trademark 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
   of Oracle Corporation.</para>">
-<!ENTITY oracle "Oracle®">
+<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
 
 <!-- http://www.powerquest.com/legal/ -->
 <!ENTITY tm-attrib.powerquest "<para>PowerQuest and PartitionMagic are
   registered trademarks of PowerQuest Corporation in the United States
   and/or other countries.</para>">
-<!ENTITY partitionmagic "PartitionMagic®">
+<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>">
 
 <!-- http://www.qualcomm.com/main/legal.html -->
 <!ENTITY tm-attrib.qualcomm "<para>QUALCOMM and Eudora are registered
   trademarks of QUALCOMM Incorporated.</para>">
-<!ENTITY eudora "Eudora®">
+<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
 
 <!-- http://www.realnetworks.com/company/logos/policy.html -->
 <!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, and
   RealAudio are the registered trademarks of RealNetworks,
   Inc.</para>">
-<!ENTITY realplayer "RealPlayer®">
+<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>">
 
 <!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks -->
 <!-- http://www.redhat.com/legal/legal_statement.html -->
@@ -253,22 +253,22 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.sap "<para>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 "R/3®">
-<!ENTITY sap "SAP®">
+<!ENTITY r3 "<trademark class='registered'>R/3</trademark>">
+<!ENTITY sap "<trademark class='registered'>SAP</trademark>">
 <!ENTITY sap.r3 "&sap; &r3;">
 
 <!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, and OpenGL are
   registered trademarks of Silicon Graphics, Inc., in the United
   States and/or other countries worldwide.</para>">
-<!ENTITY opengl "OpenGL®">
+<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
 
 <!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, and
   UltraSPARC are trademarks of SPARC International, Inc in the United
   States and other countries.  Products bearing SPARC trademarks are
   based upon architecture developed by Sun Microsystems, Inc.</para>">
-<!ENTITY sparc "Sparc®">
-<!ENTITY sparc64 "Sparc64®">
-<!ENTITY ultrasparc "UltraSPARC®">
+<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>">
+<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>">
+<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
 
 <!-- http://www.sun.com/suntrademarks/ -->
 
@@ -277,17 +277,17 @@ Coverity, Inc.</para>">
   Solaris, StarOffice and
   SunOS are trademarks or registered trademarks of Sun Microsystems,
   Inc. in the United States and other countries.</para>">
-<!ENTITY java "Java™">
-<!ENTITY java.virtual.machine "Java Virtual Machine™">
-<!ENTITY jdk "JDK™">
-<!ENTITY jre "JRE™">
-<!ENTITY jsp "JSP™">
-<!ENTITY jvm "JVM™">
-<!ENTITY netra "Netra™">
-<!ENTITY solaris "Solaris™">
-<!ENTITY staroffice "StarOffice™">
-<!ENTITY sun "Sun™">
-<!ENTITY sunos "SunOS™">
+<!ENTITY java "<trademark>Java</trademark>">
+<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</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 solaris "<trademark>Solaris</trademark>">
+<!ENTITY staroffice "<trademark>StarOffice</trademark>">
+<!ENTITY sun "<trademark>Sun</trademark>">
+<!ENTITY sunos "<trademark>SunOS</trademark>">
 
 <!-- http://www.symantec.com/legal/legal_note.html -->
 <!ENTITY tm-attrib.symantec "<para>Symantec and Ghost are registered
@@ -297,39 +297,39 @@ Coverity, Inc.</para>">
 <!-- http://www.mathworks.com/company/trademarks.shtml -->
 <!ENTITY tm-attrib.themathworks "<para>MATLAB is a registered trademark
   of The MathWorks, Inc.</para>">
-<!ENTITY matlab "MATLAB®">
+<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
 
 <!ENTITY tm-attrib.thomson "<para>SpeedTouch is a trademark of
   Thomson.</para>">
-<!ENTITY speedtouch "SpeedTouch™">
+<!ENTITY speedtouch "<trademark>SpeedTouch</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
   registered trademarks of U.S. Robotics Corporation.</para>">
-<!ENTITY sportster "Sportster®">
-<!ENTITY usrobotics "U.S. Robotics®">
+<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
+<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
 
 <!-- http://www.maplesoft.com/trademarks.shtml -->
 <!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple and Maple are
   trademarks or registered trademarks of Waterloo Maple Inc.</para>">
-<!ENTITY maple "Maple™">
+<!ENTITY maple "<trademark>Maple</trademark>">
 
 <!-- http://www.wolfram.com/company/terms.html -->
 <!ENTITY tm-attrib.wolframresearch "<para>Mathematica is a registered
   trademark of Wolfram Research, Inc.</para>">
-<!ENTITY mathematica "Mathematica®">
+<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
 
 <!-- http://www.vmware.com/legal.html -->
 <!ENTITY tm-attrib.vmware "<para>VMware is a trademark of VMware,
   Inc.</para>">
 
 <!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY xen "Xen™">
+<!ENTITY xen "<trademark>Xen</trademark>">
 
 <!ENTITY tm-attrib.xfree86 "<para>XFree86 is a trademark of The
   XFree86 Project, Inc.</para>">
-<!ENTITY xfree86 "XFree86™">
+<!ENTITY xfree86 "<trademark>XFree86</trademark>">
 
 <!-- http://www.xiph.org/ -->
 <!ENTITY tm-attrib.xiph "<para>Ogg Vorbis and Xiph.Org are trademarks

Modified: projects/db5/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml
==============================================================================
--- projects/db5/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml	Sun Jun  9 19:09:52 2013	(r41888)
+++ projects/db5/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml	Mon Jun 10 09:40:37 2013	(r41889)
@@ -912,7 +912,7 @@
       applications puissantes et simples d'emploi prêtes
       à être installées.  Certaines d'entre elles
       sont compatibles avec des formats de fichiers très
-      répandus comme ceux utilisés par <application>Quicken®</application> ou <application>Excel</application> pour stocker des documents.</para>
+      répandus comme ceux utilisés par <application><trademark class="registered">Quicken</trademark></application> ou <application>Excel</application> pour stocker des documents.</para>
 
     <para>Cette section couvre les programmes suivants:</para>
 

Modified: projects/db5/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
==============================================================================
--- projects/db5/fr_FR.ISO8859-1/books/handbook/install/chapter.xml	Sun Jun  9 19:09:52 2013	(r41888)
+++ projects/db5/fr_FR.ISO8859-1/books/handbook/install/chapter.xml	Mon Jun 10 09:40:37 2013	(r41889)
@@ -1615,7 +1615,7 @@ Mounting root from ufs:/dev/md0c
 	sauvegarder un système est d'acheter un second disque dur
 	identique, et d'exécuter des copies régulières
 	du premier disque
-	vers le second en utilisant <application>Ghost®</application> ou
+	vers le second en utilisant <application><trademark class="registered">Ghost</trademark></application> ou
 	<application>XCOPY</application>.  Alors, si le premier disque
 	tombe en panne, ou est attaqué par un virus, ou corrompu par un
 	défaut du système d'exploitation, on peut facilement

Modified: projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent
==============================================================================
--- projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent	Sun Jun  9 19:09:52 2013	(r41888)
+++ projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent	Mon Jun 10 09:40:37 2013	(r41889)
@@ -19,58 +19,58 @@
 <!ENTITY tm-attrib.3com "<para>3Com et HomeConnect sont des marques
   déposées de 3Com Corporation.</para>">
 <!-- An SGML entity can't start with a number... -->
-<!ENTITY tm.3com "3Com®">
+<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
 
 <!ENTITY tm-attrib.3ware "<para>3ware et Escalade sont des marques
   déposées de 3ware Inc.</para>">
-<!ENTITY tm.3ware "3ware®">
+<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
 
 <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
 <!ENTITY tm-attrib.adaptec "<para>Adaptec is a registered trademark of
   Adaptec, Inc.</para>">
-<!ENTITY adaptec "Adaptec®">
+<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
 
 <!ENTITY tm-attrib.adobe "<para>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 "Acrobat®">
-<!ENTITY acrobat.reader "Acrobat Reader®">
-<!ENTITY adobe "Adobe®">
-<!ENTITY postscript "PostScript®">
+<!ENTITY acrobat "<trademark class='registered'>Acrobat</trademark>">
+<!ENTITY acrobat.reader "<trademark class='registered'>Acrobat Reader</trademark>">
+<!ENTITY adobe "<trademark class='registered'>Adobe</trademark>">
+<!ENTITY postscript "<trademark class='registered'>PostScript</trademark>">
 
 <!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
 <!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon,
   AMD Opteron, Athlon, Élan, Opteron, et PCnet sont
   des marques de Advanced Micro Devices, Inc.</para>">
-<!ENTITY amd.athlon "AMD Athlon™">
-<!ENTITY amd.opteron "AMD Opteron™">
-<!ENTITY athlon "Athlon™">
-<!ENTITY elan "Élan™">
-<!ENTITY opteron "Opteron™">
+<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>">
+<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>">
+<!ENTITY athlon "<trademark>Athlon</trademark>">
+<!ENTITY elan "<trademark>Élan</trademark>">
+<!ENTITY opteron "<trademark>Opteron</trademark>">
 
 <!-- http://www.apple.com/legal/trademark/appletmlist.html -->
 <!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS,
   Quicktime, et TrueType sont des marques d'Apple Computer, Inc.,
   déposées aux Etats Unis et dans d'autres pays.</para>">
-<!ENTITY airport "AirPort®">
-<!ENTITY apple "Apple®">
-<!ENTITY firewire "FireWire®">
-<!ENTITY mac "Mac®">
-<!ENTITY macintosh "Macintosh®">
-<!ENTITY macos "Mac OS®">
-<!ENTITY quicktime "Quicktime®">
-<!ENTITY truetype "TrueType®">
+<!ENTITY airport "<trademark class='registered'>AirPort</trademark>">
+<!ENTITY apple "<trademark class='registered'>Apple</trademark>">
+<!ENTITY firewire "<trademark class='registered'>FireWire</trademark>">
+<!ENTITY mac "<trademark class='registered'>Mac</trademark>">
+<!ENTITY macintosh "<trademark class='registered'>Macintosh</trademark>">

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