From owner-svn-doc-projects@FreeBSD.ORG Thu Nov 15 13:37:31 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 99518835; Thu, 15 Nov 2012 13:37:31 +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 7F2A38FC16; Thu, 15 Nov 2012 13:37:31 +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 qAFDbVnH090484; Thu, 15 Nov 2012 13:37:31 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFDbV1a090468; Thu, 15 Nov 2012 13:37:31 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201211151337.qAFDbV1a090468@svn.freebsd.org> From: Glen Barber Date: Thu, 15 Nov 2012 13:37:30 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r39998 - in projects/pkgng/share: mk pgpkeys 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: Thu, 15 Nov 2012 13:37:31 -0000 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 @@ - 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) +uid Adam Weinberger (adamw.org) +sub 2048g/9C6D0E30 2012-11-15 ]]> 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 @@ + + + +uid Bryan Venteicher (FreeBSD) +sub 4096R/2EBC1A46 2012-11-05 +]]> + 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 @@ + + + +sub 2048R/5DE28719 2012-11-03 [expires: 2014-11-03] +]]> + 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; + + &a.gblach; + &pgpkey.gblach; + + &a.mbr; &pgpkey.mbr; @@ -1761,6 +1766,11 @@ &pgpkey.ups; + + &a.bryanv; + &pgpkey.bryanv; + + &a.nectar; &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 @@ + @@ -122,6 +123,7 @@ + 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 @@ -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 +sub 4096R/59F38CB0 2012-11-11 [expires: 2016-11-11] ]]> 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 @@ bruno@FreeBSD.org"> +bryanv@FreeBSD.org"> + bsam@FreeBSD.org"> bschmidt@FreeBSD.org"> @@ -446,6 +448,8 @@ gber@FreeBSD.org"> +gblach@FreeBSD.org"> + gclarkii@FreeBSD.org"> gehenna@FreeBSD.org"> 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 @@ + + Support.od.ua + http://support.od.ua/ + + 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 website. + + + MediaCenter http://www.umc.se/ 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 @@ + + Hub Hosting Services + http://hub.org/ + + Hub.Org has provided Open-Source Web Hosting services since 1997. + Our solutions include FreeBSD VPS Hosting + and self-managed + VPS hosting 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. + + + IP Global.net http://www.ipglobal.net/ 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 @@ - - Zeus Technology Limited - http://www.zeus.co.uk/ - - Zeus Technology Limited offers Zeus Server 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 downloaded. - - - Sippy Software, Inc. http://www.sippysoft.com 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$ + @@ -214,6 +215,7 @@ $FreeBSD$ + 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 @@ + + Central European BSD-Day 2013 + http://bsdday.eu/2013 + + 2013 + 4 + 6 + + + 2013 + 4 + 6 + + + Italy + Naples + Institute of Biostructures and Bioimaging + + 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. + + BSDCan 2013 http://www.bsdcan.org/ 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 @@ 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 @@ 2012 + 11 + + + 5 + + +

New committer: + Bryan Venteicher (src)

+ + + + + 4 + + +

New committer: + Grzegorz Blach (ports)

+ + + + + 3 + + + &os; 9.1-RC3 Available + +

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 available + on most of our &os; + mirror sites.

+ + + + + 10 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 @@ - +