Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Jan 2010 21:56:54 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 172585 for review
Message-ID:  <201001042156.o04LusXl046300@repoman.freebsd.org>

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

Change 172585 by rene@rene_self on 2010/01/04 21:56:04

	IFC	

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#42 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#13 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#66 integrate
.. //depot/projects/docproj_nl/www/en/internal/machines.sgml#5 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.886 2009/12/22 17:52:43 delphij Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.887 2010/01/04 17:34:50 glarkin Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -1727,6 +1727,11 @@
     </listitem>
 
     <listitem>
+      <para>Christopher Knaust
+	<email>jigboe@gmx.de</email></para>
+    </listitem>
+
+    <listitem>
       <para>Christopher N. Harrell
 	<email>cnh@ivmg.net</email></para>
     </listitem>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.200 2009/12/14 15:51:08 pav Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.201 2010/01/04 16:30:55 bcr Exp $
 -->
 
 <chapter id="x11">
@@ -936,8 +936,9 @@
       in <filename>/usr/local/lib/X11/fonts/</filename> and
       <filename>~/.fonts/</filename> are automatically 
       made available for anti-aliasing to Xft-aware applications.
-      Most recent applications are Xft-aware, including KDE, GNOME, and
-      Firefox.</para>
+      Most recent applications are Xft-aware, including
+      <application>KDE</application>, <application>GNOME</application>, and
+      <application>Firefox</application>.</para>
 
     <para>In order to control which fonts are anti-aliased, or to
       configure anti-aliasing properties, create (or edit, if it

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1043 2009/12/31 21:14:16 dougb Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1045 2010/01/04 20:38:15 dougb Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -8447,7 +8447,8 @@
       <para>Example simple <filename>rc.d</filename> script:</para>
 
       <programlisting>#!/bin/sh
-# $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1043 2009/12/31 21:14:16 dougb Exp $
+
+# &dollar;FreeBSD&dollar;
 #
 # PROVIDE: doormand
 # REQUIRE: LOGIN
@@ -8481,10 +8482,10 @@
 
       <para> Unless there is a good reason to start the service
 	earlier all ports scripts should use
-	<programlisting>REQUIRE: LOGIN</programlisting>. If the service
+	<programlisting>REQUIRE: LOGIN</programlisting> If the service
 	runs as a particular user (other than root) this is mandatory.
-	The <programlisting>KEYWORD: shutdown</programlisting>
-	included in the script above is there because the mythical port
+	<programlisting>KEYWORD: shutdown</programlisting>
+	is included in the script above because the mythical port
 	we are using as an example starts a service, and should be shut
 	down cleanly when the system shuts down. If the script is not
 	starting a persistent service this is not necessary.</para>
@@ -13484,6 +13485,14 @@
 		      <function>sleepq_sleepcnt()</function>, which can be used to
 			query the number of waiters on a specific waiting queue.</entry>
                   </row>
+		  <row>
+		    <entry>900006</entry>
+		    <entry>January 4, 2010</entry>
+		    <entry>9.0-CURRENT after change of the
+		      <function>scandir(3)</function> and
+			<function>alphasort(3)</function> prototypes to
+			conform to SUSv4.</entry>
+                  </row>
 		</tbody>
 	      </tgroup>
 	    </table>

==== //depot/projects/docproj_nl/www/en/internal/machines.sgml#5 (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.94 2009/11/09 05:49:27 linimon Exp $">
+<!ENTITY date "$FreeBSD: www/en/internal/machines.sgml,v 1.95 2010/01/03 19:18:01 linimon Exp $">
 <!ENTITY title "The FreeBSD.org Network">
 <!ENTITY % navinclude.docs "INCLUDE">
 ]>
@@ -40,14 +40,14 @@
 
 <tr>
 <td>freefall</td>
-<td>7-CURRENT</td>
+<td>8-PRERELEASE</td>
 <td>GNATS/shell Logins.</td>
 <td>committers</td>
 </tr>
 
 <tr>
 <td>ftp-master</td>
-<td>7-STABLE</td>
+<td>8-STABLE</td>
 <td>FTP Master (stage server).</td>
 <td>peter/kuriyama/obrien/steve</td>
 </tr>
@@ -60,15 +60,22 @@
 </tr>
 
 <tr>
+<td>gohan18</td>
+<td>8-STABLE</td>
+<td>portmgr testbed.</td>
+<td>portmgr</td>
+</tr>
+
+<tr>
 <td>gohan20-59</td>
-<td>8-CURRENT</td>
+<td>8-STABLE</td>
 <td>i386 package build cluster.</td>
 <td>portmgr</td>
 </tr>
 
 <tr>
 <td>hub</td>
-<td>6-STABLE</td>
+<td>7-STABLE</td>
 <td>Mailing Lists and Mail services.</td>
 <td>postmaster</td>
 </tr>
@@ -103,23 +110,23 @@
 
 <tr>
 <td>pluto1</td>
-<td>7-STABLE</td>
-<td>Reference machine for testing ia64 changes.</td>
+<td>8-STABLE</td>
+<td>Reference machine for testing ia64 changes; ia64 package building.</td>
 <td>committers</td>
 </tr>
 
 <tr>
 <td>pluto2</td>
-<td>-CURRENT</td>
-<td>Reference machine for testing ia64 changes.</td>
+<td>9-CURRENT</td>
+<td>Reference machine for testing ia64 changes; ia64 package building.</td>
 <td>committers</td>
 </tr>
 
 <tr>
 <td>pointyhat</td>
-<td>-CURRENT</td>
+<td>9-CURRENT</td>
 <td>All architectures package build master.</td>
-<td>portmgr</td>
+<td>portmgr (r/w), committers (r/o)</td>
 </tr>
 
 <tr>
@@ -138,7 +145,7 @@
 
 <tr>
 <td>sledge</td>
-<td>-CURRENT</td>
+<td>8-STABLE</td>
 <td>Reference machine for testing AMD64 changes.</td>
 <td>committers</td>
 </tr>
@@ -152,7 +159,7 @@
 
 <tr>
 <td>www</td>
-<td>6-STABLE</td>
+<td>7-STABLE</td>
 <td>The www.FreeBSD.org Webserver.</td>
 <td>webmaster</td>
 </tr>
@@ -192,8 +199,8 @@
 <tr valign="top">
 <td>ftp-master</td>
 <td>Intel x86</td>
-<td>2.66GHz Pentium 4, 1GB Memory, 40GB Maxtor ATA drive,
-  Broadcom BCM5703 Gigabit Ethernet NIC.</td>
+<td>2x dual-core 2.80GHz Xeon, 4GB Memory, LSI Logic PERC 4e/Di RAID
+  adapter, 1.14T disk, 2x Intel PRO/1000 Ethernet NIC.</td>
 </tr>
 
 <tr valign="top">
@@ -204,6 +211,13 @@
 </tr>
 
 <tr valign="top">
+<td>gohan18</td>
+<td>Intel x86</td>
+<td>2x1.8GHz quad-core Xeon L5320, 8GB Memory, LSILogic SAS/SATA controller,
+1x160GB SAT300 drive, 2x Broadcom NetXtreme Gigabit Ethernet NIC.</td>
+</tr>
+
+<tr valign="top">
 <td>gohan20-59</td>
 <td>Intel x86</td>
 <td>700-900MHz Pentium III, 1GB Memory, ServerWorks CSB5 UDMA100 controller,
@@ -283,9 +297,9 @@
 
 <tr valign="top">
 <td>www</td>
-<td>Intel x86 MP</td>
-<td>2x600MHz Pentium III, 1GB Memory, 3ware 4-port IDE controller (twe),
-  Intel EtherExpress Pro 10/100B NIC.</td>
+<td>Intel x86</td>
+<td>2x dual-core 2.80GHz Xeon, 1.5GB Memory, Compaq Smart Array 5i RAID controller,
+  2x34GB SCSI Disks in RAID1, 2x Broadcom Gigabit Ethernet NIC.</td>
 </tr>
 
 </tbody>



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