svn commit: r42245 - in projects/zfsupdate-201307: . de_DE.ISO8859-1/books/handbook/firewalls de_DE.ISO8859-1/books/porters-handbook el_GR.ISO8859-7/books/handbook/firewalls en_US.ISO8859-1/article...

Glen Barber gjb at FreeBSD.org
Thu Jul 11 03:07:24 UTC 2013


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

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

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

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

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

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

Modified: projects/zfsupdate-201307/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- projects/zfsupdate-201307/en_US.ISO8859-1/articles/committers-guide/article.xml	Thu Jul 11 03:06:43 2013	(r42244)
+++ projects/zfsupdate-201307/en_US.ISO8859-1/articles/committers-guide/article.xml	Thu Jul 11 03:07:22 2013	(r42245)
@@ -2046,11 +2046,6 @@ ControlPersist yes</screen>
 	</listitem>
 
 	<listitem>
-	  <para>Also add your author entity to
-	    <filename>head/share/xml/developers.ent</filename>.</para>
-	</listitem>
-
-	<listitem>
 	  <para>Add yourself to the <quote>Developers</quote> section
 	    of the <ulink
 	      url="&url.articles.contributors;/index.html">Contributors
@@ -2079,7 +2074,7 @@ ControlPersist yes</screen>
 	    <filename>head/share/pgpkeys/pgpkeys-developers.xml</filename>.
 	    Please note that entries are sorted by last name.</para>
 
-	  <para>&a.des; has written a shell script
+	  <para>&a.des.email; has written a shell script
 	    (<filename>head/share/pgpkeys/addkey.sh</filename>) to
 	    make this extremely simple.  See the <ulink
 	      url="http://svnweb.FreeBSD.org/doc/head/share/pgpkeys/README">README</ulink>
@@ -2268,7 +2263,7 @@ ControlPersist yes</screen>
 
     <para>The &os; project discourages completely new licenses and
       variations on the standard licenses.  New licenses require the
-      approval of <email>core 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/zfsupdate-201307/en_US.ISO8859-1/articles/console-server/article.xml
==============================================================================
--- projects/zfsupdate-201307/en_US.ISO8859-1/articles/console-server/article.xml	Thu Jul 11 03:06:43 2013	(r42244)
+++ projects/zfsupdate-201307/en_US.ISO8859-1/articles/console-server/article.xml	Thu Jul 11 03:07:22 2013	(r42245)
@@ -539,7 +539,7 @@ print crypt($cleartext, $salt), "\n";</p
 	  likely need a different style of salt.</para>
       </note>
 
-      <para>&a.kris; has since pointed out you can get the same effect using
+      <para>&a.kris.email; has since pointed out you can get the same effect using
 	the <command>openssl passwd</command> command:</para>
 
       <screen>&prompt.user; openssl passwd -1

Modified: projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/article.xml
==============================================================================
--- projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/article.xml	Thu Jul 11 03:06:43 2013	(r42244)
+++ projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/article.xml	Thu Jul 11 03:07:22 2013	(r42245)
@@ -51,7 +51,7 @@
 
 	<itemizedlist>
 	  <listitem>
-	    <para>&a.mbarkah; and his employer, <ulink
+	    <para>&a.mbarkah.email; and his employer, <ulink
 		url="http://www.hemi.com/"> Hemisphere Online</ulink>,
 		donated a <emphasis>Pentium Pro (P6) 200MHz CPU</emphasis>
 	    </para>
@@ -97,7 +97,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>&a.dillon;</para>
+	    <para>&a.dillon.email;</para>
 	  </listitem>
 
 	  <listitem>
@@ -111,7 +111,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>&a.sef;</para>
+	    <para>&a.sef.email;</para>
 	  </listitem>
 
 	  <listitem>
@@ -137,7 +137,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>&a.chuckr;</para>
+	    <para>&a.chuckr.email;</para>
 	  </listitem>
 
 	  <listitem>
@@ -241,7 +241,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>Larry Altneu <email>larry 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/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Thu Jul 11 03:06:43 2013	(r42244)
+++ projects/zfsupdate-201307/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Thu Jul 11 03:07:22 2013	(r42245)
@@ -365,8 +365,7 @@
     </listitem>
 
     <listitem>
-      <para>Alexander Best
-	<email>arundel 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>
@@ -5969,11 +5959,6 @@
     </listitem>
 
     <listitem>
-      <para>Luiz Otavio O Souza
-	<email>loos.br at gmail.com</email></para>
-    </listitem>
-
-    <listitem>
       <para>Lukasz Stelmach
 	<email>lukasz.stelmach at iem.pw.edu.pl</email></para>
     </listitem>
@@ -10844,8 +10829,7 @@
     </listitem>
 
     <listitem>
-      <para>Wolfgang Stanglmeier
-	<email>wolf at FreeBSD.org</email></para>
+      <para>&a.wolf.email;</para>
     </listitem>
 
     <listitem>
@@ -10869,7 +10853,7 @@
     </listitem>
 
     <listitem>
-      <para>&a.wylie;</para>
+      <para>&a.wylie.email;</para>
     </listitem>
 
     <listitem>

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

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


More information about the svn-doc-projects mailing list