PERFORCE change 184813 for review
Rene Ladan
rene at FreeBSD.org
Sun Oct 17 10:08:36 UTC 2010
http://p4web.freebsd.org/@@184813?ac=10
Change 184813 by rene at 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 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.965 2010/10/06 14:23:52 pluknet Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.970 2010/10/16 19:09:27 culot Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -2294,6 +2294,11 @@
</listitem>
<listitem>
+ <para>David Naylor
+ <email>naylor.b.david at gmail.com</email></para>
+ </listitem>
+
+ <listitem>
<para>David Otto
<email>ottodavid at gmx.net</email></para>
</listitem>
@@ -3181,11 +3186,6 @@
</listitem>
<listitem>
- <para>Frederic Culot
- <email>frederic at culot.org</email></para>
- </listitem>
-
- <listitem>
<para>Frederic Dubuy
<email>fdubuy at free.fr</email></para>
</listitem>
@@ -7891,6 +7891,11 @@
</listitem>
<listitem>
+ <para>Pete French
+ <email>pete at twisted.org.uk</email></para>
+ </listitem>
+
+ <listitem>
<para>Peter Haight
<email>peterh at prognet.com</email></para>
</listitem>
@@ -8517,6 +8522,11 @@
</listitem>
<listitem>
+ <para>Ruben
+ <email>chromium at hybridsource.org</email></para>
+ </listitem>
+
+ <listitem>
<para>Rudolf Cejka
<email>cejkar at fit.vutbr.cz</email></para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#54 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.313 2010/10/07 17:57:50 jonathan Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.314 2010/10/16 19:09:27 culot Exp $ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
alphabetical order by last name. Please keep in mind that fact while
@@ -291,6 +291,10 @@
</listitem>
<listitem>
+ <para>&a.culot;</para>
+ </listitem>
+
+ <listitem>
<para>&a.joel;</para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#47 (text+ko) ====
@@ -13,7 +13,7 @@
builds for the other languages, and we will poke fun of you
in public.
- $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.528 2010/10/07 17:57:50 jonathan Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.529 2010/10/16 18:57:33 culot Exp $
-->
<!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -234,6 +234,8 @@
<!ENTITY a.csjp "Christian S.J. Peron <email>csjp at FreeBSD.org</email>">
+<!ENTITY a.culot "Frederic Culot <email>culot at FreeBSD.org</email>">
+
<!ENTITY a.cwt "Chris Timmons <email>cwt at FreeBSD.org</email>">
<!ENTITY a.cy "Cy Schubert <email>cy at FreeBSD.org</email>">
==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#47 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.143 2010/10/07 17:57:50 jonathan Exp $
+ $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.144 2010/10/16 19:28:08 culot Exp $
-->
<sect2 id="pgpkey-ariff">
@@ -296,6 +296,11 @@
&pgpkey.brucec;
</sect2>
+ <sect2 id="pgpkey-culot">
+ <title>&a.culot;</title>
+ &pgpkey.culot;
+ </sect2>
+
<sect2 id="pgpkey-aaron">
<title>&a.aaron;</title>
&pgpkey.aaron;
==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#44 (text+ko) ====
@@ -1,5 +1,5 @@
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.233 2010/10/07 17:57:50 jonathan Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.234 2010/10/16 19:28:08 culot Exp $ -->
<!-- PGP keyblocks -->
<!ENTITY pgpkey.aaron SYSTEM "aaron.key">
<!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -70,6 +70,7 @@
<!ENTITY pgpkey.cperciva SYSTEM "cperciva.key">
<!ENTITY pgpkey.cshumway SYSTEM "cshumway.key">
<!ENTITY pgpkey.csjp SYSTEM "csjp.key">
+<!ENTITY pgpkey.culot SYSTEM "culot.key">
<!ENTITY pgpkey.daichi SYSTEM "daichi.key">
<!ENTITY pgpkey.damien SYSTEM "damien.key">
<!ENTITY pgpkey.danfe SYSTEM "danfe.key">
==== //depot/projects/docproj_nl/www/en/advocacy/myths.sgml#3 (text+ko) ====
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/advocacy/myths.sgml,v 1.43 2009/12/14 13:16:43 pav Exp $">
+<!ENTITY date "$FreeBSD: www/en/advocacy/myths.sgml,v 1.44 2010/10/16 00:53:53 bms Exp $">
<!ENTITY title "FreeBSD Advocacy Project">
<!ENTITY % navinclude.about "INCLUDE">
<!ENTITY url.articles "../doc/en_US.ISO8859-1/articles">
@@ -154,6 +154,11 @@
the base FreeBSD operating system, but the development
takes place separately.<p></li>
+ <li><p><a href="http://www.hybrid-cluster.com/">Hybrid Cluster</a> is
+ a web cluster, based on FreeBSD and ZFS, which provides data
+ redundancy and automated load balancing of standard LAMP
+ websites and applications.
+
<li><p><a href="http://frenzy.org.ua/eng/">Frenzy</a> 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 @@
<!ENTITY a.csgr "Geoff Rehmet">
<!ENTITY a.cshumway "Christopher Shumway">
<!ENTITY a.csjp "Christian S.J. Peron">
+<!ENTITY a.culot "Frederic Culot">
<!ENTITY a.cwt "Chris Timmons">
<!ENTITY a.cy "Cy Schubert">
<!ENTITY a.daichi "Daichi GOTO">
==== //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#19 (text+ko) ====
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
"http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
-<!-- $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 $ -->
<entries>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $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 $
</cvs:keyword>
</cvs:keywords>
@@ -461,6 +461,18 @@
</description>
</entry>
+ <entry id="NQhost">
+ <name>NQhost</name>
+ <url>http://nqhost.com/</url>
+ <description>
+ NQhost offers virtual private servers with guaranteed resources.
+ Our <a href="http://nqhost.com/freebsd-vps.html">FreeBSD VPS</a>
+ packages can be created in Germany or US-located data centers.
+ We offer flexible tariff plans, configurations and friendly
+ support.
+ </description>
+ </entry>
+
<entry id="bsn">
<name>BSn.Com</name>
<url>http://bsn.com/</url>
==== //depot/projects/docproj_nl/www/share/sgml/events.xml#33 (text+ko) ====
@@ -10,7 +10,7 @@
<events>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $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 $
</cvs:keyword>
</cvs:keywords>
@@ -64,6 +64,33 @@
from commercial vendors.</description>
</event>
+ <event id="eurobsdcon-2011">
+ <name>EuroBSDCon 2011</name>
+ <url>http://2011.eurobsdcon.org/</url>
+ <startdate>
+ <year>2011</year>
+ <month>10</month>
+ <day>6</day>
+ </startdate>
+ <enddate>
+ <year>2011</year>
+ <month>10</month>
+ <day>9</day>
+ </enddate>
+ <location>
+ <country code="NL">The Netherlands</country>
+ </location>
+ <description>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.</description>
+ </event>
+
<event id="bsdcan-2011">
<name>BSDCan 2011</name>
<url>http://www.bsdcan.org/</url>
==== //depot/projects/docproj_nl/www/share/sgml/news.xml#92 (text+ko) ====
@@ -25,7 +25,7 @@
<news>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $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 $
</cvs:keyword>
</cvs:keywords>
@@ -34,11 +34,18 @@
<month>
<name>10</name>
+
+ <day>
+ <name>16</name>
+ <event>
+ <p>New committer: <a href="mailto:culot at FreeBSD.org">Frederic Culot</a> (ports)</p>
+ </event>
+ </day>
<day>
<name>7</name>
<event>
- <p>New committer: <a href="mailto:jonathan at FreeBSD.org">Jonathan Anderson</a></p>
+ <p>New committer: <a href="mailto:jonathan at FreeBSD.org">Jonathan Anderson</a> (src)</p>
</event>
</day>
==== //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#17 (text+ko) ====
@@ -5,7 +5,7 @@
<usergroups>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $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 $
</cvs:keyword>
</cvs:keywords>
@@ -622,6 +622,19 @@
</description>
</entry>
+ <entry id="sacblug">
+ <name>The Sacramento BSD and Linux Users Group (SacBLUG)</name>
+ <url>http://sacblug.org/</url>
+ <description>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 <a
+ href="http://sacblug.org">our website</a> for more information.
+ </description>
+ </entry>
+
<entry id="yfuug">
<name>Yavapai Free Unix Users Group</name>
<url>mailto:rcarter at consys.com</url>
More information about the p4-projects
mailing list