svn commit: r39998 - in projects/pkgng/share: mk pgpkeys xml
Glen Barber
gjb at FreeBSD.org
Thu Nov 15 13:37:31 UTC 2012
Author: gjb
Date: Thu Nov 15 13:37:30 2012
New Revision: 39998
URL: http://svnweb.freebsd.org/changeset/doc/39998
Log:
Merge r39918 through 39994 from ^/head/share to pkgng/ branch.
Added:
projects/pkgng/share/pgpkeys/bryanv.key
- copied unchanged from r39950, head/share/pgpkeys/bryanv.key
projects/pkgng/share/pgpkeys/gblach.key
- copied unchanged from r39926, head/share/pgpkeys/gblach.key
Modified:
projects/pkgng/share/mk/doc.xml.mk
projects/pkgng/share/pgpkeys/adamw.key
projects/pkgng/share/pgpkeys/pgpkeys-developers.xml
projects/pkgng/share/pgpkeys/pgpkeys.ent
projects/pkgng/share/pgpkeys/remko.key
projects/pkgng/share/xml/authors.ent
projects/pkgng/share/xml/commercial.consult.xml
projects/pkgng/share/xml/commercial.isp.xml
projects/pkgng/share/xml/commercial.software.xml
projects/pkgng/share/xml/developers.ent
projects/pkgng/share/xml/events2013.xml
projects/pkgng/share/xml/header.ent
projects/pkgng/share/xml/news.xml
projects/pkgng/share/xml/release.ent
Directory Properties:
projects/pkgng/share/ (props changed)
Modified: projects/pkgng/share/mk/doc.xml.mk
==============================================================================
--- projects/pkgng/share/mk/doc.xml.mk Thu Nov 15 13:37:20 2012 (r39997)
+++ projects/pkgng/share/mk/doc.xml.mk Thu Nov 15 13:37:30 2012 (r39998)
@@ -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
Modified: projects/pkgng/share/pgpkeys/adamw.key
==============================================================================
--- projects/pkgng/share/pgpkeys/adamw.key Thu Nov 15 13:37:20 2012 (r39997)
+++ projects/pkgng/share/pgpkeys/adamw.key Thu Nov 15 13:37:30 2012 (r39998)
@@ -1,35 +1,55 @@
<!-- $FreeBSD$ -->
<!--
-sh addkey.sh adamw 42C743FD;
+sh addkey.sh adamw C57CF3A8;
-->
<programlisting role="pgpfingerprint"><![CDATA[
-pub 1024D/42C743FD 2002-10-12 Adam Weinberger <adam at vectors.cx>
- Key fingerprint = A980 3F2E 80A8 9619 9D1C 82E8 A3C2 8CD9 42C7 43FD
-sub 1024g/15D67628 2002-10-12
+pub 2048D/C57CF3A8 2012-11-15
+ Key fingerprint = CCD9 F28A BD1D 50A1 8D08 18A7 F48B B195 C57C F3A8
+uid Adam Weinberger (FreeBSD) <adamw at FreeBSD.org>
+uid Adam Weinberger (adamw.org) <adamw at adamw.org>
+sub 2048g/9C6D0E30 2012-11-15
]]></programlisting>
<programlisting role="pgpkey"><![CDATA[
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.0 (FreeBSD)
-mQGiBD2neE8RBADgkTfNUPbm3AVnVPn/Ds5lDO89yKowW3ULixWqJ6Mti+7sIQ6y
-A4v5/dlUODTH0sdL4Cl3q36pCOP13IIq7o14h4YOjMhdMhsv43678VYK0PvR70hK
-/PxqIRV3lQsP2g8LihKLpRy6sHleIXu1hRLbIBI6/iJTmFcENQfivyHpBwCg31J6
-6jew1OrTLlB76aWmmRJIlVkEAII7j0gAqV/zjR16sAsfiCSHSg9A8RGBmC67zUfK
-PxnrLiw0gqyrt77YnXvANGWDdIMHEZrcDBrb8ciSO8agBO2+/7mOVDVDU5I/SJRi
-rfJTQvFphcnOe7F3MaxdfA/vZE9woXq4JLXfnmcgUAey4iYB2QbV/+v1HBo6wys6
-qyDXBACMsXFWZbDNDwUZBxGVS66bLwpZ/UhWqkrAyvK/7M/HQjkFTUUX2fSTPnWh
-AkcA82asPxQFTdbd7BOs4JnXUY4m+wfP3pzGaCbgL6WYumRjvmvkmeyZtFD+2wxL
-nu/F3oO9PC2f4mGa6E928BLy2bRCV75L0OMmbR5Fd0Z+95k3kLQhQWRhbSBXZWlu
-YmVyZ2VyIDxhZGFtQHZlY3RvcnMuY3g+iFkEExECABkFAj2neE8ECwcDAgMVAgMD
-FgIBAh4BAheAAAoJEKPCjNlCx0P9I7UAmQGWPEjqlXfxptWgb5WKskfl+rkkAJwI
-OSvOdiBFM7/EBBgn9pUQ/6PVUrkBDQQ9p3haEAQAzc17FQj9ePY4tW2+nWiQzj8I
-GVG+8fsVwFhDb4hFcpJxPiR3/J07tU4iyKek/qUiOQdW/dI30vm3rOSIUa3r9iaj
-OaJilRVDO3ErUCdcrJjGf+fTWZFa8t2TLwOooyV8tJ5IUYLwJ8s7/3OpwWh1pfCQ
-qxGACCiXeKQo0a9jxJcAAwUD/35x0sm6jV2OZaHxX/JteeLu1hJOE4hc8oRqiE93
-4j8frz33jIsRFpKJ+H28LXtRmVXtVTdq3RuHll5JRCMG+IPLT3Tns/d0L90twpOj
-4r+2BFIK6SYE6JYngf+J5clwve3vE7Y/b8NbSawEApvVxdrpsevGH0Sn5MSdiukm
-EkJviEYEGBECAAYFAj2neFoACgkQo8KM2ULHQ/1NRgCeJ6ZJYvc1oOUBdEKd7SoH
-rFA6N/8An3A9ukQlZm3lPMutMia2vnsb108k
-=0qTN
+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
+IpuNrKfM7zuBiw==
+=yHIG
-----END PGP PUBLIC KEY BLOCK-----
]]></programlisting>
Copied: projects/pkgng/share/pgpkeys/bryanv.key (from r39950, head/share/pgpkeys/bryanv.key)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/pkgng/share/pgpkeys/bryanv.key Thu Nov 15 13:37:30 2012 (r39998, copy of r39950, head/share/pgpkeys/bryanv.key)
@@ -0,0 +1,77 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh bryanv E97DB7DB;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub 4096R/E97DB7DB 2012-11-05
+ Key fingerprint = 0F8F 11EF F4D2 EDCA ECEA CB16 744C BF25 E97D B7DB
+uid Bryan Venteicher (DITC) <bryanv at daemoninthecloset.org>
+uid Bryan Venteicher (FreeBSD) <bryanv at freebsd.org>
+sub 4096R/2EBC1A46 2012-11-05
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+hvaQWSxKvtCA3RdI3vmKyQc=
+=6YAA
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
Copied: projects/pkgng/share/pgpkeys/gblach.key (from r39926, head/share/pgpkeys/gblach.key)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/pkgng/share/pgpkeys/gblach.key Thu Nov 15 13:37:30 2012 (r39998, copy of r39926, 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 at 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: projects/pkgng/share/pgpkeys/pgpkeys-developers.xml
==============================================================================
--- projects/pkgng/share/pgpkeys/pgpkeys-developers.xml Thu Nov 15 13:37:20 2012 (r39997)
+++ projects/pkgng/share/pgpkeys/pgpkeys-developers.xml Thu Nov 15 13:37:30 2012 (r39998)
@@ -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;
@@ -1761,6 +1766,11 @@
&pgpkey.ups;
</sect2>
+ <sect2 id="pgpkey-bryanv">
+ <title>&a.bryanv;</title>
+ &pgpkey.bryanv;
+ </sect2>
+
<sect2 id="pgpkey-nectar">
<title>&a.nectar;</title>
&pgpkey.nectar;
Modified: projects/pkgng/share/pgpkeys/pgpkeys.ent
==============================================================================
--- projects/pkgng/share/pgpkeys/pgpkeys.ent Thu Nov 15 13:37:20 2012 (r39997)
+++ projects/pkgng/share/pgpkeys/pgpkeys.ent Thu Nov 15 13:37:30 2012 (r39998)
@@ -55,6 +55,7 @@
<!ENTITY pgpkey.brucec SYSTEM "brucec.key">
<!ENTITY pgpkey.brueffer SYSTEM "brueffer.key">
<!ENTITY pgpkey.bruno SYSTEM "bruno.key">
+<!ENTITY pgpkey.bryanv SYSTEM "bryanv.key">
<!ENTITY pgpkey.bsam SYSTEM "bsam.key">
<!ENTITY pgpkey.bschmidt SYSTEM "bschmidt.key">
<!ENTITY pgpkey.bsd SYSTEM "bsd.key">
@@ -122,6 +123,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">
Modified: projects/pkgng/share/pgpkeys/remko.key
==============================================================================
--- projects/pkgng/share/pgpkeys/remko.key Thu Nov 15 13:37:20 2012 (r39997)
+++ projects/pkgng/share/pgpkeys/remko.key Thu Nov 15 13:37:30 2012 (r39998)
@@ -1,70 +1,74 @@
<!-- $FreeBSD$ -->
<!--
-sh addkey.sh remko 6EB8C8C8;
+sh addkey.sh remko 3F774079;
-->
<programlisting role="pgpfingerprint"><![CDATA[
-pub 2048R/6EB8C8C8 2010-05-28
- Key fingerprint = D692 91F9 F4EF D363 7F3F 4D17 9C75 DF7B 6EB8 C8C8
-uid Remko Lodder (Remko Lodder's Key) <remko at FreeBSD.org>
-sub 4096R/7532E07C 2012-08-14
+pub 4096R/3F774079 2012-11-11 [expires: 2016-11-11]
+ Key fingerprint = 7EE4 C4AF DCA3 E0B4 479B A344 7135 8ED6 3F77 4079
+uid Remko Lodder <remko at FreeBSD.org>
+sub 4096R/59F38CB0 2012-11-11 [expires: 2016-11-11]
]]></programlisting>
<programlisting role="pgpkey"><![CDATA[
-----BEGIN PGP PUBLIC KEY BLOCK-----
-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
-aeC52ekBQto6mKzZFAsMa+sPhzxXsNmpyywL
-=mQXV
+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
+5sGIhylLEgeij8uoeFOeA1qMqbhYORfYOxE=
+=+q/B
-----END PGP PUBLIC KEY BLOCK-----
]]></programlisting>
Modified: projects/pkgng/share/xml/authors.ent
==============================================================================
--- projects/pkgng/share/xml/authors.ent Thu Nov 15 13:37:20 2012 (r39997)
+++ projects/pkgng/share/xml/authors.ent Thu Nov 15 13:37:30 2012 (r39998)
@@ -192,6 +192,8 @@
<!ENTITY a.bruno "Bruno Ducrot <email>bruno at FreeBSD.org</email>">
+<!ENTITY a.bryanv "Bryan Venteicher <email>bryanv at FreeBSD.org</email>">
+
<!ENTITY a.bsam "Boris Samorodov <email>bsam at FreeBSD.org</email>">
<!ENTITY a.bschmidt "Bernhard Schmidt <email>bschmidt at FreeBSD.org</email>">
@@ -446,6 +448,8 @@
<!ENTITY a.gber "Grzegorz Bernacki <email>gber at FreeBSD.org</email>">
+<!ENTITY a.gblach "Grzegorz Blach <email>gblach at FreeBSD.org</email>">
+
<!ENTITY a.gclarkii "Gary Clark II <email>gclarkii at FreeBSD.org</email>">
<!ENTITY a.gehenna "MAEKAWA Masahide <email>gehenna at FreeBSD.org</email>">
Modified: projects/pkgng/share/xml/commercial.consult.xml
==============================================================================
--- projects/pkgng/share/xml/commercial.consult.xml Thu Nov 15 13:37:20 2012 (r39997)
+++ projects/pkgng/share/xml/commercial.consult.xml Thu Nov 15 13:37:30 2012 (r39998)
@@ -770,6 +770,18 @@
</description>
</entry>
+ <entry id="Supportodua" category="europe">
+ <name>Support.od.ua</name>
+ <url>http://support.od.ua/</url>
+ <description>
+ Support.od.ua is located in Odessa, Ukraine. We offer professional
+ FreeBSD and Linux installation, consulting and server solutions for
+ customers in Ukraine, Russian Federation and Kazakhstan. For more
+ information and contact details please visit our <a
+ href="http://support.od.ua">website</a>.
+ </description>
+ </entry>
+
<entry id="MediaCenter" category="europe">
<name>MediaCenter</name>
<url>http://www.umc.se/</url>
Modified: projects/pkgng/share/xml/commercial.isp.xml
==============================================================================
--- projects/pkgng/share/xml/commercial.isp.xml Thu Nov 15 13:37:20 2012 (r39997)
+++ projects/pkgng/share/xml/commercial.isp.xml Thu Nov 15 13:37:30 2012 (r39998)
@@ -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: projects/pkgng/share/xml/commercial.software.xml
==============================================================================
--- projects/pkgng/share/xml/commercial.software.xml Thu Nov 15 13:37:20 2012 (r39997)
+++ projects/pkgng/share/xml/commercial.software.xml Thu Nov 15 13:37:30 2012 (r39998)
@@ -1404,19 +1404,6 @@
</description>
</entry>
- <entry id="ZeusTechnology" category="NETWORK">
- <name>Zeus Technology Limited</name>
- <url>http://www.zeus.co.uk/</url>
- <description>
- Zeus Technology Limited offers <em>Zeus Server</em> for FreeBSD. Zeus
- Server is an advanced, powerful, full-featured, commercial grade web
- server designed with exceptional performance, minimal machine
- resource requirements, and ease of administration in mind. FREE
- evaluation copies may be <a
- href="http://www.zeus.co.uk/">downloaded</a>.
- </description>
- </entry>
-
<entry id="SippySoftwareInc" category="NETWORK">
<name>Sippy Software, Inc.</name>
<url>http://www.sippysoft.com</url>
Modified: projects/pkgng/share/xml/developers.ent
==============================================================================
--- projects/pkgng/share/xml/developers.ent Thu Nov 15 13:37:20 2012 (r39997)
+++ projects/pkgng/share/xml/developers.ent Thu Nov 15 13:37:30 2012 (r39998)
@@ -94,6 +94,7 @@ $FreeBSD$
<!ENTITY a.brucec "Bruce Cran">
<!ENTITY a.brueffer "Christian Brüffer">
<!ENTITY a.bruno "Bruno Ducrot">
+<!ENTITY a.bryanv "Bryan Venteicher">
<!ENTITY a.bsam "Boris Samorodov">
<!ENTITY a.bschmidt "Bernhard Schmidt">
<!ENTITY a.bsd "Brian S. Dean">
@@ -214,6 +215,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">
Modified: projects/pkgng/share/xml/events2013.xml
==============================================================================
--- projects/pkgng/share/xml/events2013.xml Thu Nov 15 13:37:20 2012 (r39997)
+++ projects/pkgng/share/xml/events2013.xml Thu Nov 15 13:37:30 2012 (r39998)
@@ -41,6 +41,39 @@
</description>
</event>
+ <event id="bsdday-2013">
+ <name>Central European BSD-Day 2013</name>
+ <url>http://bsdday.eu/2013</url>
+ <startdate>
+ <year>2013</year>
+ <month>4</month>
+ <day>6</day>
+ </startdate>
+ <enddate>
+ <year>2013</year>
+ <month>4</month>
+ <day>6</day>
+ </enddate>
+ <location>
+ <country code="IT">Italy</country>
+ <city>Naples</city>
+ <site>Institute of Biostructures and Bioimaging</site>
+ </location>
+ <description>Watch out, another BSD-Day is rising: next April
+ Beastie visits Naples to gather BSD people of Italy and Central
+ Europe to meet up! This event is an excellent opportunity for
+ BSD developers and enthusiasts to present their work to larger
+ audiences, share their thoughts with their fellows and reach out
+ for their potential partners. Traditionally, the event tries to
+ avoid formalities as it does not require the speakers to submit
+ papers or the attendees to register or pay an entry fee.
+ However, the invited folks are encouraged to a give a brief talk
+ on their favorite BSD topic. The goal is to motivate everybody,
+ especially university students to see the benefits of our
+ approach and take a chance on working with BSD
+ systems.</description>
+ </event>
+
<event id="bsdcan-2013">
<name>BSDCan 2013</name>
<url>http://www.bsdcan.org/</url>
Modified: projects/pkgng/share/xml/header.ent
==============================================================================
--- projects/pkgng/share/xml/header.ent Thu Nov 15 13:37:20 2012 (r39997)
+++ projects/pkgng/share/xml/header.ent Thu Nov 15 13:37:30 2012 (r39998)
@@ -101,7 +101,6 @@
<ul>
<li><a href="http://wiki.FreeBSD.org/IdeasPage">Project Ideas</a></li>
<li><a href="http://svnweb.FreeBSD.org">SVN Repository</a></li>
- <li><a href="http://cvsweb.FreeBSD.org">CVS Repository</a></li>
<li><a href="http://p4web.FreeBSD.org">Perforce Repository</a></li>
</ul>
</li>
Modified: projects/pkgng/share/xml/news.xml
==============================================================================
--- projects/pkgng/share/xml/news.xml Thu Nov 15 13:37:20 2012 (r39997)
+++ projects/pkgng/share/xml/news.xml Thu Nov 15 13:37:30 2012 (r39998)
@@ -31,6 +31,44 @@
<name>2012</name>
<month>
+ <name>11</name>
+
+ <day>
+ <name>5</name>
+
+ <event>
+ <p>New committer:
+ <a href="mailto:bryanv at FreeBSD.org">Bryan Venteicher</a> (src)</p>
+ </event>
+ </day>
+
+ <day>
+ <name>4</name>
+
+ <event>
+ <p>New committer:
+ <a href="mailto:gblach at FreeBSD.org">Grzegorz Blach</a> (ports)</p>
+ </event>
+ </day>
+
+ <day>
+ <name>3</name>
+
+ <event>
+ <title>&os; 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>
Modified: projects/pkgng/share/xml/release.ent
==============================================================================
--- projects/pkgng/share/xml/release.ent Thu Nov 15 13:37:20 2012 (r39997)
+++ projects/pkgng/share/xml/release.ent Thu Nov 15 13:37:30 2012 (r39998)
@@ -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
More information about the svn-doc-projects
mailing list