From owner-svn-doc-projects@FreeBSD.ORG Thu Jul 11 03:07:24 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D739E367; Thu, 11 Jul 2013 03:07:24 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C6F7F1CD1; Thu, 11 Jul 2013 03:07:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6B37OC8095668; Thu, 11 Jul 2013 03:07:24 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6B37NuR095656; Thu, 11 Jul 2013 03:07:23 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201307110307.r6B37NuR095656@svn.freebsd.org> From: Glen Barber Date: Thu, 11 Jul 2013 03:07:23 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: 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... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jul 2013 03:07:24 -0000 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: - + 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 " Nur lesbare Variablen + Bedeutung 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: - + 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 - Also add your author entity to - head/share/xml/developers.ent. - - - Add yourself to the Developers section of the Contributors @@ -2079,7 +2074,7 @@ ControlPersist yes head/share/pgpkeys/pgpkeys-developers.xml. Please note that entries are sorted by last name. - &a.des; has written a shell script + &a.des.email; has written a shell script (head/share/pgpkeys/addkey.sh) to make this extremely simple. See the README @@ -2268,7 +2263,7 @@ ControlPersist yes The &os; project discourages completely new licenses and variations on the standard licenses. New licenses require the - approval of core@FreeBSD.org 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 Makefile. 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 - &a.ru; + &a.ru.email; Ruslan is Mister &man.mdoc.7;. If you are writing a @@ -2474,7 +2469,7 @@ ControlPersist yes - &a.bde; + &a.bde.email; Bruce is the Style Police-Meister. When you do a @@ -2486,7 +2481,7 @@ ControlPersist yes - &team.re; + &a.re.members.email; These are the members of the &a.re;. This team is @@ -2507,7 +2502,7 @@ ControlPersist yes - &a.des; + &a.des.email; Dag-Erling is the @@ -2518,7 +2513,7 @@ ControlPersist yes - &a.wollman; + &a.wollman.email; If you need advice on obscure network internals or @@ -3443,9 +3438,10 @@ ControlPersist yes port Makefile. It will also add an entry to the port's category Makefile. 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. + also CC &a.crees.email;, the current maintainer. @@ -3560,9 +3556,9 @@ ControlPersist yes Alternatively, you can use the rmport script, from ports/Tools/scripts. - 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. + also CC &a.crees.email;, the current maintainer. @@ -4372,7 +4368,7 @@ bak/packages packages from last complet name or freebsd/developer/NickServ name. 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. 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";

- &a.kris; has since pointed out you can get the same effect using + &a.kris.email; has since pointed out you can get the same effect using the openssl passwd command: &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 @@ - &a.mbarkah; and his employer, &a.mbarkah.email; and his employer, Hemisphere Online, donated a Pentium Pro (P6) 200MHz CPU @@ -97,7 +97,7 @@ - &a.dillon; + &a.dillon.email; @@ -111,7 +111,7 @@ - &a.sef; + &a.sef.email; @@ -137,7 +137,7 @@ - &a.chuckr; + &a.chuckr.email; @@ -241,7 +241,7 @@ - Larry Altneu larry@ALR.COM, and &a.wilko;, + Larry Altneu larry@ALR.COM, and &a.wilko.email;, provided Wangtek and Archive QIC-02 tape drives in order to improve the wt driver. @@ -273,7 +273,7 @@ - Christoph Kukulies kuku@FreeBSD.org donated + &a.kuku.email; donated an FX120 12 speed Mitsumi CDROM drive for IDE CDROM driver development. @@ -309,7 +309,7 @@ The interface business GmbH, Dresden 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... 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 @@ - Alexander Best - arundel@FreeBSD.org + &a.arundel.email; @@ -1747,8 +1746,7 @@ - Christoph P. Kukulies - kuku@FreeBSD.org + &a.kuku.email; @@ -2220,8 +2218,7 @@ - Dave Tweten - tweten@FreeBSD.org + &a.tweten.email; @@ -2703,7 +2700,7 @@ - &a.whiteside; + &a.whiteside.email; @@ -3346,7 +3343,7 @@ - &a.stanislav; + &a.stanislav.email; @@ -4308,8 +4305,7 @@ - Jan Koum - jkb@FreeBSD.org + &a.jkb.email; @@ -4622,8 +4618,7 @@ - Jim Babb - babb@FreeBSD.org + &a.babb.email; @@ -4918,11 +4913,6 @@ - John Marino - draco@marino.st - - - John McAree john@mcaree.org @@ -5263,7 +5253,7 @@ - &a.jhs; + &a.jhs.email; @@ -5969,11 +5959,6 @@ - Luiz Otavio O Souza - loos.br@gmail.com - - - Lukasz Stelmach lukasz.stelmach@iem.pw.edu.pl @@ -10844,8 +10829,7 @@ - Wolfgang Stanglmeier - wolf@FreeBSD.org + &a.wolf.email; @@ -10869,7 +10853,7 @@ - &a.wylie; + &a.wylie.email; 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 @@ - &a.ariff; + &a.ariff.email; - &a.tabthorpe; + &a.tabthorpe.email; - &a.eadler; + &a.eadler.email; - &a.akiyama; + &a.akiyama.email; - &a.monthadar; + &a.monthadar.email; - &a.ambrisko; + &a.ambrisko.email; - &a.shaun; + &a.shaun.email; - &a.brix; + &a.brix.email; - &a.jonathan; + &a.jonathan.email; - &a.mandree; + &a.mandree.email; - &a.will; + &a.will.email; - &a.dim; + &a.dim.email; - &a.mva; + &a.mva.email; - &a.araujo; + &a.araujo.email; - &a.mat; + &a.mat.email; - &a.syuu; + &a.syuu.email; - &a.gavin; + &a.gavin.email; - &a.jsa; + &a.jsa.email; - &a.jadawin; + &a.jadawin.email; - &a.timur; + &a.timur.email; - &a.jhb; + &a.jhb.email; - &a.gjb; + &a.gjb.email; - &a.art; + &a.art.email; - &a.kib; + &a.kib.email; - &a.tobez; + &a.tobez.email; - &a.gber; + &a.gber.email; - &a.pb; + &a.pb.email; - &a.tdb; + &a.tdb.email; - &a.gblach; + &a.gblach.email; - &a.mbr; + &a.mbr.email; - &a.wblock; + &a.wblock.email; - &a.novel; + &a.novel.email; - &a.garga; + &a.garga.email; - &a.sbz; + &a.sbz.email; - &a.ebrandi; + &a.ebrandi.email; - &a.harti; + &a.harti.email; - &a.makc; + &a.makc.email; - &a.antoine; + &a.antoine.email; - &a.db; + &a.db.email; - &a.sbruno; + &a.sbruno.email; - &a.brueffer; + &a.brueffer.email; - &a.markus; + &a.markus.email; - &a.oleg; + &a.oleg.email; - &a.jchandra; + &a.jchandra.email; - &a.acm; + &a.acm.email; - &a.gahr; + &a.gahr.email; - &a.adrian; + &a.adrian.email; - &a.dchagin; + &a.dchagin.email; - &a.charnier; + &a.charnier.email; - &a.jon; + &a.jon.email; - &a.loader; + &a.loader.email; - &a.luoqi; + &a.luoqi.email; - &a.ache; + &a.ache.email; - &a.melifaro; + &a.melifaro.email; - &a.theraven; + &a.theraven.email; - &a.davidch; + &a.davidch.email; - &a.marcus; + &a.marcus.email; - &a.tijl; + &a.tijl.email; - &a.rakuco; + &a.rakuco.email; - &a.alc; + &a.alc.email; - &a.cracauer; + &a.cracauer.email; - &a.brucec; + &a.brucec.email; - &a.culot; + &a.culot.email; - &a.joel; + &a.joel.email; - &a.bapt; + &a.bapt.email; - &a.davidc; + &a.davidc.email; - &a.brd; + &a.brd.email; - &a.brooks; + &a.brooks.email; - &a.pjd; + &a.pjd.email; - &a.jwd; + &a.jwd.email; - &a.carl; + &a.carl.email; - &a.vd; + &a.vd.email; - &a.rdivacky; + &a.rdivacky.email; - &a.mdodd; + &a.mdodd.email; - &a.danfe; + &a.danfe.email; - &a.dd; + &a.dd.email; - &a.iedowse; + &a.iedowse.email; - &a.bdrewery; + &a.bdrewery.email; - &a.gad; + &a.gad.email; - &a.olivierd; + &a.olivierd.email; - &a.bruno; + &a.bruno.email; - &a.ale; + &a.ale.email; - &a.peadar; + &a.peadar.email; - &a.deischen; + &a.deischen.email; - &a.eivind; + &a.eivind.email; - &a.julian; + &a.julian.email; - &a.ae; + &a.ae.email; - &a.lme; + &a.lme.email; - &a.rse; + &a.rse.email; - &a.ru; + &a.ru.email; - &a.le; + &a.le.email; - &a.se; + &a.se.email; - &a.bde; + &a.bde.email; - &a.jasone; + &a.jasone.email; - &a.bf; + &a.bf.email; - &a.madpilot; + &a.madpilot.email; - &a.rafan; + &a.rafan.email; - &a.stefanf; + &a.stefanf.email; - &a.scf; + &a.scf.email; - &a.feld; + &a.feld.email; - &a.green; + &a.green.email; - &a.lioux; + &a.lioux.email; - &a.fanf; + &a.fanf.email; - &a.mdf; + &a.mdf.email; - &a.blackend; + &a.blackend.email; - &a.olli; + &a.olli.email; - &a.decke; + &a.decke.email; - &a.gallatin; + &a.gallatin.email; - &a.avg; + &a.avg.email; - &a.beat; + &a.beat.email; - &a.danger; + &a.danger.email; - &a.sjg; + &a.sjg.email; - &a.gibbs; + &a.gibbs.email; - &a.pfg; + &a.pfg.email; - &a.girgen; + &a.girgen.email; - &a.pgollucci; + &a.pgollucci.email; - &a.trociny; + &a.trociny.email; - &a.daichi; + &a.daichi.email; - &a.bgray; + &a.bgray.email; - &a.dg; + &a.dg.email; - &a.grehan; + &a.grehan.email; - &a.jamie; + &a.jamie.email; - &a.edwin; + &a.edwin.email; - &a.wg; + &a.wg.email; - &a.bar; + &a.bar.email; - &a.jmg; + &a.jmg.email; - &a.mjg; + &a.mjg.email; - &a.vg; + &a.vg.email; - &a.jhale; + &a.jhale.email; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***