Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 Nov 2012 22:42:54 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-translations@freebsd.org
Subject:   svn commit: r39941 - in translations/share: examples/vim mk pgpkeys xml
Message-ID:  <201211042242.qA4MgsOL070558@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gjb
Date: Sun Nov  4 22:42:54 2012
New Revision: 39941
URL: http://svnweb.freebsd.org/changeset/doc/39941

Log:
  Merge r39761 through r39932 from head/ to translations/

Added:
  translations/share/examples/vim/edit-xml.vim
     - copied unchanged from r39932, head/share/examples/vim/edit-xml.vim
  translations/share/pgpkeys/gblach.key
     - copied unchanged from r39932, head/share/pgpkeys/gblach.key
  translations/share/pgpkeys/sjg.key
     - copied unchanged from r39932, head/share/pgpkeys/sjg.key
Deleted:
  translations/share/examples/vim/edit-sgml.vim
Modified:
  translations/share/mk/doc.xml.mk
  translations/share/pgpkeys/loader.key
  translations/share/pgpkeys/pgpkeys-developers.xml
  translations/share/pgpkeys/pgpkeys.ent
  translations/share/xml/authors.ent
  translations/share/xml/bibliography.xml
  translations/share/xml/commercial.isp.xml
  translations/share/xml/developers.ent
  translations/share/xml/events2012.xml
  translations/share/xml/navibar.ent
  translations/share/xml/news.xml
  translations/share/xml/release.ent
  translations/share/xml/trademarks.ent
Directory Properties:
  translations/share/   (props changed)

Copied: translations/share/examples/vim/edit-xml.vim (from r39932, head/share/examples/vim/edit-xml.vim)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ translations/share/examples/vim/edit-xml.vim	Sun Nov  4 22:42:54 2012	(r39941, copy of r39932, head/share/examples/vim/edit-xml.vim)
@@ -0,0 +1,11 @@
+" formatting XML documents
+" $FreeBSD$
+
+if !exists("format_fdp_xml")
+  let format_fdp_xml = 1
+  " correction for highlighting special characters
+  autocmd BufNewFile,BufRead *.xml,*.ent,*.html syn match xmlSpecial "&[^;]*;"
+
+  " formatting FreeBSD XML/Docbook
+  autocmd BufNewFile,BufRead *.xml,*.ent set autoindent formatoptions=tcq2l textwidth=70 shiftwidth=2 softtabstop=2 tabstop=8
+endif

Modified: translations/share/mk/doc.xml.mk
==============================================================================
--- translations/share/mk/doc.xml.mk	Sun Nov  4 22:40:53 2012	(r39940)
+++ translations/share/mk/doc.xml.mk	Sun Nov  4 22:42:54 2012	(r39941)
@@ -27,13 +27,14 @@ _XML_INCLIST=	libcommon.l10n.xsl \
 		header.l10n.ent \
 		iso8879.ent \
 		l10n.ent \
-		release.ent
-.for F in ${_INCLIST}
+		release.ent \
+		release.l10n.ent
+.for F in ${_XML_INCLIST}
 .if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/${F})
-XML_INCLUDES+=	${F}
+XML_INCLUDES+=	${DOC_PREFIX}/${LANGCODE}/share/xml/${F}
 .endif
 .if exists(${DOC_PREFIX}/share/xml/${F})
-XML_INCLUDES+=	${F}
+XML_INCLUDES+=	${DOC_PREFIX}/share/xml/${F}
 .endif
 .endfor
 

Copied: translations/share/pgpkeys/gblach.key (from r39932, head/share/pgpkeys/gblach.key)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ translations/share/pgpkeys/gblach.key	Sun Nov  4 22:42:54 2012	(r39941, copy of r39932, head/share/pgpkeys/gblach.key)
@@ -0,0 +1,41 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh gblach D25B0682;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   2048R/D25B0682 2012-11-03 [expires: 2014-11-03]
+      Key fingerprint = 225B 941C A886 05C6 1C87  9C03 DE72 593D D25B 0682
+uid                  Grzegorz Blach <gblach@FreeBSD.org>
+sub   2048R/5DE28719 2012-11-03 [expires: 2014-11-03]
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFCVjegBCACjZOtHgTAG3s3XOVJt1VVM3LZTKKx0K5Aip1c4TDetBTkNIPCb
+V9UiflZUGv9v6OEF0O5rRwS6WwTLxjhuA9io9mSBWuCfZywsRSShpZQbEMZq5/F+
+OgHOMav3Gc+ITwvM/nFPtU2OHj1h3t4n6IBbuVfPh4Yb9TJsAWQlUchWAOBj7CG0
+oqfR2PuDbYFtXNnGVrpZZuxxBI9onvY0n5w2gmtmO9+GFQ8Ob9K6EI/jwqPVGSQK
+Tch14aaeRF5Uh+Ua7UDXKyZFBJUuGEvtHcn7eDNFEs4SY4tW7he6VGiCwr3gU3pZ
+CdQwEUDwXkBm/JZ8JjsDOq8NVtTX3d0mViTRABEBAAG0I0dyemVnb3J6IEJsYWNo
+IDxnYmxhY2hARnJlZUJTRC5vcmc+iQE+BBMBAgAoBQJQlY3oAhsDBQkDwmcABgsJ
+CAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDeclk90lsGgt6gB/4vyw2faWL5MntH
+grGiwqdeCdm1x++zGjxrs30RLaHPmSVXYA/bQIBbnVs/kR2wRpCO9fxl9xQ5bBnZ
+vHwK9+hbGqli/eqWuvgwRYmkIAd/xLVN8Ffyj73RXRead6bmpOQ8e2Osabttyccc
+Un4V8OZptpIYLbdnVGsiB147GYnooPv5uJ6RD+Wz+iSORFzcFEA6VD0Ft6vxe1on
++dBxpHO8Np1wID8JH3Gl6oGfpYcPsp1QVknMZ197+94QNHgN23xzDVuKkbjFb1Du
+N7SegRdm1wwhF0QlqIWPIQT8jXY7WX1NWV6ns8gOUXChJxGMPRsOxCuhQJp8crsS
+q32CqqDmuQENBFCVjegBCAC56QSMFVZjklZSA9mxNm6GZyBcUoAYISM2hg4QSN92
+/8CY84TXiAB9x8+KoYeVukMu5B/2BhNW4bWA/3GwMk0tn1s2ZEVFz9ZbTBPmTA1Z
+x1wZOKdr4Y5feOO73ouBW1cyR4AgbYEsQtllfb3yQ2CukouEJNjesDT+zDAJnIS9
+JG+1MGngMIxddKasNfBliiN0iNNbGEKpFvcNpTBnIpbQ55/yMMJ9CZmey/1HFKBO
+setIET7f1Z3f2tUoxku73QhwfwBlrw269S4Aeuvk80bZa1YZLoQiZ5B2WqFz4V4H
+uxk9WgqOQ/gJEFCOYkpLjSctCuFQnLefsV44gveB+LU7ABEBAAGJASUEGAECAA8F
+AlCVjegCGwwFCQPCZwAACgkQ3nJZPdJbBoLnwwf/Z8bFOlDaLWkCP4K8Uz6kHGno
+nvRPc6l76aJhqDPceEiDU1DumjTSokQNj2i9jKqhM/b2cPLIwWbYbkypLer9R00o
+AJcM1i2nkZXRLRMIFfQTZUmXMSZvZ5NG+MyiSAI9zpfw/psgUUad6mDUZafYVWez
+KnCFybbJ2TwcFzFcHxi4desKNnrh/NTIt7XyFVof9Wkz8Zt9cGGf/BxQPA9oPbvd
+b8wN9Yjegb4OunNmHc309cuVCktSlr7u4kdMUn0LuZmi4xZj2XY0+GuHErD49G1b
+x4+G59TE5S619vSAcdjtmvXDvV8no1Y9ENp/blCkeKcGBoWZKc6dHSw3RsMawA==
+=/8wY
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

Modified: translations/share/pgpkeys/loader.key
==============================================================================
--- translations/share/pgpkeys/loader.key	Sun Nov  4 22:40:53 2012	(r39940)
+++ translations/share/pgpkeys/loader.key	Sun Nov  4 22:42:54 2012	(r39941)
@@ -1,51 +1,76 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh loader 40AB1752;
+sh addkey.sh loader 6BD4DDE6;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   1024D/40AB1752 2007-08-01 [expires: 2010-07-31]
-      Key fingerprint = 98C4 6E6B 1C21 15E4 5042  01FC C7B7 E152 40AB 1752
+pub   4096R/6BD4DDE6 2012-10-26
+      Key fingerprint = A33E 88AB D358 DA49 59A6  B263 A9A2 599C 6BD4 DDE6
 uid                  loader <loader@FreeBSD.org>
-sub   4096g/9E53A5C7 2007-08-01 [expires: 2010-07-31]
+uid                  loader <loader@FreeBSDMall.com>
+sub   4096R/1036D26C 2012-10-26
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-=PrOy
+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
+DPodrx7PwaXno88xFjmqosI94Et7mQ==
+=qJuU
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

Modified: translations/share/pgpkeys/pgpkeys-developers.xml
==============================================================================
--- translations/share/pgpkeys/pgpkeys-developers.xml	Sun Nov  4 22:40:53 2012	(r39940)
+++ translations/share/pgpkeys/pgpkeys-developers.xml	Sun Nov  4 22:42:54 2012	(r39941)
@@ -124,6 +124,11 @@
       &pgpkey.tdb;
     </sect2>
 
+    <sect2 id="pgpkey-gblach">
+      <title>&a.gblach;</title>
+      &pgpkey.gblach;
+    </sect2>
+
     <sect2 id="pgpkey-mbr">
       <title>&a.mbr;</title>
       &pgpkey.mbr;
@@ -516,6 +521,11 @@
       &pgpkey.danger;
     </sect2>
 
+    <sect2 id="pgpkey-sjg">
+      <title>&a.sjg;</title>
+      &pgpkey.sjg;
+    </sect2>
+
     <sect2 id="pgpkey-gibbs">
       <title>&a.gibbs;</title>
       &pgpkey.gibbs;

Modified: translations/share/pgpkeys/pgpkeys.ent
==============================================================================
--- translations/share/pgpkeys/pgpkeys.ent	Sun Nov  4 22:40:53 2012	(r39940)
+++ translations/share/pgpkeys/pgpkeys.ent	Sun Nov  4 22:42:54 2012	(r39941)
@@ -122,6 +122,7 @@
 <!ENTITY pgpkey.garga SYSTEM "garga.key">
 <!ENTITY pgpkey.garys SYSTEM "garys.key">
 <!ENTITY pgpkey.gavin SYSTEM "gavin.key">
+<!ENTITY pgpkey.gblach SYSTEM "gblach.key">
 <!ENTITY pgpkey.gerald SYSTEM "gerald.key">
 <!ENTITY pgpkey.ghelmer SYSTEM "ghelmer.key">
 <!ENTITY pgpkey.gibbs SYSTEM "gibbs.key">
@@ -333,6 +334,7 @@
 <!ENTITY pgpkey.shaun SYSTEM "shaun.key">
 <!ENTITY pgpkey.sheldonh SYSTEM "sheldonh.key">
 <!ENTITY pgpkey.simon SYSTEM "simon.key">
+<!ENTITY pgpkey.sjg SYSTEM "sjg.key">
 <!ENTITY pgpkey.skreuzer SYSTEM "skreuzer.key">
 <!ENTITY pgpkey.snb SYSTEM "snb.key">
 <!ENTITY pgpkey.sobomax SYSTEM "sobomax.key">

Copied: translations/share/pgpkeys/sjg.key (from r39932, head/share/pgpkeys/sjg.key)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ translations/share/pgpkeys/sjg.key	Sun Nov  4 22:42:54 2012	(r39941, copy of r39932, head/share/pgpkeys/sjg.key)
@@ -0,0 +1,70 @@
+<!-- $FreeBSD$ -->
+<!--
+sh ./addkey.sh sjg B6CC76BF;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   1024D/B6CC76BF 2002-06-12
+      Key fingerprint = F3BA D6CB E1F8 02EA 705F  BCAD 6125 F840 B6CC 76BF
+uid                  Simon J. Gerraty <sjg@crufty.net>
+uid                  Simon J. Gerraty <sjg@juniper.net>
+uid                  Simon J. Gerraty <sjg@NetBSD.org>
+uid                  Simon J. Gerraty <sjg@FreeBSD.org>
+sub   1024g/D94B72B9 2002-06-12
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+U4BS88b/Bo4u
+=onBO
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

Modified: translations/share/xml/authors.ent
==============================================================================
--- translations/share/xml/authors.ent	Sun Nov  4 22:40:53 2012	(r39940)
+++ translations/share/xml/authors.ent	Sun Nov  4 22:42:54 2012	(r39941)
@@ -446,6 +446,8 @@
 
 <!ENTITY a.gber "Grzegorz Bernacki <email>gber@FreeBSD.org</email>">
 
+<!ENTITY a.gblach "Grzegorz Blach <email>gblach@FreeBSD.org</email>">
+
 <!ENTITY a.gclarkii "Gary Clark II <email>gclarkii@FreeBSD.org</email>">
 
 <!ENTITY a.gehenna "MAEKAWA Masahide <email>gehenna@FreeBSD.org</email>">
@@ -1190,6 +1192,8 @@
 
 <!ENTITY a.simon "Simon L. Nielsen <email>simon@FreeBSD.org</email>">
 
+<!ENTITY a.sjg "Simon J. Gerraty <email>sjg@FreeBSD.org</email>">
+
 <!ENTITY a.skreuzer "Steven Kreuzer <email>skreuzer@FreeBSD.org</email>">
 
 <!ENTITY a.skv "Sergey Skvortsov <email>skv@FreeBSD.org</email>">

Modified: translations/share/xml/bibliography.xml
==============================================================================
--- translations/share/xml/bibliography.xml	Sun Nov  4 22:40:53 2012	(r39940)
+++ translations/share/xml/bibliography.xml	Sun Nov  4 22:42:54 2012	(r39941)
@@ -292,26 +292,6 @@
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-handbook">
-    <biblioset relation="book">
-      <title>The FreeBSD Handbook</title>
-
-      <corpauthor>FreeBSD Documentation Project</corpauthor>
-
-      <publisher>
-        <publishername>BSDi</publishername>
-      </publisher>
-
-      <edition>1st edition</edition>
-
-      <pubdate>November 1999</pubdate>
-
-      <pagenums>489 pages</pagenums>
-
-      <isbn>ISBN 1-57176-241-8</isbn>
-    </biblioset>
-  </biblioentry>
-
   <biblioentry id="biblio-mckusick-1">
     <abbrev>McKusick et al, 1994</abbrev>
 

Modified: translations/share/xml/commercial.isp.xml
==============================================================================
--- translations/share/xml/commercial.isp.xml	Sun Nov  4 22:40:53 2012	(r39940)
+++ translations/share/xml/commercial.isp.xml	Sun Nov  4 22:42:54 2012	(r39941)
@@ -34,6 +34,23 @@
     </description>
   </entry>
 
+  <entry id="hubdotorg">
+    <name>Hub Hosting Services</name>
+    <url>http://hub.org/</url>;
+    <description>
+      Hub.Org has provided Open-Source Web Hosting services since 1997.
+      Our solutions include <a
+      href="http://hub.org/freebsd-vps-hosting">FreeBSD VPS Hosting</a>
+      and <a href="http://hub.org/self-managed-vps-hosting">self-managed
+      VPS hosting</a> among many others.  Hub has several cost-effective
+      hosting plans to fit your business, whether it is a new site or
+      several busy ones.  Hub.Org has been actively involved in several
+      leading, open-source projects (FreeBSD InterNet News (INN), WU-FTPd,
+      OpenSSH), and providing hosting for open-source projects include
+      PostgreSQL and Horde.
+    </description>
+  </entry>
+
   <entry id="ipglobal">
     <name>IP Global.net</name>
     <url>http://www.ipglobal.net/</url>;

Modified: translations/share/xml/developers.ent
==============================================================================
--- translations/share/xml/developers.ent	Sun Nov  4 22:40:53 2012	(r39940)
+++ translations/share/xml/developers.ent	Sun Nov  4 22:42:54 2012	(r39941)
@@ -214,6 +214,7 @@ $FreeBSD$
 <!ENTITY a.garys "Gary W. Swearingen">
 <!ENTITY a.gavin "Gavin Atkinson">
 <!ENTITY a.gber "Grzegorz Bernacki">
+<!ENTITY a.gblach "Grzegorz Blach">
 <!ENTITY a.gerald "Gerald Pfeifer">
 <!ENTITY a.ghelmer "Guy Helmer">
 <!ENTITY a.gibbs "Justin T. Gibbs">
@@ -577,6 +578,7 @@ $FreeBSD$
 <!ENTITY a.silby "Mike Silbersack">
 <!ENTITY a.simokawa "Hidetoshi Shimokawa">
 <!ENTITY a.simon "Simon L. B. Nielsen">
+<!ENTITY a.sjg "Simon J. Gerraty">
 <!ENTITY a.skreuzer "Steven Kreuzer">
 <!ENTITY a.skv "Sergey Skvortsov">
 <!ENTITY a.smace "Scott Mace">
@@ -705,14 +707,14 @@ $FreeBSD$
 <!ENTITY a.doceng '&a.gjb;, &a.blackend;, &a.gabor;, &a.hrs;'>
 
 <!-- FreeBSD Donations Liaison -->
-<!ENTITY a.donations '&a.gjb;, &a.wilko;, &a.gahr;, &a.pgollucci;, &a.skreuzer;, &a.obrien;, &a.trhodes;, Daniel Seuffert, &a.rwatson;'>
+<!ENTITY a.donations '&a.tabthorpe;, &a.gjb;, &a.gahr;, &a.pgollucci;, &a.skreuzer;, &a.obrien;, &a.trhodes;, Daniel Seuffert, &a.rwatson;'>
 
 <!-- FreeBSD Ports Manager Team -->
-<!ENTITY a.portmgr '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.beat;, &a.erwin;, &a.linimon;, &a.pav;, &a.itetcu;, &a.miwi;'>
+<!ENTITY a.portmgr '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.decke;, &a.beat;, &a.erwin;, &a.linimon;, &a.itetcu;, &a.miwi;'>
 
 <!-- FreeBSD Release Engineering Teams -->
-<!ENTITY a.re.members '&a.kib;, &a.blackend;, &a.jpaetzel;, &a.hrs;, &a.kensmith;, &a.rwatson;, &a.bz;'>
-<!ENTITY a.re-builders '&a.marcel;, &a.nyan;'>
+<!ENTITY a.re.members '&a.kib;, &a.blackend;, &a.jpaetzel;, &a.hrs;, &a.kensmith;'>
+<!ENTITY a.re-builders '&a.marcel;, &a.nyan;, &a.nwhitehorn;'>
 
 <!-- FreeBSD Security Officer -->
 <!ENTITY a.so '&a.simon;'>

Modified: translations/share/xml/events2012.xml
==============================================================================
--- translations/share/xml/events2012.xml	Sun Nov  4 22:40:53 2012	(r39940)
+++ translations/share/xml/events2012.xml	Sun Nov  4 22:42:54 2012	(r39941)
@@ -234,4 +234,33 @@
       experts.
     </description>
   </event>
+
+  <event id="bsdday-argentina-2012">
+    <name>BSDday Argentina 2012</name>
+    <url>http://www.bsdday.org/</url>;
+    <startdate>
+      <year>2012</year>
+      <month>11</month>
+      <day>17</day>
+    </startdate>
+    <enddate>
+      <year>2012</year>
+      <month>11</month>
+      <day>17</day>
+    </enddate>
+    <location>
+      <country code="AR">Argentina</country>
+      <city>Buenos Aires City</city>
+      <site>Universidad Tecnologica Nacional</site>
+    </location>
+
+    <description>BSDday Argentina is a conference for users, sysadmins
+      and developers of BSD software and based systems.  The
+      conference is for anyone developing, deploying and using systems
+      based on FreeBSD, NetBSD, OpenBSD, DragonFlyBSD and others *BSD.
+      BSDday Argentina is a technical conference and aims to collect
+      the best technical papers and presentations available to ensure
+      that the latest developments in our open source community are
+      shared with the widest possible audience.</description>
+  </event>
 </events>

Modified: translations/share/xml/navibar.ent
==============================================================================
--- translations/share/xml/navibar.ent	Sun Nov  4 22:40:53 2012	(r39940)
+++ translations/share/xml/navibar.ent	Sun Nov  4 22:42:54 2012	(r39941)
@@ -76,14 +76,14 @@
 
 <![ %beta.testing; [
 <!ENTITY beta.listitem '
-  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">Upcoming Release: &betarel.current;</a></li>
+  <li xmlns="http://www.w3.org/1999/xhtml">Upcoming Release:<br /><a href="&enbase;/&u.betarel.schedule;">&betarel.current;</a></li>
 '>
 ]]>
 <!ENTITY beta.listitem ''>
 
 <![ %beta2.testing; [
 <!ENTITY beta2.listitem '
-  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">Upcoming Release: &betarel2.current;</a></li>
+  <li xmlns="http://www.w3.org/1999/xhtml">Upcoming Release:<br /><a href="&u.betarel2.schedule;">&betarel2.current;</a></li>
 '>
 ]]>
 <!ENTITY beta2.listitem ''>
@@ -95,10 +95,11 @@
     <li><a href="&base;/where.html">Get FreeBSD</a></li>
     <li><a href="&base;/releases/">Release Information</a>
       <ul>
-	<li>Production Release: <a href="&u.rel.announce;">&rel.current;</a> <a href="&u.rel2.announce;">&rel2.current;</a></li>
+	<li>Production Release: <br />
+	  <a href="&u.rel.announce;">&rel.current;</a> <a href="&u.rel2.announce;">&rel2.current;</a></li>
         <li>Production (Legacy) Release:<br />
 	  <a href="&u.rel3.announce;">&rel3.current;</a></li>
-        <li><a href="&base;/snapshots/">Snapshot Releases</a></li>
+<!--        <li><a href="&base;/snapshots/">Snapshot Releases</a></li>-->
 	&beta.listitem;
 	&beta2.listitem;
       </ul></li>

Modified: translations/share/xml/news.xml
==============================================================================
--- translations/share/xml/news.xml	Sun Nov  4 22:40:53 2012	(r39940)
+++ translations/share/xml/news.xml	Sun Nov  4 22:42:54 2012	(r39941)
@@ -31,9 +31,75 @@
     <name>2012</name>
 
     <month>
+      <name>11</name>
+
+      <day>
+	<name>4</name>
+
+	<event>
+	  <p>New committer:
+	    <a href="mailto:gblach@FreeBSD.org">Grzegorz Blach</a> (ports)</p>
+	</event>
+      </day>
+
+      <day>
+	<name>3</name>
+
+	<event>
+	  <title>&os;&nbsp;9.1-RC3 Available</title>
+
+	  <p>The third RC build for the &os;-9.1 release cycle is
+	    now available.  ISO images for the amd64, i386, sparc64, and
+	    powerpc64 architectures are <a
+	      href="&lists.stable;/2012-November/070401.html">available</a>
+	    on most of our <a
+	      href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+	    mirror sites</a>.</p>
+	</event>
+      </day>
+    </month>
+
+    <month>
       <name>10</name>
 
       <day>
+	<name>24</name>
+
+	<event>
+	  <p>Enhanced commit privileges: <a
+	      href="mailto:erwin@FreeBSD.org">Erwin Lansing</a>
+	    (src, ports)</p>
+	</event>
+      </day>
+
+      <day>
+	<name>23</name>
+
+	<event>
+	  <p>New committer:
+	    <a href="mailto:sjg@FreeBSD.org">Simon J. Gerraty</a> (src)</p>
+	</event>
+      </day>
+
+      <day>
+	<name>20</name>
+
+	<event>
+	  <p>Enhanced commit privileges: <a
+	      href="mailto:eadler@FreeBSD.org">Eitan Adler</a>
+	    (src, ports, doc)</p>
+	</event>
+      </day>
+
+      <day>
+	<name>19</name>
+	<event>
+	  <p>New member for the Ports Management team:
+	    <a href="mailto:decke@FreeBSD.org">Bernhard Fr&ouml;hlich</a>.</p>
+	</event>
+      </day>
+
+      <day>
 	<name>10</name>
 	<event>
 	  <title>&os;&nbsp;9.1-RC2 Available</title>

Modified: translations/share/xml/release.ent
==============================================================================
--- translations/share/xml/release.ent	Sun Nov  4 22:40:53 2012	(r39940)
+++ translations/share/xml/release.ent	Sun Nov  4 22:42:54 2012	(r39941)
@@ -32,7 +32,7 @@
 <!ENTITY beta.testing "INCLUDE">
 <!ENTITY % beta.testing "INCLUDE">
 <!ENTITY betarel.current '9.1'>
-<!ENTITY betarel.vers 'RC2'>
+<!ENTITY betarel.vers 'RC3'>
 <!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'>
 
 <!-- If we have a second release in the release cycle (e.g. 5.x and 6.y

Modified: translations/share/xml/trademarks.ent
==============================================================================
--- translations/share/xml/trademarks.ent	Sun Nov  4 22:40:53 2012	(r39940)
+++ translations/share/xml/trademarks.ent	Sun Nov  4 22:42:54 2012	(r39941)
@@ -13,7 +13,7 @@
 
 <!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered
   trademarks of 3Com Corporation.</para>">
-<!-- An SGML entity can't start with a number... -->
+<!-- An XML entity can't start with a number... -->
 <!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
 
 <!ENTITY tm-attrib.3ware "<para>3ware and Escalade are registered
@@ -426,14 +426,14 @@ Coverity, Inc.</para>">
 
 <!ENTITY legalnotice '
 <legalnotice id="legalnotice">
-  <para>Redistribution and use in source (SGML DocBook) and &apos;compiled&apos;
-    forms (SGML, HTML, PDF, PostScript, RTF and so forth) with or without
+  <para>Redistribution and use in source (XML DocBook) and &apos;compiled&apos;
+    forms (XML, HTML, PDF, PostScript, RTF and so forth) with or without
     modification, are permitted provided that the following conditions are
     met:</para>
 
   <orderedlist>
     <listitem>
-      <para>Redistributions of source code (SGML DocBook) must retain the
+      <para>Redistributions of source code (XML DocBook) must retain the
         above copyright notice, this list of conditions and the following
         disclaimer as the first lines of this file unmodified.</para>
     </listitem>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211042242.qA4MgsOL070558>