From owner-svn-doc-head@FreeBSD.ORG Tue Jul 9 21:15:49 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2151FF32; Tue, 9 Jul 2013 21:15:49 +0000 (UTC) (envelope-from rene@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 0F5CA1D0F; Tue, 9 Jul 2013 21:15:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r69LFn5q044706; Tue, 9 Jul 2013 21:15:49 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r69LFmQv044700; Tue, 9 Jul 2013 21:15:48 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201307092115.r69LFmQv044700@svn.freebsd.org> From: Rene Ladan Date: Tue, 9 Jul 2013 21:15:48 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r42226 - in head: en_US.ISO8859-1/articles/committers-guide en_US.ISO8859-1/articles/console-server en_US.ISO8859-1/articles/contributors en_US.ISO8859-1/articles/cvs-freebsd en_US.ISO8... X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jul 2013 21:15:49 -0000 Author: rene Date: Tue Jul 9 21:15:47 2013 New Revision: 42226 URL: http://svnweb.freebsd.org/changeset/doc/42226 Log: Merge the projects/entities branch into head/ The primary purposes are to clean up duplicated author definitions in both share/xml/authors.ent and share/xml/developers.ent, and as a added bonus simplify writing up author names/email addresses in web pages. Apart from merging developers.ent into authors.ent, removing the former, and updating the Committers Guide there should be little user-visible changes: - a.portmgr renamed to a.portmgr.members - a.doceng renamed to a.doceng.members - team.re renamed to a.re.members.email and moved from share/xml/freebsd.ent to share/xml/authors.ent - a.core updated and moved from share/xml/mailing-lists.ent to share/xml/teams.ent - share/pgpkeys/{addkey.sh|README} updated Translations are untouched except for build fixes. Approved by: doceng (gjb) Approved by: gjb (mentor) Deleted: head/share/xml/developers.ent Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml head/en_US.ISO8859-1/articles/console-server/article.xml head/en_US.ISO8859-1/articles/contributors/article.xml head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml head/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml head/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml head/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml head/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml head/en_US.ISO8859-1/articles/cvs-freebsd/article.xml head/en_US.ISO8859-1/articles/freebsd-update-server/article.xml head/en_US.ISO8859-1/articles/gjournal-desktop/article.xml head/en_US.ISO8859-1/articles/hubs/article.xml head/en_US.ISO8859-1/articles/linux-emulation/article.xml head/en_US.ISO8859-1/articles/mailing-list-faq/article.xml head/en_US.ISO8859-1/articles/nanobsd/article.xml head/en_US.ISO8859-1/articles/releng-packages/article.xml head/en_US.ISO8859-1/articles/releng/article.xml head/en_US.ISO8859-1/articles/remote-install/article.xml head/en_US.ISO8859-1/articles/serial-uart/article.xml head/en_US.ISO8859-1/books/dev-model/book.xml head/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml head/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml head/en_US.ISO8859-1/books/faq/book.xml head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml head/en_US.ISO8859-1/books/handbook/disks/chapter.xml head/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml head/en_US.ISO8859-1/books/handbook/jails/chapter.xml head/en_US.ISO8859-1/htdocs/administration.xml head/en_US.ISO8859-1/htdocs/internal/doceng.xml head/en_US.ISO8859-1/htdocs/platforms/arm.xml head/en_US.ISO8859-1/htdocs/platforms/sparc.xml head/en_US.ISO8859-1/htdocs/platforms/xbox.xml head/en_US.ISO8859-1/htdocs/portmgr/index.xml head/en_US.ISO8859-1/htdocs/projects/summerofcode-2005.xml head/en_US.ISO8859-1/htdocs/projects/summerofcode-2006.xml head/en_US.ISO8859-1/htdocs/releng/index.xml head/en_US.ISO8859-1/htdocs/security/reporting.xml head/en_US.ISO8859-1/share/xml/mailing-lists.ent head/en_US.ISO8859-1/share/xml/teams.ent head/fr_FR.ISO8859-1/htdocs/releng/index.xml head/ru_RU.KOI8-R/htdocs/portmgr/index.xml head/ru_RU.KOI8-R/htdocs/releng/index.xml head/share/pgpkeys/README head/share/pgpkeys/addkey.sh head/share/pgpkeys/pgpkeys-core.xml head/share/pgpkeys/pgpkeys-developers.xml head/share/xml/authors.ent head/share/xml/catalog.xml head/share/xml/freebsd.ent head/share/xml/xhtml.xsl head/share/xml/xhtml10-freebsd.dtd head/share/xml/xslt10-freebsd.dtd head/share/xsl/freebsd-xhtml-common.xsl Directory Properties: head/bn_BD.ISO10646-1/ (props changed) head/da_DK.ISO8859-1/ (props changed) head/de_DE.ISO8859-1/ (props changed) head/el_GR.ISO8859-7/ (props changed) head/en_US.ISO8859-1/ (props changed) head/es_ES.ISO8859-1/ (props changed) head/fr_FR.ISO8859-1/ (props changed) head/hu_HU.ISO8859-2/ (props changed) head/it_IT.ISO8859-15/ (props changed) head/ja_JP.eucJP/ (props changed) head/mn_MN.UTF-8/ (props changed) head/nl_NL.ISO8859-1/ (props changed) head/nl_NL.ISO8859-1/share/xml/entities.ent (props changed) head/no_NO.ISO8859-1/ (props changed) head/pl_PL.ISO8859-2/ (props changed) head/pt_BR.ISO8859-1/ (props changed) head/release/ (props changed) head/ru_RU.KOI8-R/ (props changed) head/share/ (props changed) head/sr_YU.ISO8859-2/ (props changed) head/tr_TR.ISO8859-9/ (props changed) head/zh_CN.GB2312/ (props changed) head/zh_TW.Big5/ (props changed) Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Tue Jul 9 19:06:20 2013 (r42225) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Tue Jul 9 21:15:47 2013 (r42226) @@ -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: head/en_US.ISO8859-1/articles/console-server/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/console-server/article.xml Tue Jul 9 19:06:20 2013 (r42225) +++ head/en_US.ISO8859-1/articles/console-server/article.xml Tue Jul 9 21:15:47 2013 (r42226) @@ -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: head/en_US.ISO8859-1/articles/contributors/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/contributors/article.xml Tue Jul 9 19:06:20 2013 (r42225) +++ head/en_US.ISO8859-1/articles/contributors/article.xml Tue Jul 9 21:15:47 2013 (r42226) @@ -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: head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml ============================================================================== --- head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Tue Jul 9 19:06:20 2013 (r42225) +++ head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Tue Jul 9 21:15:47 2013 (r42226) @@ -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; @@ -5263,7 +5258,7 @@ - &a.jhs; + &a.jhs.email; @@ -10839,8 +10834,7 @@ - Wolfgang Stanglmeier - wolf@FreeBSD.org + &a.wolf.email; @@ -10864,7 +10858,7 @@ - &a.wylie; + &a.wylie.email; Modified: head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml ============================================================================== --- head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Tue Jul 9 19:06:20 2013 (r42225) +++ head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Tue Jul 9 21:15:47 2013 (r42226) @@ -8,1682 +8,1682 @@ - &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; - &a.smh; + &a.smh.email; - &a.ehaupt; + &a.ehaupt.email; - &a.jhay; + &a.jhay.email; - &a.jh; + &a.jh.email; - &a.jgh; + &a.jgh.email; - &a.ghelmer; + &a.ghelmer.email; - &a.wen; + &a.wen.email; - &a.dhn; + &a.dhn.email; - &a.jhibbits; + &a.jhibbits.email; - &a.nhibma; + &a.nhibma.email; - &a.pho; + &a.pho.email; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***