Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Jul 2011 16:39:31 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 196021 for review
Message-ID:  <201107111639.p6BGdVlk019406@skunkworks.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@196021?ac=10

Change 196021 by rene@rene_acer on 2011/07/11 16:38:29

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#96 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#22 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#21 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/Makefile#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#20 integrate
.. //depot/projects/docproj_nl/www/en/java/install.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/java/news.xml#8 integrate
.. //depot/projects/docproj_nl/www/en/releases/9.0R/Makefile#1 branch
.. //depot/projects/docproj_nl/www/en/releases/9.0R/docbook.css#1 branch
.. //depot/projects/docproj_nl/www/en/releases/9.0R/schedule.sgml#1 branch
.. //depot/projects/docproj_nl/www/en/releases/Makefile#8 integrate
.. //depot/projects/docproj_nl/www/en/releng/index.sgml#43 integrate
.. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#24 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1005 2011/06/29 20:36:26 beech Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1006 2011/07/07 13:37:40 martymac Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -5157,6 +5157,11 @@
     </listitem>
 
     <listitem>
+      <para>Jyun-Yan You
+	<email>pcTA@cs.nctu.edu.tw</email></para>
+    </listitem>
+
+    <listitem>
       <para>Gergely CZUCZY
 	<email>gergely.czuczy@harmless.hu</email></para>
     </listitem>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.207 2011/05/14 20:44:31 hrs Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.208 2011/07/08 17:41:07 bcr Exp $
 -->
 
 <appendix id="eresources">
@@ -600,7 +600,7 @@
 
 	    <row>
 	      <entry>&a.wireless.name;</entry>
-	      <entry>Discussions of 802.11 stack, tools device driver
+	      <entry>Discussions of 802.11 stack, tools, device driver
 		development</entry>
 	    </row>
 

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.425 2011/04/20 12:18:28 ryusuke Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.426 2011/07/08 17:29:21 bcr Exp $
 -->
 
 <chapter id="install">
@@ -678,7 +678,7 @@
 	      <para><application>Image Writer for Windows</application> is a
 	        free application that can correctly write an image file to a
 	        memory stick.  Download it from
-	        <ulink url="http://launchpad.net/win32-image-writer/"></ulink>;
+	        <ulink url="https://launchpad.net/win32-image-writer/"></ulink>;
 	        and extract it into a folder.</para>
 	    </step>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 # 
-# $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/Makefile,v 1.7 2004/08/05 10:04:30 den Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/Makefile,v 1.8 2011/07/08 16:08:33 ryusuke Exp $
 #
 # Build the FreeBSD Porter's Handbook.
 #
@@ -36,6 +36,11 @@
 IMAGES_LIB+=	callouts/8.png
 IMAGES_LIB+=	callouts/9.png
 IMAGES_LIB+=	callouts/10.png
+IMAGES_LIB+=	callouts/11.png
+IMAGES_LIB+=	callouts/12.png
+IMAGES_LIB+=	callouts/13.png
+IMAGES_LIB+=	callouts/14.png
+IMAGES_LIB+=	callouts/15.png
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#20 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      Names of FreeBSD mailing lists and related software.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent,v 1.78 2011/04/10 08:04:38 jkois Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent,v 1.79 2011/07/08 17:41:07 bcr Exp $
 -->
 
 <!ENTITY a.mailman.listinfo "http://lists.FreeBSD.org/mailman/listinfo">;
@@ -517,7 +517,7 @@
 <!ENTITY a.wip-status.name "<ulink url='&a.wip-status.url;'>freebsd-wip-status</ulink>">
 
 <!ENTITY a.wireless.url "&a.mailman.listinfo;/freebsd-wireless">
-<!ENTITY a.wireless "<ulink url='&a.wireless.url;'>Discussions of 802.11 stack, tools device driver development</ulink>">
+<!ENTITY a.wireless "<ulink url='&a.wireless.url;'>Discussions of 802.11 stack, tools, device driver development</ulink>">
 <!ENTITY a.wireless.name "<ulink url='&a.wireless.url;'>freebsd-wireless</ulink>">
 
 <!ENTITY a.www.url "&a.mailman.listinfo;/freebsd-www">

==== //depot/projects/docproj_nl/www/en/java/install.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/install.sgml,v 1.16 2011/06/03 06:21:09 glewis Exp $">
+<!ENTITY date "$FreeBSD: www/en/java/install.sgml,v 1.17 2011/07/08 19:54:33 uqs Exp $">
 <!ENTITY title "FreeBSD &java; Project: How To Install">
 <!ENTITY % navinclude.developers "INCLUDE">
 ]>
@@ -43,7 +43,7 @@
 <td>
 <h3><a name="linux-sun-jdk">Oracle JDK for Linux</a></h3>
 
-<p>This port installs the Java Developement Kit from Oracle which was built for Linux. It will run under FreeBSD using the Linux compatibility.</p>
+<p>This port installs the Java Development Kit from Oracle which was built for Linux. It will run under FreeBSD using the Linux compatibility.</p>
 
 <p><code>cd /usr/ports/java/linux-sun-jdk16
 <BR>make install clean

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

@@ -7,7 +7,7 @@
      Divide time in to <year>, <month>, and <day> elements, each of which
      has a <name>.
 
-     each <day> element contains one or more <event> elements.
+     Each <day> element contains one or more <event> elements.
 
      Each <event> contains an optional <title>, and then a <p>.  <p> elements
      can contain <a> anchors.
@@ -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.12 2011/02/19 03:55:41 ryusuke Exp $
+      $FreeBSD: www/en/java/news.xml,v 1.13 2011/07/08 19:54:33 uqs Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -910,7 +910,7 @@
         <name>10</name>
 
         <event>
-          <title>Sun Java Compability Kit Testing</title>
+          <title>Sun Java Compatibility Kit Testing</title>
 
           <p>On August 7th, 2000, the FreeBSD &jdk; team was given
             access to Sun's JCK (Java Compatibility Kit), which will

==== //depot/projects/docproj_nl/www/en/releases/Makefile#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/releases/Makefile,v 1.57 2010/10/22 14:32:47 kensmith Exp $
+# $FreeBSD: www/en/releases/Makefile,v 1.58 2011/07/10 17:12:24 hrs Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -17,6 +17,7 @@
 SUBDIR+=	6.0R 6.1R 6.2R 6.3R 6.4R
 SUBDIR+=	7.0R 7.1R 7.2R 7.3R 7.4R
 SUBDIR+=	8.0R 8.1R 8.2R
+SUBDIR+=	9.0R
 
 .if defined $(NEW_BUILD)
 SUBDIR=

==== //depot/projects/docproj_nl/www/en/releng/index.sgml#43 (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/releng/index.sgml,v 1.293 2011/04/27 19:16:58 blackend Exp $">
+<!ENTITY date "$FreeBSD: www/en/releng/index.sgml,v 1.294 2011/07/10 17:12:24 hrs Exp $">
 <!ENTITY email 're'>
 <!ENTITY title "Release Engineering Information">
 <!ENTITY % navinclude.developers "INCLUDE">
@@ -48,6 +48,14 @@
     </tr>
 
     <tr>
+      <td>September 2011</td>
+      <td>&os; 9.0</td>
+      <td>In "Code Slush" (feature freeze) now.  <a
+	  href="&base;/releases/9.0R/schedule.html">The release
+	  schedule</a> is available.</td>
+    </tr>
+
+    <tr>
       <td>February 2011</td>
       <td>&os; 8.2</td>
       <td><a href="&base;/releases/8.2R/announce.html">Released</a> on February 24, 2011</td>
@@ -79,9 +87,12 @@
 
     <tr>
       <td><tt>HEAD</tt></td>
-      <td>Open</td>
+      <td>Slush</td>
       <td>committers</td>
-      <td>Active development branch for 9-CURRENT.</td>
+
+      <td>Active development branch for 9-CURRENT.  No approval from
+	RE is required in "Code Slush" period though major ongoing
+	work such as new features must be notified to RE.</td>
     </tr>
 
     <tr>

==== //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#24 (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.106 2011/05/21 12:39:11 jkois Exp $
+      $FreeBSD: www/share/sgml/usergroups.xml,v 1.107 2011/07/11 11:51:24 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -483,12 +483,12 @@
 
     <entry id="ukug">
       <name>FreeBSD UK Users group (FreeBSD UKUG)</name>
-      <url>http://ukug.uk.FreeBSD.org/</url>;
+      <url>http://mailman.uk.freebsd.org/mailman/listinfo/ukfreebsd</url>;
 
       <description>The FreeBSD UKUG (FreeBSD UK User's Group) exists
         for the benefit of FreeBSD users in the United Kingdom.
-        Please follow the link for details.  Located in The United
-        Kingdom.
+        Please follow the link for more information.  Located in
+        the United Kingdom.
       </description>
     </entry>
   </country>



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