From owner-svn-doc-projects@FreeBSD.ORG Wed Dec 12 23:38:33 2012 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3B5CA789; Wed, 12 Dec 2012 23:38:33 +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 1F5008FC17; Wed, 12 Dec 2012 23:38:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCNcXvJ080109; Wed, 12 Dec 2012 23:38:33 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBCNcWHr080098; Wed, 12 Dec 2012 23:38:32 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201212122338.qBCNcWHr080098@svn.freebsd.org> From: Glen Barber Date: Wed, 12 Dec 2012 23:38:32 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40372 - in projects/entities/share: pgpkeys tools xml 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: Wed, 12 Dec 2012 23:38:33 -0000 Author: gjb Date: Wed Dec 12 23:38:31 2012 New Revision: 40372 URL: http://svnweb.freebsd.org/changeset/doc/40372 Log: Merged /head/share:r40180-40370 to projects/entities/share Added: projects/entities/share/pgpkeys/mdf.key - copied unchanged from r40370, head/share/pgpkeys/mdf.key projects/entities/share/pgpkeys/wen.key - copied unchanged from r40370, head/share/pgpkeys/wen.key projects/entities/share/pgpkeys/zeising.key - copied unchanged from r40370, head/share/pgpkeys/zeising.key Modified: projects/entities/share/pgpkeys/README projects/entities/share/pgpkeys/addkey.sh projects/entities/share/pgpkeys/cs.key projects/entities/share/pgpkeys/ebrandi.key projects/entities/share/pgpkeys/garga.key projects/entities/share/pgpkeys/pgpkeys-core.xml projects/entities/share/pgpkeys/pgpkeys-developers.xml projects/entities/share/pgpkeys/pgpkeys.ent projects/entities/share/pgpkeys/theraven.key projects/entities/share/tools/webupdate projects/entities/share/xml/commercial.isp.xml projects/entities/share/xml/common.ent projects/entities/share/xml/freebsd.ent projects/entities/share/xml/header.ent projects/entities/share/xml/man-refs.ent projects/entities/share/xml/mirrors.xml projects/entities/share/xml/news.dtd projects/entities/share/xml/news.xml projects/entities/share/xml/press.xml projects/entities/share/xml/xhtml.xsl Directory Properties: projects/entities/share/ (props changed) Modified: projects/entities/share/pgpkeys/README ============================================================================== --- projects/entities/share/pgpkeys/README Wed Dec 12 23:38:18 2012 (r40371) +++ projects/entities/share/pgpkeys/README Wed Dec 12 23:38:31 2012 (r40372) @@ -26,9 +26,9 @@ address. For instance, in my case: | Adding key to entity list... | | Unless you are already listed there, you should now add the -| following text to pgpkeys-developers.sgml (unless this is a role key -| or you are a core member. In that case add to pgpkeys-officers.sgml -| or pgpkeys-core.sgml). Remember to keep the list sorted by last name! +| following text to pgpkeys-developers.xml (unless this is a role key +| or you are a core member. In that case add to pgpkeys-officers.xml +| or pgpkeys-core.xml). Remember to keep the list sorted by last name! | | | &a.des.email; @@ -77,7 +77,7 @@ the diffs, and commit. There are two ways to update your key. The first is to follow the above instructions as if you were adding your key for the first time - -except that you don't need to edit chapter.sgml, because you're +except that you don't need to edit chapter.xml, because you're already listed there. The addkey.sh script will snarf the RCS Id from the old key file and generate a new one with whatever keys you specified. Modified: projects/entities/share/pgpkeys/addkey.sh ============================================================================== --- projects/entities/share/pgpkeys/addkey.sh Wed Dec 12 23:38:18 2012 (r40371) +++ projects/entities/share/pgpkeys/addkey.sh Wed Dec 12 23:38:31 2012 (r40372) @@ -72,9 +72,9 @@ mv pgpkeys.ent pgpkeys.ent.orig || exit echo echo "Unless you are already listed there, you should now add the" -echo "following text to pgpkeys-developers.sgml (unless this is a" +echo "following text to pgpkeys-developers.xml (unless this is a" echo "role key or you are a core member. In that case add to" -echo "pgpkeys-officers.sgml or pgpkeys-core.sgml)." +echo "pgpkeys-officers.xml or pgpkeys-core.xml)." echo "Remember to keep the list sorted by last name!" echo echo " " @@ -85,5 +85,5 @@ echo echo "If this is a new entry, don't forget to 'svn add ${keyfile}'" echo "and 'svn propset svn:keywords \"FreeBSD=%H\" ${keyfile}'" echo "and commit each of ${keyfile}, pgpkeys.ent and" -echo "pgpkeys-developers.sgml, pgpkeys-officers.sgml, or" -echo "pgpkeys-core.sgml as required." +echo "pgpkeys-developers.xml, pgpkeys-officers.xml, or" +echo "pgpkeys-core.xml as required." Modified: projects/entities/share/pgpkeys/cs.key ============================================================================== --- projects/entities/share/pgpkeys/cs.key Wed Dec 12 23:38:18 2012 (r40371) +++ projects/entities/share/pgpkeys/cs.key Wed Dec 12 23:38:31 2012 (r40372) @@ -1,133 +1,125 @@ -sub 4096R/99AC2A67 2012-06-05 [expires: 2017-06-04] - pub 3072R/D06F0BD7 2012-11-25 [expires: 2017-11-24] Key fingerprint = 61A4 F2B8 2A6C B81E 5557 0798 78E7 DE70 D06F 0BD7 uid Carlo Strub +uid Carlo Strub sub 3072R/71C75997 2012-11-25 [expires: 2017-11-24] sub 3072R/318AEB16 2012-11-25 [expires: 2017-11-24] ]]> Modified: projects/entities/share/pgpkeys/ebrandi.key ============================================================================== --- projects/entities/share/pgpkeys/ebrandi.key Wed Dec 12 23:38:18 2012 (r40371) +++ projects/entities/share/pgpkeys/ebrandi.key Wed Dec 12 23:38:31 2012 (r40372) @@ -1,243 +1,242 @@ -uid Edson Brandi (Born 1977-08-14 in S. S. DA GRAMA, SP - Brazil) uid Edson Brandi +uid Edson Brandi uid Edson Brandi -uid Edson Brandi uid Edson Brandi -uid Edson Brandi -uid Edson Brandi +uid Edson Brandi uid Edson Brandi uid Edson Brandi -uid Edson Brandi -sub 2048R/E20441CD 2011-11-04 [expires: 2012-11-03] -sub 2048R/734718A1 2011-11-04 [expires: 2012-11-03] -sub 2048R/3C903007 2011-11-04 [expires: 2012-11-03] -sub 2048R/409113D7 2012-09-14 [expires: 2015-09-14] -sub 2048R/5A95E5EC 2012-09-14 [expires: 2015-09-14] -sub 2048R/8F69BF17 2012-09-14 [expires: 2015-09-14] +uid Edson Brandi (Born 1977-08-14 in S. S. DA GRAMA, SP - Brazil) +sub 3072R/A34B8175 2012-11-26 [expires: 2013-11-26] +sub 3072R/4EB0E0EA 2012-11-26 [expires: 2013-11-26] +sub 3072R/89917E73 2012-11-26 [expires: 2013-11-26] ]]> Modified: projects/entities/share/pgpkeys/garga.key ============================================================================== --- projects/entities/share/pgpkeys/garga.key Wed Dec 12 23:38:18 2012 (r40371) +++ projects/entities/share/pgpkeys/garga.key Wed Dec 12 23:38:31 2012 (r40372) @@ -1,116 +1,122 @@ -uid Renato Botelho -uid Renato Botelho -uid Renato Botelho -uid Renato Botelho -uid Renato Botelho -uid Renato Botelho -sub 1024g/7B295760 2003-12-16 +pub 4096R/9F625790 2012-11-28 [expires: 2017-11-27] + Key fingerprint = E3DA 9B2A 6160 99CB 4B31 7641 F1F0 E7A1 9F62 5790 +uid Renato Botelho (FreeBSD) +uid Renato Botelho (Personal) +uid Renato Botelho (FreeBSD) +sub 4096R/473CC82A 2012-11-28 [expires: 2017-11-27] ]]> Copied: projects/entities/share/pgpkeys/mdf.key (from r40370, head/share/pgpkeys/mdf.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/entities/share/pgpkeys/mdf.key Wed Dec 12 23:38:31 2012 (r40372, copy of r40370, head/share/pgpkeys/mdf.key) @@ -0,0 +1,56 @@ + +