svn commit: r42250 - in projects/db5: de_DE.ISO8859-1/books/handbook/cutting-edge de_DE.ISO8859-1/books/handbook/install de_DE.ISO8859-1/books/handbook/mail el_GR.ISO8859-7/books/handbook/cutting-e...

Thu Jul 11 17:27:12 UTC 2013

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

Log:
  - MFH

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

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

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

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

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

Modified: projects/db5/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- projects/db5/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml	Thu Jul 11 17:13:40 2013	(r42249)
+++ projects/db5/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml	Thu Jul 11 17:27:09 2013	(r42250)
@@ -3043,13 +3043,12 @@ Script done, …</screen>
 
 	<qandaentry>
 	  <question>
-	    <para>Ç ìåôáãëþôôéóç ìïõ áðÝôõ÷å ìå ðëÞèïò ìçíõìÜôùí signal 11
+	    <para>Ç ìåôáãëþôôéóç ìïõ áðÝôõ÷å ìå ðëÞèïò ìçíõìÜôùí
+	      signal 11<indexterm><primary>signal 11</primary></indexterm>
 	      (Þ ëÜèç ìå Üëëá óÞìáôá).  Ôé Ý÷åé óõìâåß;</para>
 	  </question>
 
 	  <answer>
-	    <indexterm><primary>signal 11</primary></indexterm>
-
 	    <para>Áõôü óõíÞèùò äåß÷íåé ðñïâëÞìáôá õëéêïý.  Ç äéáäéêáóßá
 	      ìåôáãëþôôéóçò ôïõ âáóéêïý óõóôÞìáôïò åßíáé Ýíáò áðïôåëåóìáôéêüò
 	      ôñüðïò íá äïêéìÜóåôå ôï õëéêü óáò óôá üñéá ôïõ, êáé óõ÷íÜ èá

Modified: projects/db5/el_GR.ISO8859-7/books/handbook/install/chapter.xml
==============================================================================
--- projects/db5/el_GR.ISO8859-7/books/handbook/install/chapter.xml	Thu Jul 11 17:13:40 2013	(r42249)
+++ projects/db5/el_GR.ISO8859-7/books/handbook/install/chapter.xml	Thu Jul 11 17:27:09 2013	(r42250)
@@ -4452,16 +4452,12 @@ Please press any key to reboot.</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm>
-	      <primary>color</primary>
-	      <secondary>contrast</secondary>
-	    </indexterm>
-
 	    <para>¼ôáí ÷ñçóéìïðïéåßôáé ôï
 	      <application>sysinstall</application> óå Ýíá ôåñìáôéêü X11, ç
 	      êßôñéíç ãñáììáôïóåéñÜ ðÜíù óôï áíïé÷ôü ãêñé öüíôï åßíáé
-	      äõóáíÜãíùóôç.  ÕðÜñ÷åé ôñüðïò íá âåëôéùèåß ç áíôßèåóç óå áõôÞ
-	      ôçí åöáñìïãÞ;</para>
+	      äõóáíÜãíùóôç.  ÕðÜñ÷åé ôñüðïò íá âåëôéùèåß ç áíôßèåóç
+	      <indexterm><primary>color</primary><secondary>contrast</secondary>
+	      </indexterm> óå áõôÞ ôçí åöáñìïãÞ;</para>
 	  </question>
 
 	  <answer>

Modified: projects/db5/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
==============================================================================
--- projects/db5/el_GR.ISO8859-7/books/handbook/mail/chapter.xml	Thu Jul 11 17:13:40 2013	(r42249)
+++ projects/db5/el_GR.ISO8859-7/books/handbook/mail/chapter.xml	Thu Jul 11 17:27:09 2013	(r42250)
@@ -928,8 +928,8 @@ purgestat	/usr/local/supermailer/bin/pur
 	      role="fqdn">mumble.bar.edu</hostid>, áíôß ãéá áðëþò
 	    <hostid>mumble</hostid>.</para>
 
-	  <indexterm><primary>BIND</primary></indexterm>
-	  <para>ÐáñáäïóéáêÜ, áõôü åðéôñåðüôáí áðü ôïõò DNS resolvers ôïõ BIND.
+	  <para>ÐáñáäïóéáêÜ, áõôü åðéôñåðüôáí áðü ôïõò DNS resolvers ôïõ
+	    BIND<indexterm><primary>BIND</primary></indexterm>.
 	    Ùóôüóï, ç ôñÝ÷ïõóá Ýêäïóç ôïõ <application>BIND</application> ðïõ
 	    ðåñéëáìâÜíåôáé óôï &os;, äåí ðáñÝ÷åé ðëÝïí óõíôïìåýóåéò ãéá
 	    ìç-ðëÞñç ïíüìáôá ôïìÝùí, åêôüò ãéá ôïí ôïìÝá óôïí ïðïßï âñßóêåóôå.
@@ -959,10 +959,6 @@ purgestat	/usr/local/supermailer/bin/pur
 
       <qandaentry>
 	<question>
-	  <indexterm>
-	    <primary>MX record</primary>
-	  </indexterm>
-
 	  <para>Ôï <application>sendmail</application> äßíåé ôï ìÞíõìá
 	    <errorname>mail loops back to myself</errorname> (ôï mail
 	    åðéóôñÝöåé óôïí åáõôü ìïõ)</para>
@@ -981,7 +977,8 @@ purgestat	/usr/local/supermailer/bin/pur
 
 ¸÷åôå æçôÞóåé ôï mail ðñïò Ýíá ôïìÝá (ð.÷. ôï domain.net) íá
 ðñïùèåßôáé ðñïò Ýíá óõãêåêñéìÝíï õðïëïãéóôÞ (óôçí ðåñßðôùóç áõôÞ
-ôï relay.domain.net) ÷ñçóéìïðïéþíôáò ìéá åããñáöÞ MX, áëëÜ ôï
+ôï relay.domain.net) ÷ñçóéìïðïéþíôáò ìéá åããñáöÞ
+MX<indexterm><primary>MX record</primary></indexterm>, áëëÜ ôï
 ìç÷Üíçìá áíáìåôÜäïóçò (relay) äåí áíáãíùñßæåé ôïí åáõôü ôïõ ùò
 domain.net.  ÐñïóèÝóôå ôï domain.net óôï /etc/mail/local-host-names
 [åßíáé ãíùóôü ùò /etc/sendmail.cw ðñéí ôçí Ýêäïóç 8.10]
@@ -998,10 +995,9 @@ domain.net.  ÐñïóèÝóôå ôï domain.net óôï
 
       <qandaentry>
 	<question>
-	  <indexterm><primary>PPP</primary></indexterm>
-
 	  <para>Ðùò ìðïñþ íá åêôåëÝóù åîõðçñåôçôÞ mail óå õðïëïãéóôÞ ðïõ
-	    óõíäÝåôáé ìÝóù åðéëïãéêÞò óýíäåóçò PPP;</para>
+	    óõíäÝåôáé ìÝóù åðéëïãéêÞò óýíäåóçò
+	    PPP<indexterm><primary>PPP</primary></indexterm>;</para>
 	</question>
 
 	<answer>
@@ -1009,13 +1005,9 @@ domain.net.  ÐñïóèÝóôå ôï domain.net óôï
 	    (LAN) óôï Internet.  Ôï &os; ìç÷Üíçìá èá ãßíåé ðýëç ôá÷õäñïìåßïõ
 	    ãéá ôï LAN.  Ç óýíäåóç PPP äåí åßíáé áðïêëåéóôéêÞ.</para>
 
-	  <indexterm><primary>UUCP</primary></indexterm>
-	  <indexterm>
-	    <primary>MX record</primary>
-	  </indexterm>
-
 	  <para>ÕðÜñ÷ïõí ôïõëÜ÷éóôïí äýï ôñüðïé ãéá íá ôï êÜíåôå áõôü.  Ï Ýíáò
-	    åßíáé ìå ôç ÷ñÞóç UUCP.</para>
+	    åßíáé ìå ôç ÷ñÞóç UUCP<indexterm><primary>UUCP</primary>
+	    </indexterm>.</para>
 
 	  <para>¸íáò Üëëïò ôñüðïò åßíáé íá âÜëåôå Ýíá åîõðçñåôçôÞ Internet ï
 	    ïðïßïò Ý÷åé óõíå÷Þ óýíäåóç, íá óáò ðáñÝ÷åé õðçñåóßá äåõôåñåýïíôïò
@@ -1023,7 +1015,8 @@ domain.net.  ÐñïóèÝóôå ôï domain.net óôï
 	    óáò åßíáé <hostid role="domainname">example.com</hostid> êáé ï
 	    ðáñï÷Ýáò óáò Internet Ý÷åé ïñßóåé ôï
 	    <hostid role="domainname">example.net</hostid> íá ðáñÝ÷åé
-	    õðçñåóßåò äåõôåñåýïíôïò MX ãéá ôïí ôïìÝá óáò:</para>
+	    õðçñåóßåò äåõôåñåýïíôïò MX<indexterm><primary>MX record</primary>
+	    </indexterm> ãéá ôïí ôïìÝá óáò:</para>
 
 	  <programlisting>example.com.          MX        10      example.com.
                       MX        20      example.net.</programlisting>

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

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

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

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

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

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