From owner-p4-projects@FreeBSD.ORG Tue Jan 12 18:59:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4CE8106568B; Tue, 12 Jan 2010 18:59:40 +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 A91CB1065676 for ; Tue, 12 Jan 2010 18:59:40 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 95A528FC0A for ; Tue, 12 Jan 2010 18:59:40 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0CIxeKq004710 for ; Tue, 12 Jan 2010 18:59:40 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0CIxeom004708 for perforce@freebsd.org; Tue, 12 Jan 2010 18:59:40 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 12 Jan 2010 18:59:40 GMT Message-Id: <201001121859.o0CIxeom004708@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173030 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: Tue, 12 Jan 2010 18:59:41 -0000 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 @@ - + @@ -176,7 +176,8 @@ The Configuration File - Some users may wish to tweak the configuration file, + Some users may wish to tweak the default configuration file + in /etc/freebsd-update.conf, allowing better control of the process. The options are very well documented, but the following few may require a bit more explanation: ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#67 (text+ko) ==== @@ -1,7 +1,7 @@ java - Software related to the Java language. + Software related to the Java™ language. The java 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 @@ Variable definitions - If your port needs a Java™ Development Kit (JDK) to + If your port needs a Java™ Development Kit (JDK™) to either build, run or even extract the distfile, then it should define USE_JAVA. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/trademarks.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -11,7 +11,8 @@ UNIX is a registered trademark of The Open Group in the US and other countries. - Sun, Sun Microsystems, SunOS, Solaris, and Java are trademarks + 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. ==== //depot/projects/docproj_nl/share/pgpkeys/delphij.key#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + uid Xin LI -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 uid Xin LI uid Xin LI -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 +uid Xin LI +uid Xin LI +sub 2048R/F956339F 2010-01-10 [expires: 2012-01-10] ]]> ==== //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 $ --> 3Com and HomeConnect are registered @@ -328,7 +328,7 @@ 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."> @@ -340,6 +340,7 @@ JSP"> JVM"> Netra"> +OpenJDK"> Solaris"> StarOffice"> Sun"> ==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#23 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2657,6 +2657,20 @@ miwi (for pkg build cluster) Received + + + Gareth Randall + USB card + gj + Received + + + + Kyle Anderson (tummy.com) + 6 SuperMicro servers + brd (firewalls and infrastructure servers
+ for the new NYC FreeBSD co-location) + Received &footer; ==== //depot/projects/docproj_nl/www/en/java/dists/16.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -14,21 +14,21 @@

May 5, 2009: Brian Gardner's update to Build 16 of the -OpenJDK 6 port is committed. +&openjdk; 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.

February 23, 2009: Brian -Gardner's port of OpenJDK 6 is +Gardner's port of &openjdk; 6 is committed to the &os; Ports Collection.

February 6, 2009: Brian Gardner has announced a port of -OpenJDK 6 to &os; 7.0. The patch +&openjdk; 6 to &os; 7.0. The patch can be found at http://beta.experts-exchange.com/articles/OS/Unix/BSD/Patch-for-OpenJDK6-on-BSD.html.

==== //depot/projects/docproj_nl/www/en/java/news.xml#5 (text+ko) ==== @@ -20,7 +20,7 @@ - $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 $ @@ -34,12 +34,12 @@ 5 - <a href="http://openjdk.java.net/">OpenJDK</a> 6 updated + <title><a href="http://openjdk.java.net/">&openjdk;</a> 6 updated to Build 16.

Brian Gardner has released an update of the - OpenJDK 6 port to Build 16. + &openjdk; 6 port to Build 16. See the JDK 1.6.x page for more details.

 @@ -71,11 +71,11 @@ 23 - Port of <a href="http://openjdk.java.net/">OpenJDK</a> 6 + <title>Port of <a href="http://openjdk.java.net/">&openjdk;</a> 6 committed

Brian Gardner's - port of OpenJDK 6 is + port of &openjdk; 6 is committed to the Ports Collection as java/openjdk6. See the JDK 1.6.x page for more details.

@@ -86,11 +86,11 @@ 6 - Port of <a href="http://openjdk.java.net/">OpenJDK</a> 6 + <title>Port of <a href="http://openjdk.java.net/">&openjdk;</a> 6 announced

Brian Gardner has - announced a port of OpenJDK + announced a port of &openjdk; 6 to FreeBSD 7.x. See the JDK 1.6.x page for more details.

==== //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#16 (text+ko) ==== @@ -1,4 +1,4 @@ - ==== //depot/projects/docproj_nl/www/share/sgml/advisories.xml#15 (text+ko) ==== @@ -2,11 +2,35 @@ - $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 $ + 2010 + + + 1 + + + 6 + + + FreeBSD-SA-10:03.zfs + + + + FreeBSD-SA-10:02.ntpd + + + + FreeBSD-SA-10:01.bind + + + + + + 2009 ==== //depot/projects/docproj_nl/www/share/sgml/common.ent#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -57,6 +57,7 @@ + ==== //depot/projects/docproj_nl/www/share/sgml/notices.xml#5 (text+ko) ==== @@ -2,11 +2,27 @@ - $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 $ + 2010 + + + 1 + + + 6 + + + FreeBSD-EN-10:01.freebsd + + + + + + 2009