From owner-svn-doc-all@FreeBSD.ORG  Sun Jul 22 10:52:16 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CE329106566C;
	Sun, 22 Jul 2012 10:52:16 +0000 (UTC)
	(envelope-from issyl0@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B87FB8FC12;
	Sun, 22 Jul 2012 10:52:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MAqGHv074497;
	Sun, 22 Jul 2012 10:52:16 GMT (envelope-from issyl0@svn.freebsd.org)
Received: (from issyl0@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MAqGxu074495;
	Sun, 22 Jul 2012 10:52:16 GMT (envelope-from issyl0@svn.freebsd.org)
Message-Id: <201207221052.q6MAqGxu074495@svn.freebsd.org>
From: Isabell Long <issyl0@FreeBSD.org>
Date: Sun, 22 Jul 2012 10:52:16 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39243 - head/en_US.ISO8859-1/htdocs/cgi
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2012 10:52:16 -0000

Author: issyl0
Date: Sun Jul 22 10:52:16 2012
New Revision: 39243
URL: http://svn.freebsd.org/changeset/doc/39243

Log:
  Add a line feed to the end of a sentence to prevent two sentences merging
  into one (i.e. there being no blank space after a full stop).
  
  Approved by:	gavin (bugmeister), gjb (mentor)

Modified:
  head/en_US.ISO8859-1/htdocs/cgi/query-pr-summary.cgi

Modified: head/en_US.ISO8859-1/htdocs/cgi/query-pr-summary.cgi
==============================================================================
--- head/en_US.ISO8859-1/htdocs/cgi/query-pr-summary.cgi	Sat Jul 21 18:10:30 2012	(r39242)
+++ head/en_US.ISO8859-1/htdocs/cgi/query-pr-summary.cgi	Sun Jul 22 10:52:16 2012	(r39243)
@@ -211,7 +211,7 @@ print "<p>You may view summaries by <a h
 $self_ref1 .= '&amp;' if ($self_ref1 !~/\?$/);
 print "<a href='${self_ref1}state=summary'>State</a>, ";
 print "<a href='${self_ref1}category=summary'>Category</a>, or ";
-print "<a href='${self_ref1}responsible=summary'>Responsible Party</a>.";
+print "<a href='${self_ref1}responsible=summary'>Responsible Party</a>.\n";
 
 $self_ref2 = $self_ref . '?';
 foreach ('category', 'originator', 'priority', 'class', 'responsible',

From owner-svn-doc-all@FreeBSD.ORG  Sun Jul 22 16:43:09 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 41D431065670;
	Sun, 22 Jul 2012 16:43:09 +0000 (UTC)
	(envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2AF668FC08;
	Sun, 22 Jul 2012 16:43:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MGh9hp005170;
	Sun, 22 Jul 2012 16:43:09 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MGh9fh005168;
	Sun, 22 Jul 2012 16:43:09 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201207221643.q6MGh9fh005168@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sun, 22 Jul 2012 16:43:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39244 - head/ja_JP.eucJP/books/handbook/serialcomms
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2012 16:43:09 -0000

Author: ryusuke
Date: Sun Jul 22 16:43:08 2012
New Revision: 39244
URL: http://svn.freebsd.org/changeset/doc/39244

Log:
  - Merge the following from the English version:
  
    	r10504 -> r11019	head/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml

Modified:
  head/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml

Modified: head/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml	Sun Jul 22 10:52:16 2012	(r39243)
+++ head/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml	Sun Jul 22 16:43:08 2012	(r39244)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r10504
+     Original revision: r11019
      $FreeBSD$
 -->
 
@@ -30,7 +30,7 @@
       <listitem><para>¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ë¤«¤é¤Î¥·¥¹¥Æ¥àµ¯Æ°ÊýË¡</para></listitem>
     </itemizedlist>
 
-    <para>¤³¤Î¾Ï¤òÆɤàÁ°¤Ë°Ê²¼¤Î¤³¤È¤ò¹Ô¤Ã¤Æ¤ª¤¯¤Ù¤­¤Ç¤¹¡£</para>
+    <para>¤³¤Î¾Ï¤òÆɤàÁ°¤Ë¡¢°Ê²¼¤Î¤³¤È¤ò¹Ô¤Ã¤Æ¤ª¤¯¤Ù¤­¤Ç¤¹¡£</para>
     <itemizedlist>
       <listitem><para>¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¹½À®¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤ò³Ð¤¨¤ë
 	(<xref linkend="kernelconfig">)¡£</para></listitem>
@@ -87,10 +87,10 @@
       </variablelist>
 
       <para>ÄÌ¿®¤Ë¤ª¤±¤ë¥Ç¡¼¥¿Å¾Á÷®Å٤˴ؤ·¤Æ¡¢
-	Ãø¼Ô¤Ï<quote>¥Ü¡¼</quote> (baud) ¤È¤¤¤¦ÍѸì¤Ï»È¤¤¤Þ¤»¤ó¡£
+	¤³¤Î¥»¥¯¥·¥ç¥ó¤Ç¤Ï <quote>¥Ü¡¼</quote> (baud) ¤È¤¤¤¦ÍѸì¤Ï»È¤¤¤Þ¤»¤ó¡£
 	¥Ü¡¼¤È¤¤¤¦¤Î¤Ï°ìÄê»þ´Ö¤ËÀ¸¤¸¤¦¤ëÅŵ¤Åª¾õÂÖ¤ÎÊѲ½¤Î¿ô¤òɽ¤¹¤Ë¤¹¤®¤º¡¢
 	<quote>bps</quote> (bits per second)
-	¤È¤¤¤¦Ã±°Ì¤ÎÊý¤¬<quote>Àµ¤·¤¤</quote>¤«¤é¤Ç¤¹
+	¤È¤¤¤¦Ã±°Ì¤ÎÊý¤¬<emphasis>Àµ¤·¤¤</emphasis>¤«¤é¤Ç¤¹
 	(¾¯¤Ê¤¯¤È¤â¡¢¤³¤¦¤¤¤¦É½¸½¤ò¤·¤Æ¤ª¤±¤Ð¡¢
 	°ÕÃϤΰ­¤¤¿Í¤ËÅܤé¤ì¤ë¤³¤È¤â¤Ê¤¤¤Î¤Ç¤Ï¤Ê¤¤¤«¤È»×¤¤¤Þ¤¹)¡£</para>
     </sect2>
@@ -258,9 +258,8 @@
 	    ¤Î¥Ý¡¼¥È¤òÅëºÜ¤·¤Æ¤¤¤ë¤«¤â¤· ¤ì¤Þ¤»¤ó¡£</para>
 
 	  <para>ÍøÍѤµ¤ì¤Æ¤¤¤ë¥Ý¡¼¥È¤Î¼ïÎà¤Ë´Ø¤·¤Æ¤Ï¡¢
-	    ¥Ï¡¼¥É¥¦¥§¥¢¤Ë¤Ä¤¤¤Æ¤­¤¿¥É¥­¥å¥á ¥ó¥È¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-	    ¤Þ¤¿¡¢Â¿¤¯¤Î¾ì¹ç¡¢¥Ý¡¼¥È¤Î·Á¾õ¤«¤éȽÃǤ¹¤ë¤³¤È
-	    ¤â¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£</para>
+	    ¥Ï¡¼¥É¥¦¥§¥¢¤Ë¤Ä¤¤¤Æ¤­¤¿¥É¥­¥å¥á¥ó¥È¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+	    ¤Þ¤¿¡¢Â¿¤¯¤Î¾ì¹ç¡¢¥Ý¡¼¥È¤Î·Á¾õ¤«¤éȽÃǤ¹¤ë¤³¤È¤â¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£</para>
 	</sect4>
 
 	<sect4 id="term-portnames">
@@ -319,7 +318,7 @@
 	<quote>ñ½ã¤Ê</quote>¥Þ¥ë¥Á¥Ý¡¼¥È¥·¥ê¥¢¥ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ä¡¢
 	Digiboard ¤ä Stallion Technologies
 	¤¬À½Â¤¤·¤Æ¤¤¤ë¤è¤ê¥¤¥ó¥Æ¥ê¥¸¥§¥ó¥È¤Ê¥Þ¥ë¥Á¥Ý¡¼¥È¥«¡¼¥É¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
-	¥Ç¥Õ¥©¥ë¥È¤Î¥«¡¼¥Í¥ë¤Ï¡¢É¸½à¤Î COM ¥Ý¡¼¥È¤·¤«¸«¤Þ¤»¤ó¡£</para>
+	¤·¤«¤·¤Ê¤¬¤é¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥«¡¼¥Í¥ë¤Ï¡¢É¸½à¤Î COM ¥Ý¡¼¥È¤·¤«¸«¤Þ¤»¤ó¡£</para>
 
       <para>ÅëºÜ¤µ¤ì¤Æ¤¤¤ë¥·¥ê¥¢¥ë¥Ý¡¼¥È¤Î¤¤¤º¤ì¤«¤ò¡¢
 	¥«¡¼¥Í¥ë¤¬Ç§¼±¤·¤Æ¤¤¤ë¤«¤É¤¦¤«³Îǧ¤·¤¿¤¤¾ì¹ç¤Ï¡¢
@@ -493,7 +492,7 @@ crw-rw----    1 uucp     dialer    28, 1
       ¥Ç¥Ð¥¤¥¹¤¬ºÆ¤Ó¥ª¡¼¥×¥ó¤µ¤ì¤ë»þ¡¢¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄêÃͤËÌá¤ê¤Þ¤¹¡£
       ¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤òÊѹ¹¤¹¤ë¤¿¤á¤Ë¤Ï¡¢<quote>½é´ü¾õÂÖ</quote>
       ¤òÀßÄꤷ¤¿¤¤¥Ç¥Ð¥¤¥¹¤ò¥ª¡¼¥×¥ó¤·¤ÆÄ´Àá¤Ç¤­¤Þ¤¹¡£
-      ¤¿¤È¤¨¤Ð¡¢ttyd5 ¤È¤¤¤¦¥Ç¥Ð¥¤¥¹¤ËÂФ·¤Æ¡¢¥Ç¥Õ¥©¥ë¥È¤Ç
+      ¤¿¤È¤¨¤Ð¡¢<devicename>ttyd5</devicename> ¤È¤¤¤¦¥Ç¥Ð¥¤¥¹¤ËÂФ·¤Æ¡¢¥Ç¥Õ¥©¥ë¥È¤Ç
       <option>CLOCAL</option> ¥â¡¼¥É, 8 bits,
       <option>XON/XOFF</option> ¥Õ¥í¡¼À©¸æ¤òÀßÄꤷ¤¿¤¤¾ì¹ç¤Ï¡¢
       ¼¡¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -728,10 +727,11 @@ crw-rw----    1 uucp     dialer    28, 1
 	  ¥³¥ó¥½¡¼¥ë¤«¤é¤Î ¥í¥°¥¤¥ó¤¬²Äǽ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
 	  ¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢Â¾¤Î²¾ÁÛ¥³¥ó¥½¡¼¥ë¡¢¥·
 	  ¥ê¥¢¥ë¥Ý¡¼¥È¤ª¤è¤Ó²¾ÁÛüËö¤Î¥¨¥ó¥È¥ê¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-	  üËö¤òÀܳ¤¹¤ë ¾ì¹ç¤Ï¡¢¤½¤Î¥Ý¡¼¥È¤Î
+	  üËö¤òÀܳ¤¹¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥Ý¡¼¥È¤Î
 	  <filename>/dev</filename> ¤Î¥¨¥ó¥È¥ê¤ò¡¢
-	  <filename>/dev</filename> ¤ÎÉôʬ
-	  ¤ò¾Êά¤·¤Æµ­½Ò¤·¤Þ¤¹¡£</para>
+	  <filename>/dev</filename> ¤ÎÉôʬ¤ò¾Êά¤·¤Æµ­½Ò¤·¤Þ¤¹
+	  (¤¿¤È¤¨¤Ð <devicename>/dev/ttyv0</devicename> ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	  <devicename>ttyv0</devicename> ¤È¤·¤Æµ­½Ò¤·¤Þ¤¹)¡£</para>
 
 	<para>FreeBSD ¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥¤¥ó¥¹¥È¡¼¥ë¾õÂ֤Ǥϡ¢
 	  <filename>ttyd0</filename> ¤«¤é <filename>ttyd3</filename>
@@ -850,7 +850,7 @@ ttyd5   "/usr/libexec/getty std.19200"  
 		¥æ¡¼¥¶¤ÏÆø¢¤ò»ý¤¿¤Ê¤¤¥¢¥«¥¦¥ó¥È¤Ç¥í¥°¥¤¥ó¤·¤¿¸å¤Ë¡¢
 		&man.su.1; ¤äÎà»÷¤Î»ÅÁȤߤò»È¤Ã¤Æ¥¹¡¼¥Ñ¥æ¡¼¥¶Æø¢¤ò³ÍÆÀ¤·¤Þ¤¹¡£</para>
 
-	      <para>¸°¤Î¤«¤«¤ëÉô²°¤Ë¤¢¤ëüËö¤Ç¤¢¤Ã¤Æ¤â¡¢"insecure"
+	      <para>¸°¤Î¤«¤«¤ëÉô²°¤Ë¤¢¤ëüËö¤Ç¤¢¤Ã¤Æ¤â¡¢<quote>insecure</quote>
 		¤Ë¤·¤Æ¤ª¤¯¤³¤È¤¬¶¯¤¯¿ä¾©¤µ¤ì¤Þ¤¹¡£
 		¥¹¡¼¥Ñ¥æ¡¼¥¶Æø¢¤¬É¬Íפʤ顢¥í¥°¥¤¥ó¤·¤Æ¤«¤é
 		<command>su</command> ¤ò»È¤¦¤Î¤Ï½½Ê¬´Êñ¤Ç¤¹¡£</para>
@@ -872,6 +872,11 @@ ttyd5   "/usr/libexec/getty std.19200"  
 
 	<screen>&prompt.root; <userinput>kill -HUP 1</userinput></screen>
 
+	<note>
+	  <para><command>init</command> ¤Ï¡¢¥·¥¹¥Æ¥à¤ÇºÇ½é¤Ëµ¯Æ°¤¹¤ë¥×¥í¥»¥¹¤Ê¤Î¤Ç¡¢
+	    PID ¤Ï¾ï¤Ë 1 ¤Ç¤¹¡£</para>
+	</note>
+
 	<para>¤¹¤Ù¤Æ¤ÎÀßÄ꤬Àµ¤·¤¯¤ª¤³¤Ê¤ï¤ì¡¢
 	  ¤¹¤Ù¤Æ¤Î¥±¡¼¥Ö¥ë¤¬¤¿¤À¤·¤¯Àܳ¤µ¤ì¤Æ¤¤¤Æ¡¢
 	  ¤«¤ÄüËö¤ÎÅŸ»¤¬Æþ¤Ã¤Æ¤¤¤ì¤Ð¡¢¤³¤Î»þÅÀ¤Ç³ÆüËö¤Ç
@@ -887,9 +892,13 @@ ttyd5   "/usr/libexec/getty std.19200"  
 	¤È¤­¤Ë¤ÏüËö¤ÎÀܳ¤¬¤¦ ¤Þ¤¯¤¤¤«¤Ê¤¤¾ì¹ç¤¬¤¢¤ë¤Ç¤·¤ç¤¦¡£°Ê²¼¤Ë¡¢
 	¤è¤¯¸«¤é¤ì¤ëÌäÂê¤È¤½¤Î²ò·èÊýË¡ ¤ò¼¨¤·¤Þ¤¹¡£</para>
 
-      <variablelist>
-	<varlistentry><term>¥í¥°¥¤¥ó¥×¥í¥ó¥×¥È¤¬É½¼¨¤µ¤ì¤Ê¤¤</term>
-	  <listitem>
+      <qandaset>
+	<qandaentry>
+	  <question>
+	    <para>¥í¥°¥¤¥ó¥×¥í¥ó¥×¥È¤¬É½¼¨¤µ¤ì¤Ê¤¤</para>
+	  </question>
+
+	  <answer>
 	    <para>üËö¤ÎÅŸ»¤¬Àܳ¤µ¤ì¡¢
 	      ¥¹¥¤¥Ã¥Á¤¬Æþ¤Ã¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£¤â¤·¡¢PC
 	      ¤òüËö¤È¤·¤ÆÍøÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
@@ -936,12 +945,15 @@ ttyd5   "/usr/libexec/getty std.19200"  
 	      ¤Þ¤¿¡¢<filename>ttys</filename>
 	      ¥Õ¥¡¥¤¥ë¤òÊѹ¹¤·¤¿¤é¡¢<command>kill -HUP 1</command>
 	      ¤ò¼Â¹Ô¤¹¤ë¤Î¤ò˺¤ì¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</para>
-	  </listitem>
-	</varlistentry>
+	  </answer>
+	</qandaentry>
 
-	<varlistentry><term>
-	    ¥í¥°¥¤¥ó¥×¥í¥ó¥×¥È¤ÎÂå¤ï¤ê¤Ë¥´¥ß¤¬É½¼¨¤µ¤ì¤ë</term>
-	  <listitem>
+	<qandaentry>
+	  <question>
+	    <para>¥í¥°¥¤¥ó¥×¥í¥ó¥×¥È¤ÎÂå¤ï¤ê¤Ë¥´¥ß¤¬É½¼¨¤µ¤ì¤ë</para>
+	  </question>
+
+	  <answer>
 	    <para>üËö¤È FreeBSD
 	      ¤Î´Ö¤ÎÄÌ¿®Â®ÅÙ¤ª¤è¤Ó¥Ñ¥ê¥Æ¥£¤ÎÀßÄ꤬°ìÃפ·¤Æ¤¤¤ë¤³¤È¤ò³Î
 	      ¤«¤á¤Æ¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢<command>getty</command>
@@ -953,19 +965,22 @@ ttyd5   "/usr/libexec/getty std.19200"  
 	      <filename>/etc/ttys</filename> ¤ò½¤Àµ¤· ¤Æ¤«¤é¡¢
 	      <command>kill -HUP 1</command>
 	      ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-	  </listitem>
-	</varlistentry>
+	  </answer>
+	</qandaentry>
 
-	<varlistentry><term>ʸ»ú¤¬½ÅÊ£¤·¤Æɽ¼¨¤µ¤ì¤ë¡¢
-	    ÆþÎϤ·¤¿¥Ñ¥¹¥ï¡¼¥É¤¬É½¼¨¤µ¤ì¤ë</term>
-	  <listitem>
+	<qandaentry>
+	  <question>
+	    <para>ʸ»ú¤¬½ÅÊ£¤·¤Æɽ¼¨¤µ¤ì¤ë¡¢ÆþÎϤ·¤¿¥Ñ¥¹¥ï¡¼¥É¤¬É½¼¨¤µ¤ì¤ë</para>
+	  </question>
+
+	  <answer>
 	    <para>üËö¤Þ¤¿¤ÏÄÌ¿®¥½¥Õ¥È¤ÎÀßÄê¤Ç¡¢<quote>ȾÆó½Å (half
 	      duplex)</quote> ¤¢¤ë¤¤¤Ï <quote>¥í¡¼¥«
 	      ¥ë¥¨¥³¡¼</quote> ¤È¤Ê¤Ã¤Æ¤¤¤ë¤È¤³¤í¤ò¡¢<quote>Á´Æó½Å (full
 	      duplex)</quote> ¤ËÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
+	  </answer>
+	</qandaentry>
+      </qandaset>
     </sect2>
   </sect1>
 
@@ -1116,7 +1131,7 @@ ttyd5   "/usr/libexec/getty std.19200"  
       <screen> 4850 ??  I      0:00.09 /usr/libexec/getty V19200 ttyd0</screen>
 
       <para>¥æ¡¼¥¶¤¬¥â¥Ç¥à¤ËÅÅÏäò¤«¤±¡¢¥â¥Ç¥àƱ»Î¤¬Àܳ¤µ¤ì¤ë¤È¡¢
-	¥â¥Ç¥à¤Î <acronym>CD</acronym> ¤¬¸¡½Ð¤µ¤ì¤Þ¤¹¡£¤½¤Î·ë²Ì¡¢
+	¥â¥Ç¥à¤Î <acronym>CD</acronym> (Carrier Detect) ¤¬¸¡½Ð¤µ¤ì¤Þ¤¹¡£¤½¤Î·ë²Ì¡¢
 	kernel ¤¬¥­¥ã¥ê¥¢¿®¹æ¤ò¸¡½Ð¤·¤Æ¡¢<command>getty</command>
 	¤Ë¤è¤ë¥Ý¡¼¥È¤Î¥ª¡¼¥×¥ó¤Î½èÍý¤¬½ªÎ»¤·¤Þ¤¹¡£
 	<command>getty</command> ¤Ï¡¢<prompt>login:</prompt>
@@ -1193,7 +1208,7 @@ ttyd5   "/usr/libexec/getty std.19200"  
 	¤³¤Î¥í¥°¥¤¥ó¤ÎÆ°ºî¤¬Á°¼Ô¤Î¸ÇÄê®Å٤ˤè¤ëÊýË¡¤ËÈæ¤Ù¤ÆÈþ¤·¤¯¤Ê¤¤¤Î¤ÏÌÀ¤é¤«¤Ç¤¹¤¬¡¢
 	¤³¤ÎÊýË¡¤Ç¤Ï¡¢Äã®ÅÙ¤ÇÀܳ¤·¤Æ¤¤¤ë¥æ¡¼¥¶¤ËÂФ¹¤ë¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¤Î¥×¥í¥°¥é¥à¤«¤é¤Î¥ì¥¹¥Ý¥ó¥¹¤¬²þÁ±¤µ¤ì¤Þ¤¹¡£</para>
 
-      <para>¤³¤Î¥É¥­¥å¥á¥ó¥È¤Ç¤Ï¡¢Î¾Êý¤ÎÀßÄêÊýË¡¤Ë¤Ä¤¤¤Æ²òÀ⤷¤Þ¤¹¤¬¡¢
+      <para>¤³¤Î¥»¥¯¥·¥ç¥ó¤Ç¤Ï¡¢Î¾Êý¤ÎÀßÄêÊýË¡¤Ë¤Ä¤¤¤Æ²òÀ⤷¤Þ¤¹¤¬¡¢
 	¤É¤Á¤é¤«¤È¤¤¤¦¤È¥â¥Ç¥à´Ö¤Î®Å٤˱þ¤¸¤Æ RS-232
 	¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î®ÅÙ¤¬ÊѲ½¤¹¤ë¤è¤¦¤Ê
 	ÀßÄê¤ÎÊý¤ËÊФä¿ÀâÌÀ¤Ë¤Ê¤Ã¤Æ¤·¤Þ¤¦¤È»×¤¤¤Þ¤¹¡£</para>
@@ -1301,8 +1316,8 @@ vq|VH57600|Very High Speed Modem at 5760
 	  <para>¤â¤·¡¢¤ª»È¤¤¤Î CPU ¤¬Ä㮤Τâ¤Î¤Ç¤¢¤Ã¤¿¤ê¡¢CPU
 	    ¤ËÂФ¹¤ëÉé²Ù¤¬¹â¤¤¾ì¹ç¤Ç¡¢16550A
 	    ·Ï¤Î¥·¥ê¥¢¥ë¥Ý¡¼¥È¤ò¤ª»È¤¤¤Ç¤Ê¤¤¾ì¹ç¡¢
-	    57.6 Kbps ¤ÎÀܳ¤Ë¤ª¤¤¤Æ¡¢sio ¤Î <quote>silo</quote>
-	    ¥¨¥é¡¼¤¬È¯À¸¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</para>
+	    57.6 Kbps ¤ÎÀܳ¤Ë¤ª¤¤¤Æ¡¢<errorname>sio</errorname> ¤Î
+	    <quote>silo</quote> ¥¨¥é¡¼¤¬È¯À¸¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</para>
 	</sect4>
       </sect3>
 
@@ -1497,37 +1512,37 @@ AT&amp;C1&amp;D2&amp;H1&amp;I0&amp;R2&am
 
       <itemizedlist>
 	<listitem>
-	  <para>¥¹¥¤¥Ã¥Á1: UP &mdash; DTR ɸ½à</para>
+	  <para>¥¹¥¤¥Ã¥Á 1: UP &mdash; DTR ɸ½à</para>
 	</listitem>
 
 	<listitem>
-	  <para>¥¹¥¤¥Ã¥Á2: ̵»ë (¥ê¥¶¥ë¥È
-	    ¥³¡¼¥É¤òñ¸ì·Á¼°¤Ë¤¹¤ë¤«¿ôÃÍ·Á¼°¤Ë¤¹ ¤ë¤«)</para>
+	  <para>¥¹¥¤¥Ã¥Á 2: N/A
+	    (¥ê¥¶¥ë¥È¥³¡¼¥É¤òñ¸ì·Á¼°¤Ë¤¹¤ë¤«¿ôÃÍ·Á¼°¤Ë¤¹¤ë¤«)</para>
 	</listitem>
 
 	<listitem>
-	  <para>¥¹¥¤¥Ã¥Á3: UP &mdash; ¥ê¥¶¥ë¥È ¥³¡¼¥É¤òÊÖ¤µ¤Ê¤¤</para>
+	  <para>¥¹¥¤¥Ã¥Á 3: UP &mdash; ¥ê¥¶¥ë¥È¥³¡¼¥É¤òÊÖ¤µ¤Ê¤¤</para>
 	</listitem>
 
 	<listitem>
-	  <para>¥¹¥¤¥Ã¥Á4: DOWN &mdash; ¥³¥Þ¥ó¥É ¥¨¥³¡¼¤òÊÖ¤µ¤Ê¤¤</para>
+	  <para>¥¹¥¤¥Ã¥Á 4: DOWN &mdash; ¥³¥Þ¥ó¥É¥¨¥³¡¼¤òÊÖ¤µ¤Ê¤¤</para>
 	</listitem>
 
 	<listitem>
-	  <para>¥¹¥¤¥Ã¥Á5: UP &mdash; ¼«Æ°Ãå¿®</para>
+	  <para>¥¹¥¤¥Ã¥Á 5: UP &mdash; ¼«Æ°Ãå¿®</para>
 	</listitem>
 
 	<listitem>
-	  <para>¥¹¥¤¥Ã¥Á6: UP &mdash; CD ɸ½à</para>
+	  <para>¥¹¥¤¥Ã¥Á 6: UP &mdash; CD ɸ½à</para>
 	</listitem>
 
 	<listitem>
-	  <para>¥¹¥¤¥Ã¥Á7: UP &mdash;
+	  <para>¥¹¥¤¥Ã¥Á 7: UP &mdash;
 	    ÉÔ´øȯ¥é¥à¤«¤é¥Ç¥Õ¥©¥ë¥ÈÃͤò¥í¡¼¥É¤¹¤ë</para>
 	</listitem>
 
 	<listitem>
-	  <para>¥¹¥¤¥Ã¥Á8: ̵»ë (Smart Mode/Dumb Mode)</para>
+	  <para>¥¹¥¤¥Ã¥Á 8: N/A (Smart Mode/Dumb Mode)</para>
 	</listitem>
       </itemizedlist>
 
@@ -1657,8 +1672,8 @@ AT&amp;B2&amp;W</programlisting>
 	<title>¥â¥Ç¥à¤ÇÀܳ¤·¤Æ¤ß¤ë</title>
 
 	<para>¼ÂºÝ¤Ë¥â¥Ç¥à¤ò»È¤Ã¤ÆÊ̤Υ³¥ó¥Ô¥å¡¼¥¿¤«¤é
-	  Àܳ¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î»þ¡¢8¥Ó¥Ã¥È¡¢¥Ñ¥ê¥Æ¥£¤Ê¤·¡¢
-	  1¥¹¥È¥Ã¥× ¥Ó¥Ã¥È¤ÇÀܳ¤¹¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
+	  Àܳ¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î»þ¡¢8 ¥Ó¥Ã¥È¡¢¥Ñ¥ê¥Æ¥£¤Ê¤·¡¢
+	  1 ¥¹¥È¥Ã¥×¥Ó¥Ã¥È¤ÇÀܳ¤¹¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
 	  Àܳ¸å¤¹¤°¤Ë¥×¥í¥ó¥×¥È¤¬Ê֤äƤ³¤Ê¤¤¾ì¹ç¤ä¡¢
 	  ̵°ÕÌ£¤Êʸ»úÎó¤¬É½¼¨¤µ¤ì¤ë ¾ì¹ç¤Ï¡¢1ÉäË1²ó¤¯¤é¤¤¤Î³ä¹ç¤Ç
 	  <keycode>Enter</keycode> ¥­¡¼¤ò²¡¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
@@ -1763,16 +1778,18 @@ AT&amp;B2&amp;W</programlisting>
 	¤ÏÄÌ¿®¤ËÌäÂ꤬¤¢¤ë¤ÈȽÃǤ¹¤ë¤Ç¤·¤ç¤¦¡£
 	<command>ATS7=45&amp;W</command>  ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <para>¼ÂºÝ¡¢¥Ç¥Õ¥©¥ë¥È¤Î <command>tip</command> ¤Ï Hayes
-	¤Î´°Á´¤Ê¥µ¥Ý¡¼¥È¤ò ¤·¤Æ¤¤¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£²ò·èÊýË¡¤Ï
-	<filename>/usr/src/usr.bin/tip/tip</filename> ¤Î²¼¤Î
-	<filename>tipconf.h</filename>  ¤òÊѹ¹¤¹¤ë¤³¤È¤Ç¤¹¡£
-	¤â¤Á¤í¤ó¤³¤ì¤Ë¤Ï¥½¡¼¥¹ÇÛÉÛ¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹¡£</para>
-
-      <para><literal>#define HAYES 0</literal> ¤Èµ­½Ò¤µ¤ì¤Æ¤¤¤ë¹Ô¤ò
-	<literal>#define HAYES 1</literal> ¤ÈÊѹ¹¤·¡¢¤½¤·¤Æ
-	<command>make</command>¡¢<command>make install</command>
-	¤ò¼Â¹Ô¤·¤Þ¤¹¡£¤³¤ì¤Ç¤¦¤Þ¤¯Æ°ºî¤¹¤ë¤Ç¤·¤ç¤¦¡£</para>
+      <note>
+	<para>¥Ç¥Õ¥©¥ë¥È¤Î <command>tip</command> ¤Ï¡¢
+	  Hayes ¥â¥Ç¥à¤Ë´°Á´¤ËÂбþ¤·¤Æ¤¤¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£²ò·èÊýË¡¤Ï
+	  <filename>/usr/src/usr.bin/tip/tip</filename> ¤Î²¼¤Î
+	  <filename>tipconf.h</filename> ¤òÊѹ¹¤¹¤ë¤³¤È¤Ç¤¹¡£
+	  ¤â¤Á¤í¤ó¤³¤ì¤Ë¤Ï¥½¡¼¥¹ÇÛÉÛ¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹¡£</para>
+
+	<para><literal>#define HAYES 0</literal> ¤Èµ­½Ò¤µ¤ì¤Æ¤¤¤ë¹Ô¤ò
+	  <literal>#define HAYES 1</literal> ¤ÈÊѹ¹¤·¡¢¤½¤·¤Æ
+	  <command>make</command>, <command>make install</command>
+	  ¤ò¼Â¹Ô¤·¤Þ¤¹¡£¤³¤ì¤Ç¤¦¤Þ¤¯Æ°ºî¤¹¤ë¤Ç¤·¤ç¤¦¡£</para>
+      </note>
     </sect2>
 
     <sect2 id="direct-at">
@@ -1796,7 +1813,7 @@ AT&amp;B2&amp;W</programlisting>
 	¤¬¥·¥¹¥Æ¥à¤Ë¸ºß¤·¤Ê¤¤¾ì¹ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹:</para>
 
       <screen>&prompt.root; <userinput>cd /dev</userinput>
-&prompt.root; <userinput>./MAKEDEV cuaa0</userinput></screen>
+&prompt.root; <userinput>sh MAKEDEV cuaa0</userinput></screen>
 
       <para>¤Þ¤¿¤Ï root ¤Ë¤Ê¤Ã¤Æ°Ê²¼¤Î¤è¤¦¤Ë <command>cu</command>
 	¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Þ¤¹:</para>
@@ -1808,7 +1825,7 @@ AT&amp;B2&amp;W</programlisting>
 	<filename>/dev/cuaa0</filename>)¡£¤½¤·¤Æ
 	<replaceable>speed</replaceable> ¤Ë¤ÏÀܳ¤¹¤ë®ÅÙ¤ò»ØÄꤷ¤Þ¤¹
 	(Î㤨¤Ð <literal>57600</literal>)¡£¤½¤Î¸å AT
-	¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤¿¤é¡¢<command>~.</command>
+	¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤¿¤é¡¢<keycap>~.</keycap>
 	¤ÈÆþÎϤ¹¤ì¤Ð½ªÎ»¤·¤Þ¤¹¡£</para>
     </sect2>
 
@@ -2072,8 +2089,8 @@ raisechar=^^</programlisting>
     <sect2 id="serialconsole-intro">
       <title>ƳÆþ</title>
 
-      <para>FreeBSD ¤Ï¡¢¥³¥ó¥½¡¼¥ë¤È¤·¤Æ
-	¥·¥ê¥¢¥ë¥Ý¡¼¥È¾å¤Î¥À¥àüËö¤·¤«»ý¤¿¤Ê¤¤¥·¥¹¥Æ¥à¤Ç¤âµ¯Æ°¤·¤Þ¤¹¡£
+      <para>FreeBSD ¤Ï¡¢
+	¥³¥ó¥½¡¼¥ë¤È¤·¤Æ¥·¥ê¥¢¥ë¥Ý¡¼¥È¾å¤Î¥À¥àüËö¤·¤«»ý¤¿¤Ê¤¤¥·¥¹¥Æ¥à¤Ç¤âµ¯Æ°¤·¤Þ¤¹¡£
 	¤³¤ÎÍͤʹ½À®¤Ï¤­¤Ã¤È¼¡¤Î¤è¤¦¤ÊÆó¼ïÎà¤Î¿Íã¤ËÊØÍø¤Ç¤·¤ç¤¦¡£¤½¤ì¤Ï¡¢
 	¥­¡¼¥Ü¡¼¥É¤ä¥â¥Ë¥¿¤Î¤Ê¤¤¥Þ¥·¥ó¤Ë
 	FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤¤¥·¥¹¥Æ¥à´ÉÍý¼Ô¤È¡¢
@@ -2222,11 +2239,11 @@ raisechar=^^</programlisting>
 		  Í£°ì¤Î»È¤¤Æ»¤Ï¡¢¥æ¥Ë¥Ã¥È¤¬¥«¡¼¥Í¥ë¤Î¥ê¥â¡¼¥È¥Ç¥Ð¥Ã¥°ÍÑ
 		  ¤Ç¤¢¤ë¤³¤È¤ò»ØÄꤹ¤ë¤³¤È¤Ç¤¹¡£
 		  ¥ê¥â¡¼¥È¥Ç¥Ð¥Ã¥°¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï
-	          <ulink url="http://www.freebsd.org/doc/en_US.ISO8859-1/books/developers-handbook/">The
+	          <ulink url="../developers-handbook/index.html">The
 		  Developer's Handbook</ulink> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 		<note>
-		  <para>FreeBSD 4.0-CURRENT °Ê¹ß¤Ç¤Ï¡¢
+		  <para>FreeBSD 4.0 °Ê¹ß¤Ç¤Ï¡¢
 		    ¥Õ¥é¥° <literal>0x40</literal> ¤Î°ÕÌ£¤¬¼ã´³°Û¤Ê¤ê¡¢
 		    ¥·¥ê¥¢¥ë¥Ý¡¼¥È¤Ë¥ê¥â¡¼¥È¥Ç¥Ð¥Ã¥°¤ò»ØÄꤹ¤ë¤¿¤á¤Ë¤Ï¡¢
 		    Ê̤Υե饰¤ò»È¤¤¤Þ¤¹¡£</para>
@@ -2310,6 +2327,8 @@ raisechar=^^</programlisting>
 		    ¤È F12 ¤¬¤Ê¤¤) ¥­¡¼¥Ü¡¼¥É¤Ï¸¡½Ð¤µ¤ì¤Ê¤¤²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
 		    ¤³¤ÎÀ©¸Â¤«¤é¡¢¤¤¤¯¤Ä¤«¤Î¥é¥Ã¥×¥È¥Ã¥×¥³¥ó¥Ô¥å¡¼¥¿¤Î
 		    ¥­¡¼¥Ü¡¼¥É¤ÏÀµ¤·¤¯¸¡½Ð¤µ¤ì¤Ê¤¤¤Ç¤·¤ç¤¦¡£
+		    ¤â¤·¡¢¤¢¤Ê¤¿¤Î¥·¥¹¥Æ¥à¤¬¤³¤Î¤è¤¦¤Ê¥­¡¼¥Ü¡¼¥É¤ò»È¤Ã¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
+		    <option>-P</option> ¥ª¥×¥·¥ç¥ó¤ò³°¤·¤Æ¤¯¤À¤µ¤¤¡£
 		    »ÄÇ°¤Ê¤¬¤é¡¢¤³¤ÎÌäÂê¤Î²óÈòºö¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
 		</note>
 	      </listitem>
@@ -2449,7 +2468,8 @@ boot:</screen>
 	ºÇ½ªÅª¤ËÁªÂò¤µ¤ì¤ë¥³¥ó¥½¡¼¥ë¤Ë´Ø¤¹¤ë¤Þ¤È¤á¤Ç¤¹¡£</para>
 
       <sect3>
-	<title>Case 1: sio0 ¤Î flags ¤Ë 0x10 ¤ò¥»¥Ã¥È¤·¤¿¾ì¹ç</title>
+	<title>Case 1: <devicename>sio0</devicename> ¤Î
+	  flags ¤Ë 0x10 ¤ò¥»¥Ã¥È¤·¤¿¾ì¹ç</title>
 
 	<programlisting>device sio0 at isa? port "IO_COM1" tty flags 0x10 irq 4</programlisting>
 
@@ -2612,7 +2632,8 @@ boot:</screen>
 
 	<procedure>
 	  <step>
-	    <para>¥«¡¼¥Í¥ë¥½¡¼¥¹¤ò¼èÆÀ¤¹¤ë¡£</para>
+	    <para>¥«¡¼¥Í¥ë¥½¡¼¥¹¤ò¼èÆÀ¤¹¤ë (<xref linkend="updating-upgrading">
+	      ¤ò¤´Í÷¤¯¤À¤µ¤¤)¡£</para>
 	  </step>
 
 	  <step>
@@ -2730,7 +2751,7 @@ ttyd3 "/usr/libexec/getty std.9600" unkn
 	¤³¤Î¥»¥¯¥·¥ç¥ó¤Ç¤Ï¡¢¥Ö¡¼¥È¥í¡¼¥À¤Ø¤Î¥³¥Þ¥ó¥ÉÆþÎϤȴĶ­ÊÑ¿ôÀßÄê¤Ç
 	¥³¥ó¥½¡¼¥ë¤Î»ØÄê¤ò¹Ô¤Ê¤¦ÊýË¡¤ò¾Ò²ð¤·¤Þ¤¹¡£
 	¥Ö¡¼¥È¥í¡¼¥À¤¬¥Ö¡¼¥È¥Ö¥í¥Ã¥¯¤Î¸å¡¢
-	¥Ö¡¼¥È¥×¥í¥»¥¹¤ÎÂè»°¥¹¥Æ¡¼¥¸¤È¤·¤Æ¸Æ¤Ó½Ð¤µ¤ì¤¿¤È¤­¡¢
+	¥Ö¡¼¥È¥×¥í¥»¥¹¤ÎÂè»°¥¹¥Æ¡¼¥¸¤Ç¸Æ¤Ó½Ð¤µ¤ì¤¿¤È¤­¡¢
 	¥Ö¡¼¥È¥í¡¼¥À¤ÎÀßÄê¤Ë¤Ï¡¢¥Ö¡¼¥È¥Ö¥í¥Ã¥¯¤ÎÀßÄ꤬¤½¤Î¤Þ¤Þ»È¤ï¤ì¤Þ¤¹¡£
 	</para>
 

From owner-svn-doc-all@FreeBSD.ORG  Sun Jul 22 21:51:28 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4B7A5106566B;
	Sun, 22 Jul 2012 21:51:28 +0000 (UTC)
	(envelope-from wblock@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 363808FC1C;
	Sun, 22 Jul 2012 21:51:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MLpSoS029711;
	Sun, 22 Jul 2012 21:51:28 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MLpRSP029709;
	Sun, 22 Jul 2012 21:51:27 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201207222151.q6MLpRSP029709@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Sun, 22 Jul 2012 21:51:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39245 - head/en_US.ISO8859-1/books/porters-handbook
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2012 21:51:28 -0000

Author: wblock
Date: Sun Jul 22 21:51:27 2012
New Revision: 39245
URL: http://svn.freebsd.org/changeset/doc/39245

Log:
  Remove obsolete svn diff option.
  
  PR:		170006
  Submitted by:	beat@freebsd.org

Modified:
  head/en_US.ISO8859-1/books/porters-handbook/book.sgml

Modified: head/en_US.ISO8859-1/books/porters-handbook/book.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/book.sgml	Sun Jul 22 16:43:08 2012	(r39244)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.sgml	Sun Jul 22 21:51:27 2012	(r39245)
@@ -10371,15 +10371,12 @@ as .putsy.conf and edit it.</programlist
       <para>The last step is to make a unified &man.diff.1;
 	of the files against SVN:</para>
 
-      <screen>&prompt.user; <userinput>svn diff -N &gt; ../`basename ${PWD}`.diff</userinput></screen>
+      <screen>&prompt.user; <userinput>svn diff &gt; ../`basename ${PWD}`.diff</userinput></screen>
 
       <note>
-	<para>It is important to use <option>-N</option> to ensure
-	  that files you have added or removed are accounted for in
-	  the patch.  The patch will include any removed files when
-	  applied, though the file contents will be empty, so remember
-	  to include these in the PR so the committer knows to remove
-	  them.</para>
+	<para>Any files that have been removed should be explicitly
+	  mentioned in the PR, because file removal may not be obvious
+	  to the committer.</para>
       </note>
 
       <para>Send your patch following the guidelines in

From owner-svn-doc-all@FreeBSD.ORG  Sun Jul 22 22:19:34 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 22DC7106566B;
	Sun, 22 Jul 2012 22:19:34 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0DC7F8FC0A;
	Sun, 22 Jul 2012 22:19:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MMJXW5031945;
	Sun, 22 Jul 2012 22:19:33 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MMJXJ1031943;
	Sun, 22 Jul 2012 22:19:33 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201207222219.q6MMJXJ1031943@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 22 Jul 2012 22:19:33 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39246 - head/en_US.ISO8859-1/books/faq
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2012 22:19:34 -0000

Author: eadler (src,ports committer)
Date: Sun Jul 22 22:19:33 2012
New Revision: 39246
URL: http://svn.freebsd.org/changeset/doc/39246

Log:
  Modernize the minimum requirements to install the system. Note that only
  an install and reboot were tested under these conditions in a VM.
  
  Approved by:        wblock

Modified:
  head/en_US.ISO8859-1/books/faq/book.sgml

Modified: head/en_US.ISO8859-1/books/faq/book.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 21:51:27 2012	(r39245)
+++ head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:33 2012	(r39246)
@@ -1286,13 +1286,9 @@
 
 	<answer>
 	  <para>For &os; you will need a 486 or better PC, with
-	    24&nbsp;MB or more of RAM and at least 150&nbsp;MB of hard
+	    64&nbsp;MB or more of RAM and at least 1&nbsp;GB of hard
 	    disk space.</para>
 
-	  <para>All versions of &os; can run with a low end MDA graphics
-	    card but to run &xorg;, a VGA or better video card is
-	    needed.</para>
-
 	  <para>See also <xref linkend="hardware">.</para>
 	</answer>
       </qandaentry>

From owner-svn-doc-all@FreeBSD.ORG  Sun Jul 22 22:19:36 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 41F94106564A;
	Sun, 22 Jul 2012 22:19:36 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2D1838FC0C;
	Sun, 22 Jul 2012 22:19:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MMJa51031980;
	Sun, 22 Jul 2012 22:19:36 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MMJZuG031978;
	Sun, 22 Jul 2012 22:19:35 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201207222219.q6MMJZuG031978@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 22 Jul 2012 22:19:35 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39247 - head/en_US.ISO8859-1/books/faq
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2012 22:19:36 -0000

Author: eadler (src,ports committer)
Date: Sun Jul 22 22:19:35 2012
New Revision: 39247
URL: http://svn.freebsd.org/changeset/doc/39247

Log:
  Generalize question about install floppies.
  
  Approved by:	wblock

Modified:
  head/en_US.ISO8859-1/books/faq/book.sgml

Modified: head/en_US.ISO8859-1/books/faq/book.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:33 2012	(r39246)
+++ head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:35 2012	(r39247)
@@ -1295,15 +1295,12 @@
 
       <qandaentry>
 	<question id="custom-boot-floppy">
-	  <para>How can I make my own custom install floppy?</para>
+	  <para>How can I make my own custom install disk?</para>
 	</question>
 
 	<answer>
-	  <para>Currently there is no way to <emphasis>just</emphasis>
-	    make a custom install floppy.  You have to cut a whole new
-	    release, which will include your install floppy.</para>
-
-	  <para>To make a custom release, follow the instructions in the
+	  <para>Customized &os; installation media can be created by
+	    building a custom release.  Follow the instructions in the
 	    <ulink
 	      url="&url.articles.releng;/article.html">Release Engineering</ulink>
 	    article.</para>

From owner-svn-doc-all@FreeBSD.ORG  Sun Jul 22 22:19:38 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7CE58106566C;
	Sun, 22 Jul 2012 22:19:38 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4E3EE8FC12;
	Sun, 22 Jul 2012 22:19:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MMJcX8032018;
	Sun, 22 Jul 2012 22:19:38 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MMJcAq032016;
	Sun, 22 Jul 2012 22:19:38 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201207222219.q6MMJcAq032016@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 22 Jul 2012 22:19:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39248 - head/en_US.ISO8859-1/books/faq
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2012 22:19:38 -0000

Author: eadler (src,ports committer)
Date: Sun Jul 22 22:19:37 2012
New Revision: 39248
URL: http://svn.freebsd.org/changeset/doc/39248

Log:
  Modernize the question relating to whether sources need to be installed.
  
  Reviewed by:	dougb
  Approved by:	wblock

Modified:
  head/en_US.ISO8859-1/books/faq/book.sgml

Modified: head/en_US.ISO8859-1/books/faq/book.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:35 2012	(r39247)
+++ head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:37 2012	(r39248)
@@ -1813,35 +1813,17 @@
 
       <qandaentry>
 	<question id="need-complete-sources">
-	  <para>Do I need to install the complete sources?</para>
+	  <para>Do I need to install the source?</para>
 	</question>
 
 	<answer>
-	  <para>In general, no.  However, we would strongly recommend
-	    that you install, at a minimum, the <literal>base</literal>
-	    source kit, which includes several of the files mentioned
-	    here, and the <literal>sys</literal> (kernel) source kit,
-	    which includes sources for the kernel.  There is nothing in
-	    the system which requires the presence of the sources to
-	    operate, however, except for the kernel-configuration
-	    program &man.config.8;.  With the exception of the kernel
-	    sources, our build structure is set up so that you can
-	    read-only mount the sources from elsewhere via NFS and still
-	    be able to make new binaries (due to the kernel-source
-	    restriction, we recommend that you not mount this on
-	    <filename class="directory">/usr/src</filename> directly, but
-	    rather in some other location with appropriate symbolic
-	    links to duplicate the top-level structure of the source
-	    tree).</para>
-
-	  <para>Having the sources on-line and knowing how to build a
-	    system with them will make it much easier for you to upgrade
-	    to future releases of &os;.</para>
-
-	  <para>To actually select a subset of the sources, use the
-	    <guimenuitem>Custom</guimenuitem> menu item when you are in
-	    the <guimenuitem>Distributions</guimenuitem> menu of the
-	    system installation tool.</para>
+	  <para>In general, no.  There is nothing in the base
+	    system which requires the presence of the source to
+	    operate.  Some ports, like <filename
+	      role="package">sysutils/lsof</filename>, will not build
+	    unless the source is installed.  In particular, if the
+	    port builds a kernel module or directly operates on kernel
+	    structures, the source must be installed.</para>
 	</answer>
       </qandaentry>
 

From owner-svn-doc-all@FreeBSD.ORG  Sun Jul 22 22:19:40 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 72BC810656B1;
	Sun, 22 Jul 2012 22:19:40 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D3858FC14;
	Sun, 22 Jul 2012 22:19:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MMJeZK032051;
	Sun, 22 Jul 2012 22:19:40 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MMJeAL032049;
	Sun, 22 Jul 2012 22:19:40 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201207222219.q6MMJeAL032049@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 22 Jul 2012 22:19:40 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39249 - head/en_US.ISO8859-1/books/faq
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2012 22:19:40 -0000

Author: eadler (src,ports committer)
Date: Sun Jul 22 22:19:39 2012
New Revision: 39249
URL: http://svn.freebsd.org/changeset/doc/39249

Log:
  Modernize question about building your own kernel.
  
  Approved by:	wblock

Modified:
  head/en_US.ISO8859-1/books/faq/book.sgml

Modified: head/en_US.ISO8859-1/books/faq/book.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:37 2012	(r39248)
+++ head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:39 2012	(r39249)
@@ -1833,18 +1833,12 @@
 	</question>
 
 	<answer>
-	  <para>Building a new kernel was originally pretty much a
-	    required step in a &os; installation, but more recent releases
-	    have benefited from the introduction of much friendlier
-	    kernel configuration methods.  It is very easy to configure
-	    the kernel's configuration by much more flexible
-	    <quote>hints</quote> which can be set at the loader
-	    prompt.</para>
-
-	  <para>It may still be worthwhile building a new kernel
-	    containing just the drivers that you need, just to save a
-	    bit of RAM, but it is no longer necessary for most
-	    systems.</para>
+	  <para>Usually not.  The supplied <literal>GENERIC</literal>
+	    kernel contains the drivers an ordinary computer will
+	    need.  For computers with very limited RAM, such as
+	    embedded systems, it may be worthwhile to build a
+	    smaller custom kernel containing just the required
+	    drivers.</para>
 	</answer>
       </qandaentry>
 

From owner-svn-doc-all@FreeBSD.ORG  Sun Jul 22 22:19:42 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 87E95106566B;
	Sun, 22 Jul 2012 22:19:42 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 735C78FC16;
	Sun, 22 Jul 2012 22:19:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MMJgwu032085;
	Sun, 22 Jul 2012 22:19:42 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MMJgeH032082;
	Sun, 22 Jul 2012 22:19:42 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201207222219.q6MMJgeH032082@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 22 Jul 2012 22:19:42 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39250 - head/en_US.ISO8859-1/books/faq
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2012 22:19:42 -0000

Author: eadler (src,ports committer)
Date: Sun Jul 22 22:19:41 2012
New Revision: 39250
URL: http://svn.freebsd.org/changeset/doc/39250

Log:
  We now use blf by default instead of md5
  
  Approved by:	wblock

Modified:
  head/en_US.ISO8859-1/books/faq/book.sgml

Modified: head/en_US.ISO8859-1/books/faq/book.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:39 2012	(r39249)
+++ head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:41 2012	(r39250)
@@ -1849,8 +1849,10 @@
 	</question>
 
 	<answer>
-	  <para>The default password format on &os; is to use
-	    <emphasis>MD5</emphasis>-based passwords.  These are
+	  <para>&os;&nbsp;7 and 8 use MD5 password hashing by
+	    default.  Recent versions
+	    of &os; use <emphasis>blf</emphasis> by default.
+	    These are
 	    believed to be more secure than the traditional &unix;
 	    password format, which used a scheme based on the
 	    <emphasis>DES</emphasis> algorithm.  DES passwords are still

From owner-svn-doc-all@FreeBSD.ORG  Sun Jul 22 22:19:44 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ADB3810656D0;
	Sun, 22 Jul 2012 22:19:44 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8BF1F8FC17;
	Sun, 22 Jul 2012 22:19:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MMJibI032119;
	Sun, 22 Jul 2012 22:19:44 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MMJieF032117;
	Sun, 22 Jul 2012 22:19:44 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201207222219.q6MMJieF032117@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 22 Jul 2012 22:19:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39251 - head/en_US.ISO8859-1/books/faq
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2012 22:19:44 -0000

Author: eadler (src,ports committer)
Date: Sun Jul 22 22:19:44 2012
New Revision: 39251
URL: http://svn.freebsd.org/changeset/doc/39251

Log:
  Motif has been updated. Remove version number so we could stop tracking
  it.
  
  Approved by:	wblock

Modified:
  head/en_US.ISO8859-1/books/faq/book.sgml

Modified: head/en_US.ISO8859-1/books/faq/book.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:41 2012	(r39250)
+++ head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:44 2012	(r39251)
@@ -4059,7 +4059,7 @@ kern.timecounter.hardware: TSC -&gt; i82
 
 	<answer>
 	  <para>The Open Group has released the source code to
-	    <application>&motif;&nbsp;2.2.2</application>.  You can
+	    <application>&motif;</application>.  You can
 	    install the <filename
 	      role="package">x11-toolkits/open-motif</filename> package,
 	    or compile it from ports.  Refer to <ulink

From owner-svn-doc-all@FreeBSD.ORG  Sun Jul 22 22:19:46 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A0C471065670;
	Sun, 22 Jul 2012 22:19:46 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8BBA48FC18;
	Sun, 22 Jul 2012 22:19:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MMJkYY032157;
	Sun, 22 Jul 2012 22:19:46 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MMJkDU032155;
	Sun, 22 Jul 2012 22:19:46 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201207222219.q6MMJkDU032155@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 22 Jul 2012 22:19:46 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39252 - head/en_US.ISO8859-1/books/faq
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2012 22:19:46 -0000

Author: eadler (src,ports committer)
Date: Sun Jul 22 22:19:46 2012
New Revision: 39252
URL: http://svn.freebsd.org/changeset/doc/39252

Log:
  We don't split the media anymore so this isn't an FAQ.
  
  Approved by:	wblock

Modified:
  head/en_US.ISO8859-1/books/faq/book.sgml

Modified: head/en_US.ISO8859-1/books/faq/book.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:44 2012	(r39251)
+++ head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:46 2012	(r39252)
@@ -10616,24 +10616,6 @@ hint.sio.7.irq="12"</programlisting>
       </qandaentry>
 
       <qandaentry>
-	<question id="split-1392k">
-	  <para>How did you split the distribution into 1392&nbsp;KB
-	    files?</para>
-	</question>
-
-	<answer>
-	  <para>Newer BSD based systems have a <option>-b</option>
-	    option to &man.split.1; that allows them to split files on
-	    arbitrary byte boundaries.</para>
-
-	  <para>Here is an example from
-	    <filename>/usr/src/release/Makefile</filename>.</para>
-
-	  <programlisting>ZIPNSPLIT=              gzip --no-name -9 -c | split -b 1392k -</programlisting>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="submitting-kernel-extensions">
 	  <para>I have written a kernel extension, who do I send it
 	    to?</para>

From owner-svn-doc-all@FreeBSD.ORG  Sun Jul 22 22:19:48 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B3CA01065673;
	Sun, 22 Jul 2012 22:19:48 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E9FF8FC17;
	Sun, 22 Jul 2012 22:19:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MMJm3c032192;
	Sun, 22 Jul 2012 22:19:48 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MMJmdZ032190;
	Sun, 22 Jul 2012 22:19:48 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201207222219.q6MMJmdZ032190@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 22 Jul 2012 22:19:48 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39253 - head/en_US.ISO8859-1/books/faq
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2012 22:19:48 -0000

Author: eadler (src,ports committer)
Date: Sun Jul 22 22:19:48 2012
New Revision: 39253
URL: http://svn.freebsd.org/changeset/doc/39253

Log:
  Remove bogus information about SMP processors
  
  Approved by: wblock

Modified:
  head/en_US.ISO8859-1/books/faq/book.sgml

Modified: head/en_US.ISO8859-1/books/faq/book.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:46 2012	(r39252)
+++ head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:48 2012	(r39253)
@@ -2262,19 +2262,9 @@
 	      support on Intel CPUs that support this feature.  A kernel
 	      with the <literal>options SMP</literal> feature enabled
 	      will automatically detect the additional logical
-	      processors.  The default &os; scheduler treats the logical
-	      processors the same as additional physical processors; in
-	      other words, no attempt is made to optimize scheduling
-	      decisions given the shared resources between logical
-	      processors within the same CPU.  Because this naive
-	      scheduling can result in suboptimal performance, under
-	      certain circumstances it may be useful to disable the
-	      logical processors with the
-	      <varname>machdep.hlt_logical_cpus</varname> sysctl
-	      variable.  It is also possible to halt any CPU in the idle
-	      loop with the <varname>machdep.hlt_cpus</varname> sysctl
-	      variable.  The &man.smp.4; manual page has more
-	      details.</para>
+	      processors.</para>
+
+	    <para>&man.smp.4; has more details.</para>
 	  </answer>
 	</qandaentry>
       </qandaset>

From owner-svn-doc-all@FreeBSD.ORG  Sun Jul 22 22:44:24 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5F98F1065672;
	Sun, 22 Jul 2012 22:44:24 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 49BF28FC0A;
	Sun, 22 Jul 2012 22:44:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MMiOMT034246;
	Sun, 22 Jul 2012 22:44:24 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MMiO0Y034244;
	Sun, 22 Jul 2012 22:44:24 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201207222244.q6MMiO0Y034244@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 22 Jul 2012 22:44:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39254 - head/en_US.ISO8859-1/books/faq
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2012 22:44:24 -0000

Author: eadler (src,ports committer)
Date: Sun Jul 22 22:44:23 2012
New Revision: 39254
URL: http://svn.freebsd.org/changeset/doc/39254

Log:
  Correct current hash function.
  
  Reminded by:	zeising
  Approved by:	wblock

Modified:
  head/en_US.ISO8859-1/books/faq/book.sgml

Modified: head/en_US.ISO8859-1/books/faq/book.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:48 2012	(r39253)
+++ head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:44:23 2012	(r39254)
@@ -1851,7 +1851,7 @@
 	<answer>
 	  <para>&os;&nbsp;7 and 8 use MD5 password hashing by
 	    default.  Recent versions
-	    of &os; use <emphasis>blf</emphasis> by default.
+	    of &os; use <emphasis>SHA512</emphasis> by default.
 	    These are
 	    believed to be more secure than the traditional &unix;
 	    password format, which used a scheme based on the

From owner-svn-doc-all@FreeBSD.ORG  Mon Jul 23 19:13:07 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0B5FA106564A;
	Mon, 23 Jul 2012 19:13:07 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EA1638FC17;
	Mon, 23 Jul 2012 19:13:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6NJD6tr040242;
	Mon, 23 Jul 2012 19:13:06 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6NJD6Mw040240;
	Mon, 23 Jul 2012 19:13:06 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201207231913.q6NJD6Mw040240@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Mon, 23 Jul 2012 19:13:06 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39255 -
	head/en_US.ISO8859-1/books/handbook/introduction
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Jul 2012 19:13:07 -0000

Author: gavin
Date: Mon Jul 23 19:13:06 2012
New Revision: 39255
URL: http://svn.freebsd.org/changeset/doc/39255

Log:
  Update date of last core election in the handbook.
  
  Submitted by:	ryusuke
  Approved by:	jkois (mentor)

Modified:
  head/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml

Modified: head/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml	Sun Jul 22 22:44:23 2012	(r39254)
+++ head/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml	Mon Jul 23 19:13:06 2012	(r39255)
@@ -850,7 +850,7 @@
 	      is one of the functions of the core team, as is the
 	      recruitment of new core team members as others move on.
 	      The current core team was elected from a pool of committer
-	      candidates in July 2010.  Elections are held
+	      candidates in July 2012.  Elections are held
 	      every 2 years.</para>
 
 	    <para>Some core team members also have specific areas of

From owner-svn-doc-all@FreeBSD.ORG  Mon Jul 23 22:50:23 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2EE75106566C;
	Mon, 23 Jul 2012 22:50:23 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1A4538FC1B;
	Mon, 23 Jul 2012 22:50:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6NMoM3J058243;
	Mon, 23 Jul 2012 22:50:22 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6NMoMBd058241;
	Mon, 23 Jul 2012 22:50:22 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201207232250.q6NMoMBd058241@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Mon, 23 Jul 2012 22:50:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39256 - head/share/pgpkeys
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Jul 2012 22:50:23 -0000

Author: gavin
Date: Mon Jul 23 22:50:22 2012
New Revision: 39256
URL: http://svn.freebsd.org/changeset/doc/39256

Log:
  New core-secretary PGP key.  The previous one has been in use for 10 years,
  so with the rotating of the core team and a new core-secretary, it seems
  a good time to generate a new key.
  
  The new key has been signed both by myself, and by the old core-secretary
  key.  The old key will be retired in due course.
  
  pub   2048R/2CA49776 2012-07-23
        Key fingerprint = 89F6 C031 B4E3 D472 E4CE  8372 4D58 FDCD 2CA4 9776
  uid               FreeBSD Core Team Secretary <core-secretary@freebsd.org>
  sub   2048R/BBAD1C98 2012-07-23
  
  Approved by:	core (implicit)

Modified:
  head/share/pgpkeys/core-secretary.key

Modified: head/share/pgpkeys/core-secretary.key
==============================================================================
--- head/share/pgpkeys/core-secretary.key	Mon Jul 23 19:13:06 2012	(r39255)
+++ head/share/pgpkeys/core-secretary.key	Mon Jul 23 22:50:22 2012	(r39256)
@@ -1,26 +1,47 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh core-secretary FF8AE305;
+sh addkey.sh core-secretary 2CA49776;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024R/FF8AE305 2002-01-08 core-secretary@FreeBSD.org
-     Key fingerprint = CE EF 8A 48 70 00 B5 A9  55 69 DE 87 E3 9A E1 CD
+pub   2048R/2CA49776 2012-07-23
+      Key fingerprint = 89F6 C031 B4E3 D472 E4CE  8372 4D58 FDCD 2CA4 9776
+uid                  FreeBSD Core Team Secretary <core-secretary@freebsd.org>
+sub   2048R/BBAD1C98 2012-07-23
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.6 (FreeBSD)
-Comment: For info see http://www.gnupg.org
+Version: GnuPG v2.0.19 (FreeBSD)
 
-mQCNAzw7fN4AAAEEALL1ENfbFYcAEmS6Hrb7CV7sWrbG+HlIwYvUUuqvr8+D3axd
-XuRJGFaWk8zNrTrwWROnlMMlctG3iXNsKzQNxAE6N64rbrUbKI5PzihfEsJW5/io
-XGXrRGdXvwob/Qdnd6mIlm3IJduChV7Nf3K2WbimUNkFeXrrh/ymwUj/iuMFAAUR
-tBpjb3JlLXNlY3JldGFyeUBGcmVlQlNELm9yZ4kAlQMFEDw7fN78psFI/4rjBQEB
-U4ID/1N6haUd+k+tzwNpX6pKnlCuTCJvJ619Lp83T8pRDGZom/uSLrfMrzvmKPeE
-abXGnreM41JRLAbGOclsONVBCLvwc/v+VVXTm24J1rdS1qY/SD+LE87pxPL6Ncyt
-Ug2sxPSo8fDVKu+MdcGK5zwP5ekNHDl+DB1mMsYDkZHTp9FMiQCVAwUQPDt+RafG
-T4fq3uQJAQFKvAQAl6+XaXQ1GzfqJoGqaTVW2O1OaodyBJjLxgRsVv7ps5Z4M4nl
-uYoe5ih+Lk3BVD9Y18QKUrnAPlbXDr1Ld0arq8uFkFsVzNDb2asg6tgcQe7mQ9lA
-QZPgVOU+siTmEuolSvxwsjxn/szBYBPv5EnU6lSmGf/RDJnbFXC9Z/LgPFU=
-=tMn4
+mQENBFANQTEBCADwvspc52P27Eq2Wdm0/kbaEC84FHSud6fZdn1Zhib/7fjuAHoV
+U+61w64t9KQVA5NHKviO19j+7dm4CY20aOJHjcHj89q7NpIfE/05J/krTAJ0Ysk+
+HdztzVOD3Zt5c9wGVKKfXbzQ3AAoISmJWF5K8a5oJo1wPt4xD4J0up9OzHOQRUjM
+MKXOYkg/8RVNrdcuVJt/31wkhpsm0Bf6AnHzUybHdgnzSdhFEiQoWg+OFC3X6X4B
+gWH32fo2FiZNsogvLEbd5fdiGPxbsT58p3D6Zd83e7IhffPxjFMlCq2ZL506drAy
+jbadDdk7d76RWvDDuFGykFXwJOtxoKuH/drFABEBAAG0OEZyZWVCU0QgQ29yZSBU
+ZWFtIFNlY3JldGFyeSA8Y29yZS1zZWNyZXRhcnlAZnJlZWJzZC5vcmc+iQE4BBMB
+AgAiBQJQDUExAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBNWP3NLKSX
+dlVTB/9BZ7FcZK2YDB9ervPig3t35Z7ips/4KKbpnTwkWw4QktwkGEOLsAr2fdRC
+XBkRiTMzT2Zwh/M8OzNkDcgJcHic5EQSIKOF0HEj/YuCE7HOBvSkxo70wHN8F1eJ
+8mqTETgv6P2BpeM3pPoMeisGAhp9NFQWYb5N7Bb5x+U2jjLnDAjmcuc1AkzrOlth
+gPrs73PY0rnu73acrzrThavCaKRO/40+Xmp88+QYHhvGjsUF54kbjXitiFQJP9ha
+ZdV22OjIigm3tOmOkPGFHMHG7g1GYp52NLbeDcytMX42eYZi1pOSvovoi3OImRb5
+rMNvryEmT6yTWC93MJOKbQe7Yn8LiEYEEBECAAYFAlAN0EQACgkQk13vRKCTJitF
+ngCffyTfE6cq5Osi9c3QGFVHYxC8uAUAn3MZ4iqGJirIXdaNT8YCK79Brdw0iJwE
+EAECAAYFAlAN0JkACgkQ/KbBSP+K4wUKiAP/TqgTqqV7mCIwesCGf6MaYNlhdv0S
+GYuPNa3RfSTbEHMyhDt9FPjaiiHpuYSl39e1/tNPFO5+48XrKsII4lu8Qgjgakgu
+KeYt8cFTjSzAX9lz9uNMieZE4Lv1/mkc8LEKYfmbaipxwPVcaxz1HiGakPIITTJ3
+34jo2LkqZBII8Xq5AQ0EUA1BMQEIALrp6i6T/r8rqpTSUU6Y6RAzKe8tMW/hCs/0
+pJt4MdIVxboVg1WgNwZuKk3srJIim60REEaR0JG8awMG+GIf9t3BMckIsQ8Pm9W9
+VQ0084iVuhUQcrjpmI+T6fsX0ssX1AFrO7lH6hLXVEXoNmCaXG3lIc1OGlR8lYi7
+r7xAbCYkFz+2isttqZxcn/CNPSRzn+CXE/jNMaikNQGouUrF8twi3ubyzYhpBvVj
+dn1PO+KFLD/kbo5rPx3+sdgw65d8XedVMiS+U5OVVpY57zoYLjeCb/QTAR/Yunen
+epd3OlwW6fR2959njWbhPFG1Wfj9FR6kgw18hpcaY/qzLN87MvcAEQEAAYkBHwQY
+AQIACQUCUA1BMQIbDAAKCRBNWP3NLKSXdsXeB/9WxOG4sVcRYmcru1z6Y6L6XnIh
+IEn/awPWt5MY3qtTZzFBXWIyxJnQYr+U2Wk2ano6Vqc8Uco+GuXqA0IfMsmcCciV
+vYTUxQUmqqRxepJ0Yw0FZdcQ7V0aaUNStlqyfWopZsSycVvPrp+jOwPO1gP57DkI
+yGUDK+3tDoSuFCYIAf+0ZYhJiYI2y86T7UQ5j+m98c2VZejtFBRtBmEwu/dsuQqw
+UgbOFW6RakI1waLsGxZoG4nZCRWsDqN3NVe9agQy5FzVTHHiCqx0HZx2usdwpov+
+UWiwIJwPX1hpxtgkBOq/DG0go94EybMGrzSXFCP6NccYpmGY3o+8bYI4HjLY
+=Y5nS
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-all@FreeBSD.ORG  Tue Jul 24 09:11:44 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E0C50106564A;
	Tue, 24 Jul 2012 09:11:44 +0000 (UTC)
	(envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CB4CB8FC08;
	Tue, 24 Jul 2012 09:11:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6O9BivP009930;
	Tue, 24 Jul 2012 09:11:44 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6O9BiJq009928;
	Tue, 24 Jul 2012 09:11:44 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201207240911.q6O9BiJq009928@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Tue, 24 Jul 2012 09:11:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39257 - head/ja_JP.eucJP/books/handbook/users
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Jul 2012 09:11:45 -0000

Author: ryusuke
Date: Tue Jul 24 09:11:44 2012
New Revision: 39257
URL: http://svn.freebsd.org/changeset/doc/39257

Log:
  - Merge the following from the English version:
  
  	r8705 -> r9228	head/ja_JP.eucJP/books/handbook/users/chapter.sgml
  
  Submitted by:	Hiroo Ono <hiroo _at_ jp dot FreeBSD dot org>
  Reference:	[doc-jp-work 1719]

Modified:
  head/ja_JP.eucJP/books/handbook/users/chapter.sgml

Modified: head/ja_JP.eucJP/books/handbook/users/chapter.sgml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/users/chapter.sgml	Mon Jul 23 22:50:22 2012	(r39256)
+++ head/ja_JP.eucJP/books/handbook/users/chapter.sgml	Tue Jul 24 09:11:44 2012	(r39257)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.5
+     Original revision: r9228
      $FreeBSD$
 -->
 
@@ -478,14 +478,240 @@ passwd: done</screen>
     </sect2>
   </sect1>
 
-  <sect1 id="users-limiting-and-personalizing">
-    <title>¥æ¡¼¥¶¤Ø¤ÎÀ©¸Â¤ÈÀßÄê</title>
+  <sect1 id="users-limiting">
+    <title>¥æ¡¼¥¶¤Ø¤ÎÀ©¸Â</title>
 
-    <para>quota ¤¬¥·¥¹¥Æ¥à¤ÇÍ­¸ú²½¤µ¤ì¤Æ¤¤¤ë¤È¡¢
-      ¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ï¥Ç¥£¥¹¥¯»ÈÍѤξå¸Â¤òÀßÄꤷ¡¢
-      ¥æ¡¼¥¶¤Ï¼«¿È¤Î¥Ç¥£¥¹¥¯»ÈÍÑÎ̤ò¥Á¥§¥Ã¥¯¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-      quota ¤Ë¤Ä¤¤¤Æ¤Ï¡¢<link linkend="quotas">quota
-        ¤Î¾Ï</link>¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+    <para>¤¢¤Ê¤¿¤¬¥Þ¥ë¥Á¥æ¡¼¥¶¥·¥¹¥Æ¥à¤ò±¿ÍѤ·¤Æ¤¤¤ë¤Î¤Ê¤é¡¢
+      ¤É¤Î¥æ¡¼¥¶¤â¥·¥¹¥Æ¥à¤Ë»³²¤òÍ¿¤¨¤Ê¤¤¤È¤¤¤¦¿®Íê¤Ï¤ª¤¤¤Æ¤¤¤Ê¤¤¤Î¤Ç¤Ï¤Ê¤¤¤Ç¤·¤ç¤¦¤«¡£
+      FreeBSD ¤Ï¡¢
+      ¸Ä¡¹¤Î¥æ¡¼¥¶¤¬ÍøÍѤǤ­¤ë¥·¥¹¥Æ¥à¤Î¥ê¥½¡¼¥¹¤ò¥·¥¹¥Æ¥à´ÉÍý¼Ô¤¬À©¸Â¤¹¤ëÊýË¡¤ò¤¤¤¯¤Ä¤âÍÑ°Õ¤·¤Æ¤¤¤Þ¤¹¡£
+      ¤½¤Î¼ï¤ÎÀ©¸Â¤Ï°ìÈÌŪ¤Ë¤Ï¡¢¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿ (quota)
+      ¤È¤½¤Î¾¤Î¥ê¥½¡¼¥¹¤ÎÀ©¸Â¤Î 2 ¤Ä¤Ëʬ¤±¤é¤ì¤Þ¤¹¡£</para>
+
+    <para>¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿¤Ï¡¢
+      ¥·¥¹¥Æ¥à´ÉÍý¼Ô¤¬¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¥æ¡¼¥¶¤¬»ÈÍѤǤ­¤ë¥Ç¥£¥¹¥¯Îΰè¤ÎÎ̤ò»Ø¼¨¤¹¤ë¼êÃʤǤ¹¡£
+      ¤µ¤é¤Ë¡¢¤½¤ÎÅÔÅÙ¬Äꤷ¤Ê¤¯¤Æ¤â¥æ¡¼¥¶¤Î¥Ç¥£¥¹¥¯»ÈÍÑÎ̤ò´Êñ¤Ë³Îǧ¤Ç¤­¤ë¼êÃʤâÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
+      ¥¯¥©¡¼¥¿¤Ë¤Ä¤¤¤Æ¤Ï¡¢<xref linkend="quotas"> ¤Ç²òÀ⤷¤Æ¤¤¤Þ¤¹¡£</para>
+
+    <para>¤½¤Î¾¤Î¥ê¥½¡¼¥¹¤ÎÀ©¸Â¤È¤Ï¡¢¥æ¡¼¥¶¤¬¾ÃÈñ¤Ç¤­¤ë
+      CPU¡¢¥á¥â¥ê¤Ê¤É¤Î¥ê¥½¡¼¥¹¤òÀ©¸Â¤¹¤ë¼êÃʤΤ³¤È¤Ç¤¹¡£
+      ¤³¤ì¤Ï¥í¥°¥¤¥ó¥¯¥é¥¹¤òÍѤ¤¤ÆÄêµÁ¤µ¤ì¤Æ¤¤¤ë¤â¤Î¤Ç¡¢
+      ¤³¤Î¸å¤Ç²òÀ⤷¤Æ¤¤¤Þ¤¹¡£</para>
+
+    <para>¥í¥°¥¤¥ó¥¯¥é¥¹¤Ï <filename>/etc/login.conf</filename>
+      ¤ÇÄêµÁ¤·¤Þ¤¹¡£¾ÜºÙ¤ÊƯ¤­¤ÎÀâÌÀ¤Ï¤³¤ÎÀá¤ÎÈϰϤòĶ¤¨¤Þ¤¹¤¬¡¢
+      &man.login.conf.5; ¤Î¥Þ¥Ë¥å¥¢¥ë¤Ë¾Ü¤·¤¯µ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+      ³Æ¥æ¡¼¥¶¤Ë¤Ï¥í¥°¥¤¥ó¥¯¥é¥¹¤¬³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Æ
+      (¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï <literal>default</literal> ¤Ç¤¹)¡¢
+      ¤½¤ì¤¾¤ì¤Î¥í¥°¥¤¥ó¥¯¥é¥¹¤Ë¤Ï¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¤Î½¸¹ç¤¬³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤ë¤È¤¤¤¨¤Ð½½Ê¬¤Ç¤·¤ç¤¦¡£
+      ¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¤È¤Ï¡¢
+      <literal><replaceable>̾¾Î</replaceable>=<replaceable>ÃÍ</replaceable></literal>
+      ¤ÎÁȤΤ³¤È¤Ç¡¢<replaceable>̾¾Î</replaceable>
+      ¤Ï¼þÃΤμ±Ê̻ҡ¢<replaceable>ÃÍ</replaceable>
+      ¤Ï¡¢Ì¾¾Î¤Ë±þ¤¸¤Æ½èÍý¤µ¤ì¤ëǤ°Õ¤Îʸ»úÎó¤Ç¤¹¡£
+      ¥í¥°¥¤¥ó¥¯¥é¥¹¤È¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¤òÀßÄꤹ¤ë¤Î¤Ï¤É¤Á¤é¤«¤È¤¤¤¨¤Ð´Êñ¤Ê¤³¤È¤Ç¡¢
+      &man.login.conf.5; ¤Ç¤âÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+
+    <para>¥ê¥½¡¼¥¹¤ÎÀ©¸Â¤Ï¡¢
+      2 ¤Ä¤ÎÅÀ¤Çɸ½àŪ¤Ê¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¤È°Û¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
+      Âè°ì¤Ë¡¢¤É¤ÎÀ©¸Â¤Ë¤Ä¤¤¤Æ¤â¡¢¥½¥Õ¥È (¸½ºß¤Î)
+      ¥ê¥ß¥Ã¥È¤È¥Ï¡¼¥É¥ê¥ß¥Ã¥È¤¬¤¢¤ê¤Þ¤¹¡£
+      ¥½¥Õ¥È¥ê¥ß¥Ã¥È¤Ï¡¢¥æ¡¼¥¶¤ä¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬Ä´À°¤Ç¤­¤Þ¤¹¤¬¡¢
+      ¥Ï¡¼¥É¥ê¥ß¥Ã¥È¤òĶ¤¨¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
+      ¥æ¡¼¥¶¤Ï¥Ï¡¼¥É¥ê¥ß¥Ã¥È¤ò²¼¤²¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤¹¤¬¡¢¾å¤²¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
+      ÂèÆó¤Ë¡¢¤Û¤È¤ó¤É¤Î¥ê¥½¡¼¥¹¤ÎÀ©¸Â¤ÏÆÃÄê¤Î¥æ¡¼¥¶¤ËÂФ·¤Æ¥×¥í¥»¥¹Ëè¤ËŬÍѤµ¤ì¤ë¤â¤Î¤Ç¡¢
+      ¤½¤Î¥æ¡¼¥¶¤¬ÍøÍѤ¹¤ë¥ê¥½¡¼¥¹¤ÎÁíÎ̤òÀ©¸Â¤¹¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+      ¤¿¤À¤·¡¢¤³¤Î°ã¤¤¤ÏÀ©¸Â¤òÆÃÊÌ°·¤¤¤¹¤ë¤³¤È¤Ç¼Â¸½¤µ¤ì¤ë¤â¤Î¤Ç¤¢¤ê¡¢
+      ¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤Î¼ÂÁõ¤Ë¤è¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó
+      (¤Ä¤Þ¤ê¡¢¥ê¥½¡¼¥¹¤ÎÀ©¸Â¤Ï¡¢
+      <emphasis>¼ÂºÝ¤Ë¤Ï</emphasis>¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¤ÎÆÃÊ̤ʾì¹ç¤Ç¤Ï¤Ê¤¤¤Î¤Ç¤¹)¡£</para>
+
+    <para>Æñ¤·¤¤ÏäϤ³¤Î¤¯¤é¤¤¤Ë¤·¤Æ¤ª¤¤¤Æ¡¢
+      °Ê²¼¤¬ºÇ¤â¤è¤¯»È¤ï¤ì¤ë¥ê¥½¡¼¥¹¤ÎÀ©¸Â¤Ë¤Ê¤ê¤Þ¤¹
+      (»Ä¤ê¤Ï¡¢Â¾¤Î¤¹¤Ù¤Æ¤Î¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¤Èʤó¤Ç
+      &man.login.conf.5; ¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹)¡£</para>
+
+    <variablelist>
+      <varlistentry>
+	<term><literal>coredumpsize</literal></term>
+
+	<listitem>
+	  <para>¥×¥í¥°¥é¥à¤¬À¸À®¤¹¤ë core
+	  ¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º¤Ë¤«¤«¤ëÀ©¸Â¤Ï¡¢
+	  ¼«ÌÀ¤ÊÍýͳ¤Ç¤Û¤«¤Î¥Ç¥£¥¹¥¯»ÈÍѤ˴ؤ¹¤ëÀ©¸Â¤Ë½¾Â°¤·¤Þ¤¹
+	  (Îã: <literal>filesize</literal> ¤ä¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿)¡£¤½¤ì¤Ç¤â¡¢
+	  ¥Ç¥£¥¹¥¯Îΰè¤Î¾ÃÈñ¤òÀ©¸æ¤¹¤ë¤¢¤Þ¤ê¸·¤·¤¯¤Ê¤¤¼êÃʤȤ·¤Æ¤è¤¯»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
+	  ¥æ¡¼¥¶¤Ï core ¥Õ¥¡¥¤¥ë¤ò¼«Ê¬¤ÇÀ¸À®¤¹¤ë¤ï¤±¤Ç¤Ï¤Ê¤¯¡¢
+	  ºï½ü¤·¤Ê¤¤¤³¤È¤â¿¤¤¤Î¤Ç¡¢¤³¤ì¤òÀßÄꤹ¤ì¤ÐÂ礭¤Ê¥×¥í¥°¥é¥à
+	  (¤¿¤È¤¨¤Ð Emacs)
+	  ¤¬°Û¾ï½ªÎ»¤·¤Æ¤â¥Ç¥£¥¹¥¯¤Î¶õ¤­¤¬¤Ê¤¯¤Ê¤é¤º¤ËºÑ¤ß¤Þ¤¹¡£</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><literal>cputime</literal></term>
+
+	<listitem>
+	  <para>¤½¤Î¥æ¡¼¥¶¤Î¥×¥í¥»¥¹¤¬¾ÃÈñ¤Ç¤­¤ë CPU »þ´Ö¤Î¾å¸Â¤Ç¤¹¡£
+	    ¤³¤ì¤òĶ¤¨¤¿¥×¥í¥»¥¹¤Ï¡¢¥«¡¼¥Í¥ë¤Ë¤è¤ê½ªÎ»¤µ¤ì¤Þ¤¹¡£
+
+	    <note>
+	      <para>¤³¤ì¤Ï¡¢¾ÃÈñ¤µ¤ì¤ë CPU <emphasis>»þ´Ö</emphasis> 
+		¤Ë¤Ä¤¤¤Æ¤ÎÀ©¸Â¤Ç¤¢¤Ã¤Æ¡¢&man.top.1; ¤ä&man.ps.1;
+		¤Î¹àÌܤΤɤ줫¤Ëɽ¼¨¤µ¤ì¤ë
+		CPU ¤Î³ä¹ç¤Ë´Ø¤¹¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+		¤³¤ì¤ò½ñ¤¤¤Æ¤¤¤ë»þÅÀ¤Ç¤Ï¸å¼Ô¤ÎÀ©¸Â¤Ï¤«¤±¤é¤ì¤Þ¤»¤ó¤·¡¢
+		Ìò¤Ë¤¿¤¿¤Ê¤¤¤Ç¤·¤ç¤¦¡£¤¿¤È¤¨¤Ð
+		(ÀµÅö¤Ê¥¿¥¹¥¯¤Ç¤¢¤ë²ÄǽÀ­¤¬¹â¤¤)
+		¥³¥ó¥Ñ¥¤¥é¤Ï¤¿¤ä¤¹¤¯°ìÄê»þ´Ö
+		CPU ¤ò 100% ¶á¤¯»È¤Ã¤Æ¤·¤Þ¤¤¤Þ¤¹¡£</para>
+	    </note>
+	  </para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><literal>filesize</literal></term>
+
+	<listitem>
+	  <para>¥æ¡¼¥¶¤¬½êÍ­¤Ç¤­¤ë¥Õ¥¡¥¤¥ë¤ÎÂ礭¤µ¤Î¾å¸Â¤Ç¤¹¡£<link
+	    linkend="quotas">¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿</link> ¤È°ã¤¤¡¢
+	    ¤³¤ÎÀ©¸Â¤Ï¥æ¡¼¥¶¤Î¥Õ¥¡¥¤¥ë¤ò¤¹¤Ù¤Æ¤Þ¤È¤á¤¿½¸¹ç¤Ë¤Ç¤Ï¤Ê¤¯¡¢
+	    ¸Ä¡¹¤Î¥Õ¥¡¥¤¥ë¤Ë¤«¤«¤ê¤Þ¤¹¡£</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><literal>maxproc</literal></term>
+
+	<listitem>
+	  <para>¥æ¡¼¥¶¤¬¼Â¹Ô¤Ç¤­¤ë¥×¥í¥»¥¹¿ô¤Î¾å¸Â¤Ç¤¹¡£
+	    ¥Õ¥©¥¢¥°¥é¥¦¥ó¥É¥×¥í¥»¥¹¤È¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥×¥í¥»¥¹¤ÎξÊý¤òÊ¿Åù¤Ë°·¤¤¤Þ¤¹¡£
+	    ¼«ÌÀ¤ÊÍýͳ¤«¤é¡¢sysctl ÊÑ¿ô <literal>kern.maxproc</literal>
+	    ¤Ç»ØÄꤵ¤ì¤¿¥·¥¹¥Æ¥à¤ÎÀ©¸Â¤òĶ¤¨¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
+	    ¤Þ¤¿¡¢Æ±»þ¤ËÊ£¿ô¥í¥°¥¤¥ó¤¹¤ë¤³¤È¤ä¡¢
+	    ¥Ñ¥¤¥×¥é¥¤¥ó¼Â¹Ô¤¹¤ë¤³¤È¤ÏÊØÍø¤Ê¤³¤È¤¬Â¿¤¤¤Î¤Ç¡¢
+	    ¤³¤ÎÃͤò¤¢¤Þ¤ê¾®¤µ¤ÊÃͤËÀßÄꤹ¤ë¤È¡¢
+	    ¤½¤Î¥æ¡¼¥¶¤ÎÀ¸»ºÀ­¤¬°­²½¤¹¤ë¤³¤È¤Ë¤âÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	    Â礭¤Ê¥×¥í¥°¥é¥à¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¾ì¹ç¤Î¤è¤¦¤Ë¡¢
+	    ¥¿¥¹¥¯¤Ë¤è¤Ã¤Æ¤ÏÊ£¿ô¤Î¥×¥í¥»¥¹¤¬¼Â¹Ô¤µ¤ì¤Þ¤¹ (¤¿¤È¤¨¤Ð
+	    &man.make.1;, &man.cc.1;
+	    ¤ä¡¢¤½¤Î¾ÃçΩ¤Á¤È¤Ê¤ë¥×¥ê¥×¥í¥»¥Ã¥µ)¡£</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><literal>memorylocked</literal></term>
+
+	<listitem>
+	  <para>¤³¤ì¤Ï¡¢
+	    1 ¤Ä¤Î¥×¥í¥»¥¹¤¬¥á¥¤¥ó¥á¥â¥ê¤Ë¥í¥Ã¥¯¤µ¤ì¤ë¤³¤È¤òÍ×µá¤Ç¤­¤ë¥á¥â¥ê¤ÎºÇÂçÍÆÎ̤Ǥ¹
+	    (&man.mlock.2; ¤ò¤´Í÷¤¯¤À¤µ¤¤)¡£&man.amd.8;
+	    ¤Î¤è¤¦¤Ê¥·¥¹¥Æ¥à¤Ç½ÅÍ×¤Ê¥×¥í¥°¥é¥à¤Ï¡¢
+	    ÌäÂêȯÀ¸»þ¤Ë¥¹¥ï¥Ã¥×¥¢¥¦¥È¤µ¤ì¤Æ¤·¤Þ¤Ã¤Æ¡¢
+	    ¥·¥¹¥Æ¥à¤Î¥¹¥é¥Ã¥·¥ó¥°¤ò°ú¤­µ¯¤³¤µ¤Ê¤¤¤è¤¦¤Ë¡¢
+	    ¥á¥¤¥ó¥á¥â¥ê¤Ø¤Î¥í¥Ã¥¯¤òÍ׵ᤷ¤Þ¤¹¡£</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><literal>memoryuse</literal></term>
+
+	<listitem>
+	  <para>¤³¤ì¤Ï¡¢¤É¤Î»þÅÀ¤«¤òÌä¤ï¤º¡¢
+	    ¤¢¤ë¥×¥í¥»¥¹¤¬¾ÃÈñ¤Ç¤­¤ëºÇÂç¤Î¥á¥â¥êÍÆÎ̤Ǥ¹¡£
+	    ¤³¤ì¤Ï¡¢¥á¥¤¥ó¥á¥â¥ê¤È¥¹¥ï¥Ã¥×¤Î»ÈÍÑÎ̤ò¹ç¤ï¤»¤¿¤â¤Î¤Ç¤¹¡£
+	    ¥á¥â¥ê¾ÃÈñ¤òÍÞ¤¨¤ë¤¿¤á¤ÎÊñ³çŪ¤ÊÀ©¸Â¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢
+	    ¼ê»Ï¤á¤Ë¤Ï¤è¤¤¤Ç¤·¤ç¤¦¡£</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><literal>openfiles</literal></term>
+
+	<listitem>
+	  <para>¤³¤ì¤Ï¡¢¤¢¤ë¥×¥í¥»¥¹¤¬³«¤¤¤Æ¤ª¤±¤ëºÇÂç¤Î¥Õ¥¡¥¤¥ë¿ô¤Ç¤¹¡£
+	    FreeBSD ¤Ç¤Ï¡¢¥Õ¥¡¥¤¥ë¤Ï¤Þ¤¿¡¢¥½¥±¥Ã¥È¤ä
+	    IPC ¥Á¥ã¥ó¥Í¥ë¤òɽ¤ï¤¹¤Î¤Ë¤â»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
+	    ¤Ç¤¹¤«¤é¡¢¤¢¤Þ¤êÄ㤤ÃͤËÀßÄꤷ¤Ê¤¤¤è¤¦Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	    ¤³¤ì¤ËÂбþ¤¹¤ë¥·¥¹¥Æ¥àÁ´ÂΤÎÀ©¸Â¤Ï sysctl ÊÑ¿ô
+	    <literal>kern.maxfiles</literal> ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><literal>sbsize</literal></term>
+
+	<listitem>
+	  <para>¤³¤ì¤Ï¡¢¤¢¤ë¥æ¡¼¥¶¤¬¾ÃÈñ¤Ç¤­¤ë¥Í¥Ã¥È¥ï¡¼¥¯¥á¥â¥ê
+	    (¤Ä¤Þ¤ê mbuf) ¤Î¾å¸Â¤ÎÎ̤Ǥ¹¡£¤³¤ì¤Ï¡¢
+	    ÂçÎ̤Υ½¥±¥Ã¥È¤òÀ¸À®¤¹¤ë¸Å¤¤¥µ¡¼¥Ó¥¹µñÈݹ¶·â¤ËÂбþ¤¹¤ë¤â¤Î¤È¤·¤Æºî¤é¤ì¤Þ¤·¤¿¤¬¡¢
+	    °ìÈÌŪ¤Ë¤Ï¥Í¥Ã¥È¥ï¡¼¥¯ÄÌ¿®¤òÀ©¸Â¤¹¤ë¤Î¤Ë»È¤¨¤Þ¤¹¡£</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><literal>stacksize</literal></term>
+
+	<listitem>
+	  <para>¤³¤ì¤Ï¡¢¥×¥í¥»¥¹¤Î¥¹¥¿¥Ã¥¯¥µ¥¤¥º¤Î¾å¸Â¤Ç¤¹¡£
+	    ¤¢¤ë¥×¥í¥°¥é¥à¤¬»ÈÍѤ·¤¦¤ë¥á¥â¥ê¤ÎÎ̤òÀ©¸Â¤¹¤ë¤Ë¤Ï¡¢
+	    ¤³¤ì¤À¤±¤Ç¤Ï½½Ê¬¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+	    ¤·¤¿¤¬¤Ã¤Æ¡¢Â¾¤ÎÀ©¸Â¤ÈÁȤ߹ç¤ï¤»¤Æ»È¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+
+    <para>¥ê¥½¡¼¥¹¤ÎÀ©¸Â¤òÀßÄꤹ¤ë¤Ë¤¢¤¿¤ê¡¢
+      ¤Û¤«¤Ë¤â¤¤¤¯¤Ä¤«³Ð¤¨¤Æ¤ª¤«¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
+      °Ê²¼¤Ï¡¢°ìÈÌŪ¤Ê¤³¤Ä¤ä¤ª´«¤á¡¢¤µ¤Þ¤¶¤Þ¤Ê¥³¥á¥ó¥È¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
+
+    <itemizedlist>
+      <listitem>
+	<para>¥·¥¹¥Æ¥àµ¯Æ°»þ¤Ë <filename>/etc/rc</filename>
+	  ¤«¤éµ¯Æ°¤µ¤ì¤¿¥×¥í¥»¥¹¤Ï¡¢<literal>daemon</literal>
+	  ¥í¥°¥¤¥ó¥¯¥é¥¹¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹¡£</para>
+      </listitem>
+
+      <listitem>
+	<para>¥·¥¹¥Æ¥à¤ËÉÕ°¤·¤Æ¤¤¤¿
+	  <filename>/etc/login.conf</filename>
+	  ¤Ï¤Û¤È¤ó¤É¤ÎÀ©¸Â¤Ë¤Ä¤¤¤ÆÂÅÅö¤ÊÃͤˤʤäƤ¤¤Þ¤¹¤¬¡¢
+	  ¤¢¤Ê¤¿¤Î¥·¥¹¥Æ¥à¤Ë²¿¤¬¤Õ¤µ¤ï¤·¤¤¤«Ê¬¤«¤ë¤Î¤Ï¡¢
+	  ´ÉÍý¼Ô¤Ç¤¢¤ë¤¢¤Ê¤¿¤À¤±¤Ç¤¹¡£
+	  À©¸Â¤ò¤¢¤Þ¤ê´Ë¤¯¤¹¤ë¤È¥·¥¹¥Æ¥à¤ò°­ÍѤ·¤ä¤¹¤¯¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¤·¡¢
+	  ¸·¤·¤¯¤·¤¹¤®¤ë¤ÈÀ¸»ºÀ­¤ò°­²½¤µ¤»¤Æ¤·¤Þ¤¤¤Þ¤¹¡£</para>
+      </listitem>
+
+      <listitem>
+	<para>X Window System (X11) ¤Î¥æ¡¼¥¶¤Ë¤Ï¡¢
+	  ¾¤Î¥æ¡¼¥¶¤è¤ê¿¤¯¤Î¥ê¥½¡¼¥¹¤òÍ¿¤¨¤ë¤Ù¤­¤«¤â¤·¤ì¤Þ¤»¤ó¡£
+	  X11 ¤½¤Î¤â¤Î¤¬Â¿¤¯¤Î¥ê¥½¡¼¥¹¤ò»È¤¦¤À¤±¤Ç¤Ê¤¯¡¢
+	  ¤è¤ê¿¤¯¤Î¥×¥í¥°¥é¥à¤òʹԤ·¤Æ»È¤¦¤³¤È¤ò¥æ¡¼¥¶¤ËÂ¥¤·¤Þ¤¹¡£</para>
+      </listitem>
+
+      <listitem>
+	<para>¿¤¯¤ÎÀ©¸Â¤Ï¸Ä¡¹¤Î¥×¥í¥»¥¹¤Ë¤«¤«¤ë¤â¤Î¤Ç¡¢
+	  °ì¿Í¤Î¥æ¡¼¥¶¤Ë¤Þ¤È¤á¤Æ¤«¤«¤ë¤â¤Î¤Ç¤Ï¤Ê¤¤¤³¤È¤ò˺¤ì¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
+	  Î㤨¤Ð¡¢openfiles ¤ò 50 ¤ËÀßÄꤹ¤ë¤³¤È¤Ï¡¢
+	  ¥æ¡¼¥¶¤¬Æ°¤«¤¹¤½¤ì¤¾¤ì¤Î¥×¥í¥»¥¹¤¬ºÇÂç
+	  50 ¸Ä¤Î¥Õ¥¡¥¤¥ë¤ò³«¤±¤ë¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
+	  ¤·¤¿¤¬¤Ã¤Æ¡¢¤¢¤ë¥æ¡¼¥¶¤¬³«¤±¤é¤ì¤ë¥Õ¥¡¥¤¥ë¤ÎÁí¿ô¤Ï¡¢
+	  <literal>openfiles</literal> ¤ÎÃÍ¤Ë <literal>maxproc</literal>
+	  ¤ò¤«¤±¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£
+	  Ʊ¤¸¤³¤È¤¬¥á¥â¥ê¾ÃÈñÎ̤ˤ⤢¤Æ¤Ï¤Þ¤ê¤Þ¤¹¡£</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>¥ê¥½¡¼¥¹¤ÎÀ©¸Â¤È¡¢¥í¥°¥¤¥ó¥¯¥é¥¹¡¢
+      ¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£°ìÈ̤ˤĤ¤¤Æ¤Î¾Ü¤·¤¤¾ðÊó¤Ï¡¢
+      ¤½¤ì¤¾¤ì¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¡¢
+      &man.cap.mkdb.1;, &man.getrlimit.2;, &man.login.conf.5;
+      ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+  </sect1>
+
+  <sect1 id="users-personalizing">
+    <title>¥æ¡¼¥¶¸ÄÊ̤ÎÀßÄê</title>
 
     <para>ÃÏ°è²½ (localization) ¤È¤Ï¡¢
       ¤½¤ì¤¾¤ì°Û¤Ê¤ë¸À¸ì¡¢¥­¥ã¥é¥¯¥¿¥»¥Ã¥È¡¢

From owner-svn-doc-all@FreeBSD.ORG  Tue Jul 24 09:13:54 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D9F1E106564A;
	Tue, 24 Jul 2012 09:13:54 +0000 (UTC)
	(envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C30288FC0A;
	Tue, 24 Jul 2012 09:13:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6O9DsOl010133;
	Tue, 24 Jul 2012 09:13:54 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6O9Ds66010131;
	Tue, 24 Jul 2012 09:13:54 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201207240913.q6O9Ds66010131@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Tue, 24 Jul 2012 09:13:54 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39258 - head/ru_RU.KOI8-R/books/porters-handbook
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Jul 2012 09:13:54 -0000

Author: pluknet
Date: Tue Jul 24 09:13:54 2012
New Revision: 39258
URL: http://svn.freebsd.org/changeset/doc/39258

Log:
  MFen r38283 -> r39245
  
  PR:		docs/169710 (MFen r38759 part)
  Submitted by:	ohauer

Modified:
  head/ru_RU.KOI8-R/books/porters-handbook/book.sgml

Modified: head/ru_RU.KOI8-R/books/porters-handbook/book.sgml
==============================================================================
--- head/ru_RU.KOI8-R/books/porters-handbook/book.sgml	Tue Jul 24 09:11:44 2012	(r39257)
+++ head/ru_RU.KOI8-R/books/porters-handbook/book.sgml	Tue Jul 24 09:13:54 2012	(r39258)
@@ -4,7 +4,7 @@
      $FreeBSD$
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/porters-handbook/book.sgml,v 1.136 2006/10/20 09:25:00 marck Exp $
 
-     Original revision: r38283
+     Original revision: r39245
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -145,7 +145,7 @@ USE_IMAKE=     yes
 
       <para>ðÏÓÍÏÔÒÉÍ, ÓÍÏÖÅÔÅ ÌÉ ×Ù ÅÇÏ ÐÏÎÑÔØ.  îÅ ÏÂÒÁÝÁÊÔÅ ×ÎÉÍÁÎÉÅ ÎÁ
         ÓÏÄÅÒÖÉÍÏÅ ÓÔÒÏÞËÉ <literal>&dollar;FreeBSD&dollar;</literal>, ÏÎÁ
-        ÂÕÄÅÔ ÚÁÐÏÌÎÅÎÁ Á×ÔÏÍÁÔÉÞÅÓËÉ ÓÉÓÔÅÍÏÊ CVS, ËÏÇÄÁ ÐÏÒÔ ÂÕÄÅÔ
+        ÂÕÄÅÔ ÚÁÐÏÌÎÅÎÁ Á×ÔÏÍÁÔÉÞÅÓËÉ ÓÉÓÔÅÍÏÊ SVN, ËÏÇÄÁ ÐÏÒÔ ÂÕÄÅÔ
         ÉÍÐÏÒÔÉÒÏ×ÁÎ × ÎÁÛÅ ÄÅÒÅ×Ï ÐÏÒÔÏ×.  ÷Ù ÍÏÖÅÔÅ ÎÁÊÔÉ ÂÏÌÅÅ ÐÏÄÒÏÂÎÙÊ
         ÐÒÉÍÅÒ × ÒÁÚÄÅÌÅ <link linkend="porting-samplem">ÐÒÉÍÅÒ
         Makefile</link>.</para>
@@ -198,8 +198,8 @@ WWW: http://www.oneko.org/</programlisti
           ÔÁËÖÅ ÎÁÚÙ×ÁÀÔ <quote>ÓÐÉÓËÏÍ ÄÌÑ ÕÐÁËÏ×ËÉ</quote>, ÐÏÔÏÍÕ ÞÔÏ
           ÐÁËÅÔ ÇÅÎÅÒÉÒÕÅÔÓÑ ÕÐÁËÏ×ËÏÊ ÆÁÊÌÏ×, ËÏÔÏÒÙÅ ÚÄÅÓØ ÕËÁÚÁÎÙ.
           éÍÅÎÁ ÐÕÔÅÊ ÕËÁÚÙ×ÁÀÔÓÑ ÏÔÎÏÓÉÔÅÌØÎÏ ÕÓÔÁÎÏ×ÏÞÎÏÇÏ ÐÒÅÆÉËÓÁ
-          (ÏÂÙÞÎÏ <filename>/usr/local</filename> ÉÌÉ
-          <filename>/usr/X11R6</filename>).  åÓÌÉ ×Ù ÉÓÐÏÌØÚÕÅÔÅ ÐÅÒÅÍÅÎÎÙÅ
+          (ÏÂÙÞÎÏ <filename>/usr/local</filename>).
+	  åÓÌÉ ×Ù ÉÓÐÏÌØÚÕÅÔÅ ÐÅÒÅÍÅÎÎÙÅ
           <makevar>MAN<replaceable>n</replaceable></makevar> (Á ×Ù ÄÏÌÖÎÙ
           ÜÔÏ ÄÅÌÁÔØ), ÔÏ ÕËÁÚÙ×ÁÔØ ÓÔÒÁÎÉÃÙ ÓÐÒÁ×ÏÞÎÉËÁ ÚÄÅÓØ ÎÅ
           ÎÕÖÎÏ.  åÓÌÉ ÐÏÒÔ ×Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ÓÏÚÄÁÅÔ ËÁÔÁÌÏÇÉ,  ÕÂÅÄÉÔÅÓØ,
@@ -346,6 +346,10 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	<step>
 	  <para><command>make package</command></para>
 	</step>
+
+	<step>
+	  <para><command>make readme</command></para>
+	</step>
       </procedure>
 
       <para>ðÒÏ×ÅÒØÔÅ, ÞÔÏ ÎÉ ÎÁ ÛÁÇÅ <maketarget>package</maketarget>, ÎÉ ÎÁ
@@ -573,7 +577,9 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	  ×ÙÚÙ×ÁÀÔ ÎÁÓÔÏÑÝÉÅ ÃÅÌÉ ÉÌÉ ÓËÒÉÐÔÙ, É ÉÈ ÎÅ ÎÕÖÎÏ ÍÅÎÑÔØ.  åÓÌÉ
 	  ×ÁÍ ÎÕÖÎÏ ÉÚÍÅÎÉÔØ ÒÁÓÐÁËÏ×ËÕ, ÉÓÐÒÁ×ÌÑÊÔÅ
 	  <maketarget>do-extract</maketarget>, ÎÏ ÎÉËÏÇÄÁ ÎÅ ÍÅÎÑÊÔÅ ÓÐÏÓÏÂ
-          ÒÁÂÏÔÙ <maketarget>extract</maketarget>!</para>
+          ÒÁÂÏÔÙ <maketarget>extract</maketarget>!  ëÒÏÍÅ ÔÏÇÏ, ÃÅÌØ
+	  <maketarget>post-deinstall</maketarget> Ñ×ÌÑÅÔÓÑ ÎÅÄÅÊÓÔ×ÉÔÅÌØÎÏÊ
+	  É ÎÅ ×ÙÐÏÌÎÑÅÔÓÑ ÉÎÆÒÁÓÔÒÕËÔÕÒÏÊ ÐÏÒÔÏ×.</para>
       </note>
 
       <para>ôÅÐÅÒØ ×Ù ÐÒÅÄÓÔÁ×ÌÑÅÔÅ, ÞÔÏ ÐÒÏÉÓÈÏÄÉÔ, ËÏÇÄÁ ÐÏÌØÚÏ×ÁÔÅÌØ
@@ -587,7 +593,7 @@ PLIST_DIRS=     lib/X11/oneko</programli
       <para>ðÏÌÕÞÉÔÅ ÏÒÉÇÉÎÁÌØÎÙÅ ÉÓÈÏÄÎÙÅ ÔÅËÓÔÙ (ÏÂÙÞÎÏ) × ×ÉÄÅ
 	ÕÐÁËÏ×ÁÎÎÏÇÏ tar-ÁÒÈÉ×Á
 	(<filename><replaceable>foo</replaceable>.tar.gz</filename> ÉÌÉ
-	<filename><replaceable>foo</replaceable>.tar.Z</filename>)
+	<filename><replaceable>foo</replaceable>.tar.bz2</filename>)
 	É ÓËÏÐÉÒÕÊÔÅ ÅÇÏ × ËÁÔÁÌÏÇ <makevar>DISTDIR</makevar>.	÷ÓÅÇÄÁ
 	ÉÓÐÏÌØÚÕÊÔÅ ÉÓÈÏÄÎÙÅ ÔÅËÓÔÙ <emphasis>ÏÓÎÏ×ÎÏÊ ×ÅÔËÉ
 	ÒÁÚÒÁÂÏÔËÉ</emphasis> ×ÅÚÄÅ, ÇÄÅ ÜÔÏ ×ÏÚÍÏÖÎÏ.</para>
@@ -708,7 +714,7 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	ÔÁË ÄÁÌÅÅ, ×ÓÅÇÄÁ ÓÓÙÌÁÊÔÅÓØ ÎÁ ÐÕÔØ É ÎÁÚ×ÁÎÉÅ ÆÁÊÌÁ × ÎÁÚ×ÁÎÉÑÈ
 	ÐÁÔÞÅÊ.</para>
 
-      <para>îÅ ÐÏÍÅÝÁÊÔÅ ÓÔÒÏËÉ RCS × ÐÁÔÞÉ.  CVS ÂÕÄÅÔ ÉÚÍÅÎÑÔØ ÉÈ ÐÒÉ
+      <para>îÅ ÐÏÍÅÝÁÊÔÅ ÓÔÒÏËÉ RCS × ÐÁÔÞÉ.  SVN ÂÕÄÅÔ ÉÚÍÅÎÑÔØ ÉÈ ÐÒÉ
 	ÐÏÍÅÝÅÎÉÉ ÆÁÊÌÏ× × ÄÅÒÅ×Ï ÐÏÒÔÏ×, É ËÏÇÄÁ ÍÙ ÂÕÄÅÍ ÉÈ ÏÔÔÕÄÁ
 	ÉÚ×ÌÅËÁÔØ, ÏÎÉ ÂÕÄÕÔ ÕÖÅ ÄÒÕÇÉÅ, ÐÏÜÔÏÍÕ ÐÒÉÍÅÎÅÎÉÅ ÐÁÔÞÅÊ
 	ÏËÏÎÞÉÔÓÑ ÎÅÕÄÁÞÅÊ.  óÔÒÏÞËÉ RCS ÐÒÅÄ×ÁÒÑÀÔÓÑ ÚÎÁËÏÍ ÄÏÌÌÁÒÁ
@@ -739,7 +745,7 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	ÞÁÓÔØ ÉÚ ÏÄÎÏÇÏ ÐÒÏÅËÔÁ ÄÌÑ ÉÓÐÒÁ×ÌÅÎÉÑ ÐÏÈÏÖÅÊ ÏÂÌÁÓÔÉ × ÄÒÕÇÏÍ,
 	ÔÏ ÂÕÄØÔÅ ÁËËÕÒÁÔÎÙ, ÐÏÖÁÌÕÊÓÔÁ: ÐÏÌÕÞÁÅÍÙÊ ÏÄÎÏÓÔÒÏÞÎÙÊ ÐÁÔÞ
 	ÍÏÖÅÔ ÂÙÔØ ÐÏÌÏÎ ÎÅÆÕÎËÃÉÏÎÁÌØÎÙÈ ÉÚÍÅÎÅÎÉÊ.  üÔÏ ÎÅ ÔÏÌØËÏ
-	Õ×ÅÌÉÞÉ×ÁÅÔ ÒÁÚÍÅÒ ÒÅÐÏÚÉÔÏÒÉÑ CVS, ÎÏ ÔÁËÖÅ ÕÓÌÏÖÎÑÅÔ ÐÏÉÓË ÔÏÇÏ,
+	Õ×ÅÌÉÞÉ×ÁÅÔ ÒÁÚÍÅÒ ÒÅÐÏÚÉÔÏÒÉÑ SVN, ÎÏ ÔÁËÖÅ ÕÓÌÏÖÎÑÅÔ ÐÏÉÓË ÔÏÇÏ,
 	ÞÔÏ ËÏÎËÒÅÔÎÏ ×ÙÚ×ÁÌÏ ÐÒÏÂÌÅÍÕ É ÞÔÏ ×Ù ×ÏÏÂÝÅ ÉÚÍÅÎÉÌÉ.</para>
 
       <para>åÓÌÉ ×ÁÍ ÎÕÖÎÏ ÕÄÁÌÉÔØ ÆÁÊÌ, ÔÏ ×Ù ÍÏÖÅÔÅ ÓÄÅÌÁÔØ ÜÔÏ ÐÒÉ
@@ -846,11 +852,8 @@ DOS2UNIX_REGEX=  .*\.(c|cpp|h)</programl
 	<makevar>EXTRACT_BEFORE_ARGS</makevar>,
 	<makevar>EXTRACT_AFTER_ARGS</makevar>,
 	<makevar>EXTRACT_SUFX</makevar> ÉÌÉ <makevar>DISTFILES</makevar> ×
-	ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÔÏÇÏ, ÎÁÓËÏÌØËÏ ÎÅÏÂÙÞÅÎ ÆÏÒÍÁÔ ÄÉÓÔÒÉÂÕÔÉ×ÎÏÇÏ ÆÁÊÌÁ.
-	(óÁÍÙÊ ÒÁÓÐÒÏÓÔÒÁΣÎÎÙÊ ÓÌÕÞÁÊ - ÜÔÏ
-	<literal>EXTRACT_SUFX=.tar.Z</literal>, ËÏÇÄÁ tar-ÆÁÊÌ ÕÐÁËÏ×ÁÎ
-	ÏÂÙÞÎÏÊ ÕÔÉÌÉÔÏÊ <command>compress</command>, Á ÎÅ ÁÒÈÉ×ÁÔÏÒÏÍ
-	<command>gzip</command>.)</para>
+	ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÔÏÇÏ, ÎÁÓËÏÌØËÏ ÎÅÏÂÙÞÅÎ ÆÏÒÍÁÔ ÄÉÓÔÒÉÂÕÔÉ×ÎÏÇÏ
+	ÆÁÊÌÁ.</para>
 
       <para>÷ ÈÕÄÛÅÍ ÓÌÕÞÁÅ ×Ù ÍÏÖÅÔÅ ÐÒÏÓÔÏ ÏÐÒÅÄÅÌÉÔØ Ó×ÏÀ ÓÏÂÓÔ×ÅÎÎÕÀ ÃÅÌØ
 	<maketarget>do-extract</maketarget> ÄÌÑ ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÑ ÄÅÊÓÔ×ÉÊ ÐÏ
@@ -1706,8 +1709,8 @@ PORTEPOCH=      1</programlisting>
 	        <entry><filename>java</filename></entry>
 	        <entry>ðÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ, Ó×ÑÚÁÎÎÏÅ Ó ÑÚÙËÏÍ
                   Java&trade;.</entry>
-                <entry>ëÁÔÅÇÏÒÉÑ <filename>java</filename> ÎÅ ÄÏÌÖÎÁ ÂÙÔØ
-		  ÅÄÉÎÓÔ×ÅÎÎÏÊ ÄÌÑ ÐÏÒÔÁ.  ïÓÔÁ×ØÔÅ ÄÌÑ ÐÏÒÔÏ×,
+                <entry>ëÁÔÅÇÏÒÉÑ <filename>java</filename> ÎÉ × ËÏÅÍ ÓÌÕÞÁÅ
+		  ÎÅ ÄÏÌÖÎÁ ÂÙÔØ ÅÄÉÎÓÔ×ÅÎÎÏÊ ÄÌÑ ÐÏÒÔÁ.  ïÓÔÁ×ØÔÅ ÄÌÑ ÐÏÒÔÏ×,
 		  ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ ÉÍÅÀÝÉÈ ÏÔÎÏÛÅÎÉÅ Ë ÑÚÙËÕ Java, ÐÏÒÔÅÒÁÍ
 		  ÔÁËÖÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ ÎÅ ÉÓÐÏÌØÚÏ×ÁÔØ
 		  <filename>java</filename> ËÁË ÏÓÎÏ×ÎÕÀ ËÁÔÅÇÏÒÉÀ
@@ -1716,8 +1719,8 @@ PORTEPOCH=      1</programlisting>
 
 	      <row>
 	        <entry><filename>kde*</filename></entry>
-	        <entry>ðÏÒÔÙ ÐÒÏÅËÔÁ <ulink url="http://www.kde.org">K Desktop
-                  Environment (KDE)</ulink>.</entry>
+		<entry>ðÏÒÔÙ ÐÒÏÅËÔÁ
+		  <ulink url="http://www.kde.org">KDE</ulink>.</entry>
                 <entry></entry>
 	      </row>
 
@@ -2405,11 +2408,15 @@ MASTER_SITE_SUBDIR=   make</programlisti
 
 	<programlisting>MASTER_SITES=   SF</programlisting>
 
-	<para>åÓÌÉ ÐÏÐÙÔËÁ ÕÇÁÄÁÔØ ÎÅ ÕÄÁÌÁÓØ, ÞÔÏ ÜÔÏ ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅÐÉÓÁÎÏ
+	<para>åÓÌÉ ÐÏÐÙÔËÁ ÕÇÁÄÁÔØ ÎÅ ÕÄÁÌÁÓØ, ÔÏ ÜÔÏ ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅÐÉÓÁÎÏ
 	  ÓÌÅÄÕÀÝÉÍ ÏÂÒÁÚÏÍ.</para>
 
-	<programlisting>MASTER_SITES=   SF/stardict/WyabdcRealPeopleTTS/${PORTVE
-RSION}</programlisting>
+	<programlisting>MASTER_SITES=   SF/stardict/WyabdcRealPeopleTTS/${PORTVERSION}</programlisting>
+
+	<para>þÔÏ ÔÁËÖÅ ÍÏÖÎÏ ÚÁÐÉÓÁÔØ × ÔÁËÏÍ ×ÉÄÅ:</para>
+
+	<programlisting>MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	stardict/WyabdcRealPeopleTTS/${PORTVERSION}</programlisting>
 
 	<table frame="none">
 	  <title>ðÏÐÕÌÑÒÎÙÅ ÍÁÇÉÞÅÓËÉÅ ÍÁËÒÏÓÙ ÄÌÑ
@@ -2515,11 +2522,12 @@ RSION}</programlisting>
         <programlisting>DISTNAME=      foo
 EXTRACT_SUFX=  .tgz</programlisting>
 
-        <para>ðÅÒÅÍÅÎÎÙÅ <makevar>USE_BZIP2</makevar> É
+        <para>ðÅÒÅÍÅÎÎÙÅ <makevar>USE_BZIP2</makevar>,
+	  <makevar>USE_XZ</makevar> É
           <makevar>USE_ZIP</makevar> ÐÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ Á×ÔÏÍÁÔÉÞÅÓËÉ
 	  ÕÓÔÁÎÁ×ÌÉ×ÁÀÔ ÚÎÁÞÅÎÉÅ <makevar>EXTRACT_SUFX</makevar> ×
-	  <literal>.tar.bz2</literal> ÉÌÉ <literal>.zip</literal>.
-	  åÓÌÉ ÎÉ ÏÄÎÁ ÉÚ ÜÔÉÈ
+	  <literal>.tar.bz2</literal>, <literal>.tar.xz</literal> ÉÌÉ
+	  <literal>.zip</literal>.  åÓÌÉ ÎÉ ÏÄÎÁ ÉÚ ÜÔÉÈ
           ÐÅÒÅÍÅÎÎÙÈ ÎÅ ÚÁÄÁÎÁ, ÔÏ ÚÎÁÞÅÎÉÅ <makevar>EXTRACT_SUFX</makevar>
           ÐÏ ÕÍÏÌÞÁÎÉÀ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × <literal>.tar.gz</literal>.</para>
 
@@ -3376,9 +3384,9 @@ ALWAYS_KEEP_DISTFILES=  yes
 	  <replaceable>target</replaceable> - ÜÔÏ ÃÅÌØ, ËÏÔÏÒÕÀ ÎÕÖÎÏ ×ÙÚ×ÁÔØ
 	  × ÜÔÏÍ ËÁÔÁÌÏÇÅ.  îÁÐÒÉÍÅÒ,</para>
 
-	<programlisting>LIB_DEPENDS=   jpeg.9:${PORTSDIR}/graphics/jpeg</programlisting>
+	<programlisting>LIB_DEPENDS=   jpeg:${PORTSDIR}/graphics/jpeg</programlisting>
 
-	<para>ÐÒÏ×ÅÒÉÔ ÎÁÌÉÞÉÅ ÂÉÂÌÉÏÔÅËÉ jpeg ÓÏ ÓÔÁÒÛÉÍ ÎÏÍÅÒÏÍ ×ÅÒÓÉÉ 9 É
+	<para>ÐÒÏ×ÅÒÉÔ ÎÁÌÉÞÉÅ ÂÉÂÌÉÏÔÅËÉ jpeg Ó ÌÀÂÙÍ ÎÏÍÅÒÏÍ ×ÅÒÓÉÉ É
 	  ÐÅÒÅÊÄÅÔ × ÐÏÄËÁÔÁÌÏÇ <filename>graphics/jpeg</filename> ×ÁÛÅÇÏ
 	  ÄÅÒÅ×Á ÐÏÒÔÏ× ÄÌÑ ÅÅ ÐÏÓÔÒÏÅÎÉÑ É ÕÓÔÁÎÏ×ËÉ, ÅÓÌÉ ÂÉÂÌÉÏÔÅËÁ
 	  ÏÔÓÕÔÓÔ×ÕÅÔ.	þÁÓÔØ <replaceable>target</replaceable> ÍÏÖÅÔ ÂÙÔØ
@@ -3389,11 +3397,11 @@ ALWAYS_KEEP_DISTFILES=  yes
 	  <para>þÁÓÔØ <replaceable>lib</replaceable> Ñ×ÌÑÅÔÓÑ ÒÅÇÕÌÑÒÎÙÍ
 	    ×ÙÒÁÖÅÎÉÅÍ, ËÏÔÏÒÏÅ ×ÙÚÙ×ÁÅÔÓÑ ÄÌÑ ×Ù×ÏÄÁ, ÐÏÌÕÞÅÎÎÏÇÏ ÉÚ
 	    <command>ldconfig -r</command>.  òÁÚÒÅÛÁÀÔÓÑ ÔÁËÉÅ ÚÎÁÞÅÎÉÑ, ËÁË
-	    <literal>intl.[5-7]</literal> É <literal>intl</literal>.
-	    ðÅÒ×ÙÅ ÛÁÂÌÏÎ, <literal>intl.[5-7]</literal>, ÓÏ×ÐÁÄÅÔ Ó ÌÀÂÙÍ
-	    ÉÚ: <literal>intl.5</literal>, <literal>intl.6</literal> ÉÌÉ
-	    <literal>intl.7</literal>.  ÷ÔÏÒÏÊ ÛÁÂÌÏÎ, <literal>intl</literal>,
-	    ÓÏ×ÐÁÄÅÔ Ó ÌÀÂÏÊ ×ÅÒÓÉÅÊ ÂÉÂÌÉÏÔÅËÉ <literal>intl</literal>.</para>
+	    <literal>intl.9</literal> É <literal>intl.[5-7]</literal>.
+	    ðÅÒ×ÙÊ ÛÁÂÌÏÎ, <literal>intl.9</literal>, ÓÏ×ÐÁÄÁÅÔ ÔÏÌØËÏ Ó
+	    intl ×ÅÒÓÉÉ 9, × ÔÏ ×ÒÅÍÑ ËÁË <literal>intl.[5-7]</literal>
+	    ÓÏ×ÐÁÄÁÅÔ Ó ÌÀÂÙÍ ÉÚ: <literal>intl.5</literal>,
+	    <literal>intl.6</literal> É <literal>intl.7</literal>.</para>
 	</note>
 
 	<para>úÁ×ÉÓÉÍÏÓÔØ ÐÒÏ×ÅÒÑÅÔÓÑ Ä×ÁÖÄÙ, ÏÄÉÎ ÒÁÚ ×ÎÕÔÒÉ ÃÅÌÉ
@@ -3423,14 +3431,15 @@ ALWAYS_KEEP_DISTFILES=  yes
 
 	<para>îÁÐÒÉÍÅÒ,</para>
 
-	<programlisting>RUN_DEPENDS=   ${LOCALBASE}/etc/innd:${PORTSDIR}/news/inn \
+	<programlisting>RUN_DEPENDS=   ${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn \
 	       xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr</programlisting>
 
-	<para>ÐÒÏ×ÅÒÉÔ, ÓÕÝÅÓÔ×ÕÅÔ ÌÉ ÆÁÊÌ ÉÌÉ ËÁÔÁÌÏÇ
-	  <filename>/usr/local/etc/innd</filename> É ÐÏÓÔÒÏÉÔ É ÕÓÔÁÎÏ×ÉÔ ÅÇÏ
-	  ÉÚ ÐÏÄËÁÔÁÌÏÇÁ <filename>news/inn</filename> ÄÅÒÅ×Á ÐÏÒÔÏ×, ÅÓÌÉ ÏÎ
-	  ÎÅ ÂÕÄÅÔ ÎÁÊÄÅÎ.  ïÎ ÔÁËÖÅ ÐÒÏ×ÅÒÉÔ, ÉÍÅÅÔÓÑ ÌÉ ×ÙÐÏÌÎÉÍÙÊ ÆÁÊÌ Ó
-	  ÉÍÅÎÅÍ <command>xmlcatmgr</command> × ÐÕÔÉ ÐÏÉÓËÁ, É ÐÅÒÅÊÄÅÔ ×
+	<para>ÐÒÏ×ÅÒÉÔ ÓÕÝÅÓÔ×Ï×ÁÎÉÅ ÆÁÊÌÁ ÉÌÉ ËÁÔÁÌÏÇÁ
+	  <filename>/usr/local/news/bin/innd</filename>, É ÅÓÌÉ ÎÉÞÅÇÏ
+	  ÎÅ ÂÕÄÅÔ ÎÁÊÄÅÎÏ, ÔÏ ÐÏÓÔÒÏÉÔ É ÕÓÔÁÎÏ×ÉÔ ÐÏÒÔ ÉÚ ÐÏÄËÁÔÁÌÏÇÁ
+	  <filename>news/inn</filename> ÄÅÒÅ×Á ÐÏÒÔÏ×.  ôÁËÖÅ ÂÕÄÅÔ
+	  ×ÙÐÏÌÎÅÎÁ ÐÒÏ×ÅÒËÁ, ÐÒÉÓÕÔÓÔ×ÕÅÔ ÌÉ × ÐÕÔÉ ÐÏÉÓËÁ ÉÓÐÏÌÎÑÅÍÙÊ
+	  ÆÁÊÌ Ó ÉÍÅÎÅÍ <command>xmlcatmgr</command>, É ÐÅÒÅÊÄÅÔ ×
 	  ÐÏÄËÁÔÁÌÏÇ <filename>textproc/xmlcatmgr</filename> ×ÁÛÅÇÏ ÄÅÒÅ×Á
 	  ÐÏÒÔÏ× ÄÌÑ ÅÇÏ ÐÏÓÔÒÏÅÎÉÑ É ÕÓÔÁÎÏ×ËÉ, ÅÓÌÉ ÏÎ ÎÅ ÂÕÄÅÔ
 	  ÎÁÊÄÅÎ.</para>
@@ -3446,7 +3455,7 @@ ALWAYS_KEEP_DISTFILES=  yes
 	  <para>ïÆÉÃÉÁÌØÎÙÍ ÚÎÁÞÅÎÉÅÍ ÐÅÒÅÍÅÎÎÏÊ ÐÏÉÓËÁ <envar>PATH</envar>,
 	    ÉÓÐÏÌØÚÕÅÍÙÍ × ËÌÁÓÔÅÒÅ ÐÏÓÔÒÏÅÎÉÑ ÐÏÒÔÏ× Ñ×ÌÑÅÔÓÑ</para>
 
-	  <programlisting>/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin</programlisting>
+	  <programlisting>/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin</programlisting>
 	</note>
 
 	<para>úÁ×ÉÓÉÍÏÓÔØ ÐÒÏ×ÅÒÑÅÔÓÑ ×ÎÕÔÒÉ ÃÅÌÉ
@@ -3589,16 +3598,16 @@ ALWAYS_KEEP_DISTFILES=  yes
       <sect2 id="use-vars">
 	<title><makevar>USE_<replaceable>*</replaceable></makevar></title>
 
-	<para>äÌÑ ÏÂßÅÄÉÎÅÎÉÑ ÎÅÓËÏÌØËÉÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ, ËÏÔÏÒÙÅ ÅÓÔØ ×Ï ÍÎÏÇÉÈ
-          ÐÏÒÔÁÈ, ÐÒÅÄÎÁÚÎÁÞÅÎÏ ÎÅÓËÏÌØËÏ ÐÅÒÅÍÅÎÎÙÈ.  èÏÔÑ ÉÈ ÉÓÐÏÌØÚÏ×ÁÎÉÅ
-	  Ñ×ÌÑÅÔÓÑ ÎÅÏÂÑÚÁÔÅÌØÎÙÍ, ÏÎÉ ÍÏÇÕÔ ÕÐÒÏÓÔÉÔØ ÉÚÂÙÔÏÞÎÏÓÔØ ÆÁÊÌÏ×
-	  <filename>Makefile</filename> ÐÏÒÔÁ.  ëÁÖÄÙÊ ÉÚ ÎÉÈ ÏÆÏÒÍÌÑÅÔÓÑ ËÁË
-	  <makevar>USE_<replaceable>*</replaceable></makevar>.  éÓÐÏÌØÚÏ×ÁÎÉÅ
-	  ÜÔÉÈ ÐÅÒÅÍÅÎÎÙÈ ÏÇÒÁÎÉÞÅÎÏ <filename>Makefile</filename>'ÏÍ ÐÏÒÔÁ
-	  É <filename>ports/Mk/bsd.*.mk</filename> É ÎÅ ÒÁÓÓÞÉÔÁÎÏ ÎÁ
-	  ×ÌÏÖÅÎÎÏÓÔØ ÕËÁÚÙ×ÁÅÍÙÈ ÐÏÌØÚÏ×ÁÔÅÌÑÍÉ ÏÐÃÉÑ &mdash; ÉÓÐÏÌØÚÕÊÔÅ
-	  ÄÌÑ ÜÔÉÈ ÃÅÌÅÊ <makevar>WITH_<replaceable>*</replaceable></makevar>
-	  É <makevar>WITHOUT_<replaceable>*</replaceable></makevar>.</para>
+	<para>äÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÏÂÝÉÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ, ÓÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÕÅÍÙÈ
+	  ÍÎÏÇÉÍÉ ÐÏÒÔÁÍÉ, ÐÒÅÄÎÁÚÎÁÞÅÎÏ ÎÅÓËÏÌØËÏ ÐÅÒÅÍÅÎÎÙÈ.  éÈ
+	  ÉÓÐÏÌØÚÏ×ÁÎÉÅ Ñ×ÌÑÅÔÓÑ ÎÅÏÂÑÚÁÔÅÌØÎÙÍ, ÎÏ ÐÏÍÏÇÁÅÔ ÕÐÒÏÓÔÉÔØ
+	  ÉÚÂÙÔÏÞÎÏÓÔØ ÆÁÊÌÏ× <filename>Makefile</filename> ÐÏÒÔÁ.
+	  ëÁÖÄÙÊ ÉÚ ÎÉÈ ÏÆÏÒÍÌÑÅÔÓÑ ËÁË
+	  <makevar>USE_<replaceable>*</replaceable></makevar>.  üÔÉ
+	  ÐÅÒÅÍÅÎÎÙÅ ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ × <filename>Makefile</filename>
+	  ÐÏÒÔÁ É <filename>ports/Mk/bsd.*.mk</filename>.  ïÎÉ ÎÅ
+	  ÐÒÅÄÎÁÚÎÁÞÅÎÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÏÌØÚÏ×ÁÔÅÌÑÍÉ ÐÁÒÁÍÅÔÒÏ× &mdash;
+	  ÉÓÐÏÌØÚÕÊÔÅ ÄÌÑ ÜÔÉÈ ÃÅÌÅÊ <makevar>PORT_OPTIONS</makevar>.</para>
 
 	<note>
 	  <para>õÓÔÁÎÏ×ËÁ ÌÀÂÙÈ <makevar>USE_<replaceable>*</replaceable></makevar>
@@ -3766,7 +3775,95 @@ ALWAYS_KEEP_DISTFILES=  yes
           ÌÀÄÅÊ&mdash;×ËÌÀÞÁÑ ÓÅÂÑ&mdash;ÏÔ ÇÒÑÄÕÝÉÈ ÂÅÄ.</para>
       </sect2>
 
-      </sect1>
+      <sect2>
+	<title>á×ÔÏÍÁÔÉÞÅÓËÉÅ ÚÁ×ÉÓÉÍÏÓÔÉ É ÐÒÏÂÌÅÍÙ, ËÏÔÏÒÙÅ ÏÎÉ
+	  ×ÙÚÙ×ÁÀÔ</title>
+
+	<para>úÁ×ÉÓÉÍÏÓÔÉ ÄÏÌÖÎÙ ÂÙÔØ ÕËÁÚÁÎÙ ÌÉÂÏ Ñ×ÎÏ, ÌÉÂÏ Ó
+	  ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ <link linkend="makefile-options">ÆÒÅÊÍ×ÏÒËÁ
+	  OPTIONS</link>.  éÓÐÏÌØÚÏ×ÁÎÉÅ ÐÒÏÞÉÈ ÍÅÔÏÄÏ×, ÔÁËÉÈ ËÁË
+	  Á×ÔÏÍÁÔÉÞÅÓËÏÅ ÏÂÎÁÒÕÖÅÎÉÅ ÚÁ×ÉÓÉÍÏÓÔÅÊ, ÕÓÌÏÖÎÑÅÔ ÉÎÄÅËÓÉÒÏ×ÁÎÉÅ,
+	  ÞÔÏ ×ÙÚÙ×ÁÅÔ ÐÒÏÂÌÅÍÙ × ÕÐÒÁ×ÌÅÎÉÉ ÐÏÒÔÁÍÉ É ÐÁËÅÔÁÍÉ.</para>
+
+	<example>
+	  <title>îÅËÏÒÒÅËÔÎÏÅ ÏÂßÑ×ÌÅÎÉÅ ÎÅÏÂÑÚÁÔÅÌØÎÏÊ ÚÁ×ÉÓÉÍÏÓÔÉ</title>
+
+	  <programlisting>.include &lt;bsd.port.pre.mk&gt;
+
+.if exists(${LOCALBASE}/bin/foo)
+LIB_DEPENDS=	bar:${PORTSDIR}/foo/bar
+.endif</programlisting>
+	</example>
+
+	<para>ðÒÏÂÌÅÍÁ Á×ÔÏÍÁÔÉÞÅÓËÏÇÏ ÄÏÂÁ×ÌÅÎÉÑ ÚÁ×ÉÓÉÍÏÓÔÅÊ
+	  ÚÁËÌÀÞÁÅÔÓÑ × ÔÏÍ, ÞÔÏ ÆÁÊÌÙ É ÎÁÓÔÒÏÊËÉ ÚÁ ÐÒÅÄÅÌÁÍÉ ÐÏÒÔÁ
+	  ÍÏÇÕÔ ÐÒÏÉÚ×ÏÌØÎÏ ÍÅÎÑÔØÓÑ.  ðÒÉÍÅÒ: ÐÏÓÌÅ ÐÏÓÔÒÏÅÎÉÑ
+	  ÉÎÄÅËÓÁ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÎÁÂÏÒ ÐÏÒÔÏ×.  ðÒÉ ÜÔÏÍ ÏÄÉÎ ÉÚ
+	  ÎÉÈ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÐÒÏ×ÅÒÑÅÍÙÊ ÆÁÊÌ.  îÁ ÜÔÏÍ ÜÔÁÐÅ ÉÎÄÅËÓ
+	  ÂÕÄÅÔ ÎÅÐÒÁ×ÉÌØÎÙÍ, ÐÏÔÏÍÕ ÞÔÏ ÕÓÔÁÎÏ×ÌÅÎÎÙÊ ÐÏÒÔ ÎÅÏÖÉÄÁÎÎÏ
+	  ÐÏÌÕÞÉÔ ÎÏ×ÕÀ ÚÁ×ÉÓÉÍÏÓÔØ.  éÎÄÅËÓ ÍÏÖÅÔ ÂÙÔØ ÐÏ ÐÒÅÖÎÅÍÕ
+	  ÎÅÐÒÁ×ÉÌØÎÙÍ ÄÁÖÅ ÐÏÓÌÅ ÅÇÏ ÐÅÒÅÓÔÒÏÅÎÉÑ, × ÓÌÕÞÁÅ ÅÓÌÉ
+	  ÄÒÕÇÉÅ ÐÏÒÔÙ ÔÁËÖÅ ÏÐÒÅÄÅÌÑÔ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ,
+	  ÏÓÎÏ×Ù×ÁÑÓØ ÎÁ ÓÕÝÅÓÔ×Ï×ÁÎÉÉ ÄÒÕÇÉÈ ÆÁÊÌÏ×.</para>
+
+	<example>
+	  <title>ëÏÒÒÅËÔÎÏÅ ÏÂßÑ×ÌÅÎÉÅ ÎÅÏÂÑÚÁÔÅÌØÎÏÊ ÚÁ×ÉÓÉÍÏÓÔÉ</title>
+
+	  <programlisting>OPTIONS_DEFINE=	BAR
+BAR_DESC=	Enable bar support
+
+.include &lt;bsd.port.options.mk&gt;
+
+.if ${PORTOPTIONS:MBAR}
+LIB_DEPENDS=	bar:${PORTSDIR}/foo/bar
+.endif</programlisting>
+	</example>
+
+	<para>ðÒÁ×ÉÌØÎÙÍ ÓÐÏÓÏÂÏÍ Ñ×ÌÑÅÔÓÑ ÐÒÏ×ÅÒËÁ ÐÅÒÅÍÅÎÎÙÈ ÐÁÒÁÍÅÔÒÏ×.
+	  üÔÏÔ ÓÐÏÓÏ ÎÅ ÐÒÉ×ÏÄÉÔ Ë ÎÅÓÏÏÔ×ÅÔÓÔ×ÉÑÍ × ÉÎÄÅËÓÅ ÎÁÂÏÒÁ
+	  ÐÏÒÔÏ×, ÐÏÓËÏÌØËÕ ÐÁÒÁÍÅÔÒÙ ÏÐÒÅÄÅÌÅÎÙ ÄÏ ÐÏÓÔÒÏÅÎÉÑ ÉÎÄÅËÓÁ.
+	  ðÒÉ ÜÔÏÍ ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÏÓÔÙÅ ÓËÒÉÐÔÙ ÄÌÑ Á×ÔÏÍÁÔÉÚÁÃÉÉ
+	  ÐÏÓÔÒÏÅÎÉÑ, ÕÓÔÁÎÏ×ËÉ É ÏÂÎÏ×ÌÅÎÉÑ ÜÔÉÈ ÐÏÒÔÏ× É ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÈ
+	  ÉÍ ÐÁËÅÔÏ×.</para>
+      </sect2>
+
+      <sect2 id="use-want">
+	<title><makevar>USE_</makevar> É
+	  <makevar>WANT_</makevar></title>
+
+	<para>ðÅÒÅÍÅÎÎÙÅ <makevar>USE_</makevar> ÚÁÄÁÀÔÓÑ ÍÅÊÎÔÅÊÎÅÒÏÍ
+	  ÐÏÒÔÁ ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ, ÏÔ ËÏÔÏÒÏÇÏ
+	  ÜÔÏÔ ÐÏÒÔ ÚÁ×ÉÓÉÔ.  ðÏÒÔ, ÄÌÑ ËÏÔÏÒÏÇÏ ÎÕÖÅÎ Firefox,
+	  ÕËÁÖÅÔ</para>
+
+	<programlisting>USE_FIREFOX=	yes</programlisting>
+
+	<para>îÅËÏÔÏÒÙÅ ÐÅÒÅÍÅÎÎÙÅ <makevar>USE_</makevar> ÍÏÇÕÔ
+	  ÐÒÉÎÉÍÁÔØ ÎÏÍÅÒÁ ×ÅÒÓÉÊ ÉÌÉ ÄÒÕÇÉÅ ÐÁÒÁÍÅÔÒÙ.  îÁÐÒÉÍÅÒ,
+	  ÐÏÒÔ, ËÏÔÏÒÙÊ ÔÒÅÂÕÅÔ Apache 2.2, ÕËÁÖÅÔ</para>
+
+	<programlisting>USE_APACHE=	22</programlisting>
+
+	<para>÷ ÎÅËÏÔÏÒÙÈ ÓÌÕÞÁÑÈ ÄÌÑ ÂÏÌØÛÅÇÏ ËÏÎÔÒÏÌÑ ÎÁÄ
+	  ÚÁ×ÉÓÉÍÏÓÔÑÍÉ ÉÓÐÏÌØÚÕÀÔÓÑ ÐÅÒÅÍÅÎÎÙÅ <makevar>WANT_</makevar>,
+	  ËÏÔÏÒÙÅ ÐÏÚ×ÏÌÑÀÔ ÕËÁÚÙ×ÁÔØ ÔÒÅÂÏ×ÁÎÉÑ × ÂÏÌÅÅ ÔÏÞÎÏÊ ÆÏÒÍÅ.
+	  îÁÐÒÉÍÅÒ, ×ÚÇÌÑÎÉÔÅ ÎÁ ÐÏÒÔ <filename
+	    role="package">mail/squirrelmail</filename>.  üÔÏÍÕ ÐÏÒÔÕ
+	  ÎÕÖÎÙ ÎÅÓËÏÌØËÏ ÍÏÄÕÌÅÊ PHP, ËÏÔÏÒÙÅ ÐÅÒÅÞÉÓÌÅÎÙ × ÐÅÒÅÍÅÎÎÏÊ
+	  <makevar>USE_PHP</makevar>:</para>
+
+	<programlisting>USE_PHP=	session mhash gettext mbstring pcre openssl xml</programlisting>
+
+	<para>üÔÉ ÍÏÄÕÌÉ ÄÏÓÔÕÐÎÙ × ×ÅÒÓÉÑÈ CLI É web, ÐÏÜÔÏÍÕ ×ÅÒÓÉÑ
+	  web ×ÙÂÒÁÎÁ Ó ÐÅÒÅÍÅÎÎÏÊ <makevar>WANT_</makevar>:</para>
+
+	<programlisting>WANT_PHP_WEB=	yes</programlisting>
+
+	<para>éÍÅÀÝÉÅÓÑ ÐÅÒÅÍÅÎÎÙÅ <makevar>USE_</makevar> É
+	  <makevar>WANT_</makevar> ÏÐÒÅÄÅÌÅÎÙ × ÆÁÊÌÁÈ
+	  <filename>/usr/ports/Mk</filename>.</para>
+      </sect2>
+    </sect1>
 
   <sect1 id="makefile-masterdir">
     <title><makevar>MASTERDIR</makevar></title>
@@ -3960,27 +4057,28 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
       <sect1 id="makefile-options">
       <title>ïÐÃÉÉ ÄÌÑ Makefile</title>
 
-      <para>îÅËÏÔÏÒÙÅ ÂÏÌØÛÉÅ ÐÒÉÌÏÖÅÎÉÑ ÍÏÇÕÔ ÂÙÔØ ÐÏÓÔÒÏÅÎÙ × ÒÁÚÌÉÞÎÙÈ
-	ËÏÎÆÉÇÕÒÁÃÉÑÈ, Ó ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔØÀ, ÚÁ×ÉÓÑÝÅÊ ÏÔ
-	ÎÁÌÉÞÉÑ × ÓÉÓÔÅÍÅ ÏÐÒÅÄÅÌ£ÎÎÙÈ ÂÉÂÌÉÏÔÅË ÉÌÉ ÐÒÉÌÏÖÅÎÉÊ.  îÁÐÒÉÍÅÒ,
+      <para>íÎÏÇÉÅ ÐÒÉÌÏÖÅÎÉÑ ÍÏÇÕÔ ÂÙÔØ ÐÏÓÔÒÏÅÎÙ × ÒÁÚÌÉÞÎÙÈ
+	ËÏÎÆÉÇÕÒÁÃÉÑÈ É Ó ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔØÀ.  îÁÐÒÉÍÅÒ,
 	×ÙÂÏÒ ÅÓÔÅÓÔ×ÅÎÎÏÇÏ (ÞÅÌÏ×ÅÞÅÓËÏÇÏ) ÑÚÙËÁ, GUI ÐÒÏÔÉ× ËÏÍÁÎÄÎÏÊ
-	ÓÔÒÏËÉ ÉÌÉ ÔÉÐÁ ÉÓÐÏÌØÚÕÅÍÏÊ ÂÁÚÙ ÄÁÎÎÙÈ. ôÁË ËÁË ÎÅ
-        ×ÓÅÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÔÒÅÂÕÀÔÓÑ ÜÔÉ ÂÉÂÌÉÏÔÅËÉ ÉÌÉ ÐÒÉÌÏÖÅÎÉÑ, ÔÏ ×
-        ÓÉÓÔÅÍÅ ÐÏÒÔÏ× ÐÒÅÄÕÓÍÏÔÒÅÎ ÍÅÈÁÎÉÚÍ, ÐÏÚ×ÏÌÑÀÝÉÊ Á×ÔÏÒÕ ÐÏÒÔÁ
-        ÐÒÉÎÉÍÁÔØ ÒÅÛÅÎÉÅ Ï ËÏÎÆÉÇÕÒÁÃÉÉ, ËÏÔÏÒÁÑ ÂÕÄÅÔ ÓÔÒÏÉÔØÓÑ.  ðÏÌÎÁÑ
-        ÐÏÄÄÅÒÖËÁ ÜÔÏÇÏ ÍÅÈÁÎÉÚÍÁ ÏÂÌÅÇÞÁÅÔ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÖÉÚÎØ É ÄÁ£Ô Ä×Á
-        ÉÌÉ ÂÏÌÅÅ ÐÏÒÔÁ ÃÅÎÏÊ ÓÏÚÄÁÎÉÑ ÏÄÎÏÇÏ.</para>
+	ÓÔÒÏËÉ ÉÌÉ ÔÉÐÁ ÉÓÐÏÌØÚÕÅÍÏÊ ÂÁÚÙ ÄÁÎÎÙÈ.  ðÏÌØÚÏ×ÁÔÅÌÉ ÍÏÇÕÔ
+	ÎÕÖÄÁÔØÓÑ × ÒÁÚÌÉÞÎÙÈ ËÏÎÆÉÇÕÒÁÃÉÑÈ, ÏÔÌÉÞÎÙÈ ÏÔ ÉÓÐÏÌØÚÕÅÍÏÊ ÐÏ
+	ÕÍÏÌÞÁÎÉÀ, ÐÏÜÔÏÍÕ × ÓÉÓÔÅÍÅ ÐÏÒÔÏ× ÐÒÅÄÕÓÍÏÔÒÅÎ ÍÅÈÁÎÉÚÍ,
+	ÐÏÚ×ÏÌÑÀÝÉÊ Á×ÔÏÒÕ ÐÏÒÔÁ ÕÐÒÁ×ÌÑÔØ ÓÂÏÒËÏÊ ÔÏÇÏ ÉÌÉ ÉÎÏÇÏ
+	×ÁÒÉÁÎÔÁ ËÏÎÆÉÇÕÒÁÃÉÉ.
+	ðÒÁ×ÉÌØÎÁÑ ÐÏÄÄÅÒÖËÁ ÜÔÉÈ ÎÅÏÂÑÚÁÔÅÌØÎÙÈ ÐÁÒÁÍÅÔÒÏ× ÏÂÌÅÇÞÁÅÔ
+	ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÖÉÚÎØ É ÄÁ£Ô Ä×Á ÉÌÉ ÂÏÌÅÅ ÐÏÒÔÁ ÐÏ ÃÅÎÅ ÏÄÎÏÇÏ.</para>
 
       <sect2>
-	  <title>Knobs</title>
+	<title>Knobs</title>
 
 	<sect3>
-	  <title><makevar>WITH_<replaceable>*</replaceable></makevar> É
+	  <title><makevar>WITH_<replaceable>*</replaceable></makevar>
+	    É
 	    <makevar>WITHOUT_<replaceable>*</replaceable></makevar></title>
 
 	  <para>üÔÉ ÐÅÒÅÍÅÎÎÙÅ ÐÒÅÄÎÁÚÎÁÞÅÎÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÓÉÓÔÅÍÎÙÍ
 	    ÁÄÍÉÎÉÓÔÒÁÔÏÒÏÍ.  íÎÏÇÉÅ ÉÚ ÎÉÈ ÓÔÁÎÄÁÒÔÉÚÏ×ÁÎÙ × ÆÁÊÌÅ
-	    <ulink url="http://www.freebsd.org/cgi/cvsweb.cgi/ports/KNOBS?rev=HEAD&amp;content-type=text/x-cvsweb-markup"><filename>ports/KNOBS</filename></ulink>.</para>
+	    <ulink url="http://svn.FreeBSD.org/ports/head/KNOBS?view=markup"><filename>ports/KNOBS</filename></ulink>.</para>
 
 	  <para>ðÒÉ ÓÏÚÄÁÎÉÉ ÐÏÒÔÁ ÎÅ ÄÁ×ÁÊÔÅ ÉÍÑ ÄÌÑ knob, ÓÐÅÃÉÆÉÞÎÏÅ
 	    ÄÌÑ ÄÁÎÎÏÇÏ ÐÒÉÌÏÖÅÎÉÑ.  îÁ ÐÒÉÍÅÒÅ ÐÏÒÔÁ Avahi, ÉÓÐÏÌØÚÕÊÔÅ
@@ -3998,7 +4096,7 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
 
 	  <note>
 	    <para>åÓÌÉ ÏÂÒÁÔÎÏÅ ÎÅ ÕËÁÚÁÎÏ, ÔÏ ÐÒÏ×ÅÒÑÅÔÓÑ ÔÏÌØËÏ ÆÁËÔ
-	      ÕÓÔÁÎÏ×ËÉ ÓÁÍÉÈ ÐÅÒÅÍÅÎÎÙÈ, ÎÏ ÎÅ ÉÈ ÚÎÁÞÅÎÉÅ ÔÉÐÁ
+	      ÕÓÔÁÎÏ×ËÉ ÓÁÍÉÈ ÐÅÒÅÍÅÎÎÙÈ, ÎÏ ÎÅ ÉÈ ËÏÎËÒÅÔÎÏÅ ÚÎÁÞÅÎÉÅ ÔÉÐÁ
 	      <literal>YES</literal> ÉÌÉ <literal>NO</literal>.</para>
 	  </note>
 
@@ -4042,10 +4140,10 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
 	        <row>
 		  <entry><makevar>WITHOUT_X11</makevar></entry>
 
-		  <entry>åÓÌÉ ÐÏÒÔ ÍÏÖÅÔ ÂÙÔØ ÓÏÂÒÁÎ Ó ÐÏÄÄÅÒÖËÏÊ ÉÌÉ ÂÅÚ
-		    ÐÏÄÄÅÒÖËÉ X, ÔÏ, ËÁË ÐÒÁ×ÉÌÏ, ÏÂÙÞÎÏ ÐÏÒÔ ÓÏÂÉÒÁÅÔÓÑ
-		    Ó ÐÏÄÄÅÒÖËÏÊ X.  åÓÌÉ ÜÔÁ ÐÅÒÅÍÅÎÎÁÑ ÏÐÒÅÄÅÌÅÎÁ, ÔÏ
-		    ÂÕÄÅÔ ÓÏÂÒÁÎÁ ×ÅÒÓÉÑ ÂÅÚ ÐÏÄÄÅÒÖËÉ X.</entry>
+		  <entry>ðÏÒÔÙ, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÂÙÔØ ÓÏÂÒÁÎÙ Ó ÐÏÄÄÅÒÖËÏÊ
+		    ÉÌÉ ÂÅÚ ÐÏÄÄÅÒÖËÉ X, ÏÂÙÞÎÏ ÓÏÂÉÒÁÀÔÓÑ Ó ÐÏÄÄÅÒÖËÏÊ
+		    X.  åÓÌÉ ÜÔÁ ÐÅÒÅÍÅÎÎÁÑ ÏÐÒÅÄÅÌÅÎÁ, ÔÏ ÂÕÄÅÔ ÓÏÂÒÁÎÁ
+		    ×ÅÒÓÉÑ ÂÅÚ ÐÏÄÄÅÒÖËÉ X.</entry>
 	        </row>
 	      </tbody>
 	    </tgroup>
@@ -4055,11 +4153,11 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
 
 	<sect3>
 	  <title>îÁÉÍÅÎÏ×ÁÎÉÅ KNOBS</title>
-	    <para>òÅËÏÍÅÎÄÕÅÔÓÑ, ÞÔÏÂÙ ÐÏÒÔÅÒÙ ÉÓÐÏÌØÚÏ×ÁÌÉ ÔÁË ÎÁÚÙ×ÁÅÍÙÅ
+	    <para>ðÏÒÔÅÒÙ ÄÏÌÖÎÙ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÁË ÎÁÚÙ×ÁÅÍÙÅ
 	      knobs ÄÌÑ ÐÏÍÏÝÉ ËÏÎÅÞÎÙÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ É ÄÌÑ ÐÏÄÄÅÒÖÁÎÉÑ
 	      ËÏÌÉÞÅÓÔ×Á ÎÁÉÍÅÎÏ×ÁÎÉÊ knobs × ÎÅÂÏÌØÛÏÍ ËÏÌÉÞÅÓÔ×Å.
 	      óÐÉÓÏË ÐÏÐÕÌÑÒÎÙÈ ÎÁÚ×ÁÎÉÊ knobs ÍÏÖÎÏ ÎÁÊÔÉ × ÆÁÊÌÅ <ulink
-	      url="http://www.freebsd.org/cgi/cvsweb.cgi/ports/KNOBS?rev=HEAD&amp;content-type=text/x-cvsweb-markup">KNOBS</ulink>
+		url="http://svn.FreeBSD.org/ports/head/KNOBS?view=markup"><filename>KNOBS</filename></ulink>
 	    </para>
 
 	    <para>îÁÚ×ÁÎÉÑ knobs ÄÏÌÖÎÙ ÏÔÒÁÖÁÔØ, ÞÔÏ ÜÔÏ ÔÁËÏÅ É ÞÔÏ
@@ -4074,81 +4172,188 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
 
 	<sect3>
 	  <title>ïÐÉÓÁÎÉÅ</title>
-	    <para>ðÒÉ ÕÓÔÁÎÏ×ËÅ ÐÏÒÔÁ ÐÅÒÅÍÅÎÎÁÑ <makevar>OPTIONS</makevar>
-	      ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÐÏÌØÚÏ×ÁÔÅÌÀ ÏËÎÏ ÄÉÁÌÏÇÁ Ó ÄÏÓÔÕÐÎÙÍÉ
-	      ÐÁÒÁÍÅÔÒÁÍÉ É ÓÏÈÒÁÎÑÅÔ ÉÈ × ÆÁÊÌ
-	      <filename>/var/db/ports/<replaceable>portname</replaceable>/options</filename>.
-	      üÔÉ ÏÐÃÉÉ ÂÕÄÕÔ ÐÏ×ÔÏÒÎÏ ÉÓÐÏÌØÚÏ×ÁÎÙ ÐÒÉ ÓÌÅÄÕÀÝÅÍ
-	      ÐÅÒÅÓÔÒÏÅÎÉÉ ÐÏÒÔÁ.  ÷ÁÍ ÂÏÌØÛÅ ÎÉËÏÇÄÁ ÎÅ ÐÏÎÁÄÏÂÉÔÓÑ
-	      ÚÁÐÏÍÉÎÁÔØ ×ÓÅ Ä×ÁÄÃÁÔØ ÏÐÃÉÊ
-	      <makevar>WITH_<replaceable>*</replaceable></makevar> É
-	      <makevar>WITHOUT_<replaceable>*</replaceable></makevar>,
-	      ÉÓÐÏÌØÚÕÅÍÙÈ ×ÁÍÉ ÐÒÉ ÐÏÓÔÒÏÅÎÉÉ ÜÔÏÇÏ ÐÏÒÔÁ!</para>
+	    <para>ðÒÉ ÕÓÔÁÎÏ×ËÅ ÐÏÒÔÁ ÐÅÒÅÍÅÎÎÙÅ <makevar>OPTIONS_*</makevar>
+	      ÐÒÅÄÏÓÔÁ×ÌÑÀÔ ÐÏÌØÚÏ×ÁÔÅÌÀ ÏËÎÏ ÄÉÁÌÏÇÁ Ó ÏÔÏÂÒÁÖÅÎÉÅÍ
+	      ÄÏÓÔÕÐÎÙÈ ÐÁÒÁÍÅÔÒÏ×, Ó ÚÁÐÉÓØÀ ×ÙÂÒÁÎÎÙÈ ÐÁÒÁÍÅÔÒÏ× × ÆÁÊÌ
+	      <filename>/var/db/ports/<makevar>${UNIQUENAME}</makevar>/options</filename>.
+	      üÔÉ ÏÐÃÉÉ ÐÏ×ÔÏÒÎÏ ÉÓÐÏÌØÚÕÀÔÓÑ ÐÒÉ ÓÌÅÄÕÀÝÅÍ ÐÏÓÔÒÏÅÎÉÉ
+	      ÐÏÒÔÁ.</para>
 
 	    <para>ëÏÇÄÁ ÐÏÌØÚÏ×ÁÔÅÌØ ÚÁÐÕÓËÁÅÔ <command>make config</command>
 	      (ÉÌÉ ÚÁÐÕÓËÁÅÔ ×ÐÅÒ×ÙÅ <command>make build</command>),
-	      ÉÎÆÒÁÓÔÒÕËÔÕÒÁ ×ÙÐÏÌÎÉÔ ÐÒÏ×ÅÒËÕ ÓÕÝÅÓÔ×Ï×ÁÎÉÑ ÆÁÊÌÁ
-	      <filename>/var/db/ports/<replaceable>portname</replaceable>
-	      /options</filename>.  åÓÌÉ ÜÔÏÔ ÆÁÊÌ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ, ÔÏ ÐÒÉ
-	      ÓÏÚÄÁÎÉÉ ÄÉÁÌÏÇÏ×ÏÇÏ ÏËÎÁ ÂÕÄÕÔ ÉÓÐÏÌØÚÏ×ÁÎÙ ÚÎÁÞÅÎÉÑ
-	      <makevar>OPTIONS</makevar>, × ËÏÔÏÒÏÍ ÉÈ ÍÏÖÎÏ ÐÅÒÅËÌÀÞÉÔØ.
-	      úÁÔÅÍ ÓÏÈÒÁÎÑÅÔÓÑ ÆÁÊÌ ÏÐÃÉÊ, É ×ÙÂÒÁÎÎÙÅ ÐÅÒÅÍÅÎÎÙÅ
-	      ÉÓÐÏÌØÚÕÀÔÓÑ ÐÒÉ ÐÏÓÔÒÏÅÎÉÉ ÐÏÒÔÁ.</para>
+	      ÉÎÆÒÁÓÔÒÕËÔÕÒÁ ×ÙÐÏÌÎÑÅÔ ÐÒÏ×ÅÒËÕ ÓÕÝÅÓÔ×Ï×ÁÎÉÑ ÆÁÊÌÁ
+	      <filename>/var/db/ports/<makevar>${UNIQUENAME}</makevar>/options</filename>.
+	      åÓÌÉ ÜÔÏÔ ÆÁÊÌ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ, ÔÏ ÉÓÐÏÌØÚÕÀÔÓÑ ÚÎÁÞÅÎÉÑ
+	      <makevar>OPTIONS_*</makevar> É ÏÔÏÂÒÁÖÁÅÔÓÑ ÄÉÁÌÏÇÏ×ÏÅ ÏËÎÏ,
+	      × ËÏÔÏÒÏÍ ÜÔÉ ÐÁÒÁÍÅÔÒÙ ÍÏÖÎÏ ×ËÌÀÞÉÔØ ÉÌÉ ×ÙËÌÀÞÉÔØ.
+	      úÁÔÅÍ ÓÏÈÒÁÎÑÅÔÓÑ ÆÁÊÌ ÏÐÃÉÊ <filename>options</filename>,
+	      É ×ÙÂÒÁÎÎÙÅ ÐÅÒÅÍÅÎÎÙÅ ÉÓÐÏÌØÚÕÀÔÓÑ ÐÒÉ ÐÏÓÔÒÏÅÎÉÉ ÐÏÒÔÁ.</para>
 
 	    <para>åÓÌÉ ÎÏ×ÁÑ ×ÅÒÓÉÑ ÐÏÒÔÁ ÄÏÂÁ×ÌÑÅÔ ÎÏ×ÙÅ ÚÎÁÞÅÎÉÑ
 	      <makevar>OPTIONS</makevar>, ÔÏ ÐÏÌØÚÏ×ÁÔÅÌÀ ÂÕÄÅÔ ÐÒÅÄÓÔÁ×ÌÅÎÏ
 	      ÏËÎÏ ÄÉÁÌÏÇÁ Ó ÓÏÈÒÁÎÅÎÎÙÍÉ ÚÁÐÏÌÎÅÎÎÙÍÉ ÚÎÁÞÅÎÉÑÍÉ ÓÔÁÒÙÈ
 	      <makevar>OPTIONS.</makevar></para>
 
-	    <para>äÌÑ ÐÒÏÓÍÏÔÒÁ ÓÏÈÒÁÎÅÎÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÉ ÉÓÐÏÌØÚÕÊÔÅ
-	      <command>make showconfig</command>.  äÌÑ ÕÄÁÌÅÎÉÑ
+	    <para><command>make showconfig</command> ÏÔÏÂÒÁÖÁÅÔ
+	      ÓÏÈÒÁÎÅÎÎÕÀ ËÏÎÆÉÇÕÒÁÃÉÀ.  äÌÑ ÕÄÁÌÅÎÉÑ
 	      ÓÏÈÒÁÎÅÎÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÉ ÉÓÐÏÌØÚÕÊÔÅ
 	      <command>make rmconfig</command>.</para>
 	</sect3>
 
 	<sect3>
 	  <title>óÉÎÔÁËÓÉÓ</title>
-	    <para>óÉÎÔÁËÓÉÓ ÐÅÒÅÍÅÎÎÏÊ <makevar>OPTIONS</makevar>:</para>
 
-	    <programlisting>OPTIONS=	OPTION	"descriptive text" default ...</programlisting>
+	    <para><makevar>OPTIONS_DEFINE</makevar> ÓÏÄÅÒÖÉÔ ÓÐÉÓÏË
+	      ÉÓÐÏÌØÚÕÅÍÙÈ <makevar>OPTIONS</makevar>.  ïÎÉ ÎÅÚÁ×ÉÓÉÍÙ
+	      ÄÒÕÇ ÏÔ ÄÒÕÇÁ É ÎÅ ÓÇÒÕÐÐÉÒÏ×ÁÎÙ:</para>
+
+	    <programlisting>OPTIONS_DEFINE=	OPT1 OPT2</programlisting>
+
+	    <para>äÁÌÅÅ ÐÏÓÌÅ ÏÐÒÅÄÅÌÅÎÉÑ ÓÌÅÄÕÅÔ ÏÐÉÓÁÎÉÅ
+	      <makevar>OPTIONS</makevar> (ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂÑÚÁÔÅÌØÎÙÍ,
+	      ÎÏ ÎÁÓÔÏÑÔÅÌØÎÏ ÒÅËÏÍÅÎÄÕÅÔÓÑ):</para>
+
+	    <programlisting>OPT1_DESC=	Describe OPT1
+OPT2_DESC=	Describe OPT2
+OPT3_DESC=	Describe OPT3
+OPT4_DESC=	Describe OPT4
+OPT5_DESC=	Describe OPT5
+OPT6_DESC=	Describe OPT6</programlisting>
+
+	    <tip>
+	      <para><filename>ports/Mk/bsd.options.desc.mk</filename>
+		ÓÏÄÅÒÖÉÔ ÏÐÉÓÁÎÉÅ ÍÎÏÖÅÓÔ×Á ÎÁÉÂÏÌÅÅ ÉÓÐÏÌØÚÕÅÍÙÈ
+		<makevar>OPTIONS</makevar>; ÐÅÒÅÏÐÒÅÄÅÌÑÔØ ÉÈ, ËÁË
+		ÐÒÁ×ÉÌÏ, ÎÅ ÎÕÖÎÏ.</para>
+	    </tip>
+
+	    <tip>
+	      <para>ðÒÉ ÏÐÉÓÁÎÉÉ ÐÁÒÁÍÅÔÒÏ× ÓÔÁÒÁÊÔÅÓØ ÐÒÅÄÓÔÁ×ÉÔØ ÓÅÂÑ
+		ÎÁ ÍÅÓÔÅ ÐÏÌØÚÏ×ÁÔÅÌÑ: <quote>þÔÏ ÜÔÏ ÄÅÌÁÅÔ?</quote>
+		É <quote>äÌÑ ÞÅÇÏ ÂÙ Ñ ÚÁÈÏÔÅÌ ×ËÌÀÞÉÔØ ÜÔÏ?</quote>
+		îÅ ÄÅÌÁÊÔÅ ÐÒÏÓÔÏÅ ÐÏ×ÔÏÒÅÎÉÅ ÎÁÚ×ÁÎÉÑ.  îÁÐÒÉÍÅÒ,
+		ÏÐÉÓÁÎÉÅ ÐÁÒÁÍÅÔÒÁ <literal>NLS</literal> ËÁË
+		<quote>include NLS support</quote> (<quote>×ËÌÀÞÉÔØ
+		ÐÏÄÄÅÒÖËÕ NLS</quote>) ÎÅ ÐÏÍÏÖÅÔ ÐÏÌØÚÏ×ÁÔÅÌÀ, ËÏÔÏÒÙÊ
+		ÕÖÅ ×ÉÄÉÔ ÎÁÚ×ÁÎÉÅ ÐÁÒÁÍÅÔÒÁ, ÎÏ ÍÏÖÅÔ ÎÅ ÚÎÁÔØ, ÞÔÏ
+		ÜÔÏ ÏÚÎÁÞÁÅÔ.  ïÐÉÓÁ× ÅÇÏ ËÁË <quote>Native Language
+		Support via gettext utilities</quote> (<quote>ðÏÄÄÅÒÖËÁ
+		ÎÁÃÉÏÎÁÌØÎÏÇÏ ÑÚÙËÁ ÞÅÒÅÚ ÕÔÉÌÉÔÙ gettext</quote>),
+		×Ù ÐÏÍÏÖÅÔÅ ÐÏÌØÚÏ×ÁÔÅÌÀ ÇÏÒÁÚÄÏ ÂÏÌØÛÅ.</para>
+	    </tip>
+
+	    <para><makevar>OPTIONS</makevar> ÍÏÖÎÏ ÇÒÕÐÐÉÒÏ×ÁÔØ × ×ÉÄÅ
+	      ÐÅÒÅËÌÀÞÁÔÅÌÅÊ, ÄÌÑ ËÏÔÏÒÙÈ ÒÁÚÒÅÛÅÎ ×ÙÂÏÒ ÅÄÉÎÓÔ×ÅÎÎÏÇÏ
+	      ×ÁÒÉÁÎÔÁ × ËÁÖÄÏÊ ÇÒÕÐÐÅ:</para>
+
+	    <programlisting>OPTIONS_SINGLE=		SG1
+OPTIONS_SINGLE_SG1=	OPT3 OPT4</programlisting>
+
+	    <para><makevar>OPTIONS</makevar> ÔÁËÖÅ ÍÏÖÎÏ ÇÒÕÐÐÉÒÏ×ÁÔØ
+	      × ×ÉÄÅ ÓÐÉÓËÏ× ÓÏ ÍÎÏÖÅÓÔ×ÅÎÎÙÍ ×ÙÂÏÒÏÍ, ÄÌÑ ËÏÔÏÒÙÈ
+	      ÏÂÑÚÁÎ ÂÙÔØ ×ËÌÀÞÅÎ <emphasis>ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ
+	      ÏÄÉÎ</emphasis> ÉÚ ÐÁÒÁÍÅÔÒÏ×:</para>
+
+	    <programlisting>OPTIONS_MULTI=		MG1
+OPTIONS_MULTI_MG1=	OPT5 OPT6</programlisting>
+
+	    <para><makevar>OPTIONS_MULTI</makevar> É
+	      <makevar>OPTIONS_SINGLE</makevar> ÔÁËÖÅ ÄÏÐÕÓËÁÀÔ
+	      ÏÔÓÕÔÓÔ×ÉÅ ×ÙÂÏÒÁ ÐÕÔ£Í ×ËÌÀÞÅÎÉÑ ÇÒÕÐÐÙ ×
+	      <makevar>OPTIONS_DEFINE</makevar>:</para>
+
+	    <programlisting>OPTIONS_DEFINE=		MG1
+OPTIONS_MULTI=		MG1
+OPTIONS_MULTI_MG1=	OPT5 OPT6</programlisting>
+
+	    <para>ðÏÓÌÅ ÜÔÏÇÏ ÇÒÕÐÐÁ ÔÒÅÂÕÅÔ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ ÏÄÉÎ
+	      <makevar>OPTION</makevar> ÉÚ <makevar>MG1</makevar>,
+	      ÔÏÌØËÏ ÅÓÌÉ ×ÙÂÒÁÎ ÎÏ×ÙÊ <makevar>MG1</makevar>
+	      <makevar>OPTION</makevar>.  òÅËÏÍÅÎÄÕÅÔÓÑ
+	      ÐÏÜËÓÐÅÒÉÍÅÎÔÉÒÏ×ÁÔØ, ÞÔÏÂÙ ÕÌÕÞÛÉÔØ ÐÏÎÉÍÁÎÉÅ.</para>
+
+	    <para>ðÏ ÕÍÏÌÞÁÎÉÀ <makevar>OPTIONS</makevar> ÎÁÈÏÄÉÔÓÑ ×
+	      ×ÙËÌÀÞÅÎÎÏÍ ÐÏÌÏÖÅÎÉÉ, ÅÓÌÉ ÐÒÉ ÜÔÏÍ ÏÎÏ ÔÁËÖÅ ÏÔÓÕÔÓÔ×ÕÅÔ
+	      × ÓÐÉÓËÅ <makevar>OPTIONS_DEFAULT</makevar>:</para>
 
-	    <para>úÎÁÞÅÎÉÅÍ ÐÏ ÕÍÏÌÞÁÎÉÀ Ñ×ÌÑÅÔÓÑ ÉÌÉ <literal>ON</literal>,
-	      ÉÌÉ <literal>OFF</literal>.  òÁÚÒÅÛÁÀÔÓÑ ÍÎÏÖÅÓÔ×ÅÎÎÙÅ
-	      ÐÏ×ÔÏÒÙ ×ÓÅÈ ÔÒÅÈ ÐÏÌÅÊ.</para>
+	    <programlisting>OPTIONS_DEFAULT=	OPT1 OPT3 OPT6</programlisting>
 
-	    <para>ïÐÒÅÄÅÌÅÎÉÅ <makevar>OPTIONS</makevar> ÏÂÑÚÁÎÏ ÐÏÑ×ÉÔØÓÑ
+	    <para>ïÐÒÅÄÅÌÅÎÉÑ <makevar>OPTIONS</makevar> ÏÂÑÚÁÎÙ ÐÏÑ×ÉÔØÓÑ
 	      ÄÏ ÐÏÄËÌÀÞÅÎÉÑ <filename>bsd.port.options.mk</filename>.
-	      ðÅÒÅÍÅÎÎÙÅ <makevar>WITH_*</makevar> É
-	      <makevar>WITHOUT_*</makevar> ÍÏÇÕÔ ÂÙÔØ ÐÒÏ×ÅÒÅÎÙ ÔÏÌØËÏ ÐÏÓÌÅ
+	      ðÅÒÅÍÅÎÎÙÅ <makevar>PORT_OPTIONS</makevar>
+	      ÍÏÇÕÔ ÂÙÔØ ÐÒÏ×ÅÒÅÎÙ ÔÏÌØËÏ ÐÏÓÌÅ
 	      ÐÏÄËÌÀÞÅÎÉÑ <filename>bsd.port.options.mk</filename>.
 	      ÷ÍÅÓÔÏ ÜÔÏÇÏ ÔÁËÖÅ ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÏÄËÌÀÞÅÎÉÅ
 	      <filename>bsd.port.pre.mk</filename>, ÞÔÏ ×ÓÅ ÅÝÅ ÛÉÒÏËÏ
 	      ÉÓÐÏÌØÚÕÅÔÓÑ × ÐÏÒÔÁÈ, ÎÁÐÉÓÁÎÎÙÈ ÄÏ ÐÏÑ×ÌÅÎÉÑ
 	      <filename>bsd.port.options.mk</filename>.  îÏ ÉÍÅÊÔÅ × ×ÉÄÕ,
-	      ÞÔÏ ÎÅËÏÔÏÒÙÅ ÐÅÒÅÍÅÎÎÙÅ, ÏÂÙÞÎÏ ÆÌÁÇÉ <makevar>USE_*</makevar>,
+	      ÞÔÏ ÎÅËÏÔÏÒÙÅ ÐÅÒÅÍÅÎÎÙÅ, ÏÂÙÞÎÏ, ÜÔÏ ÎÅËÏÔÏÒÙÅ ÆÌÁÇÉ
+	      <makevar>USE_*</makevar>,
 	      ÐÏÓÌÅ ÐÏÄËÌÀÞÅÎÉÑ <filename>bsd.port.pre.mk</filename> ÂÕÄÕÔ
-	      ÒÁÂÏÔÁÔØ ÎÅ ÔÁË, ËÁË ÜÔÏ ÏÔ ÎÉÈ ÏÖÉÄÁÅÔÓÑ.</para>
+	      ÒÁÂÏÔÁÔØ ÎÅ ÔÁË, ËÁË ÜÔÏÇÏ ÏÔ ÎÉÈ ÏÖÉÄÁÀÔ.</para>
 
 	  <example id="ports-options-simple-use">
 	    <title>ðÒÏÓÔÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ <makevar>OPTIONS</makevar></title>
-	    <programlisting>OPTIONS=      FOO "Enable option foo" On \
-              BAR "Support feature bar" Off
+
+	    <programlisting>OPTIONS_DEFINE=	FOO BAR
+FOO_DESC=	Enable option foo
+BAR_DESC=	Support feature bar
 
 .include &lt;bsd.port.options.mk&gt;
 
-.if defined(WITHOUT_FOO)
-CONFIGURE_ARGS+=	--without-foo
+.if ${PORT_OPTIONS:MFOO}
+CONFIGURE_ARGS+=--with-foo
 .else
-CONFIGURE_ARGS+=	--witht-foo
+CONFIGURE_ARGS+=--without-foo
 .endif
 
-.if defined(WITH_BAR)
+.if ${PORT_OPTIONS:MBAR}
 RUN_DEPENDS+=	bar:${PORTSDIR}/bar/bar
 .endif
 
 .include &lt;bsd.port.mk&gt;</programlisting>
 	  </example>
 
+	  <example id="ports-options-practical-use">
+	    <title>ðÒÉÍÅÒ ÒÅÁÌØÎÏÇÏ ÉÓÐÏÌØÚÏ×ÁÎÉÑ
+	      <makevar>OPTIONS</makevar></title>
+
+	    <programlisting>OPTIONS_DEFINE=		EXAMPLES
+
+OPTIONS_SINGLE=		BACKEND
+OPTIONS_SINGLE_BACKEND=	MYSQL PGSQL BDB
+
+OPTIONS_MULTI=		AUTH
+OPTIONS_MULTI_AUTH=	LDAP PAM SSL
+
+EXAMPLES_DESC=		Install extra examples
+MYSQL_DESC=		Use MySQL as backend
+PGSQL_DESC=		Use PostgreSQL as backend
+BDB_DESC=		Use Berkeley DB as backend
+LDAP_DESC=		Build with LDAP authentication support
+PAM_DESC=		Build with PAM support
+SSL_DESC=		Build with OpenSSL support
+
+OPTIONS_DEFAULT=	PGSQL LDAP SSL
+
+.include &lt;bsd.port.options.mk&gt;
+
+.if ${PORT_OPTIONS:MPGSQL}
+USE_PGSQL=		yes
+CONFIGURE_ARGS+=	--with-postgres
+.else
+CONFIGURE_ARGS+=	--without-postgres
+.endif
+
+.if ${PORT_OPTIONS:MICU}
+LIB_DEPENDS+=	icuuc:${PORTSDIR}/devel/icu
+.endif
+
+# Check other OPTIONS
+
+.include &lt;bsd.port.mk&gt;</programlisting>
+	  </example>
+
 	  <example id="ports-options-old-style-use">
 	    <title>éÓÐÏÌØÚÏ×ÁÎÉÅ <makevar>OPTIONS</makevar>
 	      × ÓÔÁÒÏÍ ÓÔÉÌÅ</title>
@@ -4164,6 +4369,12 @@ CONFIGURE_ARGS+=	--with-foo
 
 .include &lt;bsd.port.post.mk&gt;</programlisting>
 	  </example>
+
+	  <important>
+	    <para>ôÁËÏÊ ÓÐÏÓÏ ÉÓÐÏÌØÚÏ×ÁÎÉÑ <makevar>OPTIONS</makevar>
+	      Ñ×ÌÑÅÔÓÑ ÕÓÔÁÒÅ×ÛÉÍ, É × ÂÕÄÕÝÅÍ ÅÇÏ ÐÏÄÄÅÒÖËÁ ÂÕÄÅÔ
+	      ÕÄÁÌ£ÎÁ.  îÅ ÉÓÐÏÌØÚÕÊÔÅ ÜÔÏÔ ÓÐÏÓÏ ÄÌÑ ÎÏ×ÙÈ ÐÏÒÔÏ×.</para>
+	  </important>
 	</sect3>
       </sect2>
 
@@ -4180,8 +4391,9 @@ CONFIGURE_ARGS+=	--with-foo
 
 	<example>
 	  <title>îÅÐÒÁ×ÉÌØÎÏÅ ÕÐÒÁ×ÌÅÎÉÅ ÏÐÃÉÅÊ</title>
-	  <programlisting>.if defined(WITH_FOO)
-LIB_DEPENDS+=		foo.0:${PORTSDIR}/devel/foo
+
+	  <programlisting>.if ${PORT_OPTIONS:MFOO}
+LIB_DEPENDS+=		foo:${PORTSDIR}/devel/foo
 CONFIGURE_ARGS+=	--enable-foo
 .endif</programlisting>
 	</example>
@@ -4198,8 +4410,9 @@ CONFIGURE_ARGS+=	--enable-foo
 
 	<example>
 	  <title>ðÒÁ×ÉÌØÎÏÅ ÕÐÒÁ×ÌÅÎÉÅ ÏÐÃÉÅÊ</title>
-	  <programlisting>.if defined(WITH_FOO)
-LIB_DEPENDS+=		foo.0:${PORTSDIR}/devel/foo
+
+	  <programlisting>.if ${PORT_OPTIONS:MFOO}
+LIB_DEPENDS+=		foo:${PORTSDIR}/devel/foo
 CONFIGURE_ARGS+=	--enable-foo
 .else
 CONFIGURE_ARGS+=	--disable-foo
@@ -5317,7 +5530,7 @@ PLIST_SUB+=             NLS="@comment "
     </sect1>
 
     <sect1 id="using-perl">
-      <title>éÓÐÏÌØÚÏ×ÁÎÉÅ <literal>perl</literal></title>
+      <title>éÓÐÏÌØÚÏ×ÁÎÉÅ <application>Perl</application></title>
 
       <para>åÓÌÉ <makevar>MASTER_SITES</makevar> ÕÓÔÁÎÏ×ÌÅÎÁ × ÚÎÁÞÅÎÉÅ
 	<makevar>MASTER_SITE_PERL_CPAN</makevar>, ÔÏ ÐÒÅÄÐÏÞÔÉÔÅÌØÎÙÍ
@@ -5334,12 +5547,12 @@ PLIST_SUB+=             NLS="@comment "
 	× ËÁÞÅÓÔ×Å <makevar>MASTER_SITE_SUBDIR</makevar> ÒÁÚÒÅÛÁÅÔÓÑ
 	ÉÓÐÏÌØÚÏ×ÁÔØ id Á×ÔÏÒÁ.</para>
 
-      <para>÷ÓÅ ÉÚ ÎÁÓÔÒÁÉ×ÁÅÍÙÈ knobs ÎÉÖÅ ÐÒÉÎÉÍÁÀÔ É <literal>YES</literal>,
-	É ÓÔÒÏËÕ Ó ×ÅÒÓÉÅÊ, ×ÉÄÁ <literal>5.8.0+</literal>.  éÓÐÏÌØÚÏ×ÁÎÉÅ
+      <para>÷ÓÅ ÉÚ ÎÁÓÔÒÁÉ×ÁÅÍÙÈ knobs ÎÉÖÅ ÐÒÉÎÉÍÁÀÔ ÌÉÂÏ <literal>YES</literal>,
+	ÌÉÂÏ ÓÔÒÏËÕ Ó ×ÅÒÓÉÅÊ ×ÉÄÁ <literal>5.8.0+</literal>.
 	<literal>YES</literal> ÏÚÎÁÞÁÅÔ, ÞÔÏ ÄÁÎÎÙÊ ÐÏÒÔ ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ
-	ÓÏ ×ÓÅÍÉ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÍÉ ×ÅÒÓÉÑÍÉ <application>Perl</application>.
+	Ó ÌÀÂÏÊ ÉÚ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ×ÅÒÓÉÊ Perl.
 	åÓÌÉ ÐÏÒÔ ÒÁÂÏÔÁÅÔ ÔÏÌØËÏ Ó ÎÅËÏÔÏÒÙÍÉ ×ÅÒÓÉÑÍÉ
-	<application>Perl</application>, ÔÏ ÜÔÏ ÍÏÖÎÏ ÏÂÏÚÎÁÞÉÔØ ÐÒÉ ÐÏÍÏÝÉ
+	Perl, ÔÏ ÜÔÏ ÍÏÖÎÏ ÏÂÏÚÎÁÞÉÔØ ÐÒÉ ÐÏÍÏÝÉ
 	ÓÔÒÏËÉ Ó ×ÅÒÓÉÅÊ, ÕËÁÚÙ×ÁÀÝÅÊ ÎÁ ÍÉÎÉÍÁÌØÎÕÀ ×ÅÒÓÉÀ (ÐÒÉÍÅÒ:
 	<literal>5.7.3+</literal>), ÍÁËÓÉÍÁÌØÎÕÀ ×ÅÒÓÉÀ (ÐÒÉÍÅÒ:
 	<literal>5.8.0-</literal>) ÉÌÉ ÔÏÞÎÕÀ ×ÅÒÓÉÀ (ÐÒÉÍÅÒ:
@@ -5347,14 +5560,14 @@ PLIST_SUB+=             NLS="@comment "
 
       <table frame="none">
 	<title>ðÅÒÅÍÅÎÎÙÅ ÄÌÑ ÐÏÒÔÏ×, ÉÓÐÏÌØÚÕÀÝÉÈ
-          <literal>perl</literal></title>
+	  <application>Perl</application></title>
 
 	<tgroup cols="2">
 	  <thead>
 	    <row>
 	      <entry>ðÅÒÅÍÅÎÎÁÑ</entry>
 
-	      <entry>óÍÙÓÌ</entry>
+	      <entry>úÎÁÞÅÎÉÅ</entry>
 	    </row>
 	  </thead>
 
@@ -5362,29 +5575,26 @@ PLIST_SUB+=             NLS="@comment "
 	    <row>
 	      <entry><makevar>USE_PERL5</makevar></entry>
 
-	      <entry>õËÁÚÙ×ÁÅÔ ÎÁ ÔÏ, ÞÔÏ ÐÏÒÔ ÉÓÐÏÌØÚÕÅÔ <literal>perl
-                5</literal> ÄÌÑ Ó×ÏÅÇÏ ÐÏÓÔÒÏÅÎÉÑ É ÒÁÂÏÔÙ.</entry>
+	      <entry>Perl 5 ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ É ÒÁÂÏÔÙ.</entry>
 	    </row>
 
 	    <row>
               <entry><makevar>USE_PERL5_BUILD</makevar></entry>
 
-              <entry>õËÁÚÙ×ÁÅÔ ÎÁ ÔÏ, ÞÔÏ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ ÐÏÒÔ
-                ÉÓÐÏÌØÚÕÅÔ <literal>perl 5</literal>.</entry>
+	      <entry>Perl 5 ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ.</entry>
             </row>
 
             <row>
               <entry><makevar>USE_PERL5_RUN</makevar></entry>
 
-              <entry>õËÁÚÙ×ÁÅÔ ÎÁ ÔÏ, ÞÔÏ ÄÌÑ ÒÁÂÏÔÙ ÐÏÒÔ ÉÓÐÏÌØÚÕÅÔ
-                <literal>perl 5</literal>.</entry>
+	      <entry>Perl 5 ÉÓÐÏÌØÚÕÅÔÓÑ ×Ï ×ÒÅÍÑ ÒÁÂÏÔÙ.</entry>
             </row>
 
             <row>
               <entry><makevar>PERL</makevar></entry>
 
-              <entry>ðÏÌÎÙÊ ÍÁÒÛÒÕÔ Ë <literal>perl 5</literal>, ÌÉÂÏ ×
-                ÓÉÓÔÅÍÅ, ÌÉÂÏ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ÉÚ ÐÏÒÔÏ×, ÎÏ ÂÅÚ ÎÏÍÅÒÁ ×ÅÒÓÉÉ.
+	      <entry>ðÏÌÎÙÊ ÐÕÔØ Ë ÉÎÔÅÒÐÒÅÔÁÔÏÒÕ Perl 5, ÌÉÂÏ ×
+                ÓÉÓÔÅÍÅ, ÌÉÂÏ ÕÓÔÁÎÏ×ÌÅÎÎÏÍÕ ÉÚ ÐÏÒÔÏ×, ÎÏ ÂÅÚ ÎÏÍÅÒÁ ×ÅÒÓÉÉ.
                 éÓÐÏÌØÚÕÊÔÅ ÜÔÏ, ÅÓÌÉ ×ÁÍ ÎÕÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÒÏËÉ
                 <quote><literal>#!</literal></quote> × ÓËÒÉÐÔÁÈ.</entry>
             </row>
@@ -5417,14 +5627,14 @@ PLIST_SUB+=             NLS="@comment "
 	    <row>
 	      <entry><makevar>PERL_VERSION</makevar></entry>
 
-	      <entry>ðÏÌÎÁÑ ×ÅÒÓÉÑ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ <literal>perl</literal>
+	      <entry>ðÏÌÎÁÑ ×ÅÒÓÉÑ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ Perl
                 (ÎÁÐÒÉÍÅÒ, <literal>5.8.9</literal>).</entry>
 	    </row>
 
             <row>
               <entry><makevar>PERL_LEVEL</makevar></entry>
 
-              <entry>÷ÅÒÓÉÑ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ <literal>perl</literal> × ÆÏÒÍÅ
+	      <entry>õÓÔÁÎÏ×ÌÅÎÎÁÑ ×ÅÒÓÉÑ Perl × ÆÏÒÍÅ
                 ÃÅÌÏÇÏ ÞÉÓÌÁ ×ÉÄÁ <literal>MNNNPP</literal> (ÎÁÐÒÉÍÅÒ,
                 <literal>500809</literal>).</entry>
 	    </row>
@@ -5432,7 +5642,7 @@ PLIST_SUB+=             NLS="@comment "
 	    <row>
 	      <entry><makevar>PERL_ARCH</makevar></entry>
 
-	      <entry>íÅÓÔÏ, ÇÄÅ <literal>perl</literal> ÈÒÁÎÉÔ
+	      <entry>íÅÓÔÏ, × ËÏÔÏÒÏÍ Perl ÈÒÁÎÉÔ
                 ÁÒÈÉÔÅËÔÕÒÎÏ-ÚÁ×ÉÓÉÍÙÅ ÂÉÂÌÉÏÔÅËÉ.  ðÏ ÕÍÏÌÞÁÎÉÀ
                 ÜÔÏ <literal>${ARCH}-freebsd</literal>.</entry>
             </row>
@@ -5440,7 +5650,7 @@ PLIST_SUB+=             NLS="@comment "
             <row>
               <entry><makevar>PERL_PORT</makevar></entry>
 
-              <entry>îÁÚ×ÁÎÉÅ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ÐÏÒÔÁ <literal>perl</literal>,
+	      <entry>îÁÚ×ÁÎÉÅ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ÐÏÒÔÁ Perl,
                 (Ë ÐÒÉÍÅÒÕ, <literal>perl5</literal>).</entry>
             </row>
 
@@ -5448,8 +5658,8 @@ PLIST_SUB+=             NLS="@comment "
               <entry><makevar>SITE_PERL</makevar></entry>
 
               <entry>éÍÑ ËÁÔÁÌÏÇÁ, ËÕÄÁ ÐÏÍÅÝÁÀÔÓÑ ÓÐÅÃÉÆÉÞÎÙÅ ÄÌÑ ÓÁÊÔÁ
-                ÐÁËÅÔÙ <literal>perl</literal>.  üÔÏ ÚÎÁÞÅÎÉÅ ÄÏÂÁ×ÌÑÅÔÓÑ Ë
-                PLIST_SUB.</entry>
+                ÐÁËÅÔÙ Perl.  üÔÏ ÚÎÁÞÅÎÉÅ ÄÏÂÁ×ÌÑÅÔÓÑ Ë
+                <makevar>PLIST_SUB</makevar>.</entry>
             </row>
 	  </tbody>
 	</tgroup>
@@ -5462,6 +5672,23 @@ PLIST_SUB+=             NLS="@comment "
 	  <literal>http://search.cpan.org/dist/Module-Name/</literal>
 	  (×ËÌÀÞÁÑ ÚÁ×ÅÒÛÁÀÝÉÊ ÓÌÜÛ).</para>
       </note>
+
+      <note>
+	<para>îÅ ÉÓÐÏÌØÚÕÊÔÅ <literal>${SITE_PERL}</literal> × ÏÂßÑ×ÌÅÎÉÉ
+	  ÚÁ×ÉÓÉÍÏÓÔÅÊ.  éÓÐÏÌØÚÏ×ÁÎÉÅ ÜÔÏÊ ËÏÎÓÔÒÕËÃÉÉ ÐÏÄÒÁÚÕÍÅ×ÁÅÔ
+	  ÎÁÌÉÞÉÅ ÐÏÄËÌÀÞÅÎÎÏÇÏ <filename>bsd.perl.mk</filename>, ÞÔÏ
+	  ÎÅ ×ÓÅÇÄÁ ÔÁË.  ðÏÒÔÙ, ÚÁ×ÉÓÉÍÙÅ ÏÔ ÜÔÏÇÏ ÐÏÒÔÁ, ÐÏÌÕÞÁÔ
+	  ÎÅÐÒÁ×ÉÌØÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ, ÅÓÌÉ ÆÁÊÌÙ ÜÔÏÇÏ ÐÏÒÔÁ ÂÕÄÕÔ
+	  ÐÅÒÅÍÅÝÅÎÙ ÐÒÉ ÐÏÓÌÅÄÕÀÝÅÍ ÏÂÎÏ×ÌÅÎÉÉ.  ðÒÁ×ÉÌØÎÙÊ ÓÐÏÓÏÂ
+	  ÏÂßÑ×ÌÅÎÉÑ ÚÁ×ÉÓÉÍÏÓÔÅÊ ÄÌÑ ÍÏÄÕÌÅÊ Perl ÐÏËÁÚÁÎ × ÐÒÉÍÅÒÅ
+	  ÎÉÖÅ.</para>
+      </note>
+
+      <example id="use-perl-dependency-example">
+	<title>ðÒÉÍÅÒ ÚÁ×ÉÓÉÍÏÓÔÉ Perl</title>
+
+	<programlisting>p5-IO-Tee&gt;=0.64:${PORTSDIR}/devel/p5-IO-Tee</programlisting>
+      </example>
     </sect1>
 
     <sect1 id="using-x11">
@@ -5476,17 +5703,19 @@ PLIST_SUB+=             NLS="@comment "
 	  ËÏÍÐÏÎÅÎÔÏ×.  ë ÎÁÓÔÏÑÝÅÍÕ ×ÒÅÍÅÎÉ ÄÏÓÔÕÐÎÙÍÉ ËÏÍÐÏÎÅÎÔÁÍÉ
 	  Ñ×ÌÑÀÔÓÑ:</para>
 
-	<para><literal>bigreqsproto compositeproto damageproto dmx dmxproto
-	  evieproto fixesproto fontcacheproto fontenc fontsproto fontutil
-	  glproto ice inputproto kbproto libfs oldx printproto randrproto
-	  recordproto renderproto resourceproto scrnsaverproto sm trapproto
-	  videoproto x11 xau xaw xaw6 xaw7 xaw8 xbitmaps xcmiscproto xcomposite
-	  xcursor xdamage xdmcp xevie xext xextproto xf86bigfontproto
-	  xf86dgaproto xf86driproto xf86miscproto xf86rushproto
-	  xf86vidmodeproto xfixes xfont xfontcache xft xi xinerama
-	  xineramaproto xkbfile xkbui xmu xmuu xorg-server xp xpm xprintapputil
-	  xprintutil xpr oto xproxymngproto xrandr xrender xres xscrnsaver xt
-	  xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm</literal>.</para>
+	<para><literal>bigreqsproto compositeproto damageproto dmx
+	    dmxproto dri2proto evieproto fixesproto fontcacheproto
+	    fontenc fontsproto fontutil glproto ice inputproto kbproto
+	    libfs oldx pciaccess pixman printproto randrproto
+	    recordproto renderproto resourceproto scrnsaverproto sm
+	    trapproto videoproto x11 xau xaw xaw6 xaw7 xbitmaps
+	    xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext
+	    xextproto xf86bigfontproto xf86dgaproto xf86driproto
+	    xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont
+	    xfontcache xft xi xinerama xineramaproto xkbfile xkbui
+	    xmu xmuu xorg-server xp xpm xprintapputil xprintutil
+	    xproto xproxymngproto xrandr xrender xres xscrnsaver xt
+	    xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm</literal>.</para>
 
 	<para>÷ÓÅÇÄÁ ÁËÔÕÁÌØÎÙÊ ÐÅÒÅÞÅÎØ ÍÏÖÎÏ ÎÁÊÔÉ ×
 	  <filename>/usr/ports/Mk/bsd.xorg.mk</filename>.</para>
@@ -5504,7 +5733,7 @@ PLIST_SUB+=             NLS="@comment "
 USE_GL=     glu</programlisting>
 	</example>
 
-	<para>íÎÏÇÉÅ ÐÏÒÔÙ ÏÐÒÅÄÅÌÑÀÔ <makevar>USE_XLIB</makevar>, ËÏÔÏÒÁÑ
+	<para>îÅËÏÔÏÒÙÅ ÐÏÒÔÙ ÏÐÒÅÄÅÌÑÀÔ <makevar>USE_XLIB</makevar>, ËÏÔÏÒÁÑ
 	  ÄÅÌÁÅÔ ÐÏÒÔ ÚÁ×ÉÓÉÍÙÍ ÏÔÏ ×ÓÅÈ 50 ÉÌÉ ÏËÏÌÏ ÔÏÇÏ ÂÉÂÌÉÏÔÅË.  üÔÁ
 	  ÐÅÒÅÍÅÎÎÁÑ ÓÕÝÅÓÔ×ÕÅÔ ÄÌÑ ÏÂÒÁÔÎÏÊ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ, Ô.Ë. ÐÒÅÄÛÅÓÔ×ÕÅÔ
 	  ÍÏÄÕÌØÎÏÍÕ X.Org, É ÎÅ ÄÏÌÖÎÁ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ × ÎÏ×ÙÈ ÐÏÒÔÁÈ.</para>
@@ -5529,14 +5758,6 @@ USE_GL=     glu</programlisting>
 	    </row>
 
 	    <row>
-	      <entry><makevar>USE_X_PREFIX</makevar></entry>
-
-	      <entry>ñ×ÌÑÅÔÓÑ ÕÓÔÁÒÅ×ÛÉÍ.  óÅÊÞÁÓ ÜÔÏ ÜË×É×ÁÌÅÎÔÎÏ
-		<makevar>USE_XLIB</makevar> É ÍÏÖÅÔ ÂÙÔØ Ó×ÏÂÏÄÎÏ ÉÍ
-		ÚÁÍÅÎÅÎÏ.</entry>
-	    </row>
-
-	    <row>
 	      <entry><makevar>XMKMF</makevar></entry>
 
 	      <entry>úÁÄÁ£ÔÓÑ ÍÁÒÛÒÕÔ ÄÏ <command>xmkmf</command>, ÅÓÌÉ ÏÎ
@@ -5706,8 +5927,8 @@ USE_XORG=      x11 xpm</programlisting>
 	</itemizedlist>
 
 	<para>úÁÍÅÔØÔÅ, ÞÔÏ ÐÅÒÅÍÅÎÎÁÑ <makevar>MOTIFLIB</makevar> (ËÁË
-	  ÐÒÁ×ÉÌÏ) ÒÁÓËÒÙ×ÁÅÔÓÑ × <literal>-L/usr/X11R6/lib -lXm</literal> ÉÌÉ
-	  <literal>/usr/X11R6/lib/libXm.a</literal>, ÔÁË ÞÔÏ ÎÅÔ ÎÕÖÄÙ ×ÐÅÒÅÄÉ
+	  ÐÒÁ×ÉÌÏ) ÒÁÓËÒÙ×ÁÅÔÓÑ × <literal>-L/usr/local/lib -lXm</literal> ÉÌÉ
+	  <literal>/usr/local/lib/libXm.a</literal>, ÔÁË ÞÔÏ ÎÅÔ ÎÕÖÄÙ ×ÐÅÒÅÄÉ
 	  ÄÏÂÁ×ÌÑÔØ <literal>-L</literal> ÉÌÉ <literal>-l</literal>.</para>
 
       </sect2>
@@ -5877,7 +6098,8 @@ USE_XORG=      x11 xpm</programlisting>
 		<entry><makevar>QTNONSTANDARD</makevar></entry>
 
 		<entry>ðÏÄÁ×ÌÑÅÔ ÉÚÍÅÎÅÎÉÅ <makevar>CONFIGURE_ENV</makevar>,
-		  <makevar>CONFIGURE_ARGS</makevar> É
+		  <makevar>CONFIGURE_ARGS</makevar>,
+		  <makevar>CPPFLAGS</makevar> É
 		  <makevar>MAKE_ENV</makevar>.</entry>
 	      </row>
 
@@ -5895,36 +6117,29 @@ USE_XORG=      x11 xpm</programlisting>
 		<entry><makevar>QT_COMPONENTS</makevar></entry>
 
 		<entry>õËÁÚÙ×ÁÅÔ ÉÎÓÔÒÕÍÅÎÔÙ É ÂÉÂÌÉÏÔÅËÉ × ËÁÞÅÓÔ×Å
-		  ÚÁ×ÉÓÉÍÏÓÔÅÊ ÄÌÑ Qt4.  óÍÏÔÒÉÔÅ ÐÏÄÒÏÂÎÅÅ ÎÉÖÅ.</entry>
+		  ÚÁ×ÉÓÉÍÏÓÔÅÊ ÄÌÑ Qt 4.  óÍÏÔÒÉÔÅ ÐÏÄÒÏÂÎÅÅ ÎÉÖÅ.</entry>
 	      </row>
 
 	      <row>
 		<entry><makevar>UIC</makevar></entry>
 
 		<entry>õÓÔÁÎÁ×ÌÉ×ÁÅÔ ÐÕÔØ Ë <command>uic</command>
-		  (ÐÅÒÅÍÅÎÎÁÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ).  ðÏ ÕÍÏÌÞÁÎÉÀ
-		  ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÐÅÒÅÍÅÎÎÏÊ
-		  <makevar>USE_QT_VER</makevar>.</entry>
+		  (ÐÅÒÅÍÅÎÎÁÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ).</entry>
 	      </row>
 
 	      <row>
 		<entry><makevar>QMAKE</makevar></entry>
 
 		<entry>õÓÔÁÎÁ×ÌÉ×ÁÅÔ ÐÕÔØ Ë <command>qmake</command>
-		  (ÐÅÒÅÍÅÎÎÁÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ).  ðÏ ÕÍÏÌÞÁÎÉÀ
-		  ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÐÅÒÅÍÅÎÎÏÊ
-		  <makevar>USE_QT_VER</makevar>.</entry>
+		  (ÐÅÒÅÍÅÎÎÁÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ).</entry>
 	      </row>
 
 	      <row>
 		<entry><makevar>QMAKESPEC</makevar></entry>
 
 		<entry>õÓÔÁÎÁ×ÌÉ×ÁÅÔ ÐÕÔØ Ë ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÍÕ ÆÁÊÌÕ ÄÌÑ
-		  <command>qmake</command> (ÐÅÒÅÍÅÎÎÁÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ).
-		  ðÏ ÕÍÏÌÞÁÎÉÀ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÐÅÒÅÍÅÎÎÏÊ
-		  <makevar>USE_QT_VER</makevar>.</entry>
+		  <command>qmake</command> (ÐÅÒÅÍÅÎÎÁÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ).</entry>
 	      </row>
-
 	    </tbody>
 	  </tgroup>
 	</table>
@@ -5937,8 +6152,9 @@ USE_XORG=      x11 xpm</programlisting>
                  --with-qt-libraries=${QT_PREFIX}/lib \
                  --with-extra-libs=${LOCALBASE}/lib \
                  --with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+=  MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
-                 QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"</programlisting>
+CONFIGURE_ENV+=  MOC="${MOC}" LIBS="${QTCFGLIBS}" \
+                 QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
+CPPFLAGS+=       ${QTCPPFLAGS}</programlisting>
 
 	<para>åÓÌÉ ÐÅÒÅÍÅÎÎÁÑ <makevar>USE_QT_VER</makevar> ÕÓÔÁÎÏ×ÌÅÎÁ ×
 	  ÚÎÁÞÅÎÉÅ <literal>4</literal>,  ÔÏ ÔÁËÖÅ ÒÁÚ×ÏÒÁÞÉ×ÁÀÔÓÑ ÓÌÅÄÕÀÝÉÅ
@@ -5952,9 +6168,10 @@ MAKE_ENV+=      QMAKESPEC="${QMAKESPEC}"
       <sect2 id="qt4-components">
 	<title>÷ÙÂÏÒ ËÏÍÐÏÎÅÎÔÏ× (ÔÏÌØËÏ ÄÌÑ Qt 4.x)</title>
 
-	<para>åÓÌÉ <makevar>USE_QT_VER</makevar> ÕÓÔÁÎÏ×ÌÅÎÁ × 4, ÔÏ ×
+	<para>åÓÌÉ <makevar>USE_QT_VER</makevar> ÕÓÔÁÎÏ×ÌÅÎÁ ×
+	  ÚÎÁÞÅÎÉÅ <literal>4</literal>, ÔÏ ×
 	  ÐÅÒÅÍÅÎÎÏÊ <makevar>QT_COMPONENTS</makevar> ÍÏÖÎÏ ÕËÁÚÁÔØ
-	  ÚÁ×ÉÓÉÍÏÓÔØ ÏÔ ÏÔÄÅÌØÎÙÈ ÉÎÓÔÒÕÍÅÎÔÏ× É ÂÉÂÌÉÏÔÅË Qt4.  ë ËÁÖÄÏÍÕ
+	  ÚÁ×ÉÓÉÍÏÓÔØ ÏÔ ÏÔÄÅÌØÎÙÈ ÉÎÓÔÒÕÍÅÎÔÏ× É ÂÉÂÌÉÏÔÅË Qt 4.  ë ËÁÖÄÏÍÕ
 	  ËÏÍÐÏÎÅÎÔÕ ÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÓÕÆÆÉËÓ, <literal>_build</literal>
 	  ÉÌÉ <literal>_run</literal>, ÏÔÒÁÖÁÀÝÉÊ, ËÏÇÄÁ ÄÏÌÖÎÁ ÂÙÔØ ÐÒÉÍÅÎÅÎÁ
 	  ÚÁ×ÉÓÉÍÏÓÔØ, ×Ï ×ÒÅÍÑ ÓÂÏÒËÉ ÉÌÉ ×ÙÐÏÌÎÅÎÉÑ, ÓÏÏÔ×ÅÔÓÔ×ÅÎÎÏ.  åÓÌÉ
@@ -5968,7 +6185,7 @@ MAKE_ENV+=      QMAKESPEC="${QMAKESPEC}"
 	  <filename>/usr/ports/Mk/bsd.qt.mk</filename>):</para>
 
 	<table frame="none">
-	  <title>äÏÓÔÕÐÎÙÅ ÂÉÂÌÉÏÔÅÞÎÙÅ ËÏÍÐÏÎÅÎÔÙ Qt4</title>
+	  <title>äÏÓÔÕÐÎÙÅ ÂÉÂÌÉÏÔÅÞÎÙÅ ËÏÍÐÏÎÅÎÔÙ Qt 4</title>
 
 	  <tgroup cols="2">
 	    <thead>
@@ -6003,7 +6220,7 @@ MAKE_ENV+=      QMAKESPEC="${QMAKESPEC}"
 
 	      <row>
 		<entry><literal>qt3support</literal></entry>
-		<entry>ÂÉÂÌÉÏÔÅËÁ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ Ó Qt3</entry>
+		<entry>ÂÉÂÌÉÏÔÅËÁ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ Ó Qt 3</entry>
 	      </row>
 
 	      <row>
@@ -6035,7 +6252,7 @@ MAKE_ENV+=      QMAKESPEC="${QMAKESPEC}"
 	  ÐÏÓÌÅ ÕÓÐÅÛÎÏÊ ËÏÍÐÉÌÑÃÉÉ.</para>
 
 	<table frame="none">
-	  <title>äÏÓÔÕÐÎÙÅ ËÏÍÐÏÎÅÎÔÙ ÉÎÓÔÒÕÍÅÎÔÏ× Qt4</title>
+	  <title>äÏÓÔÕÐÎÙÅ ËÏÍÐÏÎÅÎÔÙ ÉÎÓÔÒÕÍÅÎÔÏ× Qt 4</title>
 
 	  <tgroup cols="2">
 	    <thead>
@@ -6077,7 +6294,7 @@ MAKE_ENV+=      QMAKESPEC="${QMAKESPEC}"
 	</table>
 
 	<table frame="none">
-	  <title>äÏÓÔÕÐÎÙÅ ËÏÍÐÏÎÅÎÔÙ ÐÌÁÇÉÎÏ× Qt4</title>
+	  <title>äÏÓÔÕÐÎÙÅ ËÏÍÐÏÎÅÎÔÙ ÐÌÁÇÉÎÏ× Qt 4</title>
 
 	  <tgroup cols="2">

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-doc-all@FreeBSD.ORG  Tue Jul 24 09:33:49 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1FFDC1065673;
	Tue, 24 Jul 2012 09:33:49 +0000 (UTC)
	(envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0AF9A8FC15;
	Tue, 24 Jul 2012 09:33:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6O9Xmlp011738;
	Tue, 24 Jul 2012 09:33:48 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6O9Xm7j011735;
	Tue, 24 Jul 2012 09:33:48 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201207240933.q6O9Xm7j011735@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Tue, 24 Jul 2012 09:33:48 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39259 - in head/ja_JP.eucJP/books/handbook:
	introduction serialcomms
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Jul 2012 09:33:49 -0000

Author: ryusuke
Date: Tue Jul 24 09:33:48 2012
New Revision: 39259
URL: http://svn.freebsd.org/changeset/doc/39259

Log:
  - Merge the following from the English version:
  
  	r39064 -> r39255	head/ja_JP.eucJP/books/handbook/introduction/chapter.sgml
  	r11019 -> r13081	head/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml

Modified:
  head/ja_JP.eucJP/books/handbook/introduction/chapter.sgml
  head/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml

Modified: head/ja_JP.eucJP/books/handbook/introduction/chapter.sgml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/introduction/chapter.sgml	Tue Jul 24 09:13:54 2012	(r39258)
+++ head/ja_JP.eucJP/books/handbook/introduction/chapter.sgml	Tue Jul 24 09:33:48 2012	(r39259)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39064
+     Original revision: r39255
      $FreeBSD$
 -->
 
@@ -921,7 +921,7 @@
 	      ÀÕǤ´¶¤¢¤Õ¤ì¤ë³«È¯¼Ô¤ò¾åµ­¤Î¥½¡¼¥¹¥Ä¥ê¡¼´ÉÍý¼Ô¤È¤·¤Æ¾·¤¯¤³¤È¡¢
 	      ¤Þ¤¿»Å»ö¾å¤ÎÅÔ¹ç¤Ê¤É¤Ç¥³¥¢¥Á¡¼¥à¤ò¤ä¤á¤¿¿Í¤¿¤Á¤Î¸åǤ¤ò¸«¤Ä¤±¤ë¤³¤È¤â¥³¥¢¥Á¡¼¥à¤ÎÌò³ä¤Ç¤¹¡£
 	      ¸½ºß¤Î¥³¥¢¥Á¡¼¥à¤Ï &os; ³«È¯¼Ô (committer) ¤ÎÃ椫¤é
-	      2010 ǯ 7 ·î¤ËÁªµó¤Ë¤è¤Ã¤ÆÁª½Ð¤µ¤ì¤Þ¤·¤¿¡£
+	      2012 ǯ 7 ·î¤ËÁªµó¤Ë¤è¤Ã¤ÆÁª½Ð¤µ¤ì¤Þ¤·¤¿¡£
 	      ¥³¥¢¥Á¡¼¥à¤òÁª½Ð¤¹¤ë¤¿¤á¤ÎÁªµó¤Ï¡¢2 ǯ¤´¤È¤Ë¹Ô¤Ê¤ï¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
 	    <para>¥³¥¢¥Á¡¼¥à¤Î¤¦¤Á²¿¿Í¤«¤ÏÆÃÄê¤ÎôÅöʬÌî¤ò»ý¤Ã¤Æ¤ª¤ê¡¢

Modified: head/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml	Tue Jul 24 09:13:54 2012	(r39258)
+++ head/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml	Tue Jul 24 09:33:48 2012	(r39259)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r11019
+     Original revision: r13081
      $FreeBSD$
 -->
 
@@ -310,10 +310,10 @@
 
       <para>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢FreeBSD ¤Ï
 	4 ¤Ä¤Î¥·¥ê¥¢¥ë¥Ý¡¼¥È¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£MS-DOS ¤ÎÀ¤³¦¤Ç¤Ï¡¢
-	<devicename>COM1:</devicename>,
-	<devicename>COM2:</devicename>,
-	<devicename>COM3:</devicename> ¤ª¤è¤Ó
-	<devicename>COM4:</devicename> ¤È¸Æ¤Ð¤ì¤Æ¤¤¤Þ¤¹¡£
+	<devicename>COM1</devicename>,
+	<devicename>COM2</devicename>,
+	<devicename>COM3</devicename> ¤ª¤è¤Ó
+	<devicename>COM4</devicename> ¤È¸Æ¤Ð¤ì¤Æ¤¤¤Þ¤¹¡£
 	FreeBSD ¤Ç¤Ï¡¢¸½ºß¤Î¤È¤³¤í BocaBoard ¤Î 1008 ¤ä 2016 ¤Ê¤É¤Î¡¢
 	<quote>ñ½ã¤Ê</quote>¥Þ¥ë¥Á¥Ý¡¼¥È¥·¥ê¥¢¥ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ä¡¢
 	Digiboard ¤ä Stallion Technologies
@@ -407,7 +407,7 @@ device		sio3	at isa? port "IO_COM4" tty 
 	¤âÍÑ°Õ¤·¤Æ¤¤¤Þ¤¹¡£
 	½é´ü²½¥Ç¥Ð¥¤¥¹¤Ï¡¢ÄÌ¿®¥Ý¡¼¥È¤¬¥ª¡¼¥×¥ó¤µ¤ì¤ëÅ٤ˡ¢
 	¤½¤Î¥Ý¡¼¥È¤Î½é´üÀßÄê¤ò¹Ô¤¦¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
-	<literal>CTS/RTS</literal>
+	<literal>RTS/CTS</literal>
 	¤Ë¤è¤ë¥Õ¥í¡¼À©¸æ¤ò¹Ô¤¦¥â¥Ç¥à¤¬Àܳ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Î
 	<literal>crtscts</literal>
 	¤Ê¤É¤Î¥Ñ¥é¥á¡¼¥¿¤Î½é´ü²½¤¬¹Ô¤ï¤ì¤Þ¤¹¡£
@@ -431,13 +431,13 @@ device		sio3	at isa? port "IO_COM4" tty 
 	  <filename>/dev</filename> ¤Ë¤¢¤ë¥·¥§¥ë¥¹¥¯¥ê¥×¥È
 	  <command>MAKEDEV</command> ¤Ç¹Ô¤¤¤Þ¤¹¡£
 	  <command>MAKEDEV</command> ¤ò»È¤Ã¤Æ¡¢
-	  <devicename>COM1:</devicename> (¥Ý¡¼¥È 0)
+	  <devicename>COM1</devicename> (¥Ý¡¼¥È 0)
 	  ¤ò¥À¥¤¥¢¥ë¥¢¥Ã¥×¤Î¥Ý¡¼¥È¤È¤·¤ÆÍøÍѤ¹¤ë¤¿¤á¤Î
 	  ¥Ç¥Ð¥¤¥¹¥¹¥Ú¥·¥ã¥ë¥Õ¥¡¥¤¥ë¤òºî¤ë¤Ë¤Ï¡¢
 	  <filename>/dev</filename> ¤Ë <command>cd</command> ¤·¤Æ¤«¤é¡¢
 	  <command>MAKEDEV ttyd0</command> ¤È¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£
 	  ƱÍͤˡ¢<command>MAKEDEV ttyd1</command> ¤È¤¹¤ë¤³¤È¤Ç¡¢
-	  <devicename>COM2:</devicename> (¥Ý¡¼¥È 1)
+	  <devicename>COM2</devicename> (¥Ý¡¼¥È 1)
 	  ÍѤΥǥХ¤¥¹¥¹¥Ú¥·¥ã¥ë¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤¹¡£</para>
 
 	<para><command>MAKEDEV</command> ¤Ï¡¢
@@ -1334,7 +1334,7 @@ vq|VH57600|Very High Speed Modem at 5760
 	  ¤Ë°Û¤Ê¤ë°ú¿ô¤òÅϤ·¤Æ¡¢°Û¤Ê¤ëüËö¼ïÊ̤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
 	  ¸ÇÄê®ÅÙ¤ª¤è¤Ó²ÄÊÑ®ÅÙξÊý¤Ë¶¦Ä̤¹¤ë·Á¼°¤Ï¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
 
-	<programlisting>ttyd0   "/usr/libexec/getty xxx"   dialup on</programlisting>
+	<programlisting>ttyd0   "/usr/libexec/getty <replaceable>xxx</replaceable>"   dialup on</programlisting>
 
 	<para>1 ÈÖÌܤιàÌܤϡ¢¤³¤Î¥¨¥ó¥È¥ê¤ÇÂоݤȤ¹¤ë¥Ç¥Ð¥¤¥¹¥¹¥Ú¥·¥ã¥ë¥Õ¥¡¥¤¥ë¤Ç¤¹¡£
 	  ¾å¤ÎÎã¤Ç¤Ï <literal>ttyd0</literal> ¤È¤·¤Æ¡¢
@@ -1435,7 +1435,7 @@ vq|VH57600|Very High Speed Modem at 5760
 	  <filename>/etc/rc.serial</filename> ¤Ëµ­½Ò¤Ç¤­¤Þ¤¹¡£</para>
 
 	<para>¤¿¤È¤¨¤Ð¡¢¥·¥ê¥¢¥ë¥Ý¡¼¥È 1 ÈÖ
-	  (<devicename>COM2:</devicename>)
+	  (<devicename>COM2</devicename>)
 	  ¤Î¥À¥¤¥ä¥ë¥¤¥ó¤ª¤è¤Ó¥À¥¤¥ä¥ë¥¢¥¦¥È½é´ü²½¥Ç¥Ð¥¤¥¹¤Ë
 	  <literal>termios</literal> ¥Õ¥é¥° <varname>crtscts</varname>
 	  ¤òÀßÄꤹ¤ë¤Ë¤Ï¡¢¼¡¤Î¹Ô¤ò <filename>/etc/rc.serial</filename>
@@ -1624,12 +1624,12 @@ AT&amp;B2&amp;W</programlisting>
 	  ¤ÎÃå¿®¤òÂԤäƤ¤¤ë¾õÂ֤Ǥ¢¤ë¤³¤È¤ò°ÕÌ£¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
 	<para>¤â¤· <acronym>DTR</acronym>
-	  ¤Î¥¤¥ó¥¸¥±¡¼¥¿¤¬ÅÀÅô¤·¤Ê¤¤¾ì¹ç¤Ï¡¢¥·¥¹¥Æ¥à¤Î¥³¥ó¥½¡¼¥ë¤« ¤é
+	  ¤Î¥¤¥ó¥¸¥±¡¼¥¿¤¬ÅÀÅô¤·¤Ê¤¤¾ì¹ç¤Ï¡¢¥·¥¹¥Æ¥à¤Î¥³¥ó¥½¡¼¥ë¤«¤é
 	  FreeBSD ¤Ë¥í¥°¥¤¥ó¤·¤Æ¡¢<command>ps ax</command> ¤ò¼Â¹Ô¤·¡¢
-	  FreeBSD ¤¬ ŬÀڤʥݡ¼ ¥È¤ËÂФ·¤Æ<command>getty</command>
-	  ¥×¥í¥»¥¹¤òµ¯Æ°¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤Î¤«¤É¤¦¤«³Îǧ¤·¤Æ ¤¯¤À¤µ¤¤¡£
-	  ¥×¥í¥»¥¹¤Ë´Ø¤¹¤ë¾ðÊó¤ÎÃæ¤Ë¡¢°Ê²¼¤Î¤è¤¦¤Ê¹Ô¤¬É½¼¨¤µ¤ì¤ë¤Ï¤º¤Ç
-	  ¤¹¡£</para>
+	  FreeBSD ¤¬Å¬Àڤʥݡ¼¥È¤ËÂФ·¤Æ<command>getty</command>
+	  ¥×¥í¥»¥¹¤òµ¯Æ°¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤Î¤«¤É¤¦¤«³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	  ¥×¥í¥»¥¹¤Ë´Ø¤¹¤ë¾ðÊó¤ÎÃæ¤Ë¡¢
+	  °Ê²¼¤Î¤è¤¦¤Ê¹Ô¤¬É½¼¨¤µ¤ì¤ë¤Ï¤º¤Ç¤¹¡£</para>
 
 	<screen>  114 ??  I      0:00.10 /usr/libexec/getty V19200 ttyd0
   115 ??  I      0:00.10 /usr/libexec/getty V19200 ttyd1</screen>
@@ -1815,8 +1815,8 @@ AT&amp;B2&amp;W</programlisting>
       <screen>&prompt.root; <userinput>cd /dev</userinput>
 &prompt.root; <userinput>sh MAKEDEV cuaa0</userinput></screen>
 
-      <para>¤Þ¤¿¤Ï root ¤Ë¤Ê¤Ã¤Æ°Ê²¼¤Î¤è¤¦¤Ë <command>cu</command>
-	¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Þ¤¹:</para>
+      <para>¤Þ¤¿¤Ï <username>root</username> ¤Ë¤Ê¤Ã¤Æ°Ê²¼¤Î¤è¤¦¤Ë
+	<command>cu</command> ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Þ¤¹:</para>
 
       <screen>&prompt.root; <userinput>cu -l<replaceable>line</replaceable> -s<replaceable>speed</replaceable></userinput></screen>
 
@@ -1884,8 +1884,7 @@ tip57600|Dial any phone number at 57600b
     </sect2>
 
     <sect2>
-      <title>¥¿¡¼¥ß¥Ê¥ë¥µ¡¼¥Ð¤ò·Ðͳ¤·¤Æ
-	Ê£¿ô¤Î¥Û¥¹¥È¤Ø¥¢¥¯¥»¥¹¤·¤¿¤¤¤Ç¤¹¡£</title>
+      <title>¥¿¡¼¥ß¥Ê¥ë¥µ¡¼¥Ð¤ò·Ðͳ¤·¤ÆÊ£¿ô¤Î¥Û¥¹¥È¤Ø¥¢¥¯¥»¥¹¤·¤¿¤¤¤Ç¤¹</title>
 
       <para>Ëè²óÀܳ¤µ¤ì¤ë¤Î¤òÂԤäÆ
 	<command>CONNECT &lt;host&gt;</command> ¤ÈÆþÎϤ¹¤ë
@@ -2166,30 +2165,30 @@ raisechar=^^</programlisting>
 	</step>
 
 	<step>
-	  <para><devicename>COM1:</devicename> (<devicename>sio0</devicename>)
+	  <para><devicename>COM1</devicename> (<devicename>sio0</devicename>)
 	    ¤Ë¥À¥àüËö¤òÀܳ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	  <para>¥À¥àüËö¤¬¤Ê¤±¤ì¤Ð¡¢¤«¤ï¤ê¤Ë¸Å¤¤ PC/XT ¤Ç¥â¥Ç¥à
 	    ¥×¥í¥°¥é¥à¤òÁö¤é¤»¤Æ»È¤Ã¤¿¤ê¡¢¥·¥ê¥¢¥ë¥Ý¡¼¥È¤Ë¾¤Î Unix
-	    ¥Þ¥·¥ó¤ò·Ò¤¤¤À¤ê¤Ç¤­¤Þ¤¹¡£¤â¤·¤â <devicename>COM1:</devicename>
+	    ¥Þ¥·¥ó¤ò·Ò¤¤¤À¤ê¤Ç¤­¤Þ¤¹¡£¤â¤·¤â <devicename>COM1</devicename>
 	    (<devicename>sio0</devicename>) ¤¬¤Ê¤±¤ì¤Ð¡¢ºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£
-	    º£¤Î¤È¤³¤í¡¢<devicename>COM1:</devicename> °Ê³°¤Î¥Ý¡¼¥È¤ò
+	    º£¤Î¤È¤³¤í¡¢<devicename>COM1</devicename> °Ê³°¤Î¥Ý¡¼¥È¤ò
 	    ÁªÂò¤¹¤ë¤¿¤á¤Ë¤Ï¥Ö¡¼¥È¥Ö¥í¥Ã¥¯¤ÎºÆ¥³¥ó¥Ñ¥¤¥ë¤¬É¬ÍפǤ¹¡£
-	    ¤¹¤Ç¤Ë <devicename>COM1:</devicename> ¤ò¾¤ÎÁõÃÖ¤Ë
+	    ¤¹¤Ç¤Ë <devicename>COM1</devicename> ¤ò¾¤ÎÁõÃÖ¤Ë
 	    »È¤Ã¤Æ¤¤¤¿¾ì¹ç¤Ï¡¢°ì»þŪ¤Ë¤½¤ÎÁõÃÖ¤ò¤Ï¤º¤·¤Æ
 	    ¤¤¤Ã¤¿¤ó FreeBSD ¤¬¤¦¤Þ¤¯Æ°ºî¤·¤Æ¤«¤é¡¢
 	    ¿·¤·¤¤¥Ö¡¼¥È¥Ö¥í¥Ã¥¯¤È¥«¡¼¥Í¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
 	    (¾åµ­¤Ï¤È¤Ë¤«¤¯¥Õ¥¡¥¤¥ë/±é»»/üËö¥µ¡¼¥Ð¤Î
-	    <devicename>COM1:</devicename> ¤¬ÍøÍѲÄǽ¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ
+	    <devicename>COM1</devicename> ¤¬ÍøÍѲÄǽ¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ
 	    ¤¤¤Þ¤¹¡£¤¢¤Ê¤¿¤¬ËÜÅö¤Ë²¿¤«¤Î¤¿¤á¤Ë
-	    <devicename>COM1:</devicename> ¤¬É¬Í× (¤Ç¡¢¤Ê¤ª¤«¤Ä¤½¤Î²¿¤«¤ò
-	    <devicename>COM2:</devicename> (<devicename>sio1</devicename>)
+	    <devicename>COM1</devicename> ¤¬É¬Í× (¤Ç¡¢¤Ê¤ª¤«¤Ä¤½¤Î²¿¤«¤ò
+	    <devicename>COM2</devicename> (<devicename>sio1</devicename>)
 	    ¤ËÉÕ¤±Âؤ¨¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¤) ¤Ê¤é¤Ð¡¢Â¿Ê¬¡¢¤½¤â¤½¤â
 	    Ǻ¤ó¤Ç¤ë¾ì¹ç¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£)</para>
 	</step>
 
 	<step>
-	  <para>¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥Õ¥¡¥¤¥ë¤Î <devicename>COM1:</devicename>
+	  <para>¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥Õ¥¡¥¤¥ë¤Î <devicename>COM1</devicename>
 	    (<devicename>sio0</devicename>) ¤ËŬÀڤʥե饰¤ò
 	    ÀßÄꤷ¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -2642,8 +2641,8 @@ boot:</screen>
 	      »ÈÍѤ·¤¿¤¤¥Ý¡¼¥È¤Î¥¢¥É¥ì¥¹(0x3F8¡¢0x2F8¡¢0x3E8 or 0x2E8)¤ò
 	      ÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£»ÈÍѲÄǽ¤Ê¤Î¤Ï
 	      <devicename>sio0</devicename> ¤«¤é
-	      <devicename>sio3</devicename> (<devicename>COM1:</devicename>
-	      ¤«¤é <devicename>COM4:</devicename>) ¤Þ¤Ç¤Ç¡¢
+	      <devicename>sio3</devicename> (<devicename>COM1</devicename>
+	      ¤«¤é <devicename>COM4</devicename>) ¤Þ¤Ç¤Ç¡¢
 	      ¥Þ¥ë¥Á¥Ý¡¼¥È¥·¥ê¥¢¥ë¥«¡¼¥É¤Ï»È¤¨¤Þ¤»¤ó¡£
 	      ¤Þ¤¿¡¢¤³¤³¤Ç³ä¤ê¹þ¤ß¤ÎÀßÄê¤ò¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£</para>
 	  </step>
@@ -2652,7 +2651,7 @@ boot:</screen>
 	    <para>ÀßÄê¤òÊѹ¹¤¹¤ë¤¿¤á¤Ë¿·¤¿¤Ê¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¡¢
 	      »È¤¤¤¿¤¤¥·¥ê¥¢¥ë¥Ý¡¼¥È¤Î¥Õ¥é¥°¤òŬÀÚ¤ËÀßÄꤷ¤Þ¤¹¡£
 	      Î㤨¤Ð¡¢<devicename>sio1</devicename>
-	      (<devicename>COM2:</devicename>) ¤ò¥³¥ó¥½¡¼¥ë¤Ë¤·¤¿¤±¤ì¤Ð¡¢</para>
+	      (<devicename>COM2</devicename>) ¤ò¥³¥ó¥½¡¼¥ë¤Ë¤·¤¿¤±¤ì¤Ð¡¢</para>
 
 	    <programlisting>device sio1 at isa? port "IO_COM2" tty flags 0x10 irq 3</programlisting>
 

From owner-svn-doc-all@FreeBSD.ORG  Tue Jul 24 21:26:53 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AF902106566B;
	Tue, 24 Jul 2012 21:26:53 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9AC578FC16;
	Tue, 24 Jul 2012 21:26:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6OLQrmk075659;
	Tue, 24 Jul 2012 21:26:53 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6OLQrSG075656;
	Tue, 24 Jul 2012 21:26:53 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201207242126.q6OLQrSG075656@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Tue, 24 Jul 2012 21:26:53 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39260 - in head: en_US.ISO8859-1/htdocs share/sgml
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Jul 2012 21:26:53 -0000

Author: gavin
Date: Tue Jul 24 21:26:53 2012
New Revision: 39260
URL: http://svn.freebsd.org/changeset/doc/39260

Log:
  The core-secretary hat has been handed over to pgj, announce to the world.
  
  Submitted by:	pgj
  Approved by:	jkois (mentor)

Modified:
  head/en_US.ISO8859-1/htdocs/administration.sgml
  head/share/sgml/news.xml

Modified: head/en_US.ISO8859-1/htdocs/administration.sgml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/administration.sgml	Tue Jul 24 09:33:48 2012	(r39259)
+++ head/en_US.ISO8859-1/htdocs/administration.sgml	Tue Jul 24 21:26:53 2012	(r39260)
@@ -276,7 +276,7 @@
     actions.</p>
 
   <ul>
-    <li>&a.gavin; &lt;<a href="mailto:gavin@FreeBSD.org">gavin@FreeBSD.org</a>&gt;</li>
+    <li>&a.pgj; &lt;<a href="mailto:pgj@FreeBSD.org">pgj@FreeBSD.org</a>&gt;</li>
   </ul>
 
   <h3><a name="t-portmgr-secretary">Port Management Team Secretary</a>

Modified: head/share/sgml/news.xml
==============================================================================
--- head/share/sgml/news.xml	Tue Jul 24 09:33:48 2012	(r39259)
+++ head/share/sgml/news.xml	Tue Jul 24 21:26:53 2012	(r39260)
@@ -34,6 +34,21 @@
 
     <month>
       <name>7</name>
+
+      <day>
+	<name>24</name>
+
+	<event>
+	  <title>New Core Team Secretary: <a
+	    href="mailto:pgj@FreeBSD.org">G&aacute;bor P&aacute;li</a></title>
+
+	  <p>The &os; Core Team is glad to announce that <a
+	    href="mailto:pgj@FreeBSD.org">G&aacute;bor P&aacute;li</a> has
+	    assumed the role of <a href="mailto:core-secretary@FreeBSD.org">Core
+	    Team Secretary</a>.</p>
+	</event>
+      </day>
+
       <day>
 	<name>16</name>
 

From owner-svn-doc-all@FreeBSD.ORG  Wed Jul 25 02:25:52 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A6F4C106564A;
	Wed, 25 Jul 2012 02:25:52 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9202A8FC08;
	Wed, 25 Jul 2012 02:25:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6P2Pq6R000134;
	Wed, 25 Jul 2012 02:25:52 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6P2PqVt000132;
	Wed, 25 Jul 2012 02:25:52 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201207250225.q6P2PqVt000132@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 25 Jul 2012 02:25:52 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39261 - head/en_US.ISO8859-1/articles
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jul 2012 02:25:52 -0000

Author: gjb
Date: Wed Jul 25 02:25:52 2012
New Revision: 39261
URL: http://svn.freebsd.org/changeset/doc/39261

Log:
  Unlink articles/pxe from the doc build.
  
  Once I am sure there are no problems, I will remove the article contents
  and ensure the stale build output are removed from the site.
  
  PR:		160698

Modified:
  head/en_US.ISO8859-1/articles/Makefile

Modified: head/en_US.ISO8859-1/articles/Makefile
==============================================================================
--- head/en_US.ISO8859-1/articles/Makefile	Tue Jul 24 21:26:53 2012	(r39260)
+++ head/en_US.ISO8859-1/articles/Makefile	Wed Jul 25 02:25:52 2012	(r39261)
@@ -47,7 +47,6 @@ SUBDIR+= port-mentor-guidelines
 SUBDIR+= portbuild
 SUBDIR+= pr-guidelines
 SUBDIR+= problem-reports
-SUBDIR+= pxe
 SUBDIR+= rc-scripting
 SUBDIR+= relaydelay
 SUBDIR+= releng

From owner-svn-doc-all@FreeBSD.ORG  Wed Jul 25 03:00:32 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A897A106566C;
	Wed, 25 Jul 2012 03:00:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 799FC8FC0A;
	Wed, 25 Jul 2012 03:00:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6P30Wa1002967;
	Wed, 25 Jul 2012 03:00:32 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6P30WfX002965;
	Wed, 25 Jul 2012 03:00:32 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201207250300.q6P30WfX002965@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 25 Jul 2012 03:00:32 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39262 -
	head/en_US.ISO8859-1/books/handbook/introduction
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jul 2012 03:00:32 -0000

Author: gjb
Date: Wed Jul 25 03:00:31 2012
New Revision: 39262
URL: http://svn.freebsd.org/changeset/doc/39262

Log:
  Update the Handbook introduction chapter after the Ports CVS->SVN
  conversion.
  
  Submitted by:	ryusuke

Modified:
  head/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml

Modified: head/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml	Wed Jul 25 02:25:52 2012	(r39261)
+++ head/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml	Wed Jul 25 03:00:31 2012	(r39262)
@@ -785,23 +785,27 @@
 	      The switch was deemed necessary, as the technical limitations
 	      imposed by <application>CVS</application> were becoming obvious
 	      due to the rapid expansion of the source tree and the amount
-	      of history already stored.  While the base repository now uses
+	      of history already stored.  The Documentation Project
+	      and Ports Collection repositories also moved from
+	      <application>CVS</application> to
+	      <application>SVN</application> in May 2012 and July
+	      2012, respectively.</para>
+
+	    <para>While the <literal>src/</literal> and
+	      <literal>ports/</literal> repositories now use
 	      <application>SVN</application>, client side tools like
 	      <application>csup</application> that depend on the older
 	      <application>CVS</application> infrastructure, continue to
 	      work normally &mdash; changes in the
 	      <application>SVN</application> repository are backported to
-	      <application>CVS</application> for this purpose.</para>
-
-	    <para>In May 2012, the Documentation Project repository
-	      also moved from <application>CVS</application> to
-	      <application>SVN</application>.  Unlike the base system,
+	      <application>CVS</application> for this purpose.
+	      Unlike <literal>src/</literal> and
+	      <literal>ports/</literal>,
 	      the documentation <application>SVN</application>
 	      repository is not backported to
 	      <application>CVS</application>.</para>
 
-	    <para>The Ports repository is
-	      currently using <application>CVS</application>.  The primary
+	    <para>The primary <application>CVS</application>
 	      <ulink
 		url="http://www.FreeBSD.org/cgi/cvsweb.cgi">repository</ulink>
 	      resides on a machine in Santa Clara CA, USA

From owner-svn-doc-all@FreeBSD.ORG  Wed Jul 25 10:24:42 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5FA54106566B;
	Wed, 25 Jul 2012 10:24:42 +0000 (UTC)
	(envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4B1798FC0A;
	Wed, 25 Jul 2012 10:24:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6PAOgW5046489;
	Wed, 25 Jul 2012 10:24:42 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6PAOgN2046487;
	Wed, 25 Jul 2012 10:24:42 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201207251024.q6PAOgN2046487@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 25 Jul 2012 10:24:42 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39263 - head/ja_JP.eucJP/share/sgml
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jul 2012 10:24:42 -0000

Author: ryusuke
Date: Wed Jul 25 10:24:41 2012
New Revision: 39263
URL: http://svn.freebsd.org/changeset/doc/39263

Log:
  - Merge the following from the English version:
  
  	r39225 -> r39260	head/ja_JP.eucJP/share/sgml/news.xml

Modified:
  head/ja_JP.eucJP/share/sgml/news.xml

Modified: head/ja_JP.eucJP/share/sgml/news.xml
==============================================================================
--- head/ja_JP.eucJP/share/sgml/news.xml	Wed Jul 25 03:00:31 2012	(r39262)
+++ head/ja_JP.eucJP/share/sgml/news.xml	Wed Jul 25 10:24:41 2012	(r39263)
@@ -20,7 +20,7 @@
      the contents of <title> will be preferred over <p>.
 
      $FreeBSD$
-     Original revision: r39225;
+     Original revision: r39260
 -->
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
@@ -35,6 +35,20 @@
     <month>
       <name>7</name>
       <day>
+	<name>24</name>
+
+	<event>
+	  <title>¿·¥³¥¢¥Á¡¼¥à Secretary ½¢Ç¤: <a
+	    href="mailto:pgj@FreeBSD.org">G&aacute;bor P&aacute;li</a></title>
+
+	  <p>&os; ¥³¥¢¥Á¡¼¥à¤Ï¡¢<a
+	    href="mailto:pgj@FreeBSD.org">G&aacute;bor P&aacute;li</a> ¤¬
+	    <a href="mailto:core-secretary@FreeBSD.org">¥³¥¢¥Á¡¼¥à
+	    Secretary</a> ¤Ë½¢Ç¤¤·¤¿¤³¤È¤ò¤ªÃΤ餻¤·¤Þ¤¹¡£</p>
+	</event>
+      </day>
+
+      <day>
 	<name>16</name>
 
 	<event>

From owner-svn-doc-all@FreeBSD.ORG  Wed Jul 25 11:28:50 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CB222106567C;
	Wed, 25 Jul 2012 11:28:50 +0000 (UTC)
	(envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B519C8FC1D;
	Wed, 25 Jul 2012 11:28:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6PBSowx052653;
	Wed, 25 Jul 2012 11:28:50 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6PBSobT052650;
	Wed, 25 Jul 2012 11:28:50 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201207251128.q6PBSobT052650@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 25 Jul 2012 11:28:50 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39264 - in head/ja_JP.eucJP/books/handbook: eresources
	introduction
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jul 2012 11:28:50 -0000

Author: ryusuke
Date: Wed Jul 25 11:28:50 2012
New Revision: 39264
URL: http://svn.freebsd.org/changeset/doc/39264

Log:
  - Merge the following from the English version:
  
  	r11515 -> r13013	head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
  	r39255 -> r39262	head/ja_JP.eucJP/books/handbook/introduction/chapter.sgml

Modified:
  head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
  head/ja_JP.eucJP/books/handbook/introduction/chapter.sgml

Modified: head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml	Wed Jul 25 10:24:41 2012	(r39263)
+++ head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml	Wed Jul 25 11:28:50 2012	(r39264)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r11515
+     Original revision: r13013
      $FreeBSD$
 -->
 
@@ -103,6 +103,12 @@
 	    </row>
 
 	    <row>
+	      <entry>freebsd-bugbusters</entry>
+	      <entry>FreeBSD
+		¾ã³²Êó¹ð¥Ç¡¼¥¿¥Ù¡¼¥¹¤ª¤è¤Ó´ØÏ¢¤¹¤ë¥Ä¡¼¥ë¤Î´ÉÍý¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
+	    </row>
+
+	    <row>
 	      <entry>freebsd-chat</entry>
 	      <entry>FreeBSD
 		¥³¥ß¥å¥Ë¥Æ¥£¤Ë´ØÏ¢¤¹¤ëµ»½ÑŪ¤Ç¤Ï¤Ê¤¤ÏÃÂê</entry>
@@ -140,6 +146,16 @@
 	    </row>
 
 	    <row>
+	      <entry>freebsd-security</entry>
+	      <entry>¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ëÏÃÂê</entry>
+	    </row>
+
+	    <row>
+	      <entry>freebsd-security-notifications</entry>
+	      <entry>¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ëÄÌÃÎ</entry>
+	    </row>
+
+	    <row>
 	      <entry>freebsd-stable</entry>
 	      <entry>FreeBSD-stable ¤Î»ÈÍѤ˴ØÏ¢¤¹¤ëµÄÏÀ</entry>
 	    </row>
@@ -176,6 +192,11 @@
 	    </row>
 
 	    <row>
+	      <entry>freebsd-aic7xxx</entry>
+	      <entry>Adaptec AIC 7xxx Íѥɥ饤¥Ð¤Î³«È¯</entry>
+	    </row>
+
+	    <row>
 	      <entry>freebsd-alpha</entry>
 	      <entry>FreeBSD ¤Î Alpha ¤Ø¤Î°Ü¿¢</entry>
 	    </row>
@@ -234,6 +255,11 @@
 	    </row>
 
 	    <row>
+	      <entry>freebsd-gnome</entry>
+	      <entry>GNOME ¤ª¤è¤Ó GNOME ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î°Ü¿¢</entry>
+	    </row>
+
+	    <row>
 	      <entry>freebsd-hackers</entry>
 	      <entry>°ìÈÌŪ¤Êµ»½Ñ¤ÎµÄÏÀ</entry>
 	    </row>
@@ -270,6 +296,11 @@
 	    </row>
 
 	    <row>
+	      <entry>freebsd-lfs</entry>
+	      <entry>LFS ¤Î FreeBSD ¤Ø¤Î°Ü¿¢</entry>
+	    </row>
+
+	    <row>
 	      <entry>freebsd-libh</entry>
 	      <entry>Âè 2 À¤Âå¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢¥Ñ¥Ã¥±¡¼¥¸¥·¥¹¥Æ¥à</entry>
 	    </row>
@@ -331,16 +362,6 @@
 	    </row>
 
 	    <row>
-	      <entry>freebsd-security</entry>
-	      <entry>¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ëÏÃÂê</entry>
-	    </row>
-
-	    <row>
-	      <entry>freebsd-security-notifications</entry>
-	      <entry>¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ëÄÌÃÎ</entry>
-	    </row>
-
-	    <row>
 	      <entry>freebsd-small</entry>
 	      <entry>ÁȤ߹þ¤ß¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤ª¤±¤ë FreeBSD ¤ÎÍøÍÑ</entry>
 	    </row>
@@ -353,7 +374,7 @@
 
 	    <row>
 	      <entry>freebsd-sparc</entry>
-	      <entry>FreeBSD ¤Î Sparc ¤Ø¤Î°Ü¿¢</entry>
+	      <entry>FreeBSD ¤Î SPARC ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
@@ -420,6 +441,11 @@
 	    </row>
 
 	    <row>
+	      <entry>freebsd-user-vendors</entry>
+	      <entry>¥×¥ì¥ê¥ê¡¼¥¹¤Ë´Ø¤¹¤ë¥Ù¥ó¥À¤È¤ÎÄ´À°</entry>
+	    </row>
+
+	    <row>
 	      <entry>freebsd-www</entry>
 	      <entry><ulink url="../../../../ja/index.html">www.FreeBSD.org
 		</ulink> ¤Î´ÉÍý¼Ô</entry>
@@ -618,9 +644,8 @@ help
 	    ½ê°¤·¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¿Í¤ËÂФ·¤Æ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È
 	    ¤Î²ÁÃͤò²¼¤²¤Æ¤·¤Þ¤¦¤À¤±¤Ç¤¹¤·¡¢
 	    µö¤µ¤ì¤ë¹Ô°Ù¤Ç¤Ï¤Ê¤¤¤Ç¤·¤ç¤¦¡£
-	    ¤È¤¯¤ËÏÃÂê¤Î¤Ê¤¤¼«Í³·Á¼°¤ÎµÄÏÀ¤ËÂФ·¤Æ¤Ï freebsd-chat
-	    <email>freebsd-chat@FreeBSD.org</email>¥á¡¼¥ê
-	    ¥ó¥°¥ê¥¹¥È¤¬¼«Í³¤Ëǧ²Ä¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢
+	    ¤È¤¯¤ËÏÃÂê¤Î¤Ê¤¤¼«Í³·Á¼°¤ÎµÄÏÀ¤ËÂФ·¤Æ¤Ï &a.chat;
+	    ¤¬¼«Í³¤Ëǧ²Ä¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢
 	    ¤«¤ï¤ê¤Ë»È¤¦¤Ù¤­¤Ç¤·¤ç¤¦¡£</para>
 	</listitem>
 
@@ -1390,7 +1415,7 @@ help
 	    <entry>storm.uk.FreeBSD.org</entry>
 	    <entry>SSH ¤Î¤ß</entry>
 	    <entry>Read-only cvs, personal web space, email</entry>
-	    <entry>&a.brian</entry>
+	    <entry>&a.brian;</entry>
           </row>
 	
 	  <row>

Modified: head/ja_JP.eucJP/books/handbook/introduction/chapter.sgml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/introduction/chapter.sgml	Wed Jul 25 10:24:41 2012	(r39263)
+++ head/ja_JP.eucJP/books/handbook/introduction/chapter.sgml	Wed Jul 25 11:28:50 2012	(r39264)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39255
+     Original revision: r39262
      $FreeBSD$
 -->
 
@@ -859,25 +859,28 @@
 	      ¤³¤ì¤Þ¤Ç¤ËÃßÀѤµ¤ì¤¿ËÄÂç¤ÊÎ̤ÎÍúÎò¤Ë¤è¤Ã¤Æ¡¢
 	      <application>CVS</application>
 	      ¤Î»ý¤Äµ»½ÑŪ¤Ê¸Â³¦¤¬ÌÀ¤«¤Ë¤Ê¤Ã¤Æ¤­¤¿¤¿¤á¤Ç¤¹¡£
-	      base ¥ê¥Ý¥¸¥È¥ê¤Ï <application>SVN</application>
-	      ¤Ë¤è¤Ã¤Æ´ÉÍý¤µ¤ì¤Þ¤¹¤¬¡¢
+	      ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤È
+	      Ports Collection ¥ê¥Ý¥¸¥È¥ê¤â¡¢¤½¤ì¤¾¤ì
+	      2012 ǯ 5 ·î¤È 7 ·î¤Ë
+	      <application>CVS</application> ¤«¤é
+	      <application>SVN</application> ¤Ø¤È°Ü¹Ô¤·¤Þ¤·¤¿¡£</para>
+
+	    <para>¸½ºß <literal>src/</literal> ¤ª¤è¤Ó
+	      <literal>ports/</literal> ¥ê¥Ý¥¸¥È¥ê¤Ï
+	      <application>SVN</application> ¤Ë¤è¤Ã¤Æ´ÉÍý¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢
 	      <application>SVN</application> ¥ê¥Ý¥¸¥È¥ê¤Ë¤ª¤±¤ëÊѹ¹ÅÀ¤Ï
 	      <application>CVS</application> ¤ËÈ¿±Ç¤µ¤ì¤ë¤Î¤Ç¡¢
 	      <application>csup</application>
 	      ¤È¤¤¤Ã¤¿ <application>CVS</application>
-	      ¤Î¥¯¥é¥¤¥¢¥ó¥È¥Ä¡¼¥ë¤Ï¤³¤ì¤Þ¤ÇÄ̤êÀµ¾ï¤ËÆ°¤­¤Þ¤¹¡£</para>
-
-	    <para>2012 ǯ 5 ·î¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤Î¥ê¥Ý¥¸¥È¥ê¤â
-	      <application>CVS</application> ¤«¤é <application>SVN</application>
-	      ¤Ø¤È°Ü¹Ô¤·¤Þ¤·¤¿¡£
-	      ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤È¤Ï°Û¤Ê¤ê¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤Î
+	      ¤Î¥¯¥é¥¤¥¢¥ó¥È¥Ä¡¼¥ë¤Ï¤³¤ì¤Þ¤ÇÄ̤êÀµ¾ï¤ËÆ°¤­¤Þ¤¹¡£
+	      <literal>src/</literal> ¤ª¤è¤Ó <literal>ports/</literal>
+	      ¤È¤Ï°Û¤Ê¤ê¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤Î
 	      <application>SVN</application> ¥ê¥Ý¥¸¥È¥ê¤Ï¡¢
 	      <application>CVS</application> ¤Ø¤ÈÈ¿±Ç¤µ¤ì¤Þ¤»¤ó¡£</para>
 
-	    <para>Ports ¥ê¥Ý¥¸¥È¥ê¤Ï¡¢¸½ºß <application>CVS</application>
-	      ¤Ë¤è¤Ã¤Æ´ÉÍý¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-	      &os; ¤Î<ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi">
-		¥á¥¤¥ó¥ê¥Ý¥¸¥È¥ê</ulink>¤ÏÊƹñ¥«¥ê¥Õ¥©¥ë¥Ë¥¢½£¤Î¥µ¥ó¥¿¥¯¥é¥é»Ô¤Ë¸ºß¤·¡¢
+	    <para>&os; ¤Î <application>CVS</application>
+	      <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi">¥á¥¤¥ó¥ê¥Ý¥¸¥È¥ê</ulink>
+	      ¤ÏÊƹñ¥«¥ê¥Õ¥©¥ë¥Ë¥¢½£¤Î¥µ¥ó¥¿¥¯¥é¥é»Ô¤Ë¸ºß¤·¡¢
 	      ¤½¤³¤«¤éÀ¤³¦Ãæ¤Î¤¿¤¯¤µ¤ó¤Î¥ß¥é¡¼¥µ¥¤¥È¤Ë¥³¥Ô¡¼¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	      <link linkend="current">-CURRENT</link> ¤È
 	      <link linkend="stable">-STABLE</link>

From owner-svn-doc-all@FreeBSD.ORG  Wed Jul 25 13:24:35 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B4E341065672;
	Wed, 25 Jul 2012 13:24:34 +0000 (UTC)
	(envelope-from issyl0@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F9D18FC17;
	Wed, 25 Jul 2012 13:24:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6PDOYUS062303;
	Wed, 25 Jul 2012 13:24:34 GMT (envelope-from issyl0@svn.freebsd.org)
Received: (from issyl0@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6PDOYTL062301;
	Wed, 25 Jul 2012 13:24:34 GMT (envelope-from issyl0@svn.freebsd.org)
Message-Id: <201207251324.q6PDOYTL062301@svn.freebsd.org>
From: Isabell Long <issyl0@FreeBSD.org>
Date: Wed, 25 Jul 2012 13:24:34 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39265 - head/en_US.ISO8859-1/books/handbook/desktop
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jul 2012 13:24:35 -0000

Author: issyl0
Date: Wed Jul 25 13:24:34 2012
New Revision: 39265
URL: http://svn.freebsd.org/changeset/doc/39265

Log:
  Konqueror supports WebKit.  Add information about how to make it work
  under FreeBSD to the desktop section of the Handbook.
  
  PR:		docs/159298
  Approved by:	gjb (mentor)

Modified:
  head/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml

Modified: head/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml	Wed Jul 25 11:28:50 2012	(r39264)
+++ head/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml	Wed Jul 25 13:24:34 2012	(r39265)
@@ -408,6 +408,18 @@
 	<application>Konqueror</application>,
 	available in <filename role="package">misc/konq-plugins</filename>.</para>
 
+      <para><application>Konqueror</application> supports WebKit as
+	well as its own KHTML.  WebKit is used by many modern browsers
+	including Chromium.  To use WebKit with
+	<application>Konqueror</application> on &os;:</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/ports/www/kwebkitpart</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+      <para>Then in <application>Konqueror</application>, click
+	<quote>Settings</quote>, <quote>Configure Konqueror</quote>,
+	then <quote>Change KHTML to WebKit</quote>.</para>
+
       <para><application>Konqueror</application> also supports <application>&flash;</application>; a <quote>How To</quote> guide
 	for getting <application>&flash;</application> support on
 	<application>Konqueror</application>

From owner-svn-doc-all@FreeBSD.ORG  Wed Jul 25 19:16:40 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 677581065672;
	Wed, 25 Jul 2012 19:16:40 +0000 (UTC)
	(envelope-from loader@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 479408FC16;
	Wed, 25 Jul 2012 19:16:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6PJGesA090905;
	Wed, 25 Jul 2012 19:16:40 GMT (envelope-from loader@svn.freebsd.org)
Received: (from loader@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6PJGeGl090903;
	Wed, 25 Jul 2012 19:16:40 GMT (envelope-from loader@svn.freebsd.org)
Message-Id: <201207251916.q6PJGeGl090903@svn.freebsd.org>
From: Fukang Chen <loader@FreeBSD.org>
Date: Wed, 25 Jul 2012 19:16:40 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39266 - head/zh_CN.GB2312/books/handbook/firewalls
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jul 2012 19:16:40 -0000

Author: loader
Date: Wed Jul 25 19:16:39 2012
New Revision: 39266
URL: http://svn.freebsd.org/changeset/doc/39266

Log:
  MFen: r37165 -> r38826
  Fix typo. [1]
  
  Merging work done by:  delphij
  Submitted by:          Sutra Zhou (zhoushuqun at gmail dot com) [1]
  Obtained from:         The FreeBSD Simplified Chinese Project

Modified:
  head/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml

Modified: head/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml
==============================================================================
--- head/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml	Wed Jul 25 13:24:34 2012	(r39265)
+++ head/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml	Wed Jul 25 19:16:39 2012	(r39266)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.96
+     Original Revision: r38826
      $FreeBSD$
 -->
 
@@ -316,7 +316,7 @@ device pfsync</programlisting>
     </sect2>
 
     <sect2>
-      <title>¿ÉÓÃµÄ rc.conf Ñ¡Ïî</title>
+      <title>¿ÉÓÃµÄ <filename>rc.conf</filename> Ñ¡Ïî</title>
 
       <para>The following &man.rc.conf.5; statements configure
 	<acronym>PF</acronym> and &man.pflog.4; at boot:</para>
@@ -352,8 +352,10 @@ pflog_flags=""                  # Æô¶¯Ê±
 	<para>ÔÚä¯ÀÀ <ulink
 	    url="http://www.openbsd.org/faq/pf/">PF FAQ</ulink> ʱ£¬
           Çëʱ¿Ì×¢Òⲻͬ°æ±¾µÄ &os; ¿ÉÄÜ»áʹÓò»Í¬°æ±¾µÄ PF¡£ Ä¿Ç°£¬
-	  &os; ʹÓõÄÊÇÓë
-	  OpenBSD&nbsp;4.1 ÏàͬµÄ <acronym>PF</acronym>°æ±¾¡£</para>
+	  &os;&nbsp;8.<replaceable>X</replaceable> ºÍ֮ǰµÄϵͳʹÓõÄÊÇÓë
+	  OpenBSD&nbsp;4.1 Ïàͬ°æ±¾µÄ <acronym>PF</acronym>¡£
+          &os;&nbsp;9.<replaceable>X</replaceable> ºÍÖ®ºóµÄϵͳʹÓõÄÊÇÓë
+          OpenBSD&nbsp;4.5 Ïàͬ°æ±¾µÄ <acronym>PF</acronym>¡£</para>
       </warning>
 
       <para>&a.pf; ÊÇÒ»¸öÌáÓйØÅäÖÃʹÓà <acronym>PF</acronym>
@@ -389,7 +391,7 @@ pflog_flags=""                  # Æô¶¯Ê±
 
 	    <row>
 	      <entry><command>pfctl <option>-F</option> all <option>-f</option> /etc/pf.conf</command></entry>
-	      <entry>Çå³þËùÓйæÔò (nat, filter, state, table, µÈµÈ¡£)
+	      <entry>Çå³ýËùÓйæÔò (nat, filter, state, table, µÈµÈ¡£)
 		²¢¶ÁÈ¡ <filename>/etc/pf.conf</filename></entry>
 	    </row>
 
@@ -589,7 +591,7 @@ options IPFILTER_DEFAULT_BLOCK</programl
     </sect2>
 
     <sect2>
-      <title>¿ÉÓÃµÄ rc.conf Ñ¡Ïî</title>
+      <title>¿ÉÓÃµÄ <filename>rc.conf</filename> Ñ¡Ïî</title>
 
       <para>ÒªÔÚÆô¶¯Ê±¼¤»î IPF£¬ ÐèÒªÔÚ <filename>/etc/rc.conf</filename>
 	ÖÐÔö¼ÓÏÂÃæµÄÉèÖãº</para>
@@ -999,12 +1001,12 @@ sh /etc/ipf.rules.script</programlisting
 	ÕâЩÊDZàдÃ÷ʾÔÊÐí·À»ðǽ¹æÔò¼¯µÄ»ù±¾ÒªËØ¡£</para>
 
       <warning>
-	<para>µ±¶Ô·À»ðǽ¹æÔò½øÐвÙ×÷ʱ£¬ Ó¦¸Ã
+	<para>µ±¶Ô·À»ðǽ¹æÔò½øÐвÙ×÷ʱ£¬ Ó¦
 	    <emphasis>½÷É÷ÐÐÊÂ</emphasis>¡£ ijЩÅäÖÿÉÄÜ»á
 	    <emphasis>½«Äú·´ËøÔÚ</emphasis> ·þÎñÆ÷ÍâÃæ¡£
-	    °²È«Æð¼û£¬ Äú¿ÉÒÔ¿¼ÂÇÔÚµÚÒ»´Î½øÐзÀ»ðǽÅäÖÃʱÔÚ±¾µØ¿ØÖÆ̨ÉÏ£¬
-	    ¶ø²»ÊÇÔ¶³Ì£¬ ÀýÈçͨ¹ý
-	    <application>ssh</application> À´½øÐС£</para>
+	  ±£ÏÕÆð¼û£¬ Äú¿ÉÒÔ¿¼ÂÇÔÚµÚÒ»´Î½øÐзÀ»ðǽÅäÖÃʱÔÚ±¾µØ¿ØÖÆ̨ÉÏ£¬
+	  ¶ø²»ÊÇÔ¶³Ì£¬ Èçͨ¹ý
+	  <application>ssh</application> À´½øÐС£</para>
       </warning>
     </sect2>
 
@@ -1324,11 +1326,11 @@ sh /etc/ipf.rules.script</programlisting
 
       <para>Èç¹û¼Ç¼µÄ°üµÄ¶Ë¿ÚºÅ²¢²»ÊÇÄúËùÖªµÀµÄ£¬
 	¿ÉÒÔÔÚ <filename>/etc/services</filename> »ò <ulink
-	  url="http://www.securitystats.com/tools/portsearch.php"></ulink>
+	  url="http://en.wikipedia.org/wiki/List_of_TCP_and_UDP_port_numbers"></ulink>
 	Á˽â¶Ë¿ÚºÅͨ³£µÄÓÃ;¡£</para>
 
-      <para>²Î¿¼ÏÂÃæµÄÍøÒ³£¬ Á˽âľÂíʹÓõĶ˿ڣº<ulink
-	  url="http://www.simovits.com/trojans/trojans.html"></ulink>¡£</para>
+      <para>²Î¿¼ÏÂÃæµÄÍøÒ³£¬ Á˽âľÂíʹÓõĶ˿ڣº <ulink
+	  url="http://www.sans.org/security-resources/idfaq/oddports.php"></ulink>¡£</para>
 
       <para>ÏÂÃæÊÇÎÒÔÚ×Ô¼ºµÄϵͳÖÐʹÓõÄÍêÕûµÄ£¬ ·Ç³£°²È«µÄ
 	<literal>Ã÷ʾÔÊÐí</literal> ·À»ðǽ¹æÔò¼¯¡£ Ö±½ÓʹÓÃÕâ¸ö¹æÔò¼¯²»»á¸øÄúÔì³ÉÎÊÌ⣬
@@ -2496,10 +2498,10 @@ ks="keep-state"        # just too lazy t
 	  ÎÞЧµÄ°üÓ¦±»¶ªÆúºÍÏûʧ¡£ ÕâÑù£¬ ¹¥»÷Õß±ãÎÞ·¨ÖªµÀ°üÊÇ·ñµ½´ïÁËÄúµÄϵͳ¡£
 	  ¹¥»÷Õ߶ÔϵͳÁ˽âµÄÔ½ÉÙ£¬ Æä¹¥»÷µÄÄѶÈÒ²¾ÍÔ½´ó¡£ Èç¹û²»ÖªµÀ¶Ë¿ÚºÅ£¬
 	  ¿ÉÒÔ²éÔÄ <filename>/etc/services/</filename> »òµ½ <ulink
-	    url="http://www.securitystats.com/tools/portsearch.php"></ulink>
+	    url="http://en.wikipedia.org/wiki/List_of_TCP_and_UDP_port_numbers"></ulink>
 	  ²¢²éÕÒһ϶˿ںţ¬ ÒÔÁ˽âÆäÓÃ;¡£ ÁíÍ⣬
 	  ÄúÒ²¿ÉÒÔÔÚÕâ¸öÍøÒ³ÉÏÁ˽ⳣ¼ûľÂíËùʹÓõĶ˿ڣº <ulink
-	    url="http://www.simovits.com/trojans/trojans.html"></ulink>¡£</para>
+	    url="http://www.sans.org/security-resources/idfaq/oddports.php"></ulink>¡£</para>
       </sect3>
 
       <sect3>
@@ -2571,7 +2573,7 @@ pif="dc0"     # public interface name of
 # Interface facing Public Internet (Outbound Section)
 # Interrogate session start requests originating from behind the
 # firewall on the private network or from this gateway server
-# destine for the public Internet.
+# destined for the public Internet.
 #################################################################
 
 # Allow out access to my ISP's Domain name server.
@@ -2609,7 +2611,7 @@ pif="dc0"     # public interface name of
 # Allow out Time
 &dollar;cmd 00260 allow tcp from any to any 37 out via &dollar;pif setup keep-state
 
-# Allow out nntp news (i.e. news groups)
+# Allow out nntp news (i.e., news groups)
 &dollar;cmd 00270 allow tcp from any to any 119 out via &dollar;pif setup keep-state
 
 # Allow out secure FTP, Telnet, and SCP
@@ -2899,7 +2901,7 @@ pif="rl0"     # public interface name of
 # Allow out Time
 &dollar;cmd 090 &dollar;skip tcp from any to any 37 out via &dollar;pif setup keep-state
 
-# Allow out nntp news (i.e. news groups)
+# Allow out nntp news (i.e., news groups)
 &dollar;cmd 100 &dollar;skip tcp from any to any 119 out via &dollar;pif setup keep-state
 
 # Allow out secure FTP, Telnet, and SCP

From owner-svn-doc-all@FreeBSD.ORG  Thu Jul 26 11:31:16 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 27C5E106564A;
	Thu, 26 Jul 2012 11:31:16 +0000 (UTC)
	(envelope-from zeising@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EC4EE8FC14;
	Thu, 26 Jul 2012 11:31:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6QBVFsm078951;
	Thu, 26 Jul 2012 11:31:15 GMT (envelope-from zeising@svn.freebsd.org)
Received: (from zeising@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6QBVFwC078949;
	Thu, 26 Jul 2012 11:31:15 GMT (envelope-from zeising@svn.freebsd.org)
Message-Id: <201207261131.q6QBVFwC078949@svn.freebsd.org>
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Thu, 26 Jul 2012 11:31:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39267 - head/en_US.ISO8859-1/books/porters-handbook
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jul 2012 11:31:16 -0000

Author: zeising
Date: Thu Jul 26 11:31:15 2012
New Revision: 39267
URL: http://svn.freebsd.org/changeset/doc/39267

Log:
  Update the porters handbook with information about the new USE_PKGCONFIG
  Makefile macro.
  
  Submitted by:	bapt (via IRC) (small fixes from me and joel)
  Approved by:	joel (mentor)

Modified:
  head/en_US.ISO8859-1/books/porters-handbook/book.sgml

Modified: head/en_US.ISO8859-1/books/porters-handbook/book.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/book.sgml	Wed Jul 25 19:16:39 2012	(r39266)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.sgml	Thu Jul 26 11:31:15 2012	(r39267)
@@ -5492,6 +5492,45 @@ IGNORE=	may not be redistributed because
       </sect2>
     </sect1>
 
+    <sect1 id="using-pkg-config">
+      <title>Using <literal>pkg-config</literal></title>
+
+      <para>If your ports requires <literal>pkg-config</literal>,
+	just set <makevar>USE_PKGCONFIG</makevar> to the following
+	possible values:</para>
+      <table frame="none">
+	<title>Values for <makevar>USE_PKGCONFIG</makevar></title>
+
+	<tgroup cols="2">
+	  <thead>
+	    <row>
+	      <entry>Definition</entry>
+	      <entry>Description</entry>
+	    </row>
+	  </thead>
+
+	  <tbody>
+	    <row>
+	      <entry><makevar>USE_PKGCONFIG= yes</makevar></entry>
+	      <entry>The ports uses pkg-config only at build time</entry>
+	    </row>
+	    <row>
+	      <entry><makevar>USE_PKGCONFIG= build</makevar></entry>
+	      <entry>The ports uses pkg-config only at build time</entry>
+	    </row>
+	    <row>
+	      <entry><makevar>USE_PKGCONFIG= run</makevar></entry>
+	      <entry>The ports uses pkg-config only at run time</entry>
+	    </row>
+	    <row>
+	      <entry><makevar>USE_PKGCONFIG= both</makevar></entry>
+	      <entry>The ports uses pkg-config both at build and run time</entry>
+	    </row>
+	  </tbody>
+	</tgroup>
+      </table>
+    </sect1>
+
     <sect1 id="using-gettext">
       <title>Using GNU <literal>gettext</literal></title>
 

From owner-svn-doc-all@FreeBSD.ORG  Thu Jul 26 13:25:44 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BE2B0106564A;
	Thu, 26 Jul 2012 13:25:44 +0000 (UTC)
	(envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A90FF8FC0C;
	Thu, 26 Jul 2012 13:25:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6QDPinR088228;
	Thu, 26 Jul 2012 13:25:44 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6QDPiLI088225;
	Thu, 26 Jul 2012 13:25:44 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201207261325.q6QDPiLI088225@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Thu, 26 Jul 2012 13:25:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39268 - head/ja_JP.eucJP/books/handbook/desktop
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jul 2012 13:25:44 -0000

Author: ryusuke
Date: Thu Jul 26 13:25:44 2012
New Revision: 39268
URL: http://svn.freebsd.org/changeset/doc/39268

Log:
  - Merge the following from the English version:
  
  	r39018 -> r39265	head/ja_JP.eucJP/books/handbook/desktop/chapter.sgml

Modified:
  head/ja_JP.eucJP/books/handbook/desktop/chapter.sgml

Modified: head/ja_JP.eucJP/books/handbook/desktop/chapter.sgml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/desktop/chapter.sgml	Thu Jul 26 11:31:15 2012	(r39267)
+++ head/ja_JP.eucJP/books/handbook/desktop/chapter.sgml	Thu Jul 26 13:25:44 2012	(r39268)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39018
+     Original revision: r39265
      $FreeBSD$
 -->
 
@@ -424,6 +424,18 @@
 	<filename role="package">misc/konq-plugins</filename>
 	¤òÍøÍѤ·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
 
+      <para><application>Konqueror</application> KHTML ¤È¤È¤â¤Ë¡¢WebKit
+	¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£WebKit ¤Ï Chromium ¤Ê¤ÉºÇ¶á¤Î¥Ö¥é¥¦¥¶¤Î¿¤¯¤ÇºÎÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£
+	&os; ¤Î <application>Konqueror</application> ¤Ç WebKit
+	¤ò»È¤¦¤Ë¤Ï°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/ports/www/kwebkitpart</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+      <para>¤½¤Î¸å¡¢<application>Konqueror</application> ¤Ë¤ª¤¤¤Æ¡¢
+	<quote>Settings</quote>, <quote>Configure Konqueror</quote>
+	¤òÁªÂò¤·¡¢<quote>Change KHTML to WebKit</quote> ¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
       <para><application>Konqueror</application> ¤Ï
 	<application>&flash;</application> ¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
 	<application>Konqueror</application> ¤Ë <application>&flash;</application>

From owner-svn-doc-all@FreeBSD.ORG  Thu Jul 26 14:27:36 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C9D041065672;
	Thu, 26 Jul 2012 14:27:36 +0000 (UTC)
	(envelope-from issyl0@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B26218FC0A;
	Thu, 26 Jul 2012 14:27:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6QERasF093254;
	Thu, 26 Jul 2012 14:27:36 GMT (envelope-from issyl0@svn.freebsd.org)
Received: (from issyl0@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6QERagx093251;
	Thu, 26 Jul 2012 14:27:36 GMT (envelope-from issyl0@svn.freebsd.org)
Message-Id: <201207261427.q6QERagx093251@svn.freebsd.org>
From: Isabell Long <issyl0@FreeBSD.org>
Date: Thu, 26 Jul 2012 14:27:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39269 - in head/en_US.ISO8859-1:
	books/handbook/eresources share/sgml
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jul 2012 14:27:36 -0000

Author: issyl0
Date: Thu Jul 26 14:27:36 2012
New Revision: 39269
URL: http://svn.freebsd.org/changeset/doc/39269

Log:
  Change the references to CVS mailing lists and entities to the new SVN ones.
  
  PR:		docs/170174
  Submitted by:	Carl Delsey (carl.r.delsey (at) intel.com) (minor
  		tweaks by me)
  Approved by:	gjb (mentor)

Modified:
  head/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
  head/en_US.ISO8859-1/share/sgml/mailing-lists.ent

Modified: head/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml	Thu Jul 26 13:25:44 2012	(r39268)
+++ head/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml	Thu Jul 26 14:27:36 2012	(r39269)
@@ -615,7 +615,7 @@
 	you can change your digest options in your account options
 	section.</para>
 
-      <para><emphasis>CVS &amp; SVN lists:</emphasis> The following lists
+      <para><emphasis>SVN lists:</emphasis> The following lists
 	are for people interested in seeing the log messages for changes to
 	various areas of the source tree.  They are
 	<emphasis>Read-Only</emphasis> lists and should not have mail sent to
@@ -633,40 +633,61 @@
 
 	  <tbody>
 	    <row>
-	      <entry>&a.cvsall.name;</entry>
-	      <entry><filename>/usr/(CVSROOT|doc|ports)</filename></entry>
-	      <entry>All changes to any place in the tree (superset of other CVS commit lists)</entry>
+	      <entry>&a.svn-doc-all.name;</entry>
+	      <entry><filename>/usr/doc</filename></entry>
+	      <entry>All changes to the doc Subversion repository (except
+	        for <filename>user</filename>,
+	            <filename>projects</filename>
+	        and <filename>translations</filename>)</entry>
 	    </row>
 
 	    <row>
-	      <entry>&a.cvs-doc.name;</entry>
-	      <entry><filename>/usr/(doc|www)</filename></entry>
-	      <entry>All changes to the doc and www trees</entry>
+	      <entry>&a.svn-doc-head.name;</entry>
+	      <entry><filename>/usr/doc</filename></entry>
+	      <entry>All changes to the <quote>head</quote> branch of
+		the doc Subversion repository</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-doc-projects.name;</entry>
+	      <entry><filename>/usr/doc/projects</filename></entry>
+	      <entry>All changes to the <filename>projects</filename>
+		area of the doc Subversion repository</entry>
 	    </row>
 
 	    <row>
-	      <entry>&a.cvs-ports.name;</entry>
+	      <entry>&a.svn-doc-svnadmin.name;</entry>
+	      <entry><filename>/usr/doc</filename></entry>
+	      <entry>All changes to the administrative scripts, hooks,
+		and other configuration data of the doc Subversion
+		repository</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-ports-all.name;</entry>
 	      <entry><filename>/usr/ports</filename></entry>
-	      <entry>All changes to the ports tree</entry>
+	      <entry>All changes to the ports Subversion repository</entry>
 	    </row>
 
 	    <row>
-	      <entry>&a.cvs-projects.name;</entry>
-	      <entry><filename>/usr/projects</filename></entry>
-	      <entry>All changes to the projects tree</entry>
+	      <entry>&a.svn-ports-head.name;</entry>
+	      <entry><filename>/usr/ports</filename></entry>
+	      <entry>All changes to the <quote>head</quote> branch of
+		the ports Subversion repository</entry>
 	    </row>
 
 	    <row>
-	      <entry>&a.cvs-src.name;</entry>
-	      <entry><filename>/usr/src</filename></entry>
-	      <entry>All changes to the src tree (generated by the svn-to-cvs
-		importer commits)</entry>
+	      <entry>&a.svn-ports-svnadmin.name;</entry>
+	      <entry><filename>/usr/ports</filename></entry>
+	      <entry>All changes to the administrative scripts, hooks,
+		and other configuration data of the ports Subversion
+		repository</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.svn-src-all.name;</entry>
 	      <entry><filename>/usr/src</filename></entry>
-	      <entry>All changes to the Subversion repository (except
+	      <entry>All changes to the src Subversion repository (except
 		for <filename>user</filename>
 		and <filename>projects</filename>)</entry>
 	    </row>
@@ -675,7 +696,7 @@
 	      <entry>&a.svn-src-head.name;</entry>
 	      <entry><filename>/usr/src</filename></entry>
 	      <entry>All changes to the <quote>head</quote> branch of
-		the Subversion repository (the &os;-CURRENT
+		the src Subversion repository (the &os;-CURRENT
 		branch)</entry>
 	    </row>
 

Modified: head/en_US.ISO8859-1/share/sgml/mailing-lists.ent
==============================================================================
--- head/en_US.ISO8859-1/share/sgml/mailing-lists.ent	Thu Jul 26 13:25:44 2012	(r39268)
+++ head/en_US.ISO8859-1/share/sgml/mailing-lists.ent	Thu Jul 26 14:27:36 2012	(r39269)
@@ -411,6 +411,34 @@
 <!ENTITY a.sun4v "<ulink url='&a.sun4v.url;'>FreeBSD sun4v porting mailing list</ulink>">
 <!ENTITY a.sun4v.name "<ulink url='&a.sun4v.url;'>freebsd-sun4v</ulink>">
 
+<!ENTITY a.svn-doc-all.url "&a.mailman.listinfo;/svn-doc-all">
+<!ENTITY a.svn-doc-all "<ulink url='&a.svn-doc-all.url;'>SVN commit messages for the entire doc tree (except for <quote>user</quote>, <quote>projects</quote> and <quote>translations</quote>)</ulink>">
+<!ENTITY a.svn-doc-all.name "<ulink url='&a.svn-doc-all.url;'>svn-doc-all</ulink>">
+
+<!ENTITY a.svn-doc-head.url "&a.mailman.listinfo;/svn-doc-head">
+<!ENTITY a.svn-doc-head "<ulink url='&a.svn-doc-head.url;'>SVN commit messages for the doc tree for head/</ulink>">
+<!ENTITY a.svn-doc-head.name "<ulink url='&a.svn-doc-head.url;'>svn-doc-head</ulink>">
+
+<!ENTITY a.svn-doc-projects.url "&a.mailman.listinfo;/svn-doc-projects">
+<!ENTITY a.svn-doc-projects "<ulink url='&a.svn-doc-projects.url;'>SVN commit messages for the doc <quote>projects</quote> tree</ulink>">
+<!ENTITY a.svn-doc-projects.name "<ulink url='&a.svn-doc-projects.url;'>svn-doc-projects</ulink>">
+
+<!ENTITY a.svn-doc-svnadmin.url "&a.mailman.listinfo;/svn-doc-svnadmin">
+<!ENTITY a.svn-doc-svnadmin "<ulink url='&a.svn-doc-svnadmin.url;'>SVN commit messages for the doc admin&nbsp;/ configuration tree</ulink>">
+<!ENTITY a.svn-doc-svnadmin.name "<ulink url='&a.svn-doc-svnadmin.url;'>svn-doc-svnadmin</ulink>">
+
+<!ENTITY a.svn-ports-all.url "&a.mailman.listinfo;/svn-ports-all">
+<!ENTITY a.svn-ports-all "<ulink url='&a.svn-ports-all.url;'>SVN commit messages for the entire ports tree</ulink>">
+<!ENTITY a.svn-ports-all.name "<ulink url='&a.svn-ports-all.url;'>svn-ports-all</ulink>">
+
+<!ENTITY a.svn-ports-head.url "&a.mailman.listinfo;/svn-ports-head">
+<!ENTITY a.svn-ports-head "<ulink url='&a.svn-ports-head.url;'>SVN commit messages for the ports tree for head/</ulink>">
+<!ENTITY a.svn-ports-head.name "<ulink url='&a.svn-ports-head.url;'>svn-ports-head</ulink>">
+
+<!ENTITY a.svn-ports-svnadmin.url "&a.mailman.listinfo;/svn-ports-svnadmin">
+<!ENTITY a.svn-ports-svnadmin "<ulink url='&a.svn-ports-svnadmin.url;'>SVN commit messages for the ports admin&nbsp;/ configuration tree</ulink>">
+<!ENTITY a.svn-ports-svnadmin.name "<ulink url='&a.svn-ports-svnadmin.url;'>svn-ports-svnadmin</ulink>">
+
 <!ENTITY a.svn-src-all.url "&a.mailman.listinfo;/svn-src-all">
 <!ENTITY a.svn-src-all "<ulink url='&a.svn-src-all.url;'>SVN commit messages for the entire src tree (except for <quote>user</quote> and <quote>projects</quote>)</ulink>">
 <!ENTITY a.svn-src-all.name "<ulink url='&a.svn-src-all.url;'>svn-src-all</ulink>">

From owner-svn-doc-all@FreeBSD.ORG  Thu Jul 26 23:12:23 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4E84D1065670;
	Thu, 26 Jul 2012 23:12:23 +0000 (UTC)
	(envelope-from issyl0@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 38C278FC08;
	Thu, 26 Jul 2012 23:12:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6QNCNbT038845;
	Thu, 26 Jul 2012 23:12:23 GMT (envelope-from issyl0@svn.freebsd.org)
Received: (from issyl0@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6QNCNZ3038843;
	Thu, 26 Jul 2012 23:12:23 GMT (envelope-from issyl0@svn.freebsd.org)
Message-Id: <201207262312.q6QNCNZ3038843@svn.freebsd.org>
From: Isabell Long <issyl0@FreeBSD.org>
Date: Thu, 26 Jul 2012 23:12:23 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39270 - head/en_US.ISO8859-1/books/handbook/firewalls
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jul 2012 23:12:23 -0000

Author: issyl0
Date: Thu Jul 26 23:12:22 2012
New Revision: 39270
URL: http://svn.freebsd.org/changeset/doc/39270

Log:
  There is no need to compile IPFW into the FreeBSD kernel to make use of NAT
  functionality anymore, so remove these sentences.
  
  PR:		docs/144543
  Approved by:	gjb (mentor)

Modified:
  head/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml

Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml	Thu Jul 26 14:27:36 2012	(r39269)
+++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml	Thu Jul 26 23:12:22 2012	(r39270)
@@ -2131,8 +2131,7 @@ pass in quick on rl0 proto tcp from any 
 	run time loadable module.  The system will dynamically load the
 	kernel module when the <filename>rc.conf</filename> statement
 	<literal>firewall_enable="YES"</literal> is used.  There is no
-	need to compile IPFW into the &os; kernel unless
-	<acronym>NAT</acronym> functionality is desired.</para>
+	need to compile IPFW into the &os; kernel.</para>
 
       <para>After rebooting your system with
 	<literal>firewall_enable="YES"</literal> in
@@ -2180,9 +2179,8 @@ net.inet.ip.fw.verbose_limit=5</programl
       </indexterm>
 
       <para>It is not a mandatory requirement to enable IPFW by
-	compiling the following options into the &os; kernel, unless
-	<acronym>NAT</acronym> functionality is required.  It is presented here
-	as background information.</para>
+	compiling the following options into the &os; kernel.  It is
+	presented here as background information only.</para>
 
       <programlisting>options    IPFIREWALL</programlisting>
 

From owner-svn-doc-all@FreeBSD.ORG  Fri Jul 27 22:20:28 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8A86E1065672;
	Fri, 27 Jul 2012 22:20:28 +0000 (UTC)
	(envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 74B298FC0C;
	Fri, 27 Jul 2012 22:20:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6RMKSVY052611;
	Fri, 27 Jul 2012 22:20:28 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6RMKSf7052609;
	Fri, 27 Jul 2012 22:20:28 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201207272220.q6RMKSf7052609@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 27 Jul 2012 22:20:28 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39271 - head/ja_JP.eucJP/books/handbook/users
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Jul 2012 22:20:28 -0000

Author: ryusuke
Date: Fri Jul 27 22:20:27 2012
New Revision: 39271
URL: http://svn.freebsd.org/changeset/doc/39271

Log:
  - Merge the following from the English version:
  
  	r9228 -> r9815	head/ja_JP.eucJP/books/handbook/users/chapter.sgml
  
  Submitted by:	Hiroo Ono <hiroo _at_ jp dot FreeBSD dot org>
  Reference:	[doc-jp-work 1816]

Modified:
  head/ja_JP.eucJP/books/handbook/users/chapter.sgml

Modified: head/ja_JP.eucJP/books/handbook/users/chapter.sgml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/users/chapter.sgml	Thu Jul 26 23:12:22 2012	(r39270)
+++ head/ja_JP.eucJP/books/handbook/users/chapter.sgml	Fri Jul 27 22:20:27 2012	(r39271)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r9228
+     Original revision: r9815
      $FreeBSD$
 -->
 
@@ -348,11 +348,11 @@ Removing files belonging to jru from /va
       <title>pw</title>
 
       <para><application>pw</application> ¤Ï¡¢
-        ¥æ¡¼¥¶¤ä¥°¥ë¡¼¥×¤ÎºîÀ®¡¢ºï½ü¡¢
-        Êѹ¹¤ª¤è¤Óɽ¼¨¤ò¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¡¢
-        ¥·¥¹¥Æ¥à¥æ¡¼¥¶¥Õ¥¡¥¤¥ë¤ä¥·¥¹¥Æ¥à¥°¥ë¡¼¥×¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸µ¡Ç½¤ò»ý¤Ã¤¿
-        ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ç¤¹¡£       
-      </para>
+	¥æ¡¼¥¶¤ä¥°¥ë¡¼¥×¤ÎºîÀ®¡¢ºï½ü¡¢Êѹ¹¤ª¤è¤Óɽ¼¨¤ò¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¡¢
+	¥·¥¹¥Æ¥à¥æ¡¼¥¶¥Õ¥¡¥¤¥ë¤ä¥·¥¹¥Æ¥à¥°¥ë¡¼¥×¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸µ¡Ç½¤ò»ý¤Ã¤¿¥³¥Þ¥ó¥É¥é¥¤¥ó¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ç¤¹¡£
+	¤³¤ÎÀá¤Ç¤Ï¡¢¥æ¡¼¥¶¤ËÂФ¹¤ë»ÈÍÑÊýË¡¤òÀâÌÀ¤·¤Þ¤¹¡£
+	¸å¤Î <link linkend="users-groups">¥°¥ë¡¼¥×</link> Àá¤Ç¤Ï¡¢
+	¥°¥ë¡¼¥×¤ËÂФ¹¤ë»ÈÍÑÊýË¡¤òÀâÌÀ¤·¤Þ¤¹¡£</para>
 
       <para>
         ¤³¤ì¤Ï¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤«¤é¤ÎÍøÍѤ䡢
@@ -433,7 +433,7 @@ Other information:</screen>
     </sect2>
 
     <sect2 id="users-passwd">
-      <title>passwd</title>
+      <title>¥Ñ¥¹¥ï¡¼¥É¤ÎÊѹ¹</title>
 
       <para><application>passwd</application> ¤Ï¡¢
         ¥æ¡¼¥¶¤¬¼«Ê¬¤Î¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤¹¤ëÄ̾ï¤ÎÊýË¡¤Ç¤¹¡£
@@ -458,9 +458,13 @@ Old password:
 New password:
 Retype new password:
 passwd: updating the database...
-passwd: done
+passwd: done</screen>
+      </example>
+
+      <example>
+	<title>¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¸¢¸Â¤Ç¤Î¾¤Î¥æ¡¼¥¶¤Î¥Ñ¥¹¥ï¡¼¥ÉÊѹ¹</title>
 
-&prompt.root; <userinput>passwd jru</userinput>
+	<screen>&prompt.root; <userinput>passwd jru</userinput>
 Changing local password for jru.
 New password:
 Retype new password:
@@ -720,6 +724,85 @@ passwd: done</screen>
       ÃÏ°è²½¤Ë¤Ä¤¤¤Æ¤Ï¡¢
       <link linkend="l10n">ÃÏ°è²½¤Î¾Ï</link>¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para>
   </sect1>
+
+  <sect1 id="users-groups">
+    <title>¥°¥ë¡¼¥×</title>
+
+    <para>¥°¥ë¡¼¥×¤È¤Ï¡¢Ã±¤Ë¥æ¡¼¥¶¤òÍåÎó¤·¤¿¤â¤Î¤Ç¤¹¡£
+      ¥°¥ë¡¼¥×¤Ï¡¢¥°¥ë¡¼¥×̾¤È gid (¥°¥ë¡¼¥× ID) ¤Ç¼±Ê̤µ¤ì¤Þ¤¹¡£
+      FreeBSD (¤È¾¤Î Unix ¥·¥¹¥Æ¥à¤Î¤Û¤È¤ó¤É) ¤Ç¤Ï¡¢
+      ¤¢¤ë¥×¥í¥»¥¹¤¬²¿¤«¤¹¤ë¤Î¤òµö²Ä¤¹¤ë¤«¤É¤¦¤«¤ò¥«¡¼¥Í¥ë¤¬È½ÃǤ¹¤ëºÝ¤ËÍøÍѤ¹¤ë
+      2 ¤Ä¤Î°ø»Ò¤Ï¡¢¥æ¡¼¥¶ ID ¤È¤½¤Î¥æ¡¼¥¶¤¬½ê°¤¹¤ë¥°¥ë¡¼¥×¤Î°ìÍ÷¤Ç¤¹¡£
+      ¥æ¡¼¥¶ ID ¤È°Û¤Ê¤ê¡¢¥×¥í¥»¥¹¤Ï¤½¤Î¥×¥í¥»¥¹¤Ë´Ø·¸ÉÕ¤±¤é¤ì¤¿¥°¥ë¡¼¥×¤Î°ìÍ÷¤ò»ý¤Á¤Þ¤¹¡£
+      ¤É¤³¤«¤Ç "¥°¥ë¡¼¥× ID" ¤Ë¿¨¤ì¤Æ¤¤¤ë¤Î¤òʹ¤¯¤³¤È¤¬¤¢¤ë¤Ç¤·¤ç¤¦¤¬¡¢
+      ¤Û¤È¤ó¤É¤Î¾ì¹ç¤Ï¡¢¤³¤ì¤Ïñ¤Ë°ìÍ÷¤ÎºÇ½é¤Î¥°¥ë¡¼¥×¤ò»Ø¤·¤Æ¤¤¤Þ¤¹¡£</para>
+
+    <para>¥°¥ë¡¼¥×̾¤«¤é¥°¥ë¡¼¥× ID ¤Ø¤Î¼ÌÁü¤Ï
+      <filename>/etc/group</filename> ¤Ë¤¢¤ê¤Þ¤¹¡£
+      ¤³¤ì¤Ï¡¢¥³¥í¥ó¤Ç¶èÀÚ¤é¤ì¤¿ 4 ¹àÌܤ«¤é¤Ê¤ë¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤Ç¤¹¡£
+      1 ÈÖÌܤιàÌܤϥ°¥ë¡¼¥×̾¡¢
+      2 ÈÖÌܤϰŹ沽¤µ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¡¢
+      3 ÈÖÌܤ¬¥°¥ë¡¼¥× ID¡¢
+      4 ÈÖÌܤ¬¥«¥ó¥Þ¤Ç¶èÀÚ¤é¤ì¤¿¥á¥ó¥Ð¤Î°ìÍ÷¤Ç¤¹¡£
+      ¤³¤ì¤Ï¼ê¤ÇÊÔ½¸¤·¤ÆÌäÂꤢ¤ê¤Þ¤»¤ó
+      (¤â¤Á¤í¤ó¡¢Ê¸Ë¡¤ò¤Þ¤Ã¤¿¤¯´Ö°ã¤¨¤Ê¤¤¸Â¤ê¤Ï¤Ç¤¹¤¬)¡£
+      ʸˡ¤Ë¤Ä¤¤¤Æ¤Î´°Á´¤ÊÀâÌÀ¤Ï¡¢&man.group.5; ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+
+    <para><filename>/etc/group</filename> ¤ò¼ê¤ÇÊÔ½¸¤·¤¿¤¯¤Ê¤±¤ì¤Ð¡¢
+      &man.pw.8; ¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¥°¥ë¡¼¥×¤ÎÄɲääÊÔ½¸¤ò¤Ç¤­¤Þ¤¹¡£
+      ¤¿¤È¤¨¤Ð¡¢<groupname>teamtwo</groupname>
+      ¤È¤¤¤¦¥°¥ë¡¼¥×¤òÄɲ䷤ơ¢¤½¤Î¸ºß¤ò³Îǧ¤¹¤ë¤Ë¤Ï¡¢
+      ¼¡¤Î¤è¤¦¤Ë»È¤¨¤Ð¤Ç¤­¤Þ¤¹¡£</para>
+
+    <example>
+      <title>&man.pw.8; ¤Ë¤è¤ë¥°¥ë¡¼¥×¤ÎÄɲÃ</title>
+
+      <screen>&prompt.root; <userinput><command>pw</command> groupadd <groupname>teamtwo</groupname></userinput>
+&prompt.root; <userinput><command>pw</command> groupshow <groupname>teamtwo</groupname></userinput>
+teamtwo:*:1100:</screen>
+    </example>
+
+    <para>¾åµ­¤Î <literal>1100</literal> ¤È¤¤¤¦ÈÖ¹æ¤Ï¡¢
+      <groupname>teamtwo</groupname> ¥°¥ë¡¼¥×¤Î¥°¥ë¡¼¥× ID ¤Ç¤¹¡£
+      ¤³¤Î»þÅÀ¤Ç¤Ï¡¢<groupname>teamtwo</groupname>
+      ¤Ë¤Ï¥á¥ó¥Ð¤¬¤ª¤é¤º¡¢¤¢¤Þ¤ê°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó¡£
+      <username>jru</username> ¤ò <groupname>teamtwo</groupname>
+      ¤Ë»²²Ã¤µ¤»¤Æ¡¢¤³¤Î¾õ¶·¤òÊѤ¨¤Þ¤·¤ç¤¦¡£</para>
+
+    <example>
+      <title>&man.pw.8; ¤Ë¤è¤ë¥°¥ë¡¼¥×¤Ø¤Î¥æ¡¼¥¶ÄɲÃ</title>
+
+      <screen>&prompt.root; <userinput><command>pw</command> groupmod <groupname>teamtwo</groupname> <option>-M</option> <username>jru</username></userinput>
+&prompt.root; <userinput><command>pw</command> groupshow <groupname>teamtwo</groupname></userinput>
+teamtwo:*:1100:jru</screen>
+    </example>
+
+    <para><option>-M</option> ¥ª¥×¥·¥ç¥ó¤Î°ú¿ô¤Ï¡¢
+      ¥«¥ó¥Þ¤Ç¶èÀÚ¤é¤ì¤¿¥°¥ë¡¼¥×¤Ë½ê°¤¹¤ë¥æ¡¼¥¶¤Î°ìÍ÷¤Ç¤¹¡£
+      Á°¤ÎÀá¤òÆɤޤ줿¤Ê¤é¡¢
+      ¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤Ë³Æ¥æ¡¼¥¶¤Î¥°¥ë¡¼¥×¤¬µ­ºÜ¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò¤´Â¸ÃΤǤ·¤ç¤¦¡£
+      ¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë¥°¥ë¡¼¥×¤Ï¡¢
+      ¥·¥¹¥Æ¥à¤¬¼«Æ°Åª¤Ë¥°¥ë¡¼¥×°ìÍ÷¤Ë²Ã¤¨¤Þ¤¹¤Î¤Ç¡¢&man.pw.8;
+      ¤Ç¥°¥ë¡¼¥×¤Î¥á¥ó¥Ð°ìÍ÷¤òÄ´¤Ù¤¿»þ¤Ë¤Ï¤½¤Î¥æ¡¼¥¶¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó
+      (¤·¡¢É½¼¨¤µ¤ì¤ë¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)¡£
+      ¤¢¤ë¥æ¡¼¥¶¤¬¤É¤Î¥°¥ë¡¼¥×¤Ë°¤·¤Æ¤¤¤ë¤«¤òÄ´¤Ù¤¿¤±¤ì¤Ð¡¢
+      ¼¡¤Î¤è¤¦¤Ë &man.id.1; ¥×¥í¥°¥é¥à¤¬»È¤¨¤Þ¤¹¡£</para>
+
+    <example>
+      <title>&man.id.1; ¤Ë¤è¤ë¥°¥ë¡¼¥×¤Î¥á¥ó¥Ð¤Î³Îǧ</title>
+
+      <screen>&prompt.user; <userinput><command>id</command> <username>jru</username></userinput>
+uid=1001(jru) gid=1001(jru) groups=1001(jru), 1100(teamtwo)</screen>
+    </example>
+
+    <para>¸«¤ì¤Ðʬ¤«¤ê¤Þ¤¹¤¬¡¢<username>jru</username> ¤Ï
+      <groupname>jru</groupname> ¥°¥ë¡¼¥×¤È
+      <groupname>teamtwo</groupname> ¥°¥ë¡¼¥×¤Î¥á¥ó¥Ð¤Ç¤¹¡£</para>
+
+    <para>&man.pw.8; ¤Ë¤Ä¤¤¤Æ¾Ü¤·¤¯¤Ï¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
+      <filename>/etc/group</filename> ¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+      &man.group.5; ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+  </sect1>
 </chapter>
 
 <!-- 

From owner-svn-doc-all@FreeBSD.ORG  Fri Jul 27 23:20:23 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7E7E0106564A;
	Fri, 27 Jul 2012 23:20:23 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4F2EF8FC0C;
	Fri, 27 Jul 2012 23:20:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6RNKNCr057584;
	Fri, 27 Jul 2012 23:20:23 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6RNKNL1057583;
	Fri, 27 Jul 2012 23:20:23 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201207272320.q6RNKNL1057583@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 27 Jul 2012 23:20:23 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39272 - head/en_US.ISO8859-1/books/handbook/updating
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Jul 2012 23:20:23 -0000

Author: gjb
Date: Fri Jul 27 23:20:22 2012
New Revision: 39272
URL: http://svn.freebsd.org/changeset/doc/39272

Log:
  Remove an empty directory.

Deleted:
  head/en_US.ISO8859-1/books/handbook/updating/

From owner-svn-doc-all@FreeBSD.ORG  Sat Jul 28 00:01:00 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0843A106566B;
	Sat, 28 Jul 2012 00:01:00 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E722F8FC08;
	Sat, 28 Jul 2012 00:00:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6S00xkd061033;
	Sat, 28 Jul 2012 00:00:59 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6S00xmf061031;
	Sat, 28 Jul 2012 00:00:59 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201207280000.q6S00xmf061031@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 28 Jul 2012 00:00:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39273 - head/en_US.ISO8859-1/books/porters-handbook
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Jul 2012 00:01:00 -0000

Author: gjb
Date: Sat Jul 28 00:00:59 2012
New Revision: 39273
URL: http://svn.freebsd.org/changeset/doc/39273

Log:
  Give the Kernel Sources section of the Porter's Handbook a
  section ID so it does not clutter the filesystem when making
  local changes to porters-handbook/book.sgml, making the 'clean'
  make(1) target actually remove all files.

Modified:
  head/en_US.ISO8859-1/books/porters-handbook/book.sgml

Modified: head/en_US.ISO8859-1/books/porters-handbook/book.sgml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/book.sgml	Fri Jul 27 23:20:22 2012	(r39272)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.sgml	Sat Jul 28 00:00:59 2012	(r39273)
@@ -9431,7 +9431,7 @@ GROUPS=	pulse pulse-access pulse-rt</pro
 	<filename>ports/GIDs</filename>.</para>
     </sect1>
 
-    <sect1>
+    <sect1 id="requiring-kernel-sources">
       <title>Ports That Rely on Kernel Sources</title>
 
       <para>Some ports (such as kernel loadable modules) need the

From owner-svn-doc-all@FreeBSD.ORG  Sat Jul 28 10:07:23 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 12B0D106566B;
	Sat, 28 Jul 2012 10:07:23 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42])
	by mx1.freebsd.org (Postfix) with ESMTP id D8D698FC1C;
	Sat, 28 Jul 2012 10:07:22 +0000 (UTC)
Received: from fledge.watson.org (fledge.watson.org [65.122.17.41])
	by cyrus.watson.org (Postfix) with ESMTPS id 40F7C46B17;
	Sat, 28 Jul 2012 06:07:22 -0400 (EDT)
Date: Sat, 28 Jul 2012 11:07:22 +0100 (BST)
From: Robert Watson <rwatson@FreeBSD.org>
X-X-Sender: robert@fledge.watson.org
To: Eitan Adler <eadler@FreeBSD.org>
In-Reply-To: <201207222219.q6MMJeAL032049@svn.freebsd.org>
Message-ID: <alpine.BSF.2.00.1207281106040.53430@fledge.watson.org>
References: <201207222219.q6MMJeAL032049@svn.freebsd.org>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
	doc-committers@freebsd.org
Subject: Re: svn commit: r39249 - head/en_US.ISO8859-1/books/faq
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Jul 2012 10:07:23 -0000

On Sun, 22 Jul 2012, Eitan Adler wrote:

> Author: eadler (src,ports committer)
> Date: Sun Jul 22 22:19:39 2012
> New Revision: 39249
> URL: http://svn.freebsd.org/changeset/doc/39249
>
> Log:
>  Modernize question about building your own kernel.

A further consideration in the source code-related sections is that building 
your own {world, kernel} will bump you off the support path for binary updates 
and upgrades with freebsd-update.  This is increasingly a consideration for 
our default kernel configuration: kernel options that require recompilation 
force users not to use the most user-friendly upgrade path we have.

Robert

>
>  Approved by:	wblock
>
> Modified:
>  head/en_US.ISO8859-1/books/faq/book.sgml
>
> Modified: head/en_US.ISO8859-1/books/faq/book.sgml
> ==============================================================================
> --- head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:37 2012	(r39248)
> +++ head/en_US.ISO8859-1/books/faq/book.sgml	Sun Jul 22 22:19:39 2012	(r39249)
> @@ -1833,18 +1833,12 @@
> 	</question>
>
> 	<answer>
> -	  <para>Building a new kernel was originally pretty much a
> -	    required step in a &os; installation, but more recent releases
> -	    have benefited from the introduction of much friendlier
> -	    kernel configuration methods.  It is very easy to configure
> -	    the kernel's configuration by much more flexible
> -	    <quote>hints</quote> which can be set at the loader
> -	    prompt.</para>
> -
> -	  <para>It may still be worthwhile building a new kernel
> -	    containing just the drivers that you need, just to save a
> -	    bit of RAM, but it is no longer necessary for most
> -	    systems.</para>
> +	  <para>Usually not.  The supplied <literal>GENERIC</literal>
> +	    kernel contains the drivers an ordinary computer will
> +	    need.  For computers with very limited RAM, such as
> +	    embedded systems, it may be worthwhile to build a
> +	    smaller custom kernel containing just the required
> +	    drivers.</para>
> 	</answer>
>       </qandaentry>
>
>

From owner-svn-doc-all@FreeBSD.ORG  Sat Jul 28 15:55:21 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7322F1065670;
	Sat, 28 Jul 2012 15:55:21 +0000 (UTC)
	(envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5C6A08FC17;
	Sat, 28 Jul 2012 15:55:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6SFtLq5042274;
	Sat, 28 Jul 2012 15:55:21 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6SFtL0w042269;
	Sat, 28 Jul 2012 15:55:21 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201207281555.q6SFtL0w042269@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 28 Jul 2012 15:55:21 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39274 - in head/ja_JP.eucJP: books/handbook/eresources
	share/sgml
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Jul 2012 15:55:21 -0000

Author: ryusuke
Date: Sat Jul 28 15:55:20 2012
New Revision: 39274
URL: http://svn.freebsd.org/changeset/doc/39274

Log:
  - Merge the following from the English version:
  
  	r13013 -> r13563, r39055 -> r39269
  	  delete *-cvs-* and add &a.svn-src-* mailing lists
  		head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
  
  	r38751 -> r39269	head/ja_JP.eucJP/share/sgml/mailing-lists.ent

Modified:
  head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
  head/ja_JP.eucJP/share/sgml/mailing-lists.ent

Modified: head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml	Sat Jul 28 00:00:59 2012	(r39273)
+++ head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml	Sat Jul 28 15:55:20 2012	(r39274)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r13013
+     Original revision: r13563
      $FreeBSD$
 -->
 
@@ -77,11 +77,6 @@
 	  </thead>
 
 	  <tbody>
- 	    <row>
-	      <entry>cvs-all</entry>
-	      <entry>FreeBSD ¥½¡¼¥¹¥Ä¥ê¡¼¤Ø²Ã¤¨¤é¤ì¤¿Êѹ¹¤Ë¤Ä¤¤¤Æ</entry>
-	    </row>
-
 	    <row>
 	      <entry>freebsd-advocacy</entry>
 	      <entry>FreeBSD ¤ÎÊ¡²»ÅÁÆ»</entry>
@@ -98,17 +93,17 @@
 	    </row>
 
 	    <row>
-	      <entry>freebsd-bugs</entry>
-	      <entry>¥Ð¥°¥ì¥Ý¡¼¥È</entry>
-	    </row>
-
-	    <row>
 	      <entry>freebsd-bugbusters</entry>
 	      <entry>FreeBSD
 		¾ã³²Êó¹ð¥Ç¡¼¥¿¥Ù¡¼¥¹¤ª¤è¤Ó´ØÏ¢¤¹¤ë¥Ä¡¼¥ë¤Î´ÉÍý¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
 	    </row>
 
 	    <row>
+	      <entry>freebsd-bugs</entry>
+	      <entry>¥Ð¥°¥ì¥Ý¡¼¥È</entry>
+	    </row>
+
+	    <row>
 	      <entry>freebsd-chat</entry>
 	      <entry>FreeBSD
 		¥³¥ß¥å¥Ë¥Æ¥£¤Ë´ØÏ¢¤¹¤ëµ»½ÑŪ¤Ç¤Ï¤Ê¤¤ÏÃÂê</entry>
@@ -222,6 +217,11 @@
 	    </row>
 
 	    <row>
+	      <entry>freebsd-cvsweb</entry>
+	      <entry>CVSWeb ¤Î´ÉÍý</entry>
+	    </row>
+
+	    <row>
 	      <entry>freebsd-database</entry>
 	      <entry>FreeBSD
 		¾å¤Ç¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÍøÍѤ䳫ȯ¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
@@ -487,10 +487,6 @@
 	    </row>
 	    
 	    <row>
-	      <entry>freebsd-cvs-all-digest</entry>
-	    </row>
-	    
-	    <row>
 	      <entry>freebsd-database-digest</entry>
 	    </row>
 	    
@@ -534,7 +530,7 @@
 	</tgroup>
       </informaltable>
 
-      <para><emphasis>CVS ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È:</emphasis>
+      <para><emphasis>SVN ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È:</emphasis>
 	°Ê²¼¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¥½¡¼¥¹¥Ä¥ê¡¼¤Î
 	¤µ¤Þ¤¶¤Þ¤Ê¾ì½ê¤ÎÊѹ¹¤Î¥í¥°¥á¥Ã¥»¡¼¥¸¤ò¸«¤ë¤³¤È¤Ë
 	¶½Ì£¤Î¤¢¤ë¿Í¸þ¤±¤Ç¤¹¡£
@@ -553,9 +549,152 @@
 
 	  <tbody>
 	    <row>
-	      <entry>cvs-all</entry>
-	      <entry>/usr/src</entry>
-	      <entry>¥Ä¥ê¡¼¤Î¤¹¤Ù¤Æ¤ÎÊѹ¹ (¥¹¡¼¥Ñ¡¼¥»¥Ã¥È)</entry>
+	      <entry>&a.svn-doc-all.name;</entry>
+	      <entry><filename>/usr/doc</filename></entry>
+	      <entry>doc subversion ¥ê¥Ý¥¸¥È¥ê¤Ø²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹
+		(<filename>user</filename>, <filename>projects</filename>
+	        ¤ª¤è¤Ó <filename>translations</filename> ¤ò½ü¤¯)</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-doc-head.name;</entry>
+	      <entry><filename>/usr/doc</filename></entry>
+	      <entry>doc subversion ¥ê¥Ý¥¸¥È¥ê¤Î <quote>head</quote>
+		¥Ö¥é¥ó¥Á¤Ë²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-doc-projects.name;</entry>
+	      <entry><filename>/usr/doc/projects</filename></entry>
+	      <entry>doc subversion ¥ê¥Ý¥¸¥È¥ê¤Î <filename>projects</filename>
+		¤Ë²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-doc-svnadmin.name;</entry>
+	      <entry><filename>/usr/doc</filename></entry>
+	      <entry>doc subversion ¥ê¥Ý¥¸¥È¥ê¤Î´ÉÍýÍÑ¥¹¥¯¥ê¥×¥È¡¢
+		¥Õ¥Ã¥¯¤ª¤è¤Ó¾¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Ç¡¼¥¿¤ËÂФ·¤Æ²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-ports-all.name;</entry>
+	      <entry><filename>/usr/ports</filename></entry>
+	      <entry>ports subversion ¥ê¥Ý¥¸¥È¥ê¤Ø²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-ports-head.name;</entry>
+	      <entry><filename>/usr/ports</filename></entry>
+	      <entry>ports subversion ¥ê¥Ý¥¸¥È¥ê¤Î <quote>head</quote>
+		¥Ö¥é¥ó¥Á¤Ë²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-ports-svnadmin.name;</entry>
+	      <entry><filename>/usr/ports</filename></entry>
+	      <entry>ports subversion ¥ê¥Ý¥¸¥È¥ê¤Î´ÉÍýÍÑ¥¹¥¯¥ê¥×¥È¡¢
+		¥Õ¥Ã¥¯¤ª¤è¤Ó¾¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Ç¡¼¥¿¤ËÂФ·¤Æ²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+ 	    <row>
+	      <entry>&a.svn-src-all.name;</entry>
+	      <entry><filename>/usr/src</filename></entry>
+	      <entry>doc subversion ¥ê¥Ý¥¸¥È¥ê¤Ø²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹
+		(<filename>user</filename> ¤ª¤è¤Ó <filename>projects</filename>
+	        ¤ò½ü¤¯)</entry>
+	    </row>
+
+ 	    <row>
+	      <entry>&a.svn-src-head.name;</entry>
+	      <entry><filename>/usr/src</filename></entry>
+	      <entry>src subversion ¥ê¥Ý¥¸¥È¥ê¤Î <quote>head</quote>
+		¥Ö¥é¥ó¥Á (&os;-CURRENT ¥Ö¥é¥ó¥Á) ¤Ë²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-src-projects.name;</entry>
+	      <entry><filename>/usr/projects</filename></entry>
+	      <entry>src subversion ¥ê¥Ý¥¸¥È¥ê¤Î <filename>projects</filename>
+		¤Ë²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-src-release.name;</entry>
+	      <entry><filename>/usr/src</filename></entry>
+	      <entry>src subversion ¥ê¥Ý¥¸¥È¥ê¤Î <filename>releases</filename>
+		¤Ë²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-src-releng.name;</entry>
+	      <entry><filename>/usr/src</filename></entry>
+	      <entry>src subversion ¥ê¥Ý¥¸¥È¥ê¤Î <filename>releng</filename>
+		¥Ö¥é¥ó¥Á (¥»¥­¥å¥ê¥Æ¥£&nbsp;/ ¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¥Ö¥é¥ó¥Á)
+		¤Ë²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-src-stable.name;</entry>
+	      <entry><filename>/usr/src</filename></entry>
+	      <entry>src subversion ¥ê¥Ý¥¸¥È¥ê¤Î¤¹¤Ù¤Æ¤Î stable
+		¥Ö¥é¥ó¥Á¤Ë²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-src-stable-6.name;</entry>
+	      <entry><filename>/usr/src</filename></entry>
+	      <entry>src subversion ¥ê¥Ý¥¸¥È¥ê¤Î <filename>stable/6</filename>
+		¥Ö¥é¥ó¥Á¤Ë²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-src-stable-7.name;</entry>
+	      <entry><filename>/usr/src</filename></entry>
+	      <entry>src subversion ¥ê¥Ý¥¸¥È¥ê¤Î <filename>stable/7</filename>
+		¥Ö¥é¥ó¥Á¤Ë²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-src-stable-8.name;</entry>
+	      <entry><filename>/usr/src</filename></entry>
+	      <entry>src subversion ¥ê¥Ý¥¸¥È¥ê¤Î <filename>stable/8</filename>
+		¥Ö¥é¥ó¥Á¤Ë²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-src-stable-9.name;</entry>
+	      <entry><filename>/usr/src</filename></entry>
+	      <entry>src subversion ¥ê¥Ý¥¸¥È¥ê¤Î <filename>stable/9</filename>
+		¥Ö¥é¥ó¥Á¤Ë²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-src-stable-other.name;</entry>
+	      <entry><filename>/usr/src</filename></entry>
+	      <entry>src subversion ¥ê¥Ý¥¸¥È¥ê¤Î¸Å¤¤ <filename>stable</filename>
+		¥Ö¥é¥ó¥Á¤Ë²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-src-svnadmin.name;</entry>
+	      <entry><filename>/usr/src</filename></entry>
+	      <entry>src subversion ¥ê¥Ý¥¸¥È¥ê¤Î´ÉÍýÍÑ¥¹¥¯¥ê¥×¥È¡¢
+		¥Õ¥Ã¥¯¤ª¤è¤Ó¾¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Ç¡¼¥¿¤ËÂФ·¤Æ²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-src-user.name;</entry>
+	      <entry><filename>/usr/src</filename></entry>
+	      <entry>src subversion ¥ê¥Ý¥¸¥È¥ê¤Î <filename>user</filename>
+		¤Ë²Ã¤¨¤é¤ì¤¿¼Â¸³Åª¤Ê¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.svn-src-vendor.name;</entry>
+	      <entry><filename>/usr/src</filename></entry>
+	      <entry>src subversion ¥ê¥Ý¥¸¥È¥ê¤Î vender
+		¤Ë²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
 	    </row>
 	  </tbody>
 	</tgroup>
@@ -767,6 +906,17 @@ help
 	  </listitem>
 	</varlistentry>
 
+	<varlistentry>
+	  <term>FREEBSD-BUGBUSTERS</term>
+
+	  <listitem>
+	    <para><emphasis>¾ã³²Êó¹ð¤Î¼è¤ê°·¤¤¤Ë´Ø¤¹¤ëÄ´À°</emphasis></para>
+
+	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢
+	      ¥Ð¥°¥Þ¥¤¥¹¥¿¡¼¡¢¥Ð¥°¥Ð¥¹¥¿¡¼¡¢¤ª¤è¤Ó¾¤Î¾ã³²Êó¹ð¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë½ã¿è¤Ë¶½Ì£¤ò»ý¤Ã¤Æ¤¤¤ë¥°¥ë¡¼¥×¤ÎÄ´À°¤äµÄÏÀ¤Ë¤Ä¤¤¤Æ¤Î¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£
+	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢¸ÄÊ̤ΥХ°¡¢¥Ñ¥Ã¥Á¡¢¾ã³²Êó¹ð¤Ë¤Ä¤¤¤ÆµÄÏÀ¤ò¹Ô¤¦¤¿¤á¤Î¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
+	  </listitem>
+	</varlistentry>
 
 	<varlistentry><term>FREEBSD-BUGS</term>
 	  <listitem>
@@ -856,6 +1006,17 @@ help
  	  </listitem>
  	</varlistentry>
 
+	<varlistentry>
+	  <term>FREEBSD-CVSWEB</term>
+
+	  <listitem>
+	    <para><emphasis>FreeBSD CVSweb ¥×¥í¥¸¥§¥¯¥È</emphasis></para>
+
+	    <para>FreeBSD-CVSweb
+	      ¤ÎÍøÍÑ¡¢³«È¯¤ª¤è¤Ó´ÉÍý¤Ë¤Ä¤¤¤Æ¤Îµ»½ÑŪ¤ÊµÄÏÀ¤Î¾ì¤Ç¤¹¡£</para>
+ 	  </listitem>
+ 	</varlistentry>
+
 	<varlistentry><term>FREEBSD-DOC</term>
 	  <listitem>
 	    <para><emphasis>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</emphasis></para>

Modified: head/ja_JP.eucJP/share/sgml/mailing-lists.ent
==============================================================================
--- head/ja_JP.eucJP/share/sgml/mailing-lists.ent	Sat Jul 28 00:00:59 2012	(r39273)
+++ head/ja_JP.eucJP/share/sgml/mailing-lists.ent	Sat Jul 28 15:55:20 2012	(r39274)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.90
+     Original revision: r39269
      $FreeBSD$
 -->
 
@@ -416,6 +416,34 @@
 <!ENTITY a.sun4v "<ulink url='&a.sun4v.url;'>FreeBSD sun4v porting ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</ulink>">
 <!ENTITY a.sun4v.name "<ulink url='&a.sun4v.url;'>freebsd-sun4v</ulink>">
 
+<!ENTITY a.svn-doc-all.url "&a.mailman.listinfo;/svn-doc-all">
+<!ENTITY a.svn-doc-all "<ulink url='&a.svn-doc-all.url;'>SVN commit messages for the entire doc tree (except for <quote>user</quote>, <quote>projects</quote> and <quote>translations</quote>)</ulink>">
+<!ENTITY a.svn-doc-all.name "<ulink url='&a.svn-doc-all.url;'>svn-doc-all</ulink>">
+
+<!ENTITY a.svn-doc-head.url "&a.mailman.listinfo;/svn-doc-head">
+<!ENTITY a.svn-doc-head "<ulink url='&a.svn-doc-head.url;'>SVN commit messages for the doc tree for head/</ulink>">
+<!ENTITY a.svn-doc-head.name "<ulink url='&a.svn-doc-head.url;'>svn-doc-head</ulink>">
+
+<!ENTITY a.svn-doc-projects.url "&a.mailman.listinfo;/svn-doc-projects">
+<!ENTITY a.svn-doc-projects "<ulink url='&a.svn-doc-projects.url;'>SVN commit messages for the doc <quote>projects</quote> tree</ulink>">
+<!ENTITY a.svn-doc-projects.name "<ulink url='&a.svn-doc-projects.url;'>svn-doc-projects</ulink>">
+
+<!ENTITY a.svn-doc-svnadmin.url "&a.mailman.listinfo;/svn-doc-svnadmin">
+<!ENTITY a.svn-doc-svnadmin "<ulink url='&a.svn-doc-svnadmin.url;'>SVN commit messages for the doc admin&nbsp;/ configuration tree</ulink>">
+<!ENTITY a.svn-doc-svnadmin.name "<ulink url='&a.svn-doc-svnadmin.url;'>svn-doc-svnadmin</ulink>">
+
+<!ENTITY a.svn-ports-all.url "&a.mailman.listinfo;/svn-ports-all">
+<!ENTITY a.svn-ports-all "<ulink url='&a.svn-ports-all.url;'>SVN commit messages for the entire ports tree</ulink>">
+<!ENTITY a.svn-ports-all.name "<ulink url='&a.svn-ports-all.url;'>svn-ports-all</ulink>">
+
+<!ENTITY a.svn-ports-head.url "&a.mailman.listinfo;/svn-ports-head">
+<!ENTITY a.svn-ports-head "<ulink url='&a.svn-ports-head.url;'>SVN commit messages for the ports tree for head/</ulink>">
+<!ENTITY a.svn-ports-head.name "<ulink url='&a.svn-ports-head.url;'>svn-ports-head</ulink>">
+
+<!ENTITY a.svn-ports-svnadmin.url "&a.mailman.listinfo;/svn-ports-svnadmin">
+<!ENTITY a.svn-ports-svnadmin "<ulink url='&a.svn-ports-svnadmin.url;'>SVN commit messages for the ports admin&nbsp;/ configuration tree</ulink>">
+<!ENTITY a.svn-ports-svnadmin.name "<ulink url='&a.svn-ports-svnadmin.url;'>svn-ports-svnadmin</ulink>">
+
 <!ENTITY a.svn-src-all.url "&a.mailman.listinfo;/svn-src-all">
 <!ENTITY a.svn-src-all "<ulink url='&a.svn-src-all.url;'>SVN commit messages for the entire src tree (except for <quote>user</quote> and <quote>projects</quote>)</ulink>">
 <!ENTITY a.svn-src-all.name "<ulink url='&a.svn-src-all.url;'>svn-src-all</ulink>">