Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Jan 2010 18:59:40 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 173030 for review
Message-ID:  <201001121859.o0CIxeom004708@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=173030

Change 173030 by rene@rene_self on 2010/01/12 18:58:39

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#43 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#17 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#67 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/trademarks.sgml#2 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/delphij.key#2 integrate
.. //depot/projects/docproj_nl/share/sgml/trademarks.ent#5 integrate
.. //depot/projects/docproj_nl/www/en/donations/donors.sgml#23 integrate
.. //depot/projects/docproj_nl/www/en/java/dists/16.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/java/news.xml#5 integrate
.. //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#16 integrate
.. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#15 integrate
.. //depot/projects/docproj_nl/www/share/sgml/common.ent#2 integrate
.. //depot/projects/docproj_nl/www/share/sgml/notices.xml#5 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#43 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.887 2010/01/04 17:34:50 glarkin Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.891 2010/01/11 17:39:37 nemoliu Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -2503,6 +2503,11 @@
     </listitem>
 
     <listitem>
+      <para>Dmitry V. Sukhodoyev
+	<email>raven428@gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Dmytro Rud
 	<email>unixoid@yahoo.com</email></para>
     </listitem>
@@ -3330,6 +3335,11 @@
     </listitem>
 
     <listitem>
+      <para>Giel van Schijndel
+        <email>me@mortis.eu</email></para>
+    </listitem>
+
+    <listitem>
       <para>Glenn Johnson
 	<email>gljohns@bellsouth.net</email></para>
     </listitem>
@@ -4502,6 +4512,11 @@
     </listitem>
 
     <listitem>
+      <para>Joe Horn
+	<email>joehorn@gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Joe Jih-Shian Lu
 	<email>jslu@dns.ntu.edu.tw</email></para>
     </listitem>
@@ -5474,6 +5489,11 @@
     </listitem>
 
     <listitem>
+      <para>Larry P. Maloney
+        <email>larry@kiputers.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Larry Rosenman
 	<email>ler@lerctr.org</email></para>
     </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#17 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.245 2009/10/03 15:24:13 manolis Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.246 2010/01/10 10:24:51 manolis Exp $
 -->
 
 <chapter id="updating-upgrading">
@@ -176,7 +176,8 @@
     <sect2 id="freebsdupdate-config-file">
       <title>The Configuration File</title>
 
-      <para>Some users may wish to tweak the configuration file,
+      <para>Some users may wish to tweak the default configuration file
+	in <filename>/etc/freebsd-update.conf</filename>,
 	allowing better control of the process.  The options are
 	very well documented, but the following few may require a
 	bit more explanation:</para>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#67 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1045 2010/01/04 20:38:15 dougb Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1046 2010/01/09 06:16:56 linimon Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -1619,7 +1619,7 @@
 
 	      <row>
 		<entry><filename>java</filename></entry>
-		<entry>Software related to the Java language.</entry>
+		<entry>Software related to the Java&trade; language.</entry>
 		<entry>The <filename>java</filename> category shall not be
 		  the only one for a port. Save for ports directly related to
 		  the Java language, porters are also encouraged not to
@@ -5929,7 +5929,7 @@
       <sect2 id="java-variables">
 	<title>Variable definitions</title>
 
-      <para>If your port needs a Java&trade; Development Kit (JDK) to
+      <para>If your port needs a Java&trade; Development Kit (JDK&trade;) to
 	either build, run or even extract the distfile, then it should
 	define <makevar>USE_JAVA</makevar>.</para>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/trademarks.sgml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <!-- 
      Trademark Legend, as required by The Open Group, Sun, etc..
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/trademarks.sgml,v 1.6 2005/05/04 14:46:03 murray Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/trademarks.sgml,v 1.7 2010/01/09 06:16:55 linimon Exp $
 -->
 
 <legalnotice id="trademarks" role="trademarks">
@@ -11,7 +11,8 @@
   <para>UNIX is a registered trademark of The Open Group in the US and
     other countries.</para>
 
-  <para>Sun, Sun Microsystems, SunOS, Solaris, and Java are trademarks
+  <para>Sun, Sun Microsystems, SunOS, Solaris,
+    Java, JDK, and OpenJDK are trademarks
     or registered trademarks of Sun Microsystems, Inc. in the United
     States and other countries.</para>
 

==== //depot/projects/docproj_nl/share/pgpkeys/delphij.key#2 (text+ko) ====

@@ -1,6 +1,6 @@
-<!-- $FreeBSD: doc/share/pgpkeys/delphij.key,v 1.3 2008/01/02 00:55:05 delphij Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/delphij.key,v 1.4 2010/01/10 12:59:03 delphij Exp $ -->
 <!--
-sh addkey.sh delphij 18EDEBA0 42EA8A4B CAEEB8C0;
+sh addkey.sh delphij 18EDEBA0 3FCA37C1 42EA8A4B CAEEB8C0;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
 pub   1024D/CAEEB8C0 2004-01-28
@@ -16,12 +16,18 @@
 uid                  Xin LI <delphij@FreeBSD.org>
 uid                  Xin LI <delphij@delphij.net>
 
-pub   1024D/18EDEBA0 2008-01-02 [expires: 2010-01-02]
+pub   1024D/18EDEBA0 2008-01-02 [expired: 2010-01-02]
       Key fingerprint = 79A6 CF42 F917 DDCA F1C2  C926 8BEB DB04 18ED EBA0
 uid                  Xin LI <delphij@geekcn.org>
 uid                  Xin LI <delphij@FreeBSD.org>
 uid                  Xin LI <delphij@delphij.net>
-sub   4096g/8ED8F128 2008-01-02 [expires: 2010-01-02]
+
+pub   2048R/3FCA37C1 2010-01-10 [expires: 2012-01-10]
+      Key fingerprint = 27EA 5D6C 9398 BA7F B205  8F70 04CE F812 3FCA 37C1
+uid                  Xin LI <delphij@geekcn.org>
+uid                  Xin LI <delphij@delphij.net>
+uid                  Xin LI <delphij@FreeBSD.org>
+sub   2048R/F956339F 2010-01-10 [expires: 2012-01-10]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -105,72 +111,117 @@
 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
-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
-bnb9gHFGpH1QylHtTuqRnaA=
-=Cm8W
+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
+=A4bU
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

==== //depot/projects/docproj_nl/share/sgml/trademarks.ent#5 (text+ko) ====

@@ -8,7 +8,7 @@
 
      Please keep this file sorted.
 
-     $FreeBSD: doc/share/sgml/trademarks.ent,v 1.46 2009/07/19 20:31:50 manolis Exp $
+     $FreeBSD: doc/share/sgml/trademarks.ent,v 1.47 2010/01/09 05:21:49 linimon Exp $
 -->
 
 <!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered
@@ -328,7 +328,7 @@
 <!-- http://www.sun.com/suntrademarks/ -->
 
 <!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java
-  Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra,
+  Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, OpenJDK,
   Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS,
   Ultra and VirtualBox are trademarks or registered trademarks of
   Sun Microsystems, Inc. in the United States and other countries.</para>">
@@ -340,6 +340,7 @@
 <!ENTITY jsp "<trademark>JSP</trademark>">
 <!ENTITY jvm "<trademark>JVM</trademark>">
 <!ENTITY netra "<trademark>Netra</trademark>">
+<!ENTITY openjdk "<trademark>OpenJDK</trademark>">
 <!ENTITY solaris "<trademark>Solaris</trademark>">
 <!ENTITY staroffice "<trademark>StarOffice</trademark>">
 <!ENTITY sun "<trademark>Sun</trademark>">

==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#23 (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/donations/donors.sgml,v 1.398 2009/12/21 13:27:41 gahr Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/donors.sgml,v 1.400 2010/01/08 18:36:29 gahr Exp $">
 <!ENTITY title "Hardware Donors Page">
 <!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
@@ -2657,6 +2657,20 @@
     <td> miwi (for pkg build cluster) </td>
     <td> Received </td>
   </tr>
+
+  <tr>
+    <td> Gareth Randall </td>
+    <td> USB card </td>
+    <td> gj </td>
+    <td> Received </td>
+  </tr>
+
+  <tr>
+    <td> Kyle Anderson (tummy.com) </td>
+    <td> 6 SuperMicro servers </td>
+    <td> brd (firewalls and infrastructure servers <br>
+    	for the new NYC FreeBSD co-location) </td>
+    <td> Received </td>	
 </table>
 
 &footer;

==== //depot/projects/docproj_nl/www/en/java/dists/16.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/java/dists/16.sgml,v 1.4 2009/12/28 05:58:29 glewis Exp $">
+<!ENTITY date "$FreeBSD: www/en/java/dists/16.sgml,v 1.5 2010/01/09 15:55:30 glewis Exp $">
 <!ENTITY title "&os; &java; Project: &jdk; 1.6">
 <!ENTITY % navinclude.developers "INCLUDE">
 ]>
@@ -14,21 +14,21 @@
 <p>
 <b>May 5, 2009:</b> <a href="mailto:openjdk@getsnappy.com">Brian
 Gardner</a>'s update to Build 16 of the
-<a href="http://openjdk.java.net/">OpenJDK</a>; 6 port is committed.
+<a href="http://openjdk.java.net/">&openjdk;</a>; 6 port is committed.
 This update also fixes a problem with the port using the HotSpot JVM
 from the bootstrap JDK rather building and installing it's version of HotSpot.
 </p>
 
 <p>
 <b>February 23, 2009:</b> <a href="mailto:openjdk@getsnappy.com">Brian
-Gardner</a>'s port of <a href="http://openjdk.java.net/">OpenJDK</a>; 6 is
+Gardner</a>'s port of <a href="http://openjdk.java.net/">&openjdk;</a>; 6 is
 committed to the &os; Ports Collection.
 </p>
 
 <p>
 <b>February 6, 2009:</b> <a href="mailto:openjdk@getsnappy.com">Brian
 Gardner</a> has announced a port of
-<a href="http://openjdk.java.net/">OpenJDK</a>; 6 to &os; 7.0.  The patch
+<a href="http://openjdk.java.net/">&openjdk;</a>; 6 to &os; 7.0.  The patch
 can be found at
 <a href="http://beta.experts-exchange.com/articles/OS/Unix/BSD/Patch-for-OpenJDK6-on-BSD.html">http://beta.experts-exchange.com/articles/OS/Unix/BSD/Patch-for-OpenJDK6-on-BSD.html</a>.
 </p>

==== //depot/projects/docproj_nl/www/en/java/news.xml#5 (text+ko) ====

@@ -20,7 +20,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/en/java/news.xml,v 1.9 2009/12/28 05:58:29 glewis Exp $
+      $FreeBSD: www/en/java/news.xml,v 1.10 2010/01/09 15:55:30 glewis Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -34,12 +34,12 @@
         <name>5</name>
 
         <event>
-          <title><a href="http://openjdk.java.net/">OpenJDK</a>; 6 updated
+          <title><a href="http://openjdk.java.net/">&openjdk;</a>; 6 updated
             to Build 16.</title>
 
           <p><a href="mailto:openjdk@getsnappy.com">Brian Gardner</a> has
             released an update of the
-            <a href="http://openjdk.java.net/">OpenJDK</a>; 6 port to Build 16.
+            <a href="http://openjdk.java.net/">&openjdk;</a>; 6 port to Build 16.
             See the <a href="dists/16.html">JDK 1.6.x page</a>
             for more details.</p>
         </event>
@@ -71,11 +71,11 @@
         <name>23</name>
 
         <event>
-          <title>Port of <a href="http://openjdk.java.net/">OpenJDK</a>; 6
+          <title>Port of <a href="http://openjdk.java.net/">&openjdk;</a>; 6
             committed</title>
 
           <p><a href="mailto:openjdk@getsnappy.com">Brian Gardner</a>'s
-            port of <a href="http://openjdk.java.net/">OpenJDK</a>; 6 is
+            port of <a href="http://openjdk.java.net/">&openjdk;</a>; 6 is
             committed to the Ports Collection as java/openjdk6.
             See the <a href="dists/16.html">JDK 1.6.x page</a> for more
             details.</p>
@@ -86,11 +86,11 @@
         <name>6</name>
 
         <event>
-          <title>Port of <a href="http://openjdk.java.net/">OpenJDK</a>; 6
+          <title>Port of <a href="http://openjdk.java.net/">&openjdk;</a>; 6
             announced</title>
 
           <p><a href="mailto:openjdk@getsnappy.com">Brian Gardner</a> has
-            announced a port of <a href="http://openjdk.java.net/">OpenJDK</a>;
+            announced a port of <a href="http://openjdk.java.net/">&openjdk;</a>;
             6 to FreeBSD 7.x.
             See the <a href="dists/16.html">JDK 1.6.x page</a> for more
             details.</p>

==== //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#16 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/nl/share/sgml/header.l10n.ent,v 1.6 2009/08/02 20:02:46 rene Exp $
+<!-- $FreeBSD: www/nl/share/sgml/header.l10n.ent,v 1.7 2010/01/05 17:50:01 rene Exp $
      %SOURCE%	share/sgml/header.ent
      %SRCID%	1.14
  -->

==== //depot/projects/docproj_nl/www/share/sgml/advisories.xml#15 (text+ko) ====

@@ -2,11 +2,35 @@
 <advisories>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/advisories.xml,v 1.235 2009/12/03 10:38:32 brueffer Exp $
+      $FreeBSD: www/share/sgml/advisories.xml,v 1.236 2010/01/06 23:01:23 simon Exp $
     </cvs:keyword>
   </cvs:keywords>
 
   <year>
+    <name>2010</name>
+
+    <month>
+      <name>1</name>
+
+      <day>
+	<name>6</name>
+
+	<advisory>
+	  <name>FreeBSD-SA-10:03.zfs</name>
+	</advisory>
+
+	<advisory>
+	  <name>FreeBSD-SA-10:02.ntpd</name>
+	</advisory>
+
+	<advisory>
+	  <name>FreeBSD-SA-10:01.bind</name>
+	</advisory>
+      </day>
+    </month>
+  </year>
+
+  <year>
     <name>2009</name>
 
     <month>

==== //depot/projects/docproj_nl/www/share/sgml/common.ent#2 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/common.ent,v 1.3 2006/08/28 18:05:04 simon Exp $ -->
+<!-- $FreeBSD: www/share/sgml/common.ent,v 1.4 2010/01/09 15:55:30 glewis Exp $ -->
 
 <!-- FreeBSD Common Entities -->
 <!-- PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN" -->
@@ -57,6 +57,7 @@
 <!ENTITY unix 'UNIX&reg;'>
 <!ENTITY java 'Java&trade;'>
 <!ENTITY jdk 'JDK&trade;'>
+<!ENTITY openjdk 'OpenJDK&trade;'>
 <!ENTITY posix 'POSIX&reg;'>
 <!ENTITY leadingmark '&#183; '>
 

==== //depot/projects/docproj_nl/www/share/sgml/notices.xml#5 (text+ko) ====

@@ -2,11 +2,27 @@
 <advisories>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/notices.xml,v 1.15 2009/10/02 20:15:49 simon Exp $
+      $FreeBSD: www/share/sgml/notices.xml,v 1.16 2010/01/06 23:01:23 simon Exp $
     </cvs:keyword>
   </cvs:keywords>
 
   <year>
+    <name>2010</name>
+
+    <month>
+      <name>1</name>
+
+      <day>
+	<name>6</name>
+
+	<notice>
+	  <name>FreeBSD-EN-10:01.freebsd</name>
+	</notice>
+      </day>
+    </month>
+  </year>
+
+  <year>
     <name>2009</name>
 
     <month>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001121859.o0CIxeom004708>