PERFORCE change 208074 for review
Rene Ladan
rene at FreeBSD.org
Fri Mar 16 21:50:07 UTC 2012
http://p4web.freebsd.org/@@208074?ac=10
Change 208074 by rene at rene_acer on 2012/03/16 21:49:16
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#131 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#78 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/version-guide/article.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#14 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#133 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#71 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#25 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/bjk.key#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#72 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#69 integrate
.. //depot/projects/docproj_nl/www/en/internal/machines.sgml#10 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#135 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#131 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1069 2012/03/11 03:49:17 eadler Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1071 2012/03/15 12:49:10 culot Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -389,6 +389,11 @@
</listitem>
<listitem>
+ <para>Alexander Grigoryev
+ <email>alexander.4mail at gmail.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Alexander Gromnizki
<email>gromnizki at unixdev.net</email></para>
</listitem>
@@ -1191,11 +1196,6 @@
</listitem>
<listitem>
- <para>Benjamin Kaduk
- <email>kaduk at mit.edu</email></para>
- </listitem>
-
- <listitem>
<para>Benjamin Lewis
<email>bhlewis at gte.net</email></para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#78 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.352 2012/03/01 19:58:05 ak Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.353 2012/03/13 16:15:46 bjk Exp $ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
alphabetical order by last name. Please keep in mind that fact while
@@ -595,6 +595,10 @@
</listitem>
<listitem>
+ <para>&a.bjk;</para>
+ </listitem>
+
+ <listitem>
<para>&a.phk;</para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/version-guide/article.sgml#4 (text+ko) ====
@@ -21,7 +21,7 @@
</author>
</authorgroup>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/version-guide/article.sgml,v 1.15 2010/02/19 21:33:18 jhb Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/version-guide/article.sgml,v 1.16 2012/03/13 13:38:43 ryusuke Exp $</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -61,7 +61,7 @@
<para><literal>Releases</literal> are named with a <firstterm>major
version number</firstterm> and <firstterm>minor version
- number</firstterm>.<para>
+ number</firstterm>.</para>
<itemizedlist>
<listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#14 (text+ko) ====
@@ -1,6 +1,6 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.79 2012/02/19 22:42:38 eadler Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.80 2012/03/11 18:57:55 rene Exp $
-->
<chapter id="mac">
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#133 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1170 2012/03/03 16:47:41 crees Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1172 2012/03/16 17:26:07 wblock Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -13258,7 +13258,7 @@
<entry>700032</entry>
<entry>March 2, 2007</entry>
<entry>7.0-CURRENT after the inclusion of ipw(4) and
- iwi(4) firmwares.</entry>
+ iwi(4) firmware.</entry>
</row>
<row>
@@ -14367,7 +14367,7 @@
<row>
<entry>800092</entry>
<entry>May 29, 2009</entry>
- <entry>8.0-CURRENT after chaning
+ <entry>8.0-CURRENT after changing
<function>sx_init_flags()</function> KPI. The
<constant>SX_ADAPTIVESPIN</constant> is retired and a
new <constant>SX_NOADAPTIVE</constant> flag is
@@ -15104,6 +15104,23 @@
</row>
<row>
+ <entry>900504</entry>
+ <entry>March 3, 2012</entry>
+ <entry>9.0-STABLE after changes related to mounting
+ of filesystem inside a jail (rev
+ <svnref>232728</svnref>.</entry>
+ </row>
+
+ <row>
+ <entry>900505</entry>
+ <entry>March 13, 2012</entry>
+ <entry>9.0-STABLE after introduction of new tcp(4)
+ socket options: TCP_KEEPINIT, TCP_KEEPIDLE,
+ TCP_KEEPINTVL anf TCP_KEEPCNT, (rev
+ <svnref>232945</svnref>).</entry>
+ </row>
+
+ <row>
<entry>1000000</entry>
<entry>September 26, 2011</entry>
<entry>10.0-CURRENT.</entry>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#71 (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.569 2012/03/01 19:58:05 ak Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.570 2012/03/13 16:15:46 bjk Exp $
-->
<!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -160,6 +160,8 @@
<!ENTITY a.billf "Bill Fumerola <email>billf at FreeBSD.org</email>">
+<!ENTITY a.bjk "Benjamin Kaduk <email>bjk at FreeBSD.org</email>">
+
<!ENTITY a.blackend "Marc Fonvieille <email>blackend at FreeBSD.org</email>">
<!ENTITY a.bland "Alexander Nedotsukov <email>bland at FreeBSD.org</email>">
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#25 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Dutch Documentation Project
- $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.10 2012/02/20 21:20:24 rene Exp $
+ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.11 2012/03/11 19:11:01 rene Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/mac/chapter.sgml
%SRCID% 1.80
==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#72 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.175 2012/03/01 19:58:05 ak Exp $
+ $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.176 2012/03/13 16:15:46 bjk Exp $
-->
<sect2 id="pgpkey-ariff">
@@ -681,6 +681,11 @@
&pgpkey.trevor;
</sect2>
+ <sect2 id="pgpkey-bjk">
+ <title>&a.bjk;</title>
+ &pgpkey.bjk;
+ </sect2>
+
<sect2 id="pgpkey-phk">
<title>&a.phk;</title>
&pgpkey.phk;
==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#69 (text+ko) ====
@@ -1,5 +1,5 @@
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.265 2012/03/01 19:58:05 ak Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.266 2012/03/13 16:15:46 bjk Exp $ -->
<!-- PGP keyblocks -->
<!ENTITY pgpkey.aaron SYSTEM "aaron.key">
<!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -42,6 +42,7 @@
<!ENTITY pgpkey.benno SYSTEM "benno.key">
<!ENTITY pgpkey.bf SYSTEM "bf.key">
<!ENTITY pgpkey.billf SYSTEM "billf.key">
+<!ENTITY pgpkey.bjk SYSTEM "bjk.key">
<!ENTITY pgpkey.blackend SYSTEM "blackend.key">
<!ENTITY pgpkey.bland SYSTEM "bland.key">
<!ENTITY pgpkey.bmah SYSTEM "bmah.key">
==== //depot/projects/docproj_nl/www/en/internal/machines.sgml#10 (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/internal/machines.sgml,v 1.100 2012/02/20 02:58:02 bz Exp $">
+<!ENTITY date "$FreeBSD: www/en/internal/machines.sgml,v 1.101 2012/03/12 11:22:12 bz Exp $">
<!ENTITY title "The FreeBSD.org Network">
<!ENTITY % navinclude.docs "INCLUDE">
]>
@@ -43,9 +43,9 @@
<tr>
<td>flame</td>
-<td>8.2-RELEASE</td>
+<td>10-CURRENT</td>
<td>sparc64</td>
-<td>General developer access.</td>
+<td>Reference machine.</td>
</tr>
<tr>
@@ -270,7 +270,7 @@
<tr valign="top">
<td>flame</td>
<td>Sun SPARC</td>
-<td>2x UltraSparc-IIe 650MHz, 2GB Memory, sym SCSI controller,
+<td>Sun Fire V120, UltraSparc-IIe 648MHz, 2GB Memory, sym SCSI controller,
2x 36G SCSI-3 disk, 2x Sun ERI 10/100 Ethernet.</td>
</tr>
==== //depot/projects/docproj_nl/www/share/sgml/news.xml#135 (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.425 2012/03/07 14:14:18 gjb Exp $
+ $FreeBSD: www/share/sgml/news.xml,v 1.426 2012/03/13 16:18:47 bjk Exp $
</cvs:keyword>
</cvs:keywords>
@@ -34,6 +34,15 @@
<month>
<name>3</name>
<day>
+ <name>12</name>
+
+ <event>
+ <p>New committer:
+ <a href="mailto:bjk at FreeBSD.org">Benjamin Kaduk</a> (doc/www)</p>
+ </event>
+ </day>
+
+ <day>
<name>6</name>
<event>
<title>&os; 8.3-RC1 Available</title>
More information about the p4-projects
mailing list