From owner-p4-projects@FreeBSD.ORG Sun Oct 17 10:08:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D60C31065675; Sun, 17 Oct 2010 10:08:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 981DD1065673 for ; Sun, 17 Oct 2010 10:08:35 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 82C0B8FC1E for ; Sun, 17 Oct 2010 10:08:35 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9HA8Zox063208 for ; Sun, 17 Oct 2010 10:08:35 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9HA8ZfL063205 for perforce@freebsd.org; Sun, 17 Oct 2010 10:08:35 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 17 Oct 2010 10:08:35 GMT Message-Id: <201010171008.o9HA8ZfL063205@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184813 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Oct 2010 10:08:36 -0000 http://p4web.freebsd.org/@@184813?ac=10 Change 184813 by rene@rene_acer on 2010/10/17 10:08:29 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#75 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#54 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#47 integrate .. //depot/projects/docproj_nl/share/pgpkeys/culot.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#47 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#44 integrate .. //depot/projects/docproj_nl/www/en/advocacy/myths.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#45 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#19 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#33 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#92 integrate .. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#17 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#75 (text+ko) ==== @@ -1,4 +1,4 @@ - + + aaron@FreeBSD.org"> @@ -234,6 +234,8 @@ csjp@FreeBSD.org"> +culot@FreeBSD.org"> + cwt@FreeBSD.org"> cy@FreeBSD.org"> ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#47 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -296,6 +296,11 @@ &pgpkey.brucec; + + &a.culot; + &pgpkey.culot; + + &a.aaron; &pgpkey.aaron; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#44 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -70,6 +70,7 @@ + ==== //depot/projects/docproj_nl/www/en/advocacy/myths.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -154,6 +154,11 @@ the base FreeBSD operating system, but the development takes place separately.

+

  • Hybrid Cluster is + a web cluster, based on FreeBSD and ZFS, which provides data + redundancy and automated load balancing of standard LAMP + websites and applications. +

  • Frenzy is another live-CD distribution, but customized for administering tasks. It contains software for hardware ==== //depot/projects/docproj_nl/www/en/developers.sgml#45 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.269 2010/10/07 17:59:17 jonathan Exp $ +$FreeBSD: www/en/developers.sgml,v 1.270 2010/10/16 19:04:06 culot Exp $ --> @@ -119,6 +119,7 @@ + ==== //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#19 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.59 2010/09/10 18:45:26 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.60 2010/10/11 20:52:28 jkois Exp $ @@ -461,6 +461,18 @@ + + NQhost + http://nqhost.com/ + + NQhost offers virtual private servers with guaranteed resources. + Our FreeBSD VPS + packages can be created in Germany or US-located data centers. + We offer flexible tariff plans, configurations and friendly + support. + + + BSn.Com http://bsn.com/ ==== //depot/projects/docproj_nl/www/share/sgml/events.xml#33 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.90 2010/09/06 21:21:33 brueffer Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.91 2010/10/14 19:44:37 pgj Exp $ @@ -64,6 +64,33 @@ from commercial vendors. + + EuroBSDCon 2011 + http://2011.eurobsdcon.org/ + + 2011 + 10 + 6 + + + 2011 + 10 + 9 + + + The Netherlands + + EuroBSDCon is the annual European technical conference + for users and developers on BSD based systems. The 10th European + BSD Conference will take place in the Netherlands in October, + 2010, and include a technical track, tutorials, and FreeBSD + developer summit. Topics of interest to the conference include, + but are not limited to applications, architecture, implementation, + performance and security of BSD based operating systems, as well + as topics concerning the economic or organizational aspects of BSD + use. + + BSDCan 2011 http://www.bsdcan.org/ ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#92 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.348 2010/10/07 17:59:17 jonathan Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.350 2010/10/16 19:25:51 culot Exp $ @@ -34,11 +34,18 @@ 10 + + + 16 + +

    New committer: Frederic Culot (ports)

    + + 7 -

    New committer: Jonathan Anderson

    +

    New committer: Jonathan Anderson (src)

         ==== //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#17 (text+ko) ==== @@ -5,7 +5,7 @@ - $FreeBSD: www/share/sgml/usergroups.xml,v 1.97 2010/09/22 18:45:40 jkois Exp $ + $FreeBSD: www/share/sgml/usergroups.xml,v 1.98 2010/10/11 21:08:12 jkois Exp $ @@ -622,6 +622,19 @@ + + The Sacramento BSD and Linux Users Group (SacBLUG) + http://sacblug.org/ + The Sacramento BSD and Linux Users Group (SacBLUG) is + a collaborative effort amongst *BSD/Linux professionals in the + Sacramento area, with a focus on enterprise and server + environments. Our aim is to share our experiences in managing + and maintaining systems while also providing a social network + for members. Check out our website for more information. + + + Yavapai Free Unix Users Group mailto:rcarter@consys.com