From owner-svn-doc-head@FreeBSD.ORG  Sun Nov  4 07:34:08 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 0F6F2C71;
 Sun,  4 Nov 2012 07:34:08 +0000 (UTC)
 (envelope-from taras@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id CADDE8FC08;
 Sun,  4 Nov 2012 07:34:07 +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 qA47Y7PK021172;
 Sun, 4 Nov 2012 07:34:07 GMT (envelope-from taras@svn.freebsd.org)
Received: (from taras@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA47Y7pb021169;
 Sun, 4 Nov 2012 07:34:07 GMT (envelope-from taras@svn.freebsd.org)
Message-Id: <201211040734.qA47Y7pb021169@svn.freebsd.org>
From: Taras Korenko <taras@FreeBSD.org>
Date: Sun, 4 Nov 2012 07:34:07 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39925 - in head/ru_RU.KOI8-R/books/handbook: bsdinstall
 install
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 07:34:08 -0000

Author: taras
Date: Sun Nov  4 07:34:07 2012
New Revision: 39925
URL: http://svn.freebsd.org/changeset/doc/39925

Log:
  + fix a few typos found in bsdinstall/chapter.xml and install/chapter.xml .

Modified:
  head/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
  head/ru_RU.KOI8-R/books/handbook/install/chapter.xml

Modified: head/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml	Sat Nov  3 23:24:38 2012	(r39924)
+++ head/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml	Sun Nov  4 07:34:07 2012	(r39925)
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     Original revision: r39813
+     Original revision: r39870
 -->
 <chapter id="bsdinstall">
   <chapterinfo>
@@ -46,7 +46,7 @@
     </authorgroup>
   </chapterinfo>
 
-  <title>õÓÔÁÎÏ×ËÁ &os; ×ÅÒÓÉÉ 9.<replaceable>X</replaceable> É ÂÏÌÅÅ
+  <title>õÓÔÁÎÏ×ËÁ &os; ×ÅÒÓÉÊ 9.<replaceable>X</replaceable> É ÂÏÌÅÅ
     ÐÏÚÄÎÉÈ</title>
 
   <sect1 id="bsdinstall-synopsis">

Modified: head/ru_RU.KOI8-R/books/handbook/install/chapter.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/install/chapter.xml	Sat Nov  3 23:24:38 2012	(r39924)
+++ head/ru_RU.KOI8-R/books/handbook/install/chapter.xml	Sun Nov  4 07:34:07 2012	(r39925)
@@ -148,7 +148,7 @@
 	<para>åÓÌÉ ×ÁÛÁ ÓÉÓÔÅÍÁ ÏÓÎÏ×ÁÎÁ ÎÁ nVidia nForce3
 	  Pro-150, <emphasis>ÎÅÏÂÈÏÄÉÍÏ</emphasis> ÏÔËÌÀÞÉÔØ IO APIC
 	  × BIOS.  åÓÌÉ ÄÌÑ ÜÔÏÇÏ ÎÅÔ ÎÅÏÂÈÏÄÉÍÏÊ ÏÐÃÉÉ, ÏÔËÌÀÞÉÔÅ
-	  APIC × ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÅ.  ÷ ÞÉÐÓÅÔÅ Pro-150 ÓÏÄÅÒÖÁÔÓÑ
+	  ACPI × ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÅ.  ÷ ÞÉÐÓÅÔÅ Pro-150 ÓÏÄÅÒÖÁÔÓÑ
 	  ÏÛÉÂËÉ, ÄÌÑ ËÏÔÏÒÙÈ ÐÏËÁ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ ÉÓÐÒÁ×ÌÅÎÉÊ.</para>
       </sect3>
 
@@ -533,7 +533,7 @@
 	ÂÅÓÐÏËÏÉÔØÓÑ.</para>
 
       <para>éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÁÈ, ×ËÌÀÞÁÑ ÓÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ ËÁÖÄÏÇÏ ÒÅÌÉÚÁ,
-	ÎÁÈÏÄÉÔÓÑ ÓÔÒÁÎÉÃÅ
+	ÎÁÈÏÄÉÔÓÑ ÎÁ ÓÔÒÁÎÉÃÅ
 	<ulink url="&url.base;/ru/releases/index.html">ÉÎÆÏÒÍÁÃÉÉ
 	Ï ÒÅÌÉÚÁÈ</ulink>
 	<ulink url="&url.base;/ru/index.html">ÓÁÊÔÁ FreeBSD</ulink>.</para>
@@ -1369,7 +1369,7 @@ Mounting root from ufs:/dev/md0c
     </sect2>
 
     <sect2 id="start-install">
-      <title>îÁÞÁÌÏ ÓÔÁÎÄÁÒÔÎÏÊ ÕÓÔÁÎÏ×ËÉ (Standart)</title>
+      <title>îÁÞÁÌÏ ÓÔÁÎÄÁÒÔÎÏÊ ÕÓÔÁÎÏ×ËÉ (Standard)</title>
 
       <para>ðÕÎËÔ <guimenuitem>Standard</guimenuitem>
 	ÒÅËÏÍÅÎÄÕÅÔÓÑ ÄÌÑ ÎÏ×ÙÈ ÐÏÌØÚÏ×ÁÔÅÌÅÊ &unix; ÉÌÉ FreeBSD.

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov  4 08:42:15 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 0608A433;
 Sun,  4 Nov 2012 08:42:15 +0000 (UTC)
 (envelope-from gblach@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id DFA8A8FC0C;
 Sun,  4 Nov 2012 08:42:14 +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 qA48gEZ0034584;
 Sun, 4 Nov 2012 08:42:14 GMT (envelope-from gblach@svn.freebsd.org)
Received: (from gblach@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA48gEt2034572;
 Sun, 4 Nov 2012 08:42:14 GMT (envelope-from gblach@svn.freebsd.org)
Message-Id: <201211040842.qA48gEt2034572@svn.freebsd.org>
From: Grzegorz Blach <gblach@FreeBSD.org>
Date: Sun, 4 Nov 2012 08:42:14 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39926 - in head: en_US.ISO8859-1/articles/contributors
 share/pgpkeys share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 08:42:15 -0000

Author: gblach (ports committer)
Date: Sun Nov  4 08:42:13 2012
New Revision: 39926
URL: http://svn.freebsd.org/changeset/doc/39926

Log:
  - Add myself to authors.ent, developers.ent
  - Move myself from contrib.additional.xml to contrib.committers.xml
  - Add my news.xml entry
  - Add my PGP public key
  
  Approved by: tabthorpe (mentor)

Added:
  head/share/pgpkeys/gblach.key   (contents, props changed)
Modified:
  head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
  head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
  head/share/pgpkeys/pgpkeys-developers.xml
  head/share/pgpkeys/pgpkeys.ent
  head/share/xml/authors.ent
  head/share/xml/developers.ent
  head/share/xml/news.xml

Modified: head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Sun Nov  4 07:34:07 2012	(r39925)
+++ head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Sun Nov  4 08:42:13 2012	(r39926)
@@ -3595,11 +3595,6 @@
     </listitem>
 
     <listitem>
-      <para>Grzegorz Blach
-	<email>magik@roorback.net</email></para>
-    </listitem>
-
-    <listitem>
       <para>Guillaume Paquet
 	<email>amyfoub@videotron.ca</email></para>
     </listitem>

Modified: head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Sun Nov  4 07:34:07 2012	(r39925)
+++ head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Sun Nov  4 08:42:13 2012	(r39926)
@@ -116,6 +116,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.gblach;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.mbr;</para>
     </listitem>
 

Added: head/share/pgpkeys/gblach.key
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/pgpkeys/gblach.key	Sun Nov  4 08:42:13 2012	(r39926)
@@ -0,0 +1,41 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh gblach D25B0682;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   2048R/D25B0682 2012-11-03 [expires: 2014-11-03]
+      Key fingerprint = 225B 941C A886 05C6 1C87  9C03 DE72 593D D25B 0682
+uid                  Grzegorz Blach <gblach@FreeBSD.org>
+sub   2048R/5DE28719 2012-11-03 [expires: 2014-11-03]
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFCVjegBCACjZOtHgTAG3s3XOVJt1VVM3LZTKKx0K5Aip1c4TDetBTkNIPCb
+V9UiflZUGv9v6OEF0O5rRwS6WwTLxjhuA9io9mSBWuCfZywsRSShpZQbEMZq5/F+
+OgHOMav3Gc+ITwvM/nFPtU2OHj1h3t4n6IBbuVfPh4Yb9TJsAWQlUchWAOBj7CG0
+oqfR2PuDbYFtXNnGVrpZZuxxBI9onvY0n5w2gmtmO9+GFQ8Ob9K6EI/jwqPVGSQK
+Tch14aaeRF5Uh+Ua7UDXKyZFBJUuGEvtHcn7eDNFEs4SY4tW7he6VGiCwr3gU3pZ
+CdQwEUDwXkBm/JZ8JjsDOq8NVtTX3d0mViTRABEBAAG0I0dyemVnb3J6IEJsYWNo
+IDxnYmxhY2hARnJlZUJTRC5vcmc+iQE+BBMBAgAoBQJQlY3oAhsDBQkDwmcABgsJ
+CAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDeclk90lsGgt6gB/4vyw2faWL5MntH
+grGiwqdeCdm1x++zGjxrs30RLaHPmSVXYA/bQIBbnVs/kR2wRpCO9fxl9xQ5bBnZ
+vHwK9+hbGqli/eqWuvgwRYmkIAd/xLVN8Ffyj73RXRead6bmpOQ8e2Osabttyccc
+Un4V8OZptpIYLbdnVGsiB147GYnooPv5uJ6RD+Wz+iSORFzcFEA6VD0Ft6vxe1on
++dBxpHO8Np1wID8JH3Gl6oGfpYcPsp1QVknMZ197+94QNHgN23xzDVuKkbjFb1Du
+N7SegRdm1wwhF0QlqIWPIQT8jXY7WX1NWV6ns8gOUXChJxGMPRsOxCuhQJp8crsS
+q32CqqDmuQENBFCVjegBCAC56QSMFVZjklZSA9mxNm6GZyBcUoAYISM2hg4QSN92
+/8CY84TXiAB9x8+KoYeVukMu5B/2BhNW4bWA/3GwMk0tn1s2ZEVFz9ZbTBPmTA1Z
+x1wZOKdr4Y5feOO73ouBW1cyR4AgbYEsQtllfb3yQ2CukouEJNjesDT+zDAJnIS9
+JG+1MGngMIxddKasNfBliiN0iNNbGEKpFvcNpTBnIpbQ55/yMMJ9CZmey/1HFKBO
+setIET7f1Z3f2tUoxku73QhwfwBlrw269S4Aeuvk80bZa1YZLoQiZ5B2WqFz4V4H
+uxk9WgqOQ/gJEFCOYkpLjSctCuFQnLefsV44gveB+LU7ABEBAAGJASUEGAECAA8F
+AlCVjegCGwwFCQPCZwAACgkQ3nJZPdJbBoLnwwf/Z8bFOlDaLWkCP4K8Uz6kHGno
+nvRPc6l76aJhqDPceEiDU1DumjTSokQNj2i9jKqhM/b2cPLIwWbYbkypLer9R00o
+AJcM1i2nkZXRLRMIFfQTZUmXMSZvZ5NG+MyiSAI9zpfw/psgUUad6mDUZafYVWez
+KnCFybbJ2TwcFzFcHxi4desKNnrh/NTIt7XyFVof9Wkz8Zt9cGGf/BxQPA9oPbvd
+b8wN9Yjegb4OunNmHc309cuVCktSlr7u4kdMUn0LuZmi4xZj2XY0+GuHErD49G1b
+x4+G59TE5S619vSAcdjtmvXDvV8no1Y9ENp/blCkeKcGBoWZKc6dHSw3RsMawA==
+=/8wY
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

Modified: head/share/pgpkeys/pgpkeys-developers.xml
==============================================================================
--- head/share/pgpkeys/pgpkeys-developers.xml	Sun Nov  4 07:34:07 2012	(r39925)
+++ head/share/pgpkeys/pgpkeys-developers.xml	Sun Nov  4 08:42:13 2012	(r39926)
@@ -124,6 +124,11 @@
       &pgpkey.tdb;
     </sect2>
 
+    <sect2 id="pgpkey-gblach">
+      <title>&a.gblach;</title>
+      &pgpkey.gblach;
+    </sect2>
+
     <sect2 id="pgpkey-mbr">
       <title>&a.mbr;</title>
       &pgpkey.mbr;

Modified: head/share/pgpkeys/pgpkeys.ent
==============================================================================
--- head/share/pgpkeys/pgpkeys.ent	Sun Nov  4 07:34:07 2012	(r39925)
+++ head/share/pgpkeys/pgpkeys.ent	Sun Nov  4 08:42:13 2012	(r39926)
@@ -122,6 +122,7 @@
 <!ENTITY pgpkey.garga SYSTEM "garga.key">
 <!ENTITY pgpkey.garys SYSTEM "garys.key">
 <!ENTITY pgpkey.gavin SYSTEM "gavin.key">
+<!ENTITY pgpkey.gblach SYSTEM "gblach.key">
 <!ENTITY pgpkey.gerald SYSTEM "gerald.key">
 <!ENTITY pgpkey.ghelmer SYSTEM "ghelmer.key">
 <!ENTITY pgpkey.gibbs SYSTEM "gibbs.key">

Modified: head/share/xml/authors.ent
==============================================================================
--- head/share/xml/authors.ent	Sun Nov  4 07:34:07 2012	(r39925)
+++ head/share/xml/authors.ent	Sun Nov  4 08:42:13 2012	(r39926)
@@ -446,6 +446,8 @@
 
 <!ENTITY a.gber "Grzegorz Bernacki <email>gber@FreeBSD.org</email>">
 
+<!ENTITY a.gblach "Grzegorz Blach <email>gblach@FreeBSD.org</email>">
+
 <!ENTITY a.gclarkii "Gary Clark II <email>gclarkii@FreeBSD.org</email>">
 
 <!ENTITY a.gehenna "MAEKAWA Masahide <email>gehenna@FreeBSD.org</email>">

Modified: head/share/xml/developers.ent
==============================================================================
--- head/share/xml/developers.ent	Sun Nov  4 07:34:07 2012	(r39925)
+++ head/share/xml/developers.ent	Sun Nov  4 08:42:13 2012	(r39926)
@@ -214,6 +214,7 @@ $FreeBSD$
 <!ENTITY a.garys "Gary W. Swearingen">
 <!ENTITY a.gavin "Gavin Atkinson">
 <!ENTITY a.gber "Grzegorz Bernacki">
+<!ENTITY a.gblach "Grzegorz Blach">
 <!ENTITY a.gerald "Gerald Pfeifer">
 <!ENTITY a.ghelmer "Guy Helmer">
 <!ENTITY a.gibbs "Justin T. Gibbs">

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Sun Nov  4 07:34:07 2012	(r39925)
+++ head/share/xml/news.xml	Sun Nov  4 08:42:13 2012	(r39926)
@@ -34,6 +34,15 @@
       <name>11</name>
 
       <day>
+	<name>4</name>
+
+	<event>
+	  <p>New committer:
+	    <a href="mailto:gblach@FreeBSD.org">Grzegorz Blach</a> (ports)</p>
+	</event>
+      </day>
+
+      <day>
 	<name>3</name>
 
 	<event>

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov  4 15:00:43 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 96EDB692;
 Sun,  4 Nov 2012 15:00:43 +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 7F63C8FC08;
 Sun,  4 Nov 2012 15:00:43 +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 qA4F0hX4013627;
 Sun, 4 Nov 2012 15:00:43 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA4F0hJ8013624;
 Sun, 4 Nov 2012 15:00:43 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201211041500.qA4F0hJ8013624@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sun, 4 Nov 2012 15:00:43 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39927 - head/ja_JP.eucJP/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 15:00:43 -0000

Author: ryusuke
Date: Sun Nov  4 15:00:42 2012
New Revision: 39927
URL: http://svn.freebsd.org/changeset/doc/39927

Log:
  - Merge the following from the English version:
  
  	r39806 -> r39926	head/ja_JP.eucJP/share/xml/news.xml

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

Modified: head/ja_JP.eucJP/share/xml/news.xml
==============================================================================
--- head/ja_JP.eucJP/share/xml/news.xml	Sun Nov  4 08:42:13 2012	(r39926)
+++ head/ja_JP.eucJP/share/xml/news.xml	Sun Nov  4 15:00:42 2012	(r39927)
@@ -20,7 +20,7 @@
      the contents of <title> will be preferred over <p>.
 
      $FreeBSD$
-     Original revision: r39806
+     Original revision: r39926
 -->
 <news>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -31,6 +31,34 @@
     <name>2012</name>
 
     <month>
+      <name>11</name>
+
+      <day>
+	<name>4</name>
+
+	<event>
+	  <p>¿·¥³¥ß¥Ã¥¿½¢Ç¤:
+	    <a href="mailto:gblach@FreeBSD.org">Grzegorz Blach</a> (ports)</p>
+	</event>
+      </day>
+
+      <day>
+	<name>3</name>
+
+	<event>
+	  <title>&os;&nbsp;9.1-RC3 ¸ø³«</title>
+
+	  <p>&os;-9.1 ¥ê¥ê¡¼¥¹¤Ë¸þ¤±¤Æ 3 ²óÌܤΥê¥ê¡¼¥¹¸õÊäÈǤ¬¸ø³«¤µ¤ì¤Þ¤·¤¿¡£
+	    <a href="&url.doc.base;/books/handbook/mirrors-ftp.html">&os;
+	    ¥ß¥é¡¼¥µ¥¤¥È</a> ¤Ë¤ª¤¤¤Æ¡¢amd64, i386
+	    ¤ª¤è¤Ó powerpc64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î ISO ¥¤¥á¡¼¥¸¤¬ <a
+	    href="&lists.stable;/2012-November/070401.html">¸ø³«</a>
+	    ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
+	</event>
+      </day>
+    </month>
+
+    <month>
       <name>10</name>
 
       <day>

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov  4 15:42:01 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4A279FF8;
 Sun,  4 Nov 2012 15:42:01 +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 2E8B28FC12;
 Sun,  4 Nov 2012 15:42:01 +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 qA4Fg1k0019812;
 Sun, 4 Nov 2012 15:42:01 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA4Fg0Kt019810;
 Sun, 4 Nov 2012 15:42:00 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201211041542.qA4Fg0Kt019810@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 4 Nov 2012 15:42:00 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39928 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 15:42:01 -0000

Author: gjb
Date: Sun Nov  4 15:42:00 2012
New Revision: 39928
URL: http://svn.freebsd.org/changeset/doc/39928

Log:
  Add sparc64 to 9.1-RC3 announcement.
  
  Spotted by:	ryusuke
  Pointyhat:	gjb (myself)

Modified:
  head/share/xml/news.xml

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Sun Nov  4 15:00:42 2012	(r39927)
+++ head/share/xml/news.xml	Sun Nov  4 15:42:00 2012	(r39928)
@@ -49,7 +49,7 @@
 	  <title>&os;&nbsp;9.1-RC3 Available</title>
 
 	  <p>The third RC build for the &os;-9.1 release cycle is
-	    now available.  ISO images for the amd64, i386, and
+	    now available.  ISO images for the amd64, i386, sparc64, and
 	    powerpc64 architectures are <a
 	      href="&lists.stable;/2012-November/070401.html">available</a>
 	    on most of our <a

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov  4 16:26:45 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 60C27B4E;
 Sun,  4 Nov 2012 16:26:45 +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 463948FC08;
 Sun,  4 Nov 2012 16:26:45 +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 qA4GQjj1026819;
 Sun, 4 Nov 2012 16:26:45 GMT (envelope-from loader@svn.freebsd.org)
Received: (from loader@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA4GQjg9026817;
 Sun, 4 Nov 2012 16:26:45 GMT (envelope-from loader@svn.freebsd.org)
Message-Id: <201211041626.qA4GQjg9026817@svn.freebsd.org>
From: Fukang Chen <loader@FreeBSD.org>
Date: Sun, 4 Nov 2012 16:26:45 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39929 - head/zh_CN.GB2312/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 16:26:45 -0000

Author: loader
Date: Sun Nov  4 16:26:44 2012
New Revision: 39929
URL: http://svn.freebsd.org/changeset/doc/39929

Log:
  Update the release dates.
  
  Submitted by:          pengtu (http://www.newsmth.net/bbsqry.php?userid=pengtu)
  Obtained from:         The FreeBSD Simplified Chinese Project

Modified:
  head/zh_CN.GB2312/share/xml/l10n.ent

Modified: head/zh_CN.GB2312/share/xml/l10n.ent
==============================================================================
--- head/zh_CN.GB2312/share/xml/l10n.ent	Sun Nov  4 15:42:00 2012	(r39928)
+++ head/zh_CN.GB2312/share/xml/l10n.ent	Sun Nov  4 16:26:44 2012	(r39929)
@@ -53,5 +53,5 @@
 <!ENTITY xml.encoding        'gb2312'>
 
 <!-- From FreeBSD: www/share/xml/release.ent,v 1.8 2007/01/15 05:22:15 bmah -->
-<!ENTITY rel.current.date '2007 Äê 1 ÔÂ'>
-<!ENTITY rel2.current.date '2006 Äê 5 ÔÂ'>
+<!ENTITY rel.current.date '2012 Äê 1 ÔÂ'>
+<!ENTITY rel2.current.date '2012 Äê 4 ÔÂ'>

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov  4 16:32:54 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 04A2BCDF;
 Sun,  4 Nov 2012 16:32:53 +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 C26DC8FC12;
 Sun,  4 Nov 2012 16:32: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 qA4GWrLp027743;
 Sun, 4 Nov 2012 16:32:53 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA4GWrlZ027740;
 Sun, 4 Nov 2012 16:32:53 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201211041632.qA4GWrlZ027740@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sun, 4 Nov 2012 16:32:53 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39930 - head/ja_JP.eucJP/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 16:32:54 -0000

Author: ryusuke
Date: Sun Nov  4 16:32:53 2012
New Revision: 39930
URL: http://svn.freebsd.org/changeset/doc/39930

Log:
  - Merge the following from the English version:
  
  	r39926 -> r39928	head/ja_JP.eucJP/share/xml/news.xml
  	r39729 -> r39919	head/ja_JP.eucJP/share/xml/release.l10n.ent

Modified:
  head/ja_JP.eucJP/share/xml/news.xml
  head/ja_JP.eucJP/share/xml/release.l10n.ent

Modified: head/ja_JP.eucJP/share/xml/news.xml
==============================================================================
--- head/ja_JP.eucJP/share/xml/news.xml	Sun Nov  4 16:26:44 2012	(r39929)
+++ head/ja_JP.eucJP/share/xml/news.xml	Sun Nov  4 16:32:53 2012	(r39930)
@@ -20,7 +20,7 @@
      the contents of <title> will be preferred over <p>.
 
      $FreeBSD$
-     Original revision: r39926
+     Original revision: r39928
 -->
 <news>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -50,7 +50,7 @@
 
 	  <p>&os;-9.1 ¥ê¥ê¡¼¥¹¤Ë¸þ¤±¤Æ 3 ²óÌܤΥê¥ê¡¼¥¹¸õÊäÈǤ¬¸ø³«¤µ¤ì¤Þ¤·¤¿¡£
 	    <a href="&url.doc.base;/books/handbook/mirrors-ftp.html">&os;
-	    ¥ß¥é¡¼¥µ¥¤¥È</a> ¤Ë¤ª¤¤¤Æ¡¢amd64, i386
+	    ¥ß¥é¡¼¥µ¥¤¥È</a> ¤Ë¤ª¤¤¤Æ¡¢amd64, i386, sparc64
 	    ¤ª¤è¤Ó powerpc64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î ISO ¥¤¥á¡¼¥¸¤¬ <a
 	    href="&lists.stable;/2012-November/070401.html">¸ø³«</a>
 	    ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>

Modified: head/ja_JP.eucJP/share/xml/release.l10n.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/release.l10n.ent	Sun Nov  4 16:26:44 2012	(r39929)
+++ head/ja_JP.eucJP/share/xml/release.l10n.ent	Sun Nov  4 16:32:53 2012	(r39930)
@@ -2,7 +2,7 @@
 
 <!--
      $FreeBSD$
-     Original revision: r39729
+     Original revision: r39919
  -->
 
 <![%beta2.testing;[
@@ -109,15 +109,9 @@
         </tr>
         <tr>
           <td></td>
-          <td>ia64</td>
-          <td><a href="&url.rel;/ia64/ia64/&betarel.current;-&betarel.vers;">[ÇÛÉÛ¸µ]</a></td>
-          <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>powerpc</td>
-          <td><a href="&url.rel;/powerpc/powerpc/&betarel.current;-&betarel.vers;">[ÇÛÉÛ¸µ]</a></td>
-          <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+          <td>sparc64</td>
+          <td><a href="&url.rel;/sparc64/sparc64/&betarel.current;-&betarel.vers;">[ÇÛÉÛ¸µ]</a></td>
+          <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
         </tr>
         <tr>
           <td></td>

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov  4 16:42:46 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B0677F06;
 Sun,  4 Nov 2012 16:42:46 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 7CB968FC0A;
 Sun,  4 Nov 2012 16:42: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 qA4Ggk6k029202;
 Sun, 4 Nov 2012 16:42:46 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA4GgkjT029199;
 Sun, 4 Nov 2012 16:42:46 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201211041642.qA4GgkjT029199@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 4 Nov 2012 16:42:46 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39931 - head/nl_NL.ISO8859-1/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 16:42:46 -0000

Author: rene
Date: Sun Nov  4 16:42:45 2012
New Revision: 39931
URL: http://svn.freebsd.org/changeset/doc/39931

Log:
  MFen the shared files:
  - bibliography 39716 -> 39816
  - trademarks.ent 39534 -> 39812
  
  Note that the BSD license contained in trademarks.ent is left out so the
  default English version will be used.

Modified:
  head/nl_NL.ISO8859-1/share/xml/bibliography.xml
  head/nl_NL.ISO8859-1/share/xml/trademarks.ent

Modified: head/nl_NL.ISO8859-1/share/xml/bibliography.xml
==============================================================================
--- head/nl_NL.ISO8859-1/share/xml/bibliography.xml	Sun Nov  4 16:32:53 2012	(r39930)
+++ head/nl_NL.ISO8859-1/share/xml/bibliography.xml	Sun Nov  4 16:42:45 2012	(r39931)
@@ -5,7 +5,7 @@
   $FreeBSD$
 
   %SOURCE%	share/xml/bibliography.xml
-  %SRCID%	39716
+  %SRCID%	39816
 -->
 
 <bibliography id="bibliography">
@@ -299,26 +299,6 @@
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-handbook">
-    <biblioset relation="book">
-      <title>The &os; Handbook</title>
-
-      <corpauthor>&os; Documentation Project</corpauthor>
-
-      <publisher>
-	<publishername>BSDi</publishername>
-      </publisher>
-
-      <edition>1e editie</edition>
-
-      <pubdate>november 1999</pubdate>
-
-      <pagenums>489 pagina's</pagenums>
-
-      <isbn>ISBN 1-57176-241-8</isbn>
-    </biblioset>
-  </biblioentry>
-
   <biblioentry id="biblio-mckusick-1">
     <abbrev>McKusick et al, 1994</abbrev>
 

Modified: head/nl_NL.ISO8859-1/share/xml/trademarks.ent
==============================================================================
--- head/nl_NL.ISO8859-1/share/xml/trademarks.ent	Sun Nov  4 16:32:53 2012	(r39930)
+++ head/nl_NL.ISO8859-1/share/xml/trademarks.ent	Sun Nov  4 16:42:45 2012	(r39931)
@@ -11,12 +11,12 @@
 
      $FreeBSD$
      %SOURCE%	share/xml/trademarks.ent
-     %SRCID%	39534
+     %SRCID%	39812
 -->
 
 <!ENTITY tm-attrib.3com "<para>3Com en HomeConnect zijn geregistreerde
   handelsmerken van 3Com Corporation.</para>">
-<!-- Een SGML-entiteit kan niet met een nummer beginnen... -->
+<!-- Een XML-entiteit kan niet met een nummer beginnen... -->
 <!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
 
 <!ENTITY tm-attrib.3ware "<para>3ware en Escalade zijn geregistreerde
@@ -466,6 +466,5 @@
     deze handelsmerken in dit document voorkomen, en het &os; Project op
     de hoogte was van de claim op het handelsmerk, worden de termen
     gevolgd door het symbool <quote>&trade;</quote>.</para>
-
 </legalnotice>
 '>

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov  4 17:28:53 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1901FD5A;
 Sun,  4 Nov 2012 17:28:53 +0000 (UTC)
 (envelope-from jkois@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 0056B8FC0C;
 Sun,  4 Nov 2012 17:28: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 qA4HSqFB036254;
 Sun, 4 Nov 2012 17:28:52 GMT (envelope-from jkois@svn.freebsd.org)
Received: (from jkois@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA4HSqJW036252;
 Sun, 4 Nov 2012 17:28:52 GMT (envelope-from jkois@svn.freebsd.org)
Message-Id: <201211041728.qA4HSqJW036252@svn.freebsd.org>
From: Johann Kois <jkois@FreeBSD.org>
Date: Sun, 4 Nov 2012 17:28:52 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39932 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 17:28:53 -0000

Author: jkois
Date: Sun Nov  4 17:28:52 2012
New Revision: 39932
URL: http://svn.freebsd.org/changeset/doc/39932

Log:
  PR:     www/173338      Addition of Hub.Org to ISP link list
  
  Requested by:   Pat Krasean <conewalkerinc@gmail.com>

Modified:
  head/share/xml/commercial.isp.xml

Modified: head/share/xml/commercial.isp.xml
==============================================================================
--- head/share/xml/commercial.isp.xml	Sun Nov  4 16:42:45 2012	(r39931)
+++ head/share/xml/commercial.isp.xml	Sun Nov  4 17:28:52 2012	(r39932)
@@ -34,6 +34,23 @@
     </description>
   </entry>
 
+  <entry id="hubdotorg">
+    <name>Hub Hosting Services</name>
+    <url>http://hub.org/</url>
+    <description>
+      Hub.Org has provided Open-Source Web Hosting services since 1997.
+      Our solutions include <a
+      href="http://hub.org/freebsd-vps-hosting">FreeBSD VPS Hosting</a>
+      and <a href="http://hub.org/self-managed-vps-hosting">self-managed
+      VPS hosting</a> among many others.  Hub has several cost-effective
+      hosting plans to fit your business, whether it is a new site or
+      several busy ones.  Hub.Org has been actively involved in several
+      leading, open-source projects (FreeBSD InterNet News (INN), WU-FTPd,
+      OpenSSH), and providing hosting for open-source projects include
+      PostgreSQL and Horde.
+    </description>
+  </entry>
+
   <entry id="ipglobal">
     <name>IP Global.net</name>
     <url>http://www.ipglobal.net/</url>

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov  4 17:44:01 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E4DCD2AB;
 Sun,  4 Nov 2012 17:44:01 +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 CBF048FC08;
 Sun,  4 Nov 2012 17:44:01 +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 qA4Hi1ii038647;
 Sun, 4 Nov 2012 17:44:01 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA4Hi1oD038645;
 Sun, 4 Nov 2012 17:44:01 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211041744.qA4Hi1oD038645@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 4 Nov 2012 17:44:01 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39933 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 17:44:02 -0000

Author: eadler
Date: Sun Nov  4 17:44:01 2012
New Revision: 39933
URL: http://svn.freebsd.org/changeset/doc/39933

Log:
  Remove redundant extra extranious words
  
  Approved by:	jkois (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov  4 17:28:52 2012	(r39932)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov  4 17:44:01 2012	(r39933)
@@ -6851,8 +6851,8 @@ UserConfig&gt; <userinput>quit</userinpu
 
 	    <listitem>
 	      <para><keycode>116</keycode> &mdash;
-		<keycap>Windows</keycap> key, to the right of the
-		<keycap>AltGr</keycap> key</para>
+		<keycap>Windows</keycap> key, to the right of
+		<keycap>AltGr</keycap></para>
 	    </listitem>
 
 	    <listitem>
@@ -7917,7 +7917,7 @@ add 0 0 HISADDR</programlisting>
 	    seconds of inactivity before the connection is closed.  If
 	    <replaceable>NNN</replaceable> is zero, the connection is
 	    never closed due to a timeout.  It is possible to put this
-	    command in the <filename>ppp.conf</filename> file, or to
+	    command in <filename>ppp.conf</filename>, or to
 	    type it at the prompt in interactive mode.  It is also
 	    possible to adjust it on the fly while the line is active by
 	    connecting to <application>ppp</application>'s server socket
@@ -8026,7 +8026,7 @@ add 0 0 HISADDR</programlisting>
 	  <para>There is very little you can do about this.  Most ISPs
 	    will refuse to help if you are not running a &microsoft; OS.
 	    You can <literal>enable lqr</literal> in your
-	    <filename>ppp.conf</filename> file, allowing &man.ppp.8; to
+	    <filename>ppp.conf</filename>, allowing &man.ppp.8; to
 	    detect the remote failure and hang up, but this detection is
 	    relatively slow and therefore not that useful.  You may want
 	    to avoid telling your ISP that you are running

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov  4 17:44:09 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AA0092E3;
 Sun,  4 Nov 2012 17:44:09 +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 921698FC0C;
 Sun,  4 Nov 2012 17:44: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 qA4Hi9kZ038696;
 Sun, 4 Nov 2012 17:44:09 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA4Hi9A6038694;
 Sun, 4 Nov 2012 17:44:09 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211041744.qA4Hi9A6038694@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 4 Nov 2012 17:44:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39934 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 17:44:09 -0000

Author: eadler
Date: Sun Nov  4 17:44:09 2012
New Revision: 39934
URL: http://svn.freebsd.org/changeset/doc/39934

Log:
  ACPI is the modern version. Also, add <acronym> tags
  when required.  Remove reference to Linux when not required.
  
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov  4 17:44:01 2012	(r39933)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov  4 17:44:09 2012	(r39934)
@@ -9362,11 +9362,14 @@ hint.sio.7.irq="12"</programlisting>
 	    <quote>scratch and sniff</quote> GUI.  It is a funny old
 	    business we are in!</para>
 
-	  <para>Seriously, both &os; and &linux; use the
+	  <para>Seriously, &os; uses the
 	    <acronym>HLT</acronym> (halt) instruction when the system is
 	    idle thus lowering its energy consumption and therefore the
-	    heat it generates.  Also if you have APM (advanced power
-	    management) configured, then &os; can also put the CPU into
+	    heat it generates.  Also if you have <acronym>APM</acronym>
+	    (advanced power
+	    management) or <acronym>ACPI</acronym> (Advanced
+	    Configuration and Power Interface)
+	    configured, then &os; can also put the CPU into
 	    a low power mode.</para>
 	</answer>
       </qandaentry>

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov  4 17:44:12 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 451A02E7;
 Sun,  4 Nov 2012 17:44:12 +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 2CDF58FC12;
 Sun,  4 Nov 2012 17:44:12 +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 qA4HiCxx038736;
 Sun, 4 Nov 2012 17:44:12 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA4HiBbI038734;
 Sun, 4 Nov 2012 17:44:11 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211041744.qA4HiBbI038734@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 4 Nov 2012 17:44:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39935 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 17:44:12 -0000

Author: eadler
Date: Sun Nov  4 17:44:11 2012
New Revision: 39935
URL: http://svn.freebsd.org/changeset/doc/39935

Log:
  Convert "Intel" -> &intel; entity.
  
  Approved by:	jkois (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov  4 17:44:09 2012	(r39934)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov  4 17:44:11 2012	(r39935)
@@ -1168,7 +1168,7 @@
       <qandaentry>
 	<question id="which-architecture">
 	  <para>Which platform should I download? I have a 64
-	    bit capable Intel CPU,
+	    bit capable &intel; CPU,
 	    but I only see <literal>amd64</literal>.</para>
 	</question>
 
@@ -2087,8 +2087,8 @@
 	  </question>
 
 	  <answer>
-	    <para>Yes.  &os; currently runs on the Intel x86 and the
-	      AMD64 architectures.  The Intel EM64T, IA-64, &arm;,
+	    <para>Yes.  &os; currently runs on the &intel; x86 and the
+	      AMD64 architectures.  The &intel; EM64T, IA-64, &arm;,
 	      &powerpc;, and &sparc64; architectures are also
 	      supported.  Upcoming platforms are &mips; and &s390;, join
 	      the &a.mips; for more information about ongoing work on

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov  4 18:46:17 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 99798F94;
 Sun,  4 Nov 2012 18:46:17 +0000 (UTC)
 (envelope-from wosch@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 67C918FC0A;
 Sun,  4 Nov 2012 18:46:17 +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 qA4IkHYR048130;
 Sun, 4 Nov 2012 18:46:17 GMT (envelope-from wosch@svn.freebsd.org)
Received: (from wosch@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA4IkHuG048128;
 Sun, 4 Nov 2012 18:46:17 GMT (envelope-from wosch@svn.freebsd.org)
Message-Id: <201211041846.qA4IkHuG048128@svn.freebsd.org>
From: Wolfram Schneider <wosch@FreeBSD.org>
Date: Sun, 4 Nov 2012 18:46:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39936 - head/en_US.ISO8859-1/htdocs/cgi
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 18:46:17 -0000

Author: wosch
Date: Sun Nov  4 18:46:16 2012
New Revision: 39936
URL: http://svn.freebsd.org/changeset/doc/39936

Log:
  new man pages for OpenBSD 5.1 and OpenBSD 5.2

Modified:
  head/en_US.ISO8859-1/htdocs/cgi/man.cgi

Modified: head/en_US.ISO8859-1/htdocs/cgi/man.cgi
==============================================================================
--- head/en_US.ISO8859-1/htdocs/cgi/man.cgi	Sun Nov  4 17:44:11 2012	(r39935)
+++ head/en_US.ISO8859-1/htdocs/cgi/man.cgi	Sun Nov  4 18:46:16 2012	(r39936)
@@ -145,6 +145,8 @@ $sectionpath = {
     'OpenBSD 4.8' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
     'OpenBSD 4.9' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
     'OpenBSD 5.0' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
+    'OpenBSD 5.1' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
+    'OpenBSD 5.2' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
 
     'CentOS Linux/i386 3.9' => { 'path' => '1:2:3:3p:4:5:6:7:8:9:n', },
     'CentOS Linux/i386 4.8' => { 'path' => '1:1p:2:3:3p:4:5:6:7:8:9:n:0p', },
@@ -375,6 +377,8 @@ $manPathDefault = 'FreeBSD 9.0-RELEASE';
     'OpenBSD 4.8', "$manLocalDir/OpenBSD-4.8",
     'OpenBSD 4.9', "$manLocalDir/OpenBSD-4.9",
     'OpenBSD 5.0', "$manLocalDir/OpenBSD-5.0",
+    'OpenBSD 5.1', "$manLocalDir/OpenBSD-5.1",
+    'OpenBSD 5.2', "$manLocalDir/OpenBSD-5.2",
 
     #'NetBSD 0.9',            "$manLocalDir/NetBSD-0.9",
     'NetBSD 1.0',   "$manLocalDir/NetBSD-1.0",
@@ -585,6 +589,8 @@ my %arch = ( 
 'OpenBSD 4.8' => { 'arch' => [qw/alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk loongson luna88k mac68k macppc mvme68k mvme88k mvmeppc palm sgi socppc sparc sparc64 vax zaurus/] }, 
 'OpenBSD 4.9' => { 'arch' => [qw/alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk loongson luna88k mac68k macppc mvme68k mvme88k mvmeppc palm sgi socppc sparc sparc64 vax zaurus/] }, 
 'OpenBSD 5.0' => { 'arch' => [qw/alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk loongson luna88k mac68k macppc mvme68k mvme88k mvmeppc palm sgi socppc sparc sparc64 vax zaurus/] }, 
+'OpenBSD 5.1' => { 'arch' => [qw/alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk loongson luna88k mac68k macppc mvme68k mvme88k mvmeppc palm sgi socppc sparc sparc64 vax zaurus/] }, 
+'OpenBSD 5.2' => { 'arch' => [qw/alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk loongson luna88k mac68k macppc mvme68k mvme88k mvmeppc palm sgi socppc sparc sparc64 vax zaurus/] }, 
 );
 
 # delete not existing releases
@@ -626,7 +632,7 @@ while ( ( $key, $val ) = each %manPath )
     'macosx',     'Darwin 8.0.1/ppc',
 
     'netbsd',        'NetBSD 6.0',
-    'openbsd',       'OpenBSD 5.0',
+    'openbsd',       'OpenBSD 5.2',
     'v7',            'Unix Seventh Edition',
     'v7man',         'Unix Seventh Edition',
     'x11',           'X11R7.4',

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov  4 19:02:32 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E9AF03DA;
 Sun,  4 Nov 2012 19:02:32 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id C70F08FC0C;
 Sun,  4 Nov 2012 19:02: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 qA4J2WoT050508;
 Sun, 4 Nov 2012 19:02:32 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA4J2WU6050505;
 Sun, 4 Nov 2012 19:02:32 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201211041902.qA4J2WU6050505@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 4 Nov 2012 19:02:32 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39937 - head/nl_NL.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 19:02:33 -0000

Author: rene
Date: Sun Nov  4 19:02:32 2012
New Revision: 39937
URL: http://svn.freebsd.org/changeset/doc/39937

Log:
  MFen the Dutch website:
  - privacy.xml 39632 -> 39789
  - where.xml 39730 -> 39920 (SRCID bump only)

Modified:
  head/nl_NL.ISO8859-1/htdocs/privacy.xml
  head/nl_NL.ISO8859-1/htdocs/where.xml

Modified: head/nl_NL.ISO8859-1/htdocs/privacy.xml
==============================================================================
--- head/nl_NL.ISO8859-1/htdocs/privacy.xml	Sun Nov  4 18:46:16 2012	(r39936)
+++ head/nl_NL.ISO8859-1/htdocs/privacy.xml	Sun Nov  4 19:02:32 2012	(r39937)
@@ -7,7 +7,7 @@
 <!--
   Vertaald door: Rene Ladan
   %SOURCE% en_US.ISO8859-1/htdocs/privacy.xml
-  %SRCID% 39632
+  %SRCID% 39789
 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -42,7 +42,7 @@
 	aan &os; gerelateerde diensten in het &os;.org domein
 	("Aangesloten Sites").</p>
 
-      <p>Dit beleid is voor het laatst gewijzigd op 22 juli 2011.</p>
+      <p>Dit beleid is voor het laatst gewijzigd op 19 oktober 2012.</p>
 
       <p>LEES DIT PRIVACYBELEID AANDACHTIG DOOR.  DOOR DEZE SITE TE GEBRUIKEN,
 	STEMT U IN MET DE INHOUD VAN DIT BELEID.</p>
@@ -52,14 +52,24 @@
       <p>Wanneer u onze Site bezoekt verzamelen we informatie over uw gebruik
 	van onze site, zoals welke pagina's u bekijkt en de tijd waarop u elke
 	pagina bekijkt.  We verzamelen ook informatie als uw Internet Protocol
-	("IP") adres, type browser en informatie over uw besturingssysteem.</p>
+	("IP") adres, type browser en informatie over uw besturingssysteem.
+	Aan de voorgaande informatie wordt hieronder gemeenschappelijk
+	gerefereerd als "Uw Gebruiksgegevens".</p>
 
       <p>We slaan informatie zoals uw emailadres, naam, en organisatie of
-	bedrijf alleen op als u besluit om ons zulks toe te sturen door een
-	&os; probleemrapport in te sturen of u te abonneren op een van de &os;
-	mailinglijsten.  Informatie die wordt verstuurd in probleemrapporten of
-	naar de publieke mailinglijsten wordt als publiekelijk beschouwd en zal
-	voor iedereen op het web beschikbaar zijn.</p>
+	bedrijf ("Persoonlijk Identificeerbare Informatie") alleen op als u
+	besluit om ons zulke informatie toe te sturen door een &os; bug- of
+	probleemrapport ("PR") in te sturen, u te abonneren op een van de &os;
+	mailinglijsten of te berichten te plaatsen op de fora van onze Site.
+	Het &os; Project staat ongelimiteerde verspreiding van deze inhoud toe.
+	Informatie die wordt verstuurd in deze rapporten en lijsten, inclusief
+	uw Persoonlijk Identificeerbare Informatie, wordt als publiekelijk
+	beschouwd en zal voor iedereen op het web beschikbaar zijn.  Zulke
+	informatie wordt niet alleen opgeslagen op servers die aan de &os;
+	Foundation toebehoren, maar het wordt ook opgeslagen op andere servers
+	die de inhoud van onze Site spiegelen.  De &os; Foundation heeft geen
+	controle over het gebruik van die informatie, inclusief uw Persoonlijk
+	Identificeerbare Informatie.</p>
 
       <p>Deze website gebruikt een koekje om layoutvoorkeuren voor individuele
 	gebruikers op te slaan en om anonieme verkeersinformatie bij te houden.
@@ -114,10 +124,37 @@
       <p>Geanonimiseerde geaggregeerde verkeersinformatie over website-bezoeken
 	kan worden gedeeld voor marketing- of onderzoeksdoeleinden.</p>
 
-      <p>Alle informatie die u aanbiedt als deel van een 'probleemrapport' (PR)
-	 kan worden gepubliceerd en worden gerepliceerd of gedistribueerd door
-	 derde partijen.  U hoeft deze gegevens niet aan te bieden om de Site
-	 te gebruiken.</p>
+      <p>Het &os; Project gebruikt Google Analytics, een dienst voor webanalyse
+	van Google, Inc.  Google Analytics is een gereedschap dat het &os;
+	Project in staat stelt om te zien hoe bezoekers aan onze Site onze Site
+	gebruiken en hoe ze op onze Site arriveren.  Google Analytics gebruikt
+	"koekjes", tekstbestanden geplaatst op uw computer, om onze Site te
+	helpen om activiteiten van bezoekers te analyseren.  Wij versturen
+	gegevens aan Google Analytics die over uw gebruik van de Site
+	rapporteren.  Die gegevens omvatten Uw Gebruiksgegevens en zijn niet
+	geanonimiseerd voordat ze naar Google Analytics worden verstuurd.
+	Deze ongeanonimiseerde gegevens wordt door Google op servers
+	opgeslagen nadat het naar Google is verstuurd.  Google zal deze
+	informatie gebruiken met het doel om uw gebruik van de Site te
+	evalueren, rapporten over website-activiteit samen te stellen voor
+	beheerders van websites en andere diensten aan te bieden die verwant
+	zijn aan website-activiteit en internetgebruik.  Google kan Uw
+	Gebruiksgegevens ook aan derde partijen versturen wanneer dat wettelijk
+	noodzakelijk is, of wanneer zulke derde partijen de informatie namens
+	Google verwerken.  Google zal Uw Gebruiksgegevens niet associëren met
+	andere gegevens die door Google worden bewaard.  U kunt het gebruik van
+	koekjes weigeren door de relevante instellingen in uw browser te
+	selecteren, merk echter op dat wanneer u dit doet u misschien niet de
+	volledige functionaliteit van onze Site kunt gebruiken.  Door onze Site
+	te gebruiken stemt u in met het verwerken van Uw Gebruiksgegevens door
+	Google op de manier en voor het doel dat hierboven beschreven is.</p>
+
+      <p>Met uitzondering van het versturen van Uw Gebruiksgegevens naar Google
+	voor het enkele doel om Google Analytics te gebruiken en de publieke
+	toegang die we toestaan tot de foutrapportages die u instuurt, de
+	mailinglijsten waarop u zich abonneert, en het plaatsen van inhoud op
+	de fora van onze Site, deelt het &os; Project geen ongeanonimiseerde
+	gegevens.</p>
 
     <h2>Wijzigingen aan dit privacybeleid:</h2>
 

Modified: head/nl_NL.ISO8859-1/htdocs/where.xml
==============================================================================
--- head/nl_NL.ISO8859-1/htdocs/where.xml	Sun Nov  4 18:46:16 2012	(r39936)
+++ head/nl_NL.ISO8859-1/htdocs/where.xml	Sun Nov  4 19:02:32 2012	(r39937)
@@ -6,7 +6,7 @@
 ]>
 <!-- Vertaald door: Siebrand Mazeland / Rene Ladan
      %SOURCE%	en_US.ISO8859-1/htdocs/where.xml
-     %SRCID%	39730
+     %SRCID%	39920
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov  4 23:24:35 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id DD31D23B;
 Sun,  4 Nov 2012 23:24:34 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C06638FC08;
 Sun,  4 Nov 2012 23:24:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA4NOYiC077102;
 Sun, 4 Nov 2012 23:24:34 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA4NOY7L077099;
 Sun, 4 Nov 2012 23:24:34 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201211042324.qA4NOY7L077099@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 4 Nov 2012 23:24:34 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39943 - in head/nl_NL.ISO8859-1/articles: contributing
 contributing-ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 23:24:35 -0000

Author: rene
Date: Sun Nov  4 23:24:34 2012
New Revision: 39943
URL: http://svnweb.freebsd.org/changeset/doc/39943

Log:
  MFen the Dutch articles:
  - contributing 39632 -> 39924
  - contributing-ports 39632 -> 39913

Modified:
  head/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
  head/nl_NL.ISO8859-1/articles/contributing/article.xml

Modified: head/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
==============================================================================
--- head/nl_NL.ISO8859-1/articles/contributing-ports/article.xml	Sun Nov  4 23:08:19 2012	(r39942)
+++ head/nl_NL.ISO8859-1/articles/contributing-ports/article.xml	Sun Nov  4 23:24:34 2012	(r39943)
@@ -10,7 +10,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/articles/contributing-ports/article.xml
-     %SRCID%	39632
+     %SRCID%	39913
 -->
 
 <article lang="nl">
@@ -493,8 +493,8 @@
 	      portbouwcluster, <ulink
 		url="http://pointyhat.FreeBSD.org">pointyhat</ulink>,
 	      en de <ulink
-		url="http://www.portscout.org">
-		scanner voor distributiebestanden</ulink> om te zien
+		url="http://portscout.FreeBSD.org">scanner voor
+		distributiebestanden</ulink> om te zien
 	      of er ports zijn die u onderhoudt die er niet in slagen om
 	      gebouwd of opgehaald te worden (bekijk <link
 		linkend="resources">bronnen</link> voor meer informatie
@@ -841,8 +841,8 @@
       worden.</para>
 
     <para>De <ulink
-	url="http://www.portscout.org">scanner voor distributiebestanden voor
-	&os; ports</ulink> kan u ports laten zien waarvoor
+	url="http://portscout.FreeBSD.org">scanner voor distributiebestanden
+	voor &os; ports</ulink> kan u ports laten zien waarvoor
       de distributiebestanden niet kunnen worden opgehaald.  U kunt uw
       eigen ports controleren of u kunt het gebruiken om ports te vinden
       waarvan de <makevar>MASTER_SITES</makevar> moet worden

Modified: head/nl_NL.ISO8859-1/articles/contributing/article.xml
==============================================================================
--- head/nl_NL.ISO8859-1/articles/contributing/article.xml	Sun Nov  4 23:08:19 2012	(r39942)
+++ head/nl_NL.ISO8859-1/articles/contributing/article.xml	Sun Nov  4 23:24:34 2012	(r39943)
@@ -10,7 +10,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/articles/contributing/article.xml
-     %SRCID%	39632
+     %SRCID%	39924
 -->
 
 <article lang="nl">
@@ -102,7 +102,7 @@
 	  <para>Lees regelmatig de FAQ en het Handboek door.  Laat het
 	    ons weten als er iets slecht is uitgelegd, is verlopen of
 	    gewoon helemaal verkeerd is.  Of stuur een reparatie in
-	    (SGML is niet moeilijk te leren, maar er is geen bezwaar
+	    (Docbook is niet moeilijk te leren, maar er is geen bezwaar
 	    tegen inzendingen in ASCII).</para>
 	</listitem>
 
@@ -589,16 +589,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
 	    url="&url.base;/donations/">Donations Liaison
 	    Office</ulink>.</para>
       </sect3>
-
-      <sect3>
-	<title>Internettoegang doneren</title>
-
-	<para>We kunnen altijd nieuwe spiegelsites voor FTP, WWW, of
-	  <command>cvsup</command> gebruiken.  Als u zo'n spiegel wilt
-	  hosten, bekijk dan het artikel <ulink
-	    url="&url.articles.hubs.en;/index.html">Mirroring &os;</ulink>
-	  voor meer informatie.</para>
-      </sect3>
     </sect2>
   </sect1>
 </article>

From owner-svn-doc-head@FreeBSD.ORG  Sun Nov  4 23:47:16 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 62767578;
 Sun,  4 Nov 2012 23:47:16 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 442608FC08;
 Sun,  4 Nov 2012 23:47:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA4NlGoV080894;
 Sun, 4 Nov 2012 23:47:16 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA4NlGLc080888;
 Sun, 4 Nov 2012 23:47:16 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201211042347.qA4NlGLc080888@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 4 Nov 2012 23:47:16 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39944 - in head/nl_NL.ISO8859-1/books/handbook:
 advanced-networking config disks dtrace jails
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 23:47:16 -0000

Author: rene
Date: Sun Nov  4 23:47:15 2012
New Revision: 39944
URL: http://svnweb.freebsd.org/changeset/doc/39944

Log:
  MFen the Dutch Handbook:
  - dtrace 39631 -> 39795
  - disks 39631 -> 39908 (SRCID bump only)
  - advanced-networking 39824 -> 39902 (SRCID bump only)
  - config 39873 -> 39914
  
  Resync SRCID of jails/Makefile which now has an English counterpart.

Modified:
  head/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/config/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/jails/Makefile

Modified: head/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Sun Nov  4 23:24:34 2012	(r39943)
+++ head/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Sun Nov  4 23:47:15 2012	(r39944)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%  en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
-     %SRCID%   39824
+     %SRCID%   39902
 -->
 
 <chapter id="advanced-networking">

Modified: head/nl_NL.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/config/chapter.xml	Sun Nov  4 23:24:34 2012	(r39943)
+++ head/nl_NL.ISO8859-1/books/handbook/config/chapter.xml	Sun Nov  4 23:47:15 2012	(r39944)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/config/chapter.xml
-     %SRCID%	39873
+     %SRCID%	39914
 -->
 
 <chapter id="config-tuning">
@@ -316,7 +316,7 @@ defaultrouter="10.1.1.254"</programlisti
 ifconfig_fxp0="inet 10.1.1.1/8"</programlisting></listitem>
     </itemizedlist>
 
-    <para><filename>rc.conf</filename> kan naar elk systeem
+    <para><filename>rc.conf</filename> kan vervolgens naar elk systeem
       gedistribueerd worden met <command>rsync</command> of een
       gelijksoortig programma, terwijl <filename>rc.conf.local</filename>
       uniek blijft.</para>
@@ -544,7 +544,7 @@ run_rc_command "$1"</programlisting>
 
       <para><username>root</username> kan ook een gebruikerscrontab
 	aanleggen net als elke andere gebruiker.  Dit is niet dezelfde als
-	<filename>/etc/crontab</filename> (de systeemcrontab).  Omdat de
+	<filename>/etc/crontab</filename>, de systeemcrontab.  Omdat de
 	systeemcrontab in de praktijk de commando's als root uitvoert, is het
 	doorgaans niet nodig om een gebruikerscrontab voor
 	<username>root</username> te maken.</para>
@@ -570,8 +570,8 @@ HOME=/var/log
 
     <calloutlist>
       <callout arearefs="co-comments">
-	<para>Zoals in de meeste &os; instellingenbestanden gaat het
-	  karakter <literal>#</literal> vooraf aan commentaar.
+	<para>Zoals in de meeste instellingenbestanden van &os; zijn regels die
+	   met het karakter <literal>#</literal> beginnen commentaar.
 	  Commentaar wordt gebruikt als uitleg en geheugensteun.
 	  Commentaar dient niet vermengd te worden met commando's,
 	  anders wordt het commentaar opgevat als deel van het commando.

Modified: head/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml	Sun Nov  4 23:24:34 2012	(r39943)
+++ head/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml	Sun Nov  4 23:47:15 2012	(r39944)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/disks/chapter.xml
-     %SRCID%	39631
+     %SRCID%	39908
 -->
 
 <chapter id="disks">

Modified: head/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml	Sun Nov  4 23:24:34 2012	(r39943)
+++ head/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml	Sun Nov  4 23:47:15 2012	(r39944)
@@ -12,7 +12,7 @@ that might make this chapter too large.
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
-     %SRCID%	39631
+     %SRCID%	39795
 -->
 
 <chapter id="dtrace">
@@ -213,17 +213,16 @@ options         DDB_CTF</programlisting>
     <para>Nadat opnieuw is opgestart en de nieuwe kernel in het geheugen
       is geladen, dient ondersteuning voor de Korn-shell te worden
       toegevoegd.  Dit is nodig omdat de verschillende hulpmiddelen van
-      &dtrace; in <command>ksh</command> zijn geschreven.  Installeer
+      &dtrace;Toolkit in <command>ksh</command> zijn geschreven.  Installeer
       <filename role="package">shells/ksh93</filename>.  Het is ook
       mogelijk om deze hulpmiddelen in <filename
 	role="package">shells/pdksh</filename> of <filename
 	role="package">shells/mksh</filename> te draaien.</para>
 
-    <para>Als laatste dient de huidige &dtrace;-gereedschapskist
-      verkregen te worden.  De huidige versie is beschikbaar op <ulink
-	url="http://www.opensolaris.org/os/community/dtrace/dtracetoolkit/"></ulink>.
-      Het bevat een installatiemechanisme; om gebruik te maken van de
-      bijgeleverde hulpmiddelen is installatie echter niet nodig.</para>
+    <para>Als laatste dient de huidige &dtrace;Toolkit verkregen te worden.
+      Indien u &os; 10 draait, vindt u de &dtrace;Toolkit in
+      <filename>/usr/share/dtrace</filename>.  In andere gevallen kunt u de
+      &dtrace;Toolkit installeren via de port <filename role="package">sysutils/DTraceToolkit</filename>.</para>
   </sect1>
 
   <sect1 id="dtrace-using">
@@ -288,7 +287,8 @@ options         DDB_CTF</programlisting>
       het normaal gedraaid wordt, zal het uitvoer die op de volgende
       lijkt produceren:</para>
 
-    <screen>&prompt.root; <userinput>./hotkernel</userinput>
+    <screen>&prompt.root; <userinput>cd /usr/share/dtrace/toolkit</userinput>
+&prompt.root; <userinput>./hotkernel</userinput>
 Sampling... Hit Ctrl-C to end.</screen>
 
     <para>De systeembeheerder moet de toetsencombinatie <keycombo

Modified: head/nl_NL.ISO8859-1/books/handbook/jails/Makefile
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/jails/Makefile	Sun Nov  4 23:24:34 2012	(r39943)
+++ head/nl_NL.ISO8859-1/books/handbook/jails/Makefile	Sun Nov  4 23:47:15 2012	(r39944)
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 # %SOURCE%	en_US.ISO8859-1/books/handbook/jails/Makefile
-# %SRCID%	39631
+# %SRCID%	39829
 #
 #
 

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov  5 09:00:47 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3DD5F48B;
 Mon,  5 Nov 2012 09:00:47 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 233C88FC0C;
 Mon,  5 Nov 2012 09:00:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA590kDa065272;
 Mon, 5 Nov 2012 09:00:46 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA590kaO065270;
 Mon, 5 Nov 2012 09:00:46 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201211050900.qA590kaO065270@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Mon, 5 Nov 2012 09:00:46 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39945 - head/ja_JP.eucJP/articles/contributing
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Nov 2012 09:00:47 -0000

Author: ryusuke
Date: Mon Nov  5 09:00:46 2012
New Revision: 39945
URL: http://svnweb.freebsd.org/changeset/doc/39945

Log:
  - Merge the following from the English version:
  
  	r39881 -> r39924	head/ja_JP.eucJP/articles/contributing/article.xml

Modified:
  head/ja_JP.eucJP/articles/contributing/article.xml

Modified: head/ja_JP.eucJP/articles/contributing/article.xml
==============================================================================
--- head/ja_JP.eucJP/articles/contributing/article.xml	Sun Nov  4 23:47:15 2012	(r39944)
+++ head/ja_JP.eucJP/articles/contributing/article.xml	Mon Nov  5 09:00:46 2012	(r39945)
@@ -10,7 +10,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39881
+     Original revision: r39924
      $FreeBSD$
 -->
 
@@ -603,16 +603,6 @@ Copyright (C) [ǯ]
 	  ¥Ï¡¼¥É¥¦¥§¥¢¤ò´ó£¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤Ê¤é¡¢
 	  <ulink url="&url.base;/donations/">´ó£ÉʼõÉÕ»ö̳¶É</ulink>¤ËÏ¢Íí¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
       </sect3>
-
-      <sect3>
-	<title>¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥¢¥¯¥»¥¹¤Î´óÉÕ</title>
-
-	<para>»ä¤¿¤Á¤Ï¾ï¤Ë FTP¡¢WWW ¤ä <command>cvsup</command>
-	  ¤Î¿·¤·¤¤¥ß¥é¡¼¥µ¥¤¥È¤òÊ罸¤·¤Æ¤¤¤Þ¤¹¡£
-	  ¥ß¥é¡¼¥µ¥¤¥È¤Ë¤Ê¤ê¤¿¤¤¾ì¹ç¤Ë¤Ï <ulink
-	    url="&url.articles.hubs.en;/index.html">Mirroring FreeBSD</ulink>
-	  ¤ò¸«¤Æ¡¢¾Ü¤·¤¤¾ðÊó¤ò¼ê¤ËÆþ¤ì¤Æ¤¯¤À¤µ¤¤¡£</para>
-      </sect3>
     </sect2>
   </sect1>
 

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov  5 11:32:15 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 0EF32AF7;
 Mon,  5 Nov 2012 11:32:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CF7568FC0A;
 Mon,  5 Nov 2012 11:32:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA5BWE4l089732;
 Mon, 5 Nov 2012 11:32:14 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA5BWE4p089730;
 Mon, 5 Nov 2012 11:32:14 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201211051132.qA5BWE4p089730@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 5 Nov 2012 11:32:14 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39946 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Nov 2012 11:32:15 -0000

Author: gjb
Date: Mon Nov  5 11:32:14 2012
New Revision: 39946
URL: http://svnweb.freebsd.org/changeset/doc/39946

Log:
  Add Central European BSD-Day 2013.
  
  Submitted by:	pgj

Modified:
  head/share/xml/events2013.xml

Modified: head/share/xml/events2013.xml
==============================================================================
--- head/share/xml/events2013.xml	Mon Nov  5 09:00:46 2012	(r39945)
+++ head/share/xml/events2013.xml	Mon Nov  5 11:32:14 2012	(r39946)
@@ -41,6 +41,39 @@
     </description>
   </event>
 
+  <event id="bsdday-2013">
+    <name>Central European BSD-Day 2013</name>
+    <url>http://bsdday.eu/2013</url>
+    <startdate>
+      <year>2013</year>
+      <month>4</month>
+      <day>6</day>
+    </startdate>
+    <enddate>
+      <year>2013</year>
+      <month>4</month>
+      <day>6</day>
+    </enddate>
+    <location>
+      <country code="IT">Italy</country>
+      <city>Naples</city>
+      <site>Institute of Biostructures and Bioimaging</site>
+    </location>
+    <description>Watch out, another BSD-Day is rising: next April
+      Beastie visits Naples to gather BSD people of Italy and Central
+      Europe to meet up!  This event is an excellent opportunity for
+      BSD developers and enthusiasts to present their work to larger
+      audiences, share their thoughts with their fellows and reach out
+      for their potential partners.  Traditionally, the event tries to
+      avoid formalities as it does not require the speakers to submit
+      papers or the attendees to register or pay an entry fee.
+      However, the invited folks are encouraged to a give a brief talk
+      on their favorite BSD topic.  The goal is to motivate everybody,
+      especially university students to see the benefits of our
+      approach and take a chance on working with BSD
+      systems.</description>
+  </event>
+
   <event id="bsdcan-2013">
     <name>BSDCan 2013</name>
     <url>http://www.bsdcan.org/</url>

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov  5 13:16:45 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AE3FF419;
 Mon,  5 Nov 2012 13:16:45 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 78B838FC0C;
 Mon,  5 Nov 2012 13:16:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA5DGjPw007263;
 Mon, 5 Nov 2012 13:16:45 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA5DGjKG007261;
 Mon, 5 Nov 2012 13:16:45 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211051316.qA5DGjKG007261@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 5 Nov 2012 13:16:45 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39947 - head/en_US.ISO8859-1/books/handbook/basics
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Nov 2012 13:16:45 -0000

Author: eadler
Date: Mon Nov  5 13:16:45 2012
New Revision: 39947
URL: http://svnweb.freebsd.org/changeset/doc/39947

Log:
  Prefer the use of pgrep instead of ps | grep for exactly the reason
  specified in the handbook: ps is "racy".
  
  Approved by:	jkois

Modified:
  head/en_US.ISO8859-1/books/handbook/basics/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/basics/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Mon Nov  5 11:32:14 2012	(r39946)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Mon Nov  5 13:16:45 2012	(r39947)
@@ -2185,20 +2185,12 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 
       <step>
 	<para>Find the process ID of the process you want to send the
-	  signal to.  Do this using &man.ps.1; and &man.grep.1;.  The
-	  &man.grep.1; command is used to search through output,
-	  looking for the string you specify.  This command is run as
-	  a normal user, and &man.inetd.8; is run as
-	  <username>root</username>, so the <option>ax</option>
-	  options must be given to &man.ps.1;.</para>
-
-	<screen>&prompt.user; <userinput>ps -ax | grep inetd</userinput>
-  198  ??  IWs    0:00.00 inetd -wW</screen>
-
-	<para>So the &man.inetd.8; PID is 198.  In some cases the
-	  <literal>grep inetd</literal> command might also appear in
-	  this output.  This is because of the way &man.ps.1; has to
-	  find the list of running processes.</para>
+	  signal to.  Do this using &man.pgrep.1;.</para>
+
+	<screen>&prompt.user; <userinput>pgrep -l inetd</userinput>
+198  inetd -wW</screen>
+
+	<para>So the &man.inetd.8; PID is 198.</para>
       </step>
 
       <step>

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov  5 13:16:51 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 12FCF41A;
 Mon,  5 Nov 2012 13:16:51 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EC0108FC12;
 Mon,  5 Nov 2012 13:16:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA5DGo0K007310;
 Mon, 5 Nov 2012 13:16:50 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA5DGofW007308;
 Mon, 5 Nov 2012 13:16:50 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211051316.qA5DGofW007308@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 5 Nov 2012 13:16:50 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39948 -
 head/en_US.ISO8859-1/books/handbook/virtualization
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Nov 2012 13:16:51 -0000

Author: eadler
Date: Mon Nov  5 13:16:50 2012
New Revision: 39948
URL: http://svnweb.freebsd.org/changeset/doc/39948

Log:
  Update information about using VirtualBox.
  
  atapicam is no longer required and some devices need passthrough.
  
  PR:		docs/173255
  Submitted by:	Yuri <yuri@tsoft.com>
  Approved by:	jkois (mentor)

Modified:
  head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml	Mon Nov  5 13:16:45 2012	(r39947)
+++ head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml	Mon Nov  5 13:16:50 2012	(r39948)
@@ -1254,11 +1254,16 @@ add path 'usb/*' mode 0660 group operato
     <sect2 id="virtualization-virtualbox-host-dvd-cd-access">
       <title>&virtualbox; Host DVD/CD Access</title>
 
-      <para>The <command>atapicam</command> kernel module needs to be
-	loaded by adding the following line to
-	<filename>/boot/loader.conf</filename>:</para>
-
-      <programlisting>atapicam_load="YES"</programlisting>
+      <para>Access to the host DVD/CD drives from guests is achieved
+	through the sharing of the physical drives.  In GUI this is
+	set up from the Storage window in the Settings of the virtual
+	machine.  Create an empty IDE CD/DVD device first.
+	Then choose the Host Drive from the popup menu for the virtual
+	CD/DVD drive selection.  A checkbox labeled
+	<literal>Passthrough</literal> check box will appear.
+	This allows the virtual machine to use the hardware directly.
+	For example, audio CDs or the burner only function if
+	this option is selected.</para>
 
       <para><acronym>HAL</acronym> needs to run for
 	<application>&virtualbox;</application> DVD/CD functions to
@@ -1267,7 +1272,7 @@ add path 'usb/*' mode 0660 group operato
 
       <programlisting>hald_enable="YES"</programlisting>
 
-      <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/hald start</userinput></screen>
+      <screen>&prompt.root; <userinput>service hald start</userinput></screen>
 
       <para>In order for users to be able to use
 	<application>&virtualbox;</application> DVD/CD functions, they
@@ -1276,12 +1281,18 @@ add path 'usb/*' mode 0660 group operato
 	  class="devicefile">/dev/cd<replaceable>N</replaceable></filename>,
 	and <filename
 	  class="devicefile">/dev/pass<replaceable>N</replaceable></filename>.
-	Add the following lines to
+	This is usually achieved by making the user of
+	<application>&virtualbox;</application>
+	a member of the operator group, which is also the default
+	group of the above mentioned devices.  Permissions of these
+	devices have to be corrected by adding the following lines to
 	<filename>/etc/devfs.conf</filename>:</para>
 
-      <programlisting>perm cd0 0600
+      <programlisting>perm cd* 0600
 perm xpt0 0660
-perm pass0 0660</programlisting>
+perm pass* 0660</programlisting>
+
+      <screen>&prompt.root; <userinput>/etc/rc.d/devfs restart</userinput></screen>
     </sect2>
 
 <!--

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov  5 16:17:44 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 441E0B2D;
 Mon,  5 Nov 2012 16:17:44 +0000 (UTC) (envelope-from kaduk@mit.edu)
Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU
 [18.9.25.14]) by mx1.freebsd.org (Postfix) with ESMTP id 9682E8FC0C;
 Mon,  5 Nov 2012 16:17:43 +0000 (UTC)
X-AuditID: 1209190e-b7f756d000000904-a1-5097e57402e3
Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
 by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP id
 D1.0F.02308.475E7905; Mon,  5 Nov 2012 11:12:36 -0500 (EST)
Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
 by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id qA5GCaeG013573;
 Mon, 5 Nov 2012 11:12:36 -0500
Received: from multics.mit.edu (SYSTEM-LOW-SIPB.MIT.EDU [18.187.2.37])
 (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU)
 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qA5GCWgR016051
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
 Mon, 5 Nov 2012 11:12:34 -0500 (EST)
Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308)
 id qA5GCW08016924; Mon, 5 Nov 2012 11:12:32 -0500 (EST)
Date: Mon, 5 Nov 2012 11:12:32 -0500 (EST)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Eitan Adler <eadler@freebsd.org>
Subject: Re: svn commit: r39947 -
 head/en_US.ISO8859-1/books/handbook/basics
In-Reply-To: <201211051316.qA5DGjKG007261@svn.freebsd.org>
Message-ID: <alpine.GSO.1.10.1211051110130.2164@multics.mit.edu>
References: <201211051316.qA5DGjKG007261@svn.freebsd.org>
User-Agent: Alpine 1.10 (GSO 962 2008-03-14)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPIsWRmVeSWpSXmKPExsUixG6nrlvydHqAwc7vIhY/Ph5istj1dw6z
 xY1F+5ksdvf3MjuweMz4NJ8lgDGKyyYlNSezLLVI3y6BK+PFmT9MBS8EKiZuP83UwLiJt4uR
 k0NCwETi4KwprBC2mMSFe+vZuhi5OIQE9jFK/NuwnBHCWc8ocWztUWaQKiGB40wSJ9cXQ9j1
 Euu/bGACsVkEtCR+bfwNZrMJqEjMfLORDcQWAbK/7/8JFmcWiJLYs7QRbJuwgJ/Eixe3GUFs
 TgEricubnwLZHBy8Ag4Sc3fngJhCApYSR3bIgVSICuhIrN4/hQXE5hUQlDg58wkLxERLiX9r
 f7FOYBSchSQ1C0lqASPTKkbZlNwq3dzEzJzi1GTd4uTEvLzUIl1jvdzMEr3UlNJNjKBw5ZTk
 28H49aDSIUYBDkYlHt4PEtMDhFgTy4orcw8xSnIwKYnyFj0GCvEl5adUZiQWZ8QXleakFh9i
 lOBgVhLh5bgDlONNSaysSi3Kh0lJc7AoifNeSbnpLySQnliSmp2aWpBaBJOV4eBQkuCd8wSo
 UbAoNT21Ii0zpwQhzcTBCTKcB2h4H0gNb3FBYm5xZjpE/hSjopQ4bxNIQgAkkVGaB9cLSyev
 GMWBXhHmXQBSxQNMRXDdr4AGMwEN3n5pCsjgkkSElFQDo/TtnrMLO7t9rmnz3FV3/yJxxszT
 fWH8df4oKZ4bXk4+KsLpIasfyN8NcGzJUv9p23cu+OHsicZ7zuxt/r/87wqlq9XLuPetPeh9
 fbFc2uK7ZWxhi1YenHxs71n97MStE3w5LhxrePStQatyLd/2eZlXTuvO4JTQcXz10ERrydzt
 n9aHazbJ7VBiKc5INNRiLipOBACJDzOSAgMAAA==
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Nov 2012 16:17:44 -0000

On Mon, 5 Nov 2012, Eitan Adler wrote:

> Author: eadler
> Date: Mon Nov  5 13:16:45 2012
> New Revision: 39947
> URL: http://svnweb.freebsd.org/changeset/doc/39947
>
> Log:
>  Prefer the use of pgrep instead of ps | grep for exactly the reason
>  specified in the handbook: ps is "racy".
>
>  Approved by:	jkois
>
> Modified:
>  head/en_US.ISO8859-1/books/handbook/basics/chapter.xml
>
> Modified: head/en_US.ISO8859-1/books/handbook/basics/chapter.xml
> ==============================================================================
> --- head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Mon Nov  5 11:32:14 2012	(r39946)
> +++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Mon Nov  5 13:16:45 2012	(r39947)
> @@ -2185,20 +2185,12 @@ Swap: 256M Total, 38M Used, 217M Free, 1
>
>       <step>
> 	<para>Find the process ID of the process you want to send the
> -	  signal to.  Do this using &man.ps.1; and &man.grep.1;.  The
> -	  &man.grep.1; command is used to search through output,
> -	  looking for the string you specify.  This command is run as

grep is also a basic Unix command, appropriate to document in a "UNIX 
Basics" chapter.
grep is used in the permissions section, but not documented there.

Arguably this text should be moved to the first appearance of 'grep' in 
this chapter, not removed.

-Ben

> -	  a normal user, and &man.inetd.8; is run as
> -	  <username>root</username>, so the <option>ax</option>
> -	  options must be given to &man.ps.1;.</para>
> -
> -	<screen>&prompt.user; <userinput>ps -ax | grep inetd</userinput>
> -  198  ??  IWs    0:00.00 inetd -wW</screen>
> -
> -	<para>So the &man.inetd.8; PID is 198.  In some cases the
> -	  <literal>grep inetd</literal> command might also appear in
> -	  this output.  This is because of the way &man.ps.1; has to
> -	  find the list of running processes.</para>
> +	  signal to.  Do this using &man.pgrep.1;.</para>
> +
> +	<screen>&prompt.user; <userinput>pgrep -l inetd</userinput>
> +198  inetd -wW</screen>
> +
> +	<para>So the &man.inetd.8; PID is 198.</para>
>       </step>
>
>       <step>
>

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov  5 16:26:44 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 78D70F46
 for <svn-doc-head@freebsd.org>; Mon,  5 Nov 2012 16:26:44 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com
 [209.85.212.54])
 by mx1.freebsd.org (Postfix) with ESMTP id 103CC8FC14
 for <svn-doc-head@freebsd.org>; Mon,  5 Nov 2012 16:26:43 +0000 (UTC)
Received: by mail-vb0-f54.google.com with SMTP id l1so7909438vba.13
 for <svn-doc-head@freebsd.org>; Mon, 05 Nov 2012 08:26:43 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=MUee3flw8e/TyUjGsByDgt6/69IePgAPKlxclZUxeC8=;
 b=tUqfBB3fibSByrE+V4Bh3S8zwTJd3m4v8CmvqrycAjGKWSKNAJ53V7ZoDRJah95rEb
 C5TEKXt9vQLjuqTTwuTM+D8Fghyb1rmurg9/RGxrdar7Xnk8aUyE+uI9wj4Tgz/NBuFj
 JJqDNbtIPlnMD6LROIo2EJh04smEssryTNZzQ=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :x-gm-message-state;
 bh=MUee3flw8e/TyUjGsByDgt6/69IePgAPKlxclZUxeC8=;
 b=DSCMxjInGvEfbzIbt6GspWnrbJGMo+f7zsbDVg7pPkIJ68LEAnMHpYqqvtPEun2THZ
 GQGt3wjVYEeJ3Arntvg4VuJaDvx8UEgL1rdwqbq/Rg9GXCHyOWhe5gnLkeOU52hUfd1O
 2MX9NyHmwLNciQwIeZs2T7uO0wF7ql5ekEg7nY7bnMEHMyWs2aBksLyzX8hRg1dvpQqY
 LPopt//8Lpzf17GQl0rd4i0UaUHVlT7SBHoibD+KC8GJC5/2LX1ONMJm42viTfRBDtlo
 t2IQ3c8WOlcKfmomnuFo/RS58UYpcazy2KmZoLAjJ6TSpavpF/xWdPyAuUWMDPFF3RJ/
 OXIg==
Received: by 10.58.2.71 with SMTP id 7mr10241912ves.42.1352132803305; Mon, 05
 Nov 2012 08:26:43 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.220.58.206 with HTTP; Mon, 5 Nov 2012 08:26:13 -0800 (PST)
In-Reply-To: <alpine.GSO.1.10.1211051110130.2164@multics.mit.edu>
References: <201211051316.qA5DGjKG007261@svn.freebsd.org>
 <alpine.GSO.1.10.1211051110130.2164@multics.mit.edu>
From: Eitan Adler <eadler@freebsd.org>
Date: Mon, 5 Nov 2012 11:26:13 -0500
X-Google-Sender-Auth: Q5OFQzoPiHSevjtOzc0XQM_gYX0
Message-ID: <CAF6rxgk4PxFnEjRnMCjnOU4j4XD9MXiCjDjVeoWSyMot8FEBog@mail.gmail.com>
Subject: Re: svn commit: r39947 - head/en_US.ISO8859-1/books/handbook/basics
To: Benjamin Kaduk <kaduk@mit.edu>
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQnlTAgX6xYYDKoXIh89RFafuilUlkWrqeXaUc6riK+TwLRZiTPO5XrmiIyCCIIK1gD/ky4y
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Nov 2012 16:26:44 -0000

On 5 November 2012 11:12, Benjamin Kaduk <kaduk@mit.edu> wrote:
>
> grep is also a basic Unix command, appropriate to document in a "UNIX
> Basics" chapter.
> grep is used in the permissions section, but not documented there.
>
> Arguably this text should be moved to the first appearance of 'grep' in this
> chapter, not removed.

This text isn't sufficient for that section, but I agree it should be
document there, if it isn't already. I have quite a lot on my plat at
the moment but if no one else gets to improving that section I'll keep
it on my mind.



-- 
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams

From owner-svn-doc-head@FreeBSD.ORG  Mon Nov  5 20:37:21 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2D0801CF;
 Mon,  5 Nov 2012 20:37:21 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1068D8FC0C;
 Mon,  5 Nov 2012 20:37:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA5KbKel079691;
 Mon, 5 Nov 2012 20:37:20 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA5KbKBU079689;
 Mon, 5 Nov 2012 20:37:20 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201211052037.qA5KbKBU079689@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 5 Nov 2012 20:37:20 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39949 - head/zh_CN.GB2312/htdocs/releases
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Nov 2012 20:37:21 -0000

Author: delphij
Date: Mon Nov  5 20:37:20 2012
New Revision: 39949
URL: http://svnweb.freebsd.org/changeset/doc/39949

Log:
  Sync with r39632.

Modified:
  head/zh_CN.GB2312/htdocs/releases/index.xml

Modified: head/zh_CN.GB2312/htdocs/releases/index.xml
==============================================================================
--- head/zh_CN.GB2312/htdocs/releases/index.xml	Mon Nov  5 13:16:50 2012	(r39948)
+++ head/zh_CN.GB2312/htdocs/releases/index.xml	Mon Nov  5 20:37:20 2012	(r39949)
@@ -5,7 +5,7 @@
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original Revision 1.112 -->
+<!-- Original Revision: 39632 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -15,61 +15,193 @@
     </head>
 
     <body class="navinclude.download">
-<img alt="FreeBSD ·¢Ðа汾" src="&enbase;/gifs/releases.jpg" height="200" width="300" align="right" border="0"/>
+      <img alt="FreeBSD ·¢Ðа汾" src="&enbase;/gifs/releases.jpg" height="200" width="300" align="right" border="0"/>
 
-<p><em>Èç¹ûÄúÏëÁ˽â FreeBSD µÄ×îÐÂÐÅÏ¢£¬Çë·ÃÎÊ <a
-href="&base;/news/newsflash.html">ÐÂÎÅËÙµÝ</a> ÍøÒ³¡£</em></p>
+  <p>FreeBSD ·¢Ðа汾·ÖΪ ¡°Éú²ú°æ±¾¡± (Production Releases) ºÍ
+    ¡°¾Éʽ°æ±¾¡± (Legacy Releases)¡£ Ç°ÕßÊÊÓÃÓÚÏ£ÍûʹÓÃ×îÐÂÌØÐÔµÄÓû§£¬
+    ºóÕßÊʺÏÓÚÏ£Íû²ÉÈ¡¸ü±£ÊصÄÉý¼¶²ßÂÔµÄÓû§¡£</p>
 
-<a name="current"></a>
-<h2>µ±Ç°°æ±¾</h2>
+  <p>Ë氲ȫ³¤¹ÙÖ§³ÖµÄʱ¼ä³¤¶Ì²»Í¬£¬ ÿ¸ö·¢Ðа汾Ҳ¿É·ÖΪ ¡°ÆÕ֧ͨ³Ö¡± ºÍ
+    ¡°ÑÓ³¤Ö§³Ö¡± Á½Àà¡£</p>
+
+  <p>ÿ¸ö·¢Ðа汾µÄ HTML ¸ñʽµÄÏà¹ØÎĵµÎļþ£¬
+    ¶¼¿ÉÒÔÔÚ <a href="&base;/relnotes.html">·¢²¼Îĵµ</a>
+    Ò³ÃæÕÒµ½¡£</p>
+
+  <a name="supported-releases"></a>
+  <h2>Ä¿Ç°ÊÜÖ§³ÖµÄ°æ±¾</h2>
+
+  <p>¹ØÓÚ·¢²¼ÈÕÆÚ¡¢ Ö§³Öʱ¼ä·ÖÀ࣬ ÒÔ¼°Ô¤¼ÆµÄÉúÃüÆÚÖÕÖ¹ (EoL) ʱ¼ä£¬
+    ¿ÉÒÔÔÚ <a href="&base;/security/security.html">FreeBSD
+    °²È«ÐÅÏ¢</a> Ò³ÃæÖÐµÄ <a
+      href="&base;/security/security.html#sup">Ö§³ÖµÄ·¢²¼°æ±¾</a>
+    ²¿·ÖÕÒµ½¡£</p>
+
+  <a name="current"></a>
+  <h2>×îа汾</h2>
+
+    <h3>Éú²ú°æ±¾</h3>
+      <p><b>°æ±¾ &rel.current;</b> (&rel.current.date;)
+	<em>
+	<a href="&enbase;/releases/&u.rel.announce;">¹«¸æ</a> :
+	<a href="&enbase;/releases/&u.rel.notes;">·¢ÐÐ˵Ã÷</a> :
+	<a href="&enbase;/releases/&u.rel.installation;">°²×°ËµÃ÷</a> :
+	<a href="&enbase;/releases/&u.rel.hardware;">Ó²¼þ˵Ã÷</a> :
+	<a href="&enbase;/releases/&u.rel.readme;">×ÔÊöÎļþ</a> :
+	<a href="&enbase;/releases/&u.rel.errata;">¿±Îó</a>
+      </em></p>
+
+      <p><b>°æ±¾ &rel2.current;</b> (&rel2.current.date;)
+	<em>
+	<a href="&enbase;/releases/&u.rel2.announce;">¹«¸æ</a> :
+	<a href="&enbase;/releases/&u.rel2.notes;">·¢ÐÐ˵Ã÷</a> :
+	<a href="&enbase;/releases/&u.rel2.installation;">°²×°ËµÃ÷</a> :
+	<a href="&enbase;/releases/&u.rel2.hardware;">Ó²¼þ˵Ã÷</a> :
+	<a href="&enbase;/releases/&u.rel2.readme;">×ÔÊöÎļþ</a> :
+	<a href="&enbase;/releases/&u.rel2.errata;">¿±Îó</a>
+      </em></p>
+
+    <h3>¾Éʽ°æ±¾</h3>
+      <p><b>°æ±¾ &rel3.current;</b> (&rel3.current.date;)
+	<em>
+	<a href="&enbase;/releases/&u.rel3.announce;">¹«¸æ</a> :
+	<a href="&enbase;/releases/&u.rel3.notes;">·¢ÐÐ˵Ã÷</a> :
+	<a href="&enbase;/releases/&u.rel3.hardware;">Ó²¼þ˵Ã÷</a> :
+	<a href="&enbase;/releases/&u.rel3.readme;">×ÔÊöÎļþ</a> :
+	<a href="&enbase;/releases/&u.rel3.errata;">¿±Îó</a>
+      </em></p>
+
+  <a name="future"></a>
+  <h2>δÀ´µÄ·¢Ðа汾</h2>
+
+    <p>¹ØÓÚδÀ´°æ±¾µÄ·¢ÐÐÈÕ³ÌÒÔ¼°¹ØÓÚ·¢²¼¹¤³Ì¹ý³ÌµÄÐÅÏ¢£¬
+      Çë²ÎÔÄ <a
+	href="&base;/releng/index.html">·¢²¼¹¤³Ì</a>
+      ÍøÒ³¡£</p>
+
+    <p>´ËÍ⣬ Äú»¹¿ÉÒÔ»ñµÃÀ´×Ô <a
+	href="&base;/doc/zh_CN/books/handbook/current-stable.html#STABLE">FreeBSD-STABLE</a>
+      ºÍ <a
+	href="&base;/doc/zh_CN/books/handbook/current-stable.html#CURRENT">FreeBSD-CURRENT</a>
+      µÄ¿ìÕÕ°æ±¾¡£ Çë²ÎÔÄ <a
+	href="../where.html">»ñµÃ FreeBSD</a> Á˽âÏêÇé¡£</p>
+
+<!--  <a name="prior-supported"></a>
+  <h2>Prior Releases Still Being Supported</h2> -->
+
+  <a name="prior-unsupported"></a>
+  <h2>Ä¿Ç°ÒѾ­Í£Ö¹Ö§³ÖµÄ¸üÔç°æ±¾</h2>
+
+    <p>¹ØÓÚ¸üÔç°æ±¾µÄ·¢²¼ÈÕÆÚ¡¢ Ö§³Öʱ¼ä·ÖÀ࣬ ÒÔ¼°Êµ¼ÊµÄÉúÃüÖÜÆÚ½áÊøʱ¼ä£¬
+      ¿ÉÒÔÔÚ <a href="&base;/security/security.html">FreeBSD
+      °²È«ÐÅÏ¢</a> Ò³ÃæÖÐµÄ <a
+	href="&base;/security/security.html#unsup">²»ÔÙÖ§³ÖµÄ°æ±¾</a>
+      ²¿·ÖÕÒµ½¡£</p>
+
+    <ul>
+      <li><b>8.2</b> (2011 Äê 2 ÔÂ)
+	<em>
+	  <a href="&enbase;/releases/8.2R/announce.html">¹«¸æ</a>:
+	  <a href="&enbase;/releases/8.2R/relnotes.html">·¢ÐÐ˵Ã÷</a>:
+	  <a href="&enbase;/releases/8.2R/hardware.html">Ó²¼þ¼æÈÝ˵Ã÷</a>:
+	  <a href="&enbase;/releases/8.2R/readme.html">×ÔÊöÎļþ</a>:
+	  <a href="&enbase;/releases/8.2R/errata.html">¿±Îó</a>
+	</em>
+      </li>
+
+      <li><b>8.1</b> (2010 Äê 7 ÔÂ)
+	<em>
+	  <a href="&enbase;/releases/8.1R/announce.html">¹«¸æ</a>:
+	  <a href="&enbase;/releases/8.1R/relnotes.html">·¢ÐÐ˵Ã÷</a>:
+	  <a href="&enbase;/releases/8.1R/hardware.html">Ó²¼þ¼æÈÝ˵Ã÷</a>:
+	  <a href="&enbase;/releases/8.1R/readme.html">×ÔÊöÎļþ</a>:
+	  <a href="&enbase;/releases/8.1R/errata.html">¿±Îó</a>
+	</em>
+      </li>
+
+      <li><b>8.0</b> (2009 Äê 11 ÔÂ)
+	<em>
+	  <a href="&enbase;/releases/8.0R/announce.html">¹«¸æ</a>:
+	  <a href="&enbase;/releases/8.0R/relnotes.html">·¢ÐÐ˵Ã÷</a>:
+	  <a href="&enbase;/releases/8.0R/hardware.html">Ó²¼þ¼æÈÝ˵Ã÷</a>:
+	  <a href="&enbase;/releases/8.0R/readme.html">×ÔÊöÎļþ</a>:
+	  <a href="&enbase;/releases/8.0R/errata.html">¿±Îó</a>
+	</em>
+      </li>
+
+      <li><b>7.3</b> (2010 Äê 3 ÔÂ)
+	<em>
+	  <a href="&enbase;/releases/7.3R/announce.html">¹«¸æ</a>:
+	  <a href="&enbase;/releases/7.3R/relnotes.html">·¢ÐÐ˵Ã÷</a>:
+	  <a href="&enbase;/releases/7.3R/hardware.html">Ó²¼þ¼æÈÝ˵Ã÷</a>:
+	  <a href="&enbase;/releases/7.3R/readme.html">×ÔÊöÎļþ</a>:
+	  <a href="&enbase;/releases/7.3R/errata.html">¿±Îó</a>
+	</em>
+      </li>
+
+      <li><b>7.2</b> (2009 Äê 5 ÔÂ)
+	<em>
+	  <a href="&enbase;/releases/7.2R/announce.html">¹«¸æ</a>:
+	  <a href="7.2R/relnotes.html">·¢ÐÐ˵Ã÷</a>:
+	  <a href="7.2R/hardware.html">Ó²¼þ¼æÈÝ˵Ã÷</a>:
+	  <a href="7.2R/readme.html">×ÔÊöÎļþ</a>:
+	  <a href="7.2R/errata.html">¿±Îó</a>
+	</em>
+      </li>
+
+      <li><b>7.1</b> (2009 Äê 1 ÔÂ)
+	<em>
+	  <a href="&enbase;/releases/7.1R/announce.html">¹«¸æ</a>:
+	  <a href="7.1R/relnotes.html">·¢ÐÐ˵Ã÷</a>:
+	  <a href="7.1R/hardware.html">Ó²¼þ¼æÈÝ˵Ã÷</a>:
+	  <a href="7.1R/readme.html">×ÔÊöÎļþ</a>:
+	  <a href="7.1R/errata.html">¿±Îó</a>
+	</em>
+      </li>
+
+      <li><b>7.0</b> (2008 Äê 2 ÔÂ)
+	<em>
+	  <a href="&enbase;/releases/7.0R/announce.html">¹«¸æ</a>:
+	  <a href="7.0R/relnotes.html">·¢ÐÐ˵Ã÷</a>:
+	  <a href="7.0R/hardware.html">Ó²¼þ¼æÈÝ˵Ã÷</a>:
+	  <a href="7.0R/readme.html">×ÔÊöÎļþ</a>:
+	  <a href="7.0R/errata.html">¿±Îó</a>
+	</em>
+      </li>
+
+      <li><b>6.4</b> (2008 Äê 11 ÔÂ)
+	<em>
+	  <a href="&enbase;/releases/6.4R/announce.html">¹«¸æ</a>:
+	  <a href="&enbase;/releases/6.4R/relnotes.html">·¢ÐÐ˵Ã÷</a>:
+	  <a href="&enbase;/releases/6.4R/hardware.html">Ó²¼þ¼æÈÝ˵Ã÷</a>:
+	  <a href="&enbase;/releases/6.4R/installation.html">°²×°ËµÃ÷</a>:
+	  <a href="&enbase;/releases/6.4R/readme.html">×ÔÊöÎļþ</a>:
+	  <a href="&enbase;/releases/6.4R/errata.html">¿±Îó</a>
+	</em>
+      </li>
+
+      <li><b>6.3</b> (2008 Äê 1 ÔÂ)
+	<em>
+	  <a href="&enbase;/releases/6.3R/announce.html">¹«¸æ</a>:
+	  <a href="6.3R/relnotes.html">·¢ÐÐ˵Ã÷</a>:
+	  <a href="6.3R/hardware.html">Ó²¼þ¼æÈÝ˵Ã÷</a>:
+	  <a href="6.3R/installation.html">°²×°ËµÃ÷</a>:
+	  <a href="6.3R/readme.html">×ÔÊöÎļþ</a>:
+	  <a href="6.3R/errata.html">¿±Îó</a>
+	</em>
+      </li>
+
+      <li><b>6.2</b> (2007 Äê 1 ÔÂ)
+	<em>
+	  <a href="&enbase;/releases/6.2R/announce.html">¹«¸æ</a>:
+	  <a href="6.2R/relnotes.html">·¢ÐÐ˵Ã÷</a>:
+	  <a href="6.2R/hardware.html">Ó²¼þ¼æÈÝ˵Ã÷</a>:
+	  <a href="6.2R/installation.html">°²×°ËµÃ÷</a>:
+	  <a href="6.2R/readme.html">×ÔÊöÎļþ</a>:
+	  <a href="6.2R/errata.html">¿±Îó</a>
+	</em>
+      </li>
 
-<p><b>°æ±¾ &rel.current;</b> (&rel.current.date;)
-<em>
-<a href="&enbase;/releases/&u.rel.announce;">¹«¸æ</a>£º
-<a href="&base;/releases/&u.rel.notes;">·¢ÐÐ˵Ã÷</a>£º
-<a href="&base;/releases/&u.rel.hardware;">Ó²¼þ˵Ã÷</a>£º
-<a href="&base;/releases/&u.rel.readme;">×ÔÊöÎļþ</a>£º
-<a href="&base;/releases/&u.rel.errata;">¿±Îó</a>£º
-</em></p>
-
-<p><b>°æ±¾ &rel2.current;</b> (&rel2.current.date;)
-<em>
-<a href="&enbase;/releases/&u.rel2.announce;">¹«¸æ</a>£º
-<a href="&base;/releases/&u.rel2.notes;">·¢ÐÐ˵Ã÷</a>£º
-<a href="&base;/releases/&u.rel2.hardware;">Ó²¼þ˵Ã÷</a>£º
-<a href="&base;/releases/&u.rel2.installation;">°²×°ËµÃ÷</a>£º
-<a href="&base;/releases/&u.rel2.readme;">×ÔÊöÎļþ</a>£º
-<a href="&base;/releases/&u.rel2.errata;">¿±Îó</a>
-</em></p>
-
-<p>ÎÒÃÇÒ²ÌṩÀ´×Ô <a
-href="&enbase;/doc/&url.doc.langcode;/books/handbook/current-stable.html#STABLE">FreeBSD-STABLE</a>
-ºÍ <a
-href="&enbase;/doc/&url.doc.langcode;/books/handbook/current-stable.html#CURRENT">FreeBSD-CURRENT</a>
-·ÖÖ§×îеĿìÕÕ·¢Ðа档 Çë²Î¼û <a href="../where.html">»ñÈ¡
-FreeBSD</a> ÒÔÁ˽â¸ü¶àϸ½Ú¡£</p>
-
-<a name="future"></a>
-<h2>δÀ´µÄ·¢Ðа汾</h2>
-
-       <p>ÎÒÃǽ«³ÖÐøµØ´Ó
-       <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#STABLE">FreeBSD-STABLE</a> ºÍ
-       <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#CURRENT">FreeBSD-CURRENT</a>
-       ·ÖÖ§ÉϹ¹½¨ºÍÕý³£µÄ·¢ÐаæÀàËƵÄÃæÏò¿ª·¢ÈËÔ±µÄ¿ìÕÕ¡£</p>
-
-       <p>ÒªÁ˽â¹ØÓÚ release engineering ¹ý³ÌµÄ¸ü¶àϸ½Ú£¬
-       »òÏë²é¿´¹ØÓÚÏÂÒ»·¢Ðа汾µÄÏêϸ¼Æ»®ºÍ½ø¶È£¬
-       Çë·ÃÎʱ¾ Web Õ¾µãµÄ <a href="&enbase;/releng/index.html">Release
-       Engineering</a> ²¿·Ö¡£</p>
-
-       <p>Õë¶Ô FreeBSD-stable ºÍ
-       FreeBSD-current µÄ·¢²¼ÎĵµµÄ HTML ¸ñʽµÄ°æ±¾£¬ ¿ÉÒÔÔÚ
-       <a href="&enbase;/relnotes.html">·¢²¼Îĵµ</a> ÉÏÕÒµ½¡£
-       ÕâЩÎļþ»áÖÜÆÚÐԵع¹½¨£¬ ÒÔ·´Ó³±ä»¯ÖÐµÄ FreeBSD ¿ª·¢×´Ì¬¡£</p>
-
-<a name="past"></a>
-<h2>¹ýÈ¥µÄ·¢Ðа汾</h2>
-<ul>
       <li><b>6.1</b> (2006 Äê 5 ÔÂ)
 	<em>
 	  <a href="&enbase;/releases/6.1R/announce.html">¹«¸æ</a>£º
@@ -92,15 +224,26 @@ FreeBSD</a> ÒÔÁ˽â¸ü¶àϸ½Ú¡£</p>
 	</em>
       </li>
 
+      <li><b>5.5</b> (2006 Äê 5 ÔÂ)
+	<em>
+	  <a href="&enbase;/releases/5.5R/announce.html">¹«¸æ</a>:
+	  <a href="5.5R/relnotes.html">·¢ÐÐ˵Ã÷</a>:
+	  <a href="5.5R/hardware.html">Ó²¼þ˵Ã÷</a>:
+	  <a href="5.5R/installation.html">°²×°ËµÃ÷</a>:
+	  <a href="5.5R/readme.html">×ÔÊöÎļþ</a>:
+	  <a href="5.5R/errata.html">¿±Îó</a>:
+	</em>
+      </li>
+
       <li><b>5.4</b> (2005 Äê 5 ÔÂ)
 	<em>
 	  <a href="&enbase;/releases/5.4R/announce.html">¹«¸æ</a>£º
-	  <a href="./5.4R/relnotes.html">·¢ÐÐ˵Ã÷</a>£º
-	  <a href="./5.4R/hardware.html">Ó²¼þ˵Ã÷</a>£º
-	  <a href="./5.4R/installation.html">°²×°ËµÃ÷</a>£º
-	  <a href="./5.4R/readme.html">×ÔÊöÎļþ</a>£º
-	  <a href="./5.4R/errata.html">¿±Îó</a>£º
-	  <a href="./5.4R/migration-guide.html">ǨÒÆÖ¸ÄÏ</a>
+	  <a href="5.4R/relnotes.html">·¢ÐÐ˵Ã÷</a>£º
+	  <a href="5.4R/hardware.html">Ó²¼þ˵Ã÷</a>£º
+	  <a href="5.4R/installation.html">°²×°ËµÃ÷</a>£º
+	  <a href="5.4R/readme.html">×ÔÊöÎļþ</a>£º
+	  <a href="5.4R/errata.html">¿±Îó</a>£º
+	  <a href="5.4R/migration-guide.html">ǨÒÆÖ¸ÄÏ</a>
 	</em>
       </li>
 
@@ -454,20 +597,7 @@ FreeBSD</a> ÒÔÁ˽â¸ü¶àϸ½Ú¡£</p>
       </li>
 
       <li><b>1.0</b> (1993 Äê 11 ÔÂ)</li>
-  </ul>
-
-<a name="releasestatistic"></a>
-<h2>·¢Ðа汾ÓÃÁ¿Í³¼Æ</h2>
-
-<p>
-µ±Ç° FreeBSD ·¢ÐаæʹÓÃ×´¿öµÄͳ¼ÆµÄ¿ìÕÕ°æ±¾£¬ ¿ÉÒÔͨ¹ý
-<a href="http://www.FreeBSD.org/statistic/release_usage/2006/">
-http://www.FreeBSD.org/statistic/release_usage/2006/</a> ·ÃÎÊ¡£
-<br/>
-ÉÏÒ»ÄêµÄ FreeBSD ·¢Ðа汾ÓÃÁ¿Í³¼Æ¿ÉÒÔÔÚ£¬ ¿ÉÒÔÔÚ
-<a href="http://www.FreeBSD.org/statistic/release_usage/2005/">
-http://www.FreeBSD.org/statistic/release_usage/2005/</a> ÕÒµ½¡£
-</p>
+    </ul>
 
-</body>
+  </body>
 </html>

From owner-svn-doc-head@FreeBSD.ORG  Tue Nov  6 00:39:27 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D207916B;
 Tue,  6 Nov 2012 00:39:27 +0000 (UTC)
 (envelope-from bryanv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B45AD8FC08;
 Tue,  6 Nov 2012 00:39:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA60dRTp031490;
 Tue, 6 Nov 2012 00:39:27 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA60dRYr031482;
 Tue, 6 Nov 2012 00:39:27 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201211060039.qA60dRYr031482@svn.freebsd.org>
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Tue, 6 Nov 2012 00:39:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39950 - in head: en_US.ISO8859-1/articles/contributors
 share/pgpkeys share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Nov 2012 00:39:28 -0000

Author: bryanv (src committer)
Date: Tue Nov  6 00:39:27 2012
New Revision: 39950
URL: http://svnweb.freebsd.org/changeset/doc/39950

Log:
  - Add my author entity
  - Add myself to contrib.committers.xml
  - Add my PGP public key
  - Add my news entry
  
  Approved by:	grehan (mentor)

Added:
  head/share/pgpkeys/bryanv.key   (contents, props changed)
Modified:
  head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
  head/share/pgpkeys/pgpkeys-developers.xml
  head/share/pgpkeys/pgpkeys.ent
  head/share/xml/authors.ent
  head/share/xml/developers.ent
  head/share/xml/news.xml

Modified: head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Mon Nov  5 20:37:20 2012	(r39949)
+++ head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Tue Nov  6 00:39:27 2012	(r39950)
@@ -1524,6 +1524,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.bryanv;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.avilla;</para>
     </listitem>
 

Added: head/share/pgpkeys/bryanv.key
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/pgpkeys/bryanv.key	Tue Nov  6 00:39:27 2012	(r39950)
@@ -0,0 +1,77 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh bryanv E97DB7DB;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   4096R/E97DB7DB 2012-11-05
+      Key fingerprint = 0F8F 11EF F4D2 EDCA ECEA  CB16 744C BF25 E97D B7DB
+uid                  Bryan Venteicher (DITC) <bryanv@daemoninthecloset.org>
+uid                  Bryan Venteicher (FreeBSD) <bryanv@freebsd.org>
+sub   4096R/2EBC1A46 2012-11-05
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFCXauUBEACj+NbRz1VJJmbIz6PO3fV3bTeCaAIcBjKWzsaKogvEpuFaVlPX
+eqwKqoRqqbxHxRKfs3Matco+e1EwiWVfna426PB2S5g0+0AuNKo7lq/XtpsSZXp4
+vCPUvZUwpCio6ZYqiu26lVzQ2iZqz4wlsBmsh6pYaP9tNKuf08gPYu80kaclov+a
+/o6uC5A+cNS5u4v2Z+nojMKAOZ3IP5TECKtNVTvmEBlRwGQWKg9tgCGo8g0YOU8s
+XG0hltfpFTe0JAeVWY6k+fI6CXXTfa8U6mBBb5hhmM6Aaxx9j9e5XLXV+VhQck+V
+vJMRKnekfqACauhNvRQQHZsDnduCwn++ohW1kwm8/a0UPPrG0WkJa++GymTmUQwP
+hJ1/HBD3GS9LuxSb7oBCzqOSfiYhYzq1Mh+LiR94pzMfsykJDA2d/PG5uOO7xvL3
+lEdPMB8k/g9YFkWpNUEmVLKPt5vkZwRt2GcMhbIiexxXfOg0A6UhQJy7BWV9bXu1
+DqCeOzdUP1MBF0d/PrdxiF1yjPEHe5s5pVlwoT1PKfTYhVmtiakJINe5M9r79/h5
+Nvd7R/289x1pNLm4CiKcT75mnmb+p0ftQB/QCpk7xngc8xf1uoCPszpFYjp+ktVQ
+XAV8AKjAwjknfhwxxCX7+ijPjYQXVUNVVrFfgZZeJqoBnDTHXsuMDCZcmQARAQAB
+tC9CcnlhbiBWZW50ZWljaGVyIChGcmVlQlNEKSA8YnJ5YW52QGZyZWVic2Qub3Jn
+PokCOAQTAQIAIgUCUJdq5QIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ
+dEy/Jel9t9vFUA/+K8LrI1I9pbN7hUlFQwxj/T6b6sQR/2vneKkNq0q6uj2GxoVo
+Y+r09sAtKENKi1rQBVPMGeZyt+gSWm4yk5pudzsLglHub+7ArFvzo4PzOd+y3j6h
+0r8zUtPZLQxg4gG9K2M0hev+Wmvvksh+NRUyEvbEgRmD2vP/aurAzMl8mIxKi5jK
+cSraBTP7slbuz7GR95/BCFV29ET1fczYOGrLEYfC9ucvHTWh6VVrEIFqjhJTrsMQ
+6X6cfTBm5Mv0VVnm9g5x610X3OH7YdRS9qlDr73vWCoFSCzzjawwv4j56tJIMLM7
+at5ZGsmBYEms2Fl5SOTcb2s12c2qPFf2e0YDcJjQiiX//hgV9/Dw+JEKkkZ739Ut
+r6TTP+icDMCAS7owOW555oYIxDakOsi46xU4XQ9lXjYqmOM68NF5clEw2cfC6H2i
+/smHClty57Ra3+RD55YOaT11qy9jJ6z5w0SwHMxVKnmuLL+wLrO8xFvz8YGtwTJx
+ULUgkyMU/g1NEDoiWetkydmjWa87J34/F3qo+Znz8FpTSx3syGJPtjirC242P0Hv
+aFEpobg+IieYj/y+tcBDrK7DcFhy+ddlPRikC33obf/pMe7Tq7XUDeGsAwRMDrZ8
+5Nz77ShoTyNVbQrjvMZ3mWUL6aIqQQiXYb30YX65qSfkbjeWFV/UqVWXwPe0NkJy
+eWFuIFZlbnRlaWNoZXIgKERJVEMpIDxicnlhbnZAZGFlbW9uaW50aGVjbG9zZXQu
+b3JnPokCOAQTAQIAIgUCUJdwvQIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AA
+CgkQdEy/Jel9t9v81g/9EgilQhRDnX+jbfI7wvIx7M2i1QeOV+Zige7fZiHS3038
+jbl0o/FylG+UfZiGRS6dr56wg52apG0GZMYN8v15b+w34x1jroCMp/NAXJFAb6Ju
+6molIDL07B8yWPRV78LJ71eG3lAsTmsXo72WvsbObAKmRKT1bOJkCnu6HCc4rMt8
+Gc2DVAfWM88/pnYu4VhDrs5q8hp5iblojiOu7wgDEapTd8+5aTCq1LEZYRit+k2L
+nl2FAXfswp6s+RhXS/4mNO9Bqr9Rj6SGLjbjEXUpNDzwjjyjaL+FgNvi/31yANml
+4rWEORrdzcFGdvgwKgSP25Xn85iMrJAme68fB1/4tMzyZ5TNugNU4X1ieL7gNNgN
+c3a18N+d1pnmfAkAqs6qvnysLrMJu/2wKbOmu42uZX3fEdAWkR8r233QJIvAp59n
+qEm3zRXZEOUUP3Pt0VCGZXQ4ztYP33kCWRJ7f/pIGq/gOZC5GZ2VRqDSv1VePoAH
+D9RJSKkxIFq62AvtJoyM5ahC6YpTf8DrdSsRW6/s1QdwSFIvd88wrfcVp4mwHyWm
+hGHIdcr2N/sppKdjFM0RVGEBh5X6XrQnWXfYYC8aNnYms1FYz3c1o2aYshT+FkC+
+fJ5QyMQeB/4VcOd6g3+BcFhb5ZYW4W9//D7jrYfkVyHloF2s81wGIOqqVywjwLS5
+Ag0EUJdq5QEQAKAFUhykhpw7uQe61dbFxCK/ZVzikZEjtcRfRZFQt4kXvd2PhyDc
+t+DyT8i/ZDSnP0UblRsSwTt4Ja6Yg0KUMbo9EIuvC5n7PVVktGAsIKZC1PrtMm84
+Gw1bBCm53LEwnrjhiPxXb2l3vX58wRXPRichZACxv5LsaFWlYAjqub9mkTV/MbFD
+4AG5X51gkqXQovTaOl3s0D/kpou9wv9nY9R0rKTis5z0K+hDrbl+l2WqaacZZWK/
+sPb+EjnAFvfNH3Y4jkp5Si0olmv9aKhCDuUMslENPN5j74Heap0zXWxXPlmVLBki
+wBwBaGsSKB6blnI+eJw5xqd3ast6qMUkW9JopCKztO1yrD5lB8dkRLxl2SepL2Z3
+QrYW5DVSlqX1mQyGoJ02Q1Z1bLipjqNoePwkjpsv4AAP4rXkWOZ50Yhi+DjVDpOs
+AsHCBSBE2GK6evzE0VIsHU+hKNHkcHhBmj8BnIJkhEVLPYF+r8ghLIGemtmkmSS5
+QzyCfr5KS3rELO3H1ZprvCddamOqbeWkeixcaz04NTCLBswTNPtqCueo77uo49IS
+kU52PVXjdOOea4nLiH8coUsxb1D9uEDBLPTI5zBM3BK9Xwv5jLjNLCm5e5HZTnJq
+2MDkqjruNTMQ9A3IFNcGKeNXILm5qm+HRJPDRmWSt90mq2mxWVr1i9stABEBAAGJ
+Ah8EGAECAAkFAlCXauUCGwwACgkQdEy/Jel9t9t2mQ//Sw5dWgrWDMDlVX7tJLtR
+I16tBJEvELkjUTTJkBRFazE6qT5L6Bvx+rewTkcq31cUqT8eAfqkk+mvVz6+L8XD
+N5pyMeUBSlZMrNF1Wsfc8F5nxLi8BnNixdAOpP9KJhC7KLzQuNpycSJMdX9nAfDx
+QHfQ8CVuqmnkYB34R6rpmyHHgN0kYBdA5q6MJzzlVATwO8oON9nCca60rFCbPZAX
+f6ZLRcFn+CIkZaEEmsEFK43mCy4jmH7DsabKtjyJdeaLAxyED1IxnQ1YWKSd4LBC
+ooYj87aZ34df7VpxBZe8/q4prwm+gEjM9V0gf2F+CgEB7m8JXmqXZ2id7p84PE7k
+UZJOBMTL1UegkiPXLb1thuCaSJodOLrf6t2W95v8auBb7fUAOXWNbQ2EId1IHPT7
+FOw2Yo32VjFOa/QUjKc98XlZBU4+0TZz1hZmsUaVRhhULqEc359DRdmNUfEDWv+P
+bDGiRwejjybGpb2f3lqnne3+7b1jEcLCI8k9VTklhj1l3flMWa5l0ubz57X2W9JM
+LkwHPSTICFJmJOU9KtWo6ujC1Rx20e5y+T8SMF4A9oDb/SuNRi+k0jhrYGsT+mWx
+De/WZ2m39Eshkbdd5R2izcYLuLV+nEcbj35ZsK+wgXkQqnSZK8JrjCArQvJuiJUl
+hvaQWSxKvtCA3RdI3vmKyQc=
+=6YAA
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

Modified: head/share/pgpkeys/pgpkeys-developers.xml
==============================================================================
--- head/share/pgpkeys/pgpkeys-developers.xml	Mon Nov  5 20:37:20 2012	(r39949)
+++ head/share/pgpkeys/pgpkeys-developers.xml	Tue Nov  6 00:39:27 2012	(r39950)
@@ -1766,6 +1766,11 @@
       &pgpkey.ups;
     </sect2>
 
+    <sect2 id="pgpkey-bryanv">
+      <title>&a.bryanv;</title>
+      &pgpkey.bryanv;
+    </sect2>
+
     <sect2 id="pgpkey-nectar">
       <title>&a.nectar;</title>
       &pgpkey.nectar;

Modified: head/share/pgpkeys/pgpkeys.ent
==============================================================================
--- head/share/pgpkeys/pgpkeys.ent	Mon Nov  5 20:37:20 2012	(r39949)
+++ head/share/pgpkeys/pgpkeys.ent	Tue Nov  6 00:39:27 2012	(r39950)
@@ -55,6 +55,7 @@
 <!ENTITY pgpkey.brucec SYSTEM "brucec.key">
 <!ENTITY pgpkey.brueffer SYSTEM "brueffer.key">
 <!ENTITY pgpkey.bruno SYSTEM "bruno.key">
+<!ENTITY pgpkey.bryanv SYSTEM "bryanv.key">
 <!ENTITY pgpkey.bsam SYSTEM "bsam.key">
 <!ENTITY pgpkey.bschmidt SYSTEM "bschmidt.key">
 <!ENTITY pgpkey.bsd SYSTEM "bsd.key">

Modified: head/share/xml/authors.ent
==============================================================================
--- head/share/xml/authors.ent	Mon Nov  5 20:37:20 2012	(r39949)
+++ head/share/xml/authors.ent	Tue Nov  6 00:39:27 2012	(r39950)
@@ -192,6 +192,8 @@
 
 <!ENTITY a.bruno "Bruno Ducrot <email>bruno@FreeBSD.org</email>">
 
+<!ENTITY a.bryanv "Bryan Venteicher <email>bryanv@FreeBSD.org</email>">
+
 <!ENTITY a.bsam "Boris Samorodov <email>bsam@FreeBSD.org</email>">
 
 <!ENTITY a.bschmidt "Bernhard Schmidt <email>bschmidt@FreeBSD.org</email>">

Modified: head/share/xml/developers.ent
==============================================================================
--- head/share/xml/developers.ent	Mon Nov  5 20:37:20 2012	(r39949)
+++ head/share/xml/developers.ent	Tue Nov  6 00:39:27 2012	(r39950)
@@ -94,6 +94,7 @@ $FreeBSD$
 <!ENTITY a.brucec "Bruce Cran">
 <!ENTITY a.brueffer "Christian Br&uuml;ffer">
 <!ENTITY a.bruno "Bruno Ducrot">
+<!ENTITY a.bryanv "Bryan Venteicher">
 <!ENTITY a.bsam "Boris Samorodov">
 <!ENTITY a.bschmidt "Bernhard Schmidt">
 <!ENTITY a.bsd "Brian S. Dean">

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Mon Nov  5 20:37:20 2012	(r39949)
+++ head/share/xml/news.xml	Tue Nov  6 00:39:27 2012	(r39950)
@@ -34,6 +34,15 @@
       <name>11</name>
 
       <day>
+	<name>5</name>
+
+	<event>
+	  <p>New committer:
+	    <a href="mailto:bryanv@FreeBSD.org">Bryan Venteicher</a> (src)</p>
+	</event>
+      </day>
+
+      <day>
 	<name>4</name>
 
 	<event>

From owner-svn-doc-head@FreeBSD.ORG  Tue Nov  6 13:11:14 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id F402D177;
 Tue,  6 Nov 2012 13:11:13 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BEAF58FC12;
 Tue,  6 Nov 2012 13:11:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA6DBDpd066007;
 Tue, 6 Nov 2012 13:11:13 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA6DBD1h066005;
 Tue, 6 Nov 2012 13:11:13 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211061311.qA6DBD1h066005@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 6 Nov 2012 13:11:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39951 - head/en_US.ISO8859-1/htdocs/search
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Nov 2012 13:11:14 -0000

Author: eadler
Date: Tue Nov  6 13:11:13 2012
New Revision: 39951
URL: http://svnweb.freebsd.org/changeset/doc/39951

Log:
  Alpha is long dead.
  
  Approved by:	bcr (mentor)

Modified:
  head/en_US.ISO8859-1/htdocs/search/sitemap.xml

Modified: head/en_US.ISO8859-1/htdocs/search/sitemap.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/search/sitemap.xml	Tue Nov  6 00:39:27 2012	(r39950)
+++ head/en_US.ISO8859-1/htdocs/search/sitemap.xml	Tue Nov  6 13:11:13 2012	(r39951)
@@ -875,36 +875,6 @@
   </term>
 
   <term>
-    <text>Alpha</text>
-    <destination>&base;/platforms/alpha.html</destination>
-  </term>
-
-  <term>
-    <text>Compaq Alpha</text>
-    <destination>&base;/platforms/alpha.html</destination>
-  </term>
-
-  <term>
-    <text>DEC Alpha</text>
-    <destination>&base;/platforms/alpha.html</destination>
-  </term>
-
-  <term>
-    <text>DIGITAL Alpha</text>
-    <destination>&base;/platforms/alpha.html</destination>
-  </term>
-
-  <term>
-    <text>FreeBSD/alpha</text>
-    <destination>&base;/platforms/alpha.html</destination>
-  </term>
-
-  <term>
-    <text>HP Alpha</text>
-    <destination>&base;/platforms/alpha.html</destination>
-  </term>
-
-  <term>
     <text>AMD64</text>
     <destination>&base;/platforms/amd64.html</destination>
   </term>
@@ -1617,11 +1587,6 @@
 
   <category name="Platforms">
     <item>
-      <text>FreeBSD/alpha</text>
-      <destination>&base;/platforms/alpha.html</destination>
-    </item>
-
-    <item>
       <text>FreeBSD/amd64</text>
       <destination>&base;/platforms/amd64.html</destination>
     </item>

From owner-svn-doc-head@FreeBSD.ORG  Tue Nov  6 13:11:15 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D754C17C;
 Tue,  6 Nov 2012 13:11:15 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A2FFE8FC14;
 Tue,  6 Nov 2012 13:11:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA6DBFcV066047;
 Tue, 6 Nov 2012 13:11:15 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA6DBFvX066045;
 Tue, 6 Nov 2012 13:11:15 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211061311.qA6DBFvX066045@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 6 Nov 2012 13:11:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39952 - head/en_US.ISO8859-1/books/porters-handbook
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Nov 2012 13:11:15 -0000

Author: eadler
Date: Tue Nov  6 13:11:15 2012
New Revision: 39952
URL: http://svnweb.freebsd.org/changeset/doc/39952

Log:
  Prefer a more obvious syntax but add a note explaining why one
  may prefer the empty() syntax.
  
  PR:		docs/172662
  Submitted by:	crees
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/book.xml	Tue Nov  6 13:11:13 2012	(r39951)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Tue Nov  6 13:11:15 2012	(r39952)
@@ -4476,7 +4476,7 @@ RUN_DEPENDS+=	bar:${PORTSDIR}/bar/bar
 
 	  <example id ="ports-options-check-unset">
 	    <title>Check for Unset Port <makevar>OPTIONS</makevar></title>
-	    <programlisting>.if empty(PORT_OPTIONS:MEXAMPLES)
+	    <programlisting>.if ! ${PORT_OPTIONS:MEXAMPLES}
 CONFIGURE_ARGS+=--without-examples
 .endif</programlisting>
 	  </example>
@@ -4515,7 +4515,7 @@ CONFIGURE_ARGS+=	--without-postgres
 LIB_DEPENDS+=	icuuc:${PORTSDIR}/devel/icu
 .endif
 
-.if empty(PORT_OPTIONS:MEXAMPLES)
+.if ! ${PORT_OPTIONS:MEXAMPLES}
 CONFIGURE_ARGS+=	--without-examples
 .endif
 
@@ -4620,6 +4620,17 @@ CONFIGURE_ARGS+=	--disable-foo
 	  disabled.  The configure script does not enable related
 	  features in the application, despite library's presence in
 	  the system.</para>
+
+	<note>
+	  <para>Under some circumstances, the shorthand conditional
+	    syntax can cause problems with complex constructs.
+	    If you receive errors such as <literal>Malformed
+	      conditional</literal>, an alternative syntax can be
+	    used.</para>
+	  <programlisting>.if !empty(VARIABLE:MVALUE)
+# as an alternative to
+.if ${VARIABLE:MVALUE}</programlisting>
+	</note>
       </sect2>
     </sect1>
 

From owner-svn-doc-head@FreeBSD.ORG  Tue Nov  6 13:11:17 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 637CB17F;
 Tue,  6 Nov 2012 13:11:17 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 48B168FC15;
 Tue,  6 Nov 2012 13:11:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA6DBHwj066083;
 Tue, 6 Nov 2012 13:11:17 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA6DBHxW066081;
 Tue, 6 Nov 2012 13:11:17 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211061311.qA6DBHxW066081@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 6 Nov 2012 13:11:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39953 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Nov 2012 13:11:17 -0000

Author: eadler
Date: Tue Nov  6 13:11:17 2012
New Revision: 39953
URL: http://svnweb.freebsd.org/changeset/doc/39953

Log:
  Sadly, Zeus Technology, now Riverbed, no longer supports FreeBSD
  for its "Zeus Server" (now Stingray) product.
  
  Approved by:	jkois (mentor)

Modified:
  head/share/xml/commercial.software.xml

Modified: head/share/xml/commercial.software.xml
==============================================================================
--- head/share/xml/commercial.software.xml	Tue Nov  6 13:11:15 2012	(r39952)
+++ head/share/xml/commercial.software.xml	Tue Nov  6 13:11:17 2012	(r39953)
@@ -1404,19 +1404,6 @@
     </description>
   </entry>
 
-  <entry id="ZeusTechnology" category="NETWORK">
-    <name>Zeus Technology Limited</name>
-    <url>http://www.zeus.co.uk/</url>
-    <description>
-      Zeus Technology Limited offers <em>Zeus Server</em> for FreeBSD. Zeus
-      Server is an advanced, powerful, full-featured, commercial grade web
-      server designed with exceptional performance, minimal machine
-      resource requirements, and ease of administration in mind. FREE
-      evaluation copies may be <a
-      href="http://www.zeus.co.uk/">downloaded</a>.
-    </description>
-  </entry>
-
   <entry id="SippySoftwareInc" category="NETWORK">
     <name>Sippy Software, Inc.</name>
     <url>http://www.sippysoft.com</url>

From owner-svn-doc-head@FreeBSD.ORG  Tue Nov  6 14:27:26 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 90A0455C;
 Tue,  6 Nov 2012 14:27:26 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 753228FC12;
 Tue,  6 Nov 2012 14:27:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA6ERQ3F079214;
 Tue, 6 Nov 2012 14:27:26 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA6ERQDN079212;
 Tue, 6 Nov 2012 14:27:26 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201211061427.qA6ERQDN079212@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Tue, 6 Nov 2012 14:27:26 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39954 - head/ja_JP.eucJP/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Nov 2012 14:27:26 -0000

Author: ryusuke
Date: Tue Nov  6 14:27:26 2012
New Revision: 39954
URL: http://svnweb.freebsd.org/changeset/doc/39954

Log:
  - Merge the following from the English version:
  
  	r39928 -> r39950	head/ja_JP.eucJP/share/xml/news.xml

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

Modified: head/ja_JP.eucJP/share/xml/news.xml
==============================================================================
--- head/ja_JP.eucJP/share/xml/news.xml	Tue Nov  6 13:11:17 2012	(r39953)
+++ head/ja_JP.eucJP/share/xml/news.xml	Tue Nov  6 14:27:26 2012	(r39954)
@@ -20,7 +20,7 @@
      the contents of <title> will be preferred over <p>.
 
      $FreeBSD$
-     Original revision: r39928
+     Original revision: r39950
 -->
 <news>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -34,6 +34,15 @@
       <name>11</name>
 
       <day>
+	<name>5</name>
+
+	<event>
+	  <p>¿·¥³¥ß¥Ã¥¿½¢Ç¤:
+	    <a href="mailto:bryanv@FreeBSD.org">Bryan Venteicher</a> (src)</p>
+	</event>
+      </day>
+
+      <day>
 	<name>4</name>
 
 	<event>

From owner-svn-doc-head@FreeBSD.ORG  Tue Nov  6 16:55:36 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C24E8814;
 Tue,  6 Nov 2012 16:55:36 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A635E8FC15;
 Tue,  6 Nov 2012 16:55:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA6GtaFA006990;
 Tue, 6 Nov 2012 16:55:36 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA6Gtajt006988;
 Tue, 6 Nov 2012 16:55:36 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211061655.qA6Gtajt006988@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 6 Nov 2012 16:55:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39955 - head/en_US.ISO8859-1/articles/contributing
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Nov 2012 16:55:36 -0000

Author: eadler
Date: Tue Nov  6 16:55:36 2012
New Revision: 39955
URL: http://svnweb.freebsd.org/changeset/doc/39955

Log:
  Correct the preffered form of the copyright.
  
  Reviewed by:	bcr
  Approved by:	jkois (mentor)

Modified:
  head/en_US.ISO8859-1/articles/contributing/article.xml

Modified: head/en_US.ISO8859-1/articles/contributing/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributing/article.xml	Tue Nov  6 14:27:26 2012	(r39954)
+++ head/en_US.ISO8859-1/articles/contributing/article.xml	Tue Nov  6 16:55:36 2012	(r39955)
@@ -506,7 +506,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-        &#36;Id&#36;</programlisting>
+        &dollar;&os;&dollar;</programlisting>
 
       <para>For your convenience, a copy of this text can be found in
 	<filename>/usr/share/examples/etc/bsd-style-copyright</filename>.</para>

From owner-svn-doc-head@FreeBSD.ORG  Wed Nov  7 01:17:27 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 50D1BCAF;
 Wed,  7 Nov 2012 01:17:27 +0000 (UTC)
 (envelope-from ganbold@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 32F728FC14;
 Wed,  7 Nov 2012 01:17:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA71HR5K011645;
 Wed, 7 Nov 2012 01:17:27 GMT (envelope-from ganbold@svn.freebsd.org)
Received: (from ganbold@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA71HRdk011643;
 Wed, 7 Nov 2012 01:17:27 GMT (envelope-from ganbold@svn.freebsd.org)
Message-Id: <201211070117.qA71HRdk011643@svn.freebsd.org>
From: Ganbold Tsagaankhuu <ganbold@FreeBSD.org>
Date: Wed, 7 Nov 2012 01:17:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39956 - head/mn_MN.UTF-8/books/handbook/geom
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Nov 2012 01:17:27 -0000

Author: ganbold
Date: Wed Nov  7 01:17:26 2012
New Revision: 39956
URL: http://svnweb.freebsd.org/changeset/doc/39956

Log:
  MFen: Resync with the English version of the handbook
  
  Obtained from: FreeBSD Mongolian Documentation project

Modified:
  head/mn_MN.UTF-8/books/handbook/geom/chapter.xml

Modified: head/mn_MN.UTF-8/books/handbook/geom/chapter.xml
==============================================================================
--- head/mn_MN.UTF-8/books/handbook/geom/chapter.xml	Tue Nov  6 16:55:36 2012	(r39955)
+++ head/mn_MN.UTF-8/books/handbook/geom/chapter.xml	Wed Nov  7 01:17:26 2012	(r39956)
@@ -2,7 +2,7 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 1.55
+     Original revision 39910
 
      $FreeBSD$
 -->
@@ -233,208 +233,609 @@ Done.</screen>
       <primary>GEOM</primary>
     </indexterm>
     <indexterm>
-      <primary>Ди�к Толин ту�гал үү�г�х</primary>
+      <primary>Disk Mirroring</primary>
+    </indexterm>
+    <indexterm>
+      <primary>RAID1</primary>
     </indexterm>
 
-    <para>Толин ту�гал үү�г�х нь олон корпорациуд болон г�рийн х�р�гл�гчдийн ашигладаг
-      өгөгдлийг та�алдалгүйг��р нөөцлөх технологи юм. Толин ту�гал байх үед
-      �н� нь diskB нь diskA-г хувилж байгаа г���н үг. Э�в�л магадгүй
-      diskC+D нь diskA+B-г хувилж байгаа байж болно. Ди�кний тохиргооноо�
-      хамааралгүй чухал ойлголт бол н�г ди�к д��рх м�д��л�л болон хуваалт нь хувилагдах
-      �вдал юм. Сүүлд нь, хадгал�ан өгөгдөл нь үйлчилг�� болон хандалтын та�алдалгүйг��р,
-      амархан ��рг��гд�ж, нөөцлөгдөж бараг өгөгдлийн төмөр авдарт хадгал�ан юм шиг байх болно.</para>
-
-    <para>Эхл��д �и�темд ижил х�мж��т�й хоёр ди�к байгааг шалгаарай, �н�
-	да�галд уг ди�кнүүд�д шууд хандах (&man.da.4;) <acronym>SCSI</acronym>
-	ди�кт�й г�ж үз�ж байгаа болно.</para>
+    <para><acronym>RAID1</acronym>, буюу 
+      <firstterm>mirroring</firstterm> нь 
+      н�г өгөгдлийг н�г��� илүү ди�к д��р бичих техникийг х�лд�г. 
+      Толин ту�гал нь ди�к ажиллахаа бай�ан үед өгөгдлийг алдагдахаа� 
+      хамгаалахад их�вчл�н х�р�гл�гдд�г. Толин ту�гал дахь ди�к бүр 
+      өгөгдлийн ижил хуулбарыг агуулж байдаг. Тухайн ди�к ажиллахаа 
+      боль�он үед ажиллаж байгаа ди�кнүүд д�х өгөгдлөөр ханган 
+      толин ту�гал ажилла�ан х�в��р байна. Компьютер �н� үед ажилла�аар 
+      байх бөгөөд админи�тратор нь ажиллахаа боль�он ди�кийг х�р�гл�гчийн 
+      оролцоогүйг��р �олих боломжтой болдог.</para>
+
+    <para>Эдг��р жиш��нүүд д��р хоёр түг��м�л тохиолдлыг харуул�ан байгаа. 
+      Эхнийх д��р нь хоёр шин� ди�кн��� бүт�х толин ту�гал үү�г�ж одоо 
+      байгаа н�г ди�кний оронд ашиглаж байгаа талаар бич��н. Хоёр дахь 
+      жиш�� нь н�г шин� ди�к д��р толин ту�гал үү�г�ж хуучин ди�кний 
+      өгөгдлийг хуулж дараа нь хуучин ди�кийг толин ту�гал руу оруулж 
+      байгаа талаар болно. Эн� процедур нь илүү төвөгт�й боловч зөвхөн 
+      ганц ди�к шаарддаг.</para>
+
+    <para>Уламжлалаар толин ту�гал дахь хоёр ди�к нь модел болон 
+      х�мж��ний хувьд ижил байдаг боловч &man.gmirror.8; нь тийм байхыг 
+      шаарддаггүй. Өөр ди�кнүүд��� тогт�он толин ту�гал нь хамгийн бага 
+      ди�кний х�мж��т�й ижил байдаг. Илүү том ди�к д��рх илүүд�л зай нь
+      ашиглагддаггүй. Толин ту�гал руу �үүлд н�м�х ди�к нь толин ту�гал 
+      дахь хамгийн бага х�мж��т�й ди�кний х�мж��т�й ижил байх 
+      ё�той.</para>
+
+    <warning>
+      <para>Энд үзүүл��н толин ту�гал болгож байгаа процедур �вдл�х 
+      шинж чанаргүй боловч ди�кний үйл ажиллагаатай холбоотой учраа� 
+      бүр�н х�мж��ний нөөцлөлтийг �хл��д хийг��р�й.</para>
+    </warning>
+
+    <sect2 id="GEOM-mirror-metadata">
+      <title>Мета өгөгдөлт�й холбоотой а�уудлууд</title>
+
+      <para>Ди�кний олон �и�тем мета өгөгдлийг ди�к бүрийн төг�гөлд 
+      хадгалдаг. Ди�кийг толин ту�галд дахин ашиглахын тулд хуучин 
+      мета өгөгдлийг у�тгах ё�той. Их�нх а�уудал хуучин үлд��н 
+      мета өгөгдлийн хоёр төрлөө� болж үү�д�г: GPT хуваалтын хү�н�гтүүд,
+      болон өмнөх толин ту�галын хуучин &man.gmirror.8; мета өгөгдөл юм.</para>
+
+      <para>GPT мета өгөгдлийг &man.gpart.8; ашиглан у�тгаж болно. 
+      Эн� жиш��н д��р анхдагч болон нөөц GPT хуваалтын хү�н�гтийг 
+      <devicename>ada8</devicename> ди�кн��� у�тгаж байна:</para>
+
+      <screen>&prompt.root; <userinput>gpart destroy -F ada8</userinput></screen>
+
+      <para>&man.gmirror.8; нь ажиллаж байгаа толин ту�галаа� ди�кийг 
+      �алгаж мета өгөгдлийг арилгахыг н�г алхмаар хийж чаддаг. 
+      Энд жиш�� ди�к <devicename>ada8</devicename>-г ажиллаж байгаа 
+      толин ту�гал <devicename>gm4</devicename>-� �алгаж байна:</para>
+
+      <screen>&prompt.root; <userinput>gmirror remove gm4 ada8</userinput></screen>
+
+      <para>Х�р�в толин ту�гал ажиллахгүй байгаа бөгөөд хуучин 
+      толин ту�галын мета өгөгдөл ди�к д��р байгаа х�в��р бол 
+      <command>gmirror clear</command> тушаал ашиглан у�тгаж 
+      болно:</para>
+
+      <screen>&prompt.root; <userinput>gmirror clear ada8</userinput></screen>
+
+      <para>&man.gmirror.8; нь мета өгөгдлийн н�г блокийг ди�кний төг�гөлд 
+      хадгалдаг. GPT хуваалтын �хем нь мета өгөгдлийг ба� ди�кний 
+      төг�гөлд хадгалдаг учраа� бүт�н GPT ди�күүдийг &man.gmirror.8; 
+      ашиглан толин ту�гал хийхийг зөвлөдөггүй. Энд MBR хуваалтыг 
+      ашигладаг, учир нь �н� хуваалт нь хуваалтын хү�н�гтийг ди�кний 
+      зөвхөн �х�нд хадгалдаг бөгөөд &man.gmirror.8;-той харшилддаггүй.</para>
+    </sect2>
 
     <sect2>
-      <title>Үнд��н ди�күүдийг тольдох нь</title>
-
-      <para>&os; �хний <devicename>da0</devicename> ди�кийн төхөөрөмж д��р
-	�уулгагд�ан г�ж үзв�л &man.gmirror.8;-д өөрийн үнд��н өгөгдлийг
-	т�нд хадгал г�ж зааж өг�өн байх ё�той.</para>
-
-      <para>Толь бүт��х����� өмнө <varname>kern.geom.debugflags</varname>
-	г���н &man.sysctl.8;-ийн тохиргоог дараах утгаар тохируулж
-	н�м�лт дибаг м�д��ллийг ид�вхжүүлж төхөөрөмжид хандах хандалтыг
-	н��ж өгнө:</para>
-
-      <screen>&prompt.root; <userinput>sysctl kern.geom.debugflags=17</userinput></screen>
-
-      <para>Одоо толь үү�г�н�.
-	<filename class="devicefile">/dev/mirror/gm</filename>
-	төхөөрөмжийг үр ашигтайгаар үү�г�н мета өгөгдлийг үнд��н ди�кийн төхөөрөмж
-	д��р хадгалан проце��ийг дараах тушаал ашиглан
-	�хлүүлн�:</para>
-
-      <warning>
-	<para>Ди�кний �үүлийн �екторт �мар н�г�н өгөгдөл хадгал�ан бол
-	  ачаалах хөтчөөр толин ту�гал хийх тохиолдолд өгөгдлийн алдагдалд
-	  хүрг�ж болох юм. &os;-г шин��р �уулга�ны дараахан нь толин ту�гал
-	  үү�г��н��р �н� �р�д�лийг бага�гаж болно.
-	  &os;&nbsp;9.<replaceable>X</replaceable> нь шин� <acronym>GPT</acronym>
-	  хуваалтын �хем ашигладаг учир дараах процедур нь
-	  &os;&nbsp;9.<replaceable>X</replaceable>-н анхдагч �уулгалтын
-	  тохиргоотой нийцт�й биш юм. GEOM нь <acronym>GPT</acronym>-н
-	  мета өгөгдлийг дарж бичих бөгөөд �н� нь өгөгдлийн алдагдал
-	  болон магадгүй ачаалж орохгүй �и�тем бий болгоход хүрг�ж
-	  болох юм.</para>
-      </warning>
-
-      <screen>&prompt.root; <userinput>gmirror label -vb round-robin gm0 /dev/da0</userinput></screen>
-
-    <para>Си�тем дараах хариуг өгнө:</para>
-    <screen>Metadata value stored on /dev/da0.
-Done.</screen>
-
-    <para>GEOM-ийг �хлүүл�х�д <filename>/boot/kernel/geom_mirror.ko</filename>
-	цөмийн модулийг ачаална:</para>
-
-    <screen>&prompt.root; <userinput>gmirror load</userinput></screen>
-
-    <note>
-      <para>Эн� тушаал бүр�н ажиллаж дуу��аны дараа
-	<devicename>gm0</devicename> төхөөрөмжийн
-	ц�гийг <filename class="directory">/dev/mirror</filename>
-	�анд үү�г�х ё�той.</para>
-    </note>
-
-    <para>Си�темийг �хлүүл�х үед <filename>geom_mirror.ko</filename>
-      цөмийн модулийг дуудахыг ид�вхжүүлн�:</para>
-
-    <screen>&prompt.root; <userinput>echo 'geom_mirror_load="YES"' &gt;&gt; /boot/loader.conf</userinput></screen>
-
-      <para>Хуучин бай�ан <devicename>da0</devicename>-г
-	<devicename>gm0</devicename> толин төхөөрөмжийн шин� төхөөрөмжийн ц�г��р
-	�ольж <filename>/etc/fstab</filename> файлыг за�варлах х�р�гт�й.</para>
+      <title>Хоёр шин� ди�кн��� толин ту�гал үү�г�х</title>
 
-      <note>
-	<para>Х�р�в &man.vi.1; таны дуртай за�варлагч бол үүнийг дараах
-	  х�лбар аргаар хийж болно:</para>
-
-      <screen>&prompt.root; <userinput>vi /etc/fstab</userinput></screen>
+      <para>Эн� жиш��н д��р &os; нь <devicename>ada0</devicename> г���н 
+      н�г ди�к д��р �уулга�ан байгаа. <devicename>ada1</devicename> ба
+	<devicename>ada2</devicename> г���н хоёр шин� ди�к �и�тем 
+	рүү холбогд�он байгаа. Эн� хоёр ди�к д��р шин� толин ту�гал 
+	үү�г�х бөгөөд н�г хуучин ди�кийг �олиход ашиглагдах 
+	болно.</para>
 
-      <para>&man.vi.1; д��р <userinput>:w /etc/fstab.bak</userinput>
-	г�ж бичин <filename>fstab</filename>-ийн одоо байгаа агуулгыг
-	нөөцөлнө. Дараа нь хуучин бай�ан бүх <devicename>da0</devicename>-г
-	<devicename>gm0</devicename>-Ñ€
-	<userinput>:%s/da/mirror\/gm/g</userinput> г�ж бичин
-	�ольно.</para>
-      </note>
+      <para>&man.gmirror.8; нь цөмд цуг бүт��гд��н ��в�л ачаалах 
+      буюу ажиллах үед дуудагдах <filename>geom_mirror.ko</filename> 
+      цөмийн модулийг шаарддаг. Цөмийн модулийг гараар одоо 
+      дуудна:</para>
+
+      <screen>&prompt.root; <userinput>gmirror load</userinput></screen>
+
+      <para>Хоёр шин� ди�к��� тогтох толин ту�гал үү�г�н�.</para>
+
+      <screen>&prompt.root; <userinput>gmirror label -v gm0 /dev/ada1 /dev/ada2</userinput></screen>
+
+      <para><devicename>gm0</devicename> нь шин� толин ту�галд өг�өн 
+      х�р�гл�гчийн �онго�он төхөөрөмжийн н�р юм. Толин ту�гал 
+      �х�л�ний дараа төхөөрөмжийн н�р <filename>/dev/mirror/</filename> 
+      �анд гарч ирн�.</para>
+
+      <para>MBR болон bsdlabel хуваалтын хү�н�гтүүдийг толин ту�гал
+      д��р &man.gpart.8;-н ту�ламжтай үү�г�ж болно. Энд бид 
+      <filename>/</filename>, swap, <filename>/var</filename>,
+	<filename>/tmp</filename>, ба <filename>/usr</filename> г���н 
+	хуваалтуудтай уламжлалт хуваалттай файлын �и�темийн бүтцийг 
+	харуулж байна. Ганц <filename>/</filename> болон swap 
+	хуваалт байж ба� болно.</para>
+
+      <para>Толин ту�гал дахь хуваалтууд нь одоо байгаа ди�кнүүд 
+      шиг ижил х�мж��т�й 
+      байх албагүй боловч <devicename>ada0</devicename> д��р байгаа 
+      бүх өгөгдлийг агуулах х�мж��т�й байх ё�той.</para>
+
+      <screen>&prompt.root; <userinput>gpart create -s MBR mirror/gm0</userinput>
+&prompt.root; <userinput>gpart add -t -a 4kfreebsd mirror/gm0</userinput>
+&prompt.root; <userinput>gpart show mirror/gm0</userinput>
+=>       63  156301423  mirror/gm0  MBR  (74G)
+         63         63                    - free -  (31k)
+        126  156301299                 1  freebsd  (74G)
+  156301425         61                    - free -  (30k)</screen>
+
+      <screen>&prompt.root; <userinput>gpart create -s BSD mirror/gm0s1</userinput>
+&prompt.root; <userinput>gpart add -t freebsd-ufs  -a 4k -s 2g mirror/gm0s1</userinput>
+&prompt.root; <userinput>gpart add -t freebsd-swap -a 4k -s 4g mirror/gm0s1</userinput>
+&prompt.root; <userinput>gpart add -t freebsd-ufs  -a 4k -s 2g mirror/gm0s1</userinput>
+&prompt.root; <userinput>gpart add -t freebsd-ufs  -a 4k -s 1g mirror/gm0s1</userinput>
+&prompt.root; <userinput>gpart add -t freebsd-ufs  -a 4k       mirror/gm0s1</userinput>
+&prompt.root; <userinput>gpart show mirror/gm0s1</userinput>
+=>        0  156301299  mirror/gm0s1  BSD  (74G)
+          0          2                      - free -  (1.0k)
+          2    4194304                   1  freebsd-ufs  (2.0G)
+    4194306    8388608                   2  freebsd-swap  (4.0G)
+   12582914    4194304                   4  freebsd-ufs  (2.0G)
+   16777218    2097152                   5  freebsd-ufs  (1.0G)
+   18874370  137426928                   6  freebsd-ufs  (65G)
+  156301298          1                      - free -  (512B)</screen>
+
+      <para>�чаалах кодыг MBR болон bsdlabel-д �уулган 
+      ид�вхт�й зү�м�лийг тохируулж толин ту�галыг ачаалах 
+      боломжтой болгоно:</para>
+
+      <screen>&prompt.root; <userinput>gpart bootcode -b /boot/mbr mirror/gm0</userinput>
+&prompt.root; <userinput>gpart set -a active -i 1 mirror/gm0</userinput>
+&prompt.root; <userinput>gpart bootcode -b /boot/boot mirror/gm0s1</userinput></screen>
+
+      <para>Зөөлөн шин�чл�лийг ид�вхжүүл�н шин� толин ту�гал д��рх 
+      файлын �и�темийг формат хийн�.</para>
+
+      <screen>&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1a</userinput>
+&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1d</userinput>
+&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1e</userinput>
+&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1f</userinput></screen>
+
+      <para>Эх ди�к (<devicename>ada0</devicename>) д��рх файлын 
+      �и�темийг толин ту�гал руу &man.dump.8; ба &man.restore.8;
+      тушаалыг ашиглан хуулж болно.</para>
+
+      <screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -)</userinput>
+&prompt.root; <userinput>mount /dev/mirror/gm0s1d /mnt/var</userinput>
+&prompt.root; <userinput>mount /dev/mirror/gm0s1e /mnt/tmp</userinput>
+&prompt.root; <userinput>mount /dev/mirror/gm0s1f /mnt/usr</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /tmp | (cd /mnt/tmp && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr && restore -rf -)</userinput></screen>
+
+      <para><filename>/mnt/etc/fstab</filename>-г шин� толин 
+      ту�гал файлын �и�тем рүү заагд�ан байхаар за�варлах 
+      ё�той:</para>
+
+      <programlisting># Device		Mountpoint	FStype	Options	Dump	Pass#
+/dev/mirror/gm0s1a	/		ufs	rw	1	1
+/dev/mirror/gm0s1b	none		swap	sw	0	0
+/dev/mirror/gm0s1d	/var		ufs	rw	2	2
+/dev/mirror/gm0s1e	/tmp		ufs	rw	2	2
+/dev/mirror/gm0s1f	/usr		ufs	rw	2	2</programlisting>
+
+      <para>Х�р�в &man.gmirror.8; цөмийн модул цөмд цуг бүт��гд��гүй 
+      бол модулийг ачаалахад дуудахын тулд <filename>/mnt/boot/loader.conf</filename>
+      файлыг за�ах ё�той:</para>
+
+      <programlisting>geom_mirror_load="YES"</programlisting>
+
+      <para>Шин� толин ту�галыг те�т хийхийн тулд �и�темийг 
+      дахин ачаалж бүх өгөгдөл хуулагд�ан ���хийг шалгаарай. 
+      BIOS толин ту�галыг толин ту�гал г�ж харахгүй, харин 
+      хоёр ту�даа ди�к г�ж харна. Ди�кнүүд ижил учраа� 
+      аль нь ачаалахаар �онгогд�он нь чухал биш юм.</para>
+
+      <para>�чаалахад а�уудалтай байгаа бол 
+      <link linkend="gmirror-troubleshooting">�лдааг олж за�варлах</link>
+      х��гийг үз��р�й. Унтраагаад �хний <devicename>ada0</devicename> 
+      ди�кийг �алга�наар уг ди�кийг нөөц ма�гаар байх боломжийг 
+      бүрдүүлд�г.</para>
 
-      <para>Үүний үр дүнд <filename>fstab</filename> файл дараахтай тө�т�й
-	харагдах ё�той. Ди�кийн хөтчүүд <acronym>SCSI</acronym> ��в�л
-	<acronym>ATA</acronym> байх нь хамаагүй бөгөөд �дг��р���
-	үл хамааран <acronym>RAID</acronym> төхөөрөмж нь
-	<devicename>gm</devicename> байх болно.</para>
-
-      <programlisting># Device      Mountpoint      FStype  Options         Dump    Pass#
-/dev/mirror/gm0s1b      none            swap    sw              0       0
-/dev/mirror/gm0s1a      /               ufs     rw              1       1
-/dev/mirror/gm0s1d	/usr		ufs	rw		0	0
-/dev/mirror/gm0s1f	/home		ufs	rw		2	2
-#/dev/mirror/gm0s2d     /store          ufs     rw              2       2
-/dev/mirror/gm0s1e      /var            ufs     rw              2       2
-/dev/acd0               /cdrom          cd9660  ro,noauto       0       0</programlisting>
-
-    <para>Си�темийг дахин �хлүүлн�:</para>
-
-    <screen>&prompt.root; <userinput>shutdown -r now</userinput></screen>
-
-      <para>Си�темийг �хлүүл�х үед <devicename>gm0</devicename>-г
-	<devicename>da0</devicename> төхөөрөмжийн оронд ашиглах
-	ё�той. Бүр�н �х�лж дуу��аны дараа үүнийг
-	<command>mount</command>
-	тушаалаа� гарах үр дүнг х�на�наар шалгаж болно:</para>
-
-      <screen>&prompt.root; <userinput>mount</userinput>
-Filesystem         1K-blocks    Used    Avail Capacity  Mounted on
-/dev/mirror/gm0s1a   1012974  224604   707334    24%    /
-devfs                      1       1        0   100%    /dev
-/dev/mirror/gm0s1f  45970182   28596 42263972     0%    /home
-/dev/mirror/gm0s1d   6090094 1348356  4254532    24%    /usr
-/dev/mirror/gm0s1e   3045006 2241420   559986    80%    /var
-devfs                      1       1        0   100%    /var/named/dev</screen>
-
-      <para>Үр дүн �ана�ны дагуу зөв харагдаж байна. Төг�гөлд нь
-	�инхрончлолыг �хлүүл�хийн тулд <devicename>da1</devicename>
-	ди�кийг толь руу дараах тушаал ашиглан хийн�:</para>
-
-      <screen>&prompt.root; <userinput>gmirror insert gm0 /dev/da1</userinput></screen>
-
-    <para>Толин ту�гал бүт��гд��ний дараа түүнийн төлвийг доор дурд�ан
-	тушаал ашиглан шалгаж болно:</para>
-
-    <screen>&prompt.root; <userinput>gmirror status</userinput></screen>
-
-      <para>Толь бүт��гд�ж одоо байгаа бүх өгөгдөл
-	�инхрончлогд�оны дараа д��рх тушаалаа� гарах
-	үр дүн ийм�рхүү байх ё�той:</para>
-
-      <screen>      Name    Status  Components
-mirror/gm0  COMPLETE  da0
-                      da1</screen>
-
-      <para>Ямар н�г а�уудал байх юм уу ��в�л толь нь
-	бүт��х проце��оо хий���р байвал уг жиш��
-	<literal>COMPLETE</literal>-ийн оронд
-	<literal>DEGRADED</literal> г�ж харуулах болно.</para>
+      <para>�шиглаж байгаа үед толин ту�гал нь 
+      �г л анхны ганц ди�к шиг л ажиллах болно.</para>
     </sect2>
 
     <sect2>
-      <title>�лдааг олж за�варлах нь</title>
-      <sect3>
-	<title>Си�тем ачаалахгүй байх</title>
-
-	<para>Х�р�в �и�тем дараах тушаал хүл��х мөр хүрт�л ачаал�ан бол:</para>
-
-	<programlisting>ffs_mountroot: can't find rootvp
-Root mount failed: 6
-mountroot></programlisting>
+      <title>Байгаа ди�күүд ашиглан толин ту�гал үү�г�х</title>
 
-	<para>Унтраах болон дахин �хлүүл�х товчийг дарж машиныг дахин �хлүүл.
-	�чаалах үеийн ц��н��� (6) �онголтыг �онго. Инг�х�д �и�темийг
-	&man.loader.8; тушаал хүл��х мөрд аваачна. Цөмийн модулийг гараар
-	ачаал:</para>
+      <para>Эн� жиш��н д��р &os; <devicename>ada0</devicename> г���н 
+      н�г ди�к д��р �уу�ан байгаа. Шин� ди�к <devicename>ada1</devicename>-г  
+      �и�темд холбо�он байгаа. ��г ди�к��� тогтох толин ту�галыг 
+      шин� ди�к д��р үү�г�ж байгаа �и�темийг түүн рүү хуулж 
+      дараа нь хуучин ди�кийг толин ту�гал руу оруулна. Эн� илүү 
+      төвөгт�й процедур нь зайлшгүй шаардлагатай байдаг, учир нь &man.gmirror.8; нь
+      512 байт блок бүхий мета өгөгдлийг ди�к бүрийн төг�гөлд 
+      н�м�х х�р�гт�й байдаг бөгөөд байгаа <devicename>ada0</devicename>-н 
+      бүх зай их�вчл�н ашиглагдчих�ан байдаг.</para>
+
+      <para>&man.gmirror.8; цөмийн модулийг дуудна.</para>
+
+      <screen>&prompt.root; <userinput>gmirror load</userinput></screen>
+
+      <para>&man.diskinfo.8; ашиглан �хний ди�кний х�мж��г 
+      шалгана.</para>
+
+      <screen>&prompt.root; <userinput>diskinfo -v ada0 | head -n3</userinput>
+/dev/ada0
+	512             # sectorsize
+	1000204821504   # mediasize in bytes (931G)</screen>
+
+      <para>Шин� ди�к д��р толин ту�галыг үү�г�н�. Эхний ди�кн��� 
+      толин ту�галын х�мж�� их биш г�дгийг шалгахын тулд 
+      &man.gnop.8; ашиглан ижил х�мж��т�й хуурамч ди�к үү�г�ж үзн�.
+      Эн� ди�к нь �мар ч өгөгдөл хадгалахгүй бөгөөд толин ту�галын 
+      х�мж��г х�згаарлахад зөвхөн ашиглагдана. &man.gmirror.8; нь 
+      толин ту�гал үү�г�хд�� х�дийг��р шин� ди�к 
+      (<devicename>ada1</devicename>) илүү зайтай бай�ан ч г���н 
+      <devicename>gzero.nop</devicename>-н х�мж��г��р багтаамжийг 
+      х�згаарлана. Хоёр дахь мөрөн д��р байгаа 
+      <replaceable>1000204821504</replaceable> утга нь д��рх 
+      &man.diskinfo.8;-р харуул�антай адил 
+      <devicename>ada0</devicename>-н х�мж��т�й ижил байх 
+      ё�той.</para>
+
+      <screen>&prompt.root; <userinput>geom zero load</userinput>
+&prompt.root; <userinput>gnop create -s 1000204821504 gzero</userinput>
+&prompt.root; <userinput>gmirror label -v gm0 gzero.nop ada1</userinput>
+&prompt.root; <userinput>gmirror forget gm0</userinput></screen>
+
+      <para><devicename>gzero.nop</devicename> нь �мар ч өгөгдөл 
+      хадгалдаггүй учраа� толин ту�гал холбогд�он г�ж хардаггүй. 
+      <devicename>gzero.nop</devicename>-той 
+      холбоотой м�д��ллийг у�тган холбогдоогүй 
+      байгаа зүйлийг <quote>март</quote> г�ж толин ту�галд 
+      х�лд�г г���н үг юм. Үүний үр дүнд толин ту�гал нь 
+      зөвхөн ганц ди�к <devicename>ada1</devicename>-� тогтоно.</para>
+
+      <para><devicename>gm0</devicename>-г үү�г��ний дараа 
+      <devicename>ada0</devicename> д��рх хуваалтын хү�н�гтийг харна.</para>
+
+      <para>Энд�х гаралт нь 1&nbsp;TB ди�кн��� юм. Ди�кний 
+      төг�гөлд хуваарилагдаагүй зай байгаа бол өгөгдөл 
+      <devicename>ada0</devicename>-� шууд шин� толин ту�гал руу 
+      хуулагдаж болно.</para>
+
+      <para>Г�хд�� гаралт нь дараах жаг�аалт д��рх шиг ди�к д��рх 
+      бүх зай бүхл��р�� хуваарилагд�ан байгаагаар харуулж байгаа бол 
+      512 байт &man.gmirror.8; мета өгөгдлийн хувьд ди�кний төг�гөлд 
+      зай байхгүй г���н үг юм.</para>
+
+      <screen>&prompt.root; <userinput>gpart show ada0</userinput>
+=>        63  1953525105        ada0  MBR  (931G)
+          63  1953525105           1  freebsd  [active]  (931G)</screen>
+
+      <para>Эн� тохиолдолд <devicename>mirror/gm0</devicename> д��рх 
+      багтаамжийг н�г �ектороор бага�гахын тулд хуваалтын хү�н�гтийг 
+      за�варлах х�р�гт�й. Уг процедурыг дараа тайлбарлах болно.</para>
+
+      <para>�ль ч тохиолдолд анхдагч ди�к д��рх хуваалтын 
+      хү�н�гтүүдийг �х�лж хуулах х�р�гт�й. Үүнийг &man.gpart.8;
+	<command>backup</command> ба <command>restore</command> д�д тушаалуудыг 
+	ашиглан гүйц�тг�н�.</para>
+
+      <screen>&prompt.root; <userinput>gpart backup ada0 &gt; table.ada0</userinput>
+&prompt.root; <userinput>gpart backup ada0s1 &gt; table.ada0s1</userinput></screen>
+
+      <para>Эдг��р тушаал нь 
+      <filename>table.ada0</filename> ба
+	<filename>table.ada0s1</filename> г���н хоёр
+	файл үү�г�н�. Эн� жиш�� нь 1&nbsp;TB ди�кн��� юм:</para>
+
+      <screen>&prompt.root; <userinput>cat table.ada0</userinput>
+MBR 4
+1 freebsd         63 1953525105   [active]</screen>
+
+      <screen>&prompt.root; <userinput>cat table.ada0s1</userinput>
+BSD 8
+1  freebsd-ufs          0    4194304
+2 freebsd-swap    4194304   33554432
+4  freebsd-ufs   37748736   50331648
+5  freebsd-ufs   88080384   41943040
+6  freebsd-ufs  130023424  838860800
+7  freebsd-ufs  968884224  984640881</screen>
+
+      <para>Х�р�в &man.gpart.8;	<command>show</command> тушаалын 
+      гаралтад бүт�н ди�к ашиглагдаж байгаа бол �дг��р хуваалтын 
+      хү�н�гтүүд д��рх багтаамжийг н�г �ектороор бага�гах х�р�гт�й.
+      Зү�м�л болон �үүлийн хуваалтын зайг н�г��р бага�ган хоёр 
+      файлыг за�варлах х�р�гт�й. Эдг��р нь жаг�аалт бүрийн �үүлийн 
+      тоонууд юм.</para>
+
+      <screen>&prompt.root; <userinput>cat table.ada0</userinput>
+MBR 4
+1 freebsd         63 <emphasis>1953525104</emphasis>   [active]</screen>
+
+      <screen>&prompt.root; <userinput>cat table.ada0s1</userinput>
+BSD 8
+1  freebsd-ufs          0    4194304
+2 freebsd-swap    4194304   33554432
+4  freebsd-ufs   37748736   50331648
+5  freebsd-ufs   88080384   41943040
+6  freebsd-ufs  130023424  838860800
+7  freebsd-ufs  968884224  <emphasis>984640880</emphasis></screen>
+
+      <para>Ди�кний төг�гөлд хамгийн багадаа н�г �ектор хуваарилагдаагүй 
+      байгаа бол �дг��р хоёр файлыг за�варлалгүйг��р ашиглаж болно.</para>
+
+      <para>Одоо хуваалтын хү�н�гтийг 
+      <devicename>mirror/gm0</devicename> руу ��рг��н�.</para>
+
+      <screen>&prompt.root; <userinput>gpart restore mirror/gm0 &lt; table.ada0</userinput>
+&prompt.root; <userinput>gpart restore mirror/gm0s1 &lt; table.ada0s1</userinput></screen>
+
+      <para>&man.gpart.8; <command>show</command> тушаалаар 
+      хуваалтын хү�н�гтийг шалгана.  Эн� жиш�� нь 
+	<devicename>gm0s1a</devicename>-г <filename>/</filename>,
+	<devicename>gm0s1d</devicename>-г <filename>/var</filename>,
+	<devicename>gm0s1e</devicename>-г <filename>/usr</filename>,
+	<devicename>gm0s1f</devicename>-г 
+	<filename>/data1</filename>, ба
+	<devicename>gm0s1g</devicename>-г 
+	<filename>/data2</filename>-д ашиглана.</para>
+
+      <screen>&prompt.root; <userinput>gpart show mirror/gm0</userinput>
+=>        63  1953525104  mirror/gm0  MBR  (931G)
+          63  1953525042           1  freebsd  [active]  (931G)
+  1953525105          62              - free -  (31k)
+
+&prompt.root; <userinput>gpart show mirror/gm0s1</userinput>
+=>         0  1953525042  mirror/gm0s1  BSD  (931G)
+           0     2097152             1  freebsd-ufs  (1.0G)
+     2097152    16777216             2  freebsd-swap  (8.0G)
+    18874368    41943040             4  freebsd-ufs  (20G)
+    60817408    20971520             5  freebsd-ufs  (10G)
+    81788928   629145600             6  freebsd-ufs  (300G)
+   710934528  1242590514             7  freebsd-ufs  (592G)
+  1953525042          63                - free -  (31k)</screen>
+
+      <para>Зү�м�л болон �үүлийн хуваалт ди�к бүрийн төг�гөлд 
+      �ул зайтай байх ё�той.</para>
+
+      <para>Эн� шин� хуваалтууд д��р файлын �и�тем үү�г�н�. 
+      Х�д�н хуваалт байх нь �х ди�к <devicename>ada0</devicename> 
+      д��рх хуваалтуудаа� хамаарч �нз бүр байна.</para>
+
+      <screen>&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1a</userinput>
+&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1d</userinput>
+&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1e</userinput>
+&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1f</userinput>
+&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1g</userinput></screen>
+
+      <para>Ид�вхт�й зү�м�лийг тохируулж MBR болон bsdlabel д��р 
+      ачаалах кодыг �уулгаж толин ту�галыг ачаалах боломжтой 
+      болгоно:</para>
+
+      <screen>&prompt.root; <userinput>gpart bootcode -b /boot/mbr mirror/gm0</userinput>
+&prompt.root; <userinput>gpart set -a active -i 1 mirror/gm0</userinput>
+&prompt.root; <userinput>gpart bootcode -b /boot/boot mirror/gm0s1</userinput></screen>
+
+      <para>Толин ту�гал д��рх шин� хуваалтыг ашиглахаар 
+      болгож <filename>/etc/fstab</filename> файлыг тохируулна. 
+      <filename>/etc/fstab.orig</filename> руу хуулж �н� файлыг 
+      �хл��д нөөцөлж авах х�р�гт�й.</para>
+
+      <screen>&prompt.root; <userinput>cp /etc/fstab /etc/fstab.orig</userinput></screen>
+
+      <para><devicename>/dev/ada0</devicename>-г 
+      <devicename>mirror/gm0</devicename>-р �ольж 
+      <filename>/etc/fstab</filename> файлыг за�варлана.</para>
+
+      <programlisting># Device		Mountpoint	FStype	Options	Dump	Pass#
+/dev/mirror/gm0s1a	/		ufs	rw	1	1
+/dev/mirror/gm0s1b	none		swap	sw	0	0
+/dev/mirror/gm0s1d	/var		ufs	rw	2	2
+/dev/mirror/gm0s1e	/usr		ufs	rw	2	2
+/dev/mirror/gm0s1f	/data1		ufs	rw	2	2
+/dev/mirror/gm0s1g	/data2		ufs	rw	2	2</programlisting>
+
+      <para>Х�р�в &man.gmirror.8; цөмийн модул цөмд цуг бүт��гд��гүй 
+      бол <filename>/boot/loader.conf</filename>-г за�варлаж түүнийг
+      дуудна:</para>
+
+      <programlisting>geom_mirror_load="YES"</programlisting>
+
+      <para>Эх ди�к д��рх файлын �и�темүүдийг одоо 
+      &man.dump.8; ба &man.restore.8; тушаалуудыг ашиглан толин ту�гал 
+      руу хуулж болно. <command>dump -L</command> тушаалаар авагд�ан 
+      файл �и�тем бүрийн хувьд хормын хувилбар үү�г�х�д хугацаа 
+      шаардагдаж магадгүйг �анаарай.</para>
+
+      <screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /    | (cd /mnt && restore -rf -)</userinput>
+&prompt.root; <userinput>mount /dev/mirror/gm0s1d /mnt/var</userinput>
+&prompt.root; <userinput>mount /dev/mirror/gm0s1e /mnt/usr</userinput>
+&prompt.root; <userinput>mount /dev/mirror/gm0s1f /mnt/data1</userinput>
+&prompt.root; <userinput>mount /dev/mirror/gm0s1g /mnt/data2</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data1 | (cd /mnt/data1 && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data2 | (cd /mnt/data2 && restore -rf -)</userinput></screen>
+
+      <para><devicename>ada1</devicename>-� ачаалж 
+      �и�темийг дахин ачаална. Бүгд ажиллаж байгаа бол 
+      �и�тем <devicename>mirror/gm0</devicename>-� ачаалах бөгөөд 
+      �н� нь <devicename>ada0</devicename>-н өмнө агуулж бай�ан 
+      өгөгдлийг ба� агуулах болно. �чаалахтай холбоотой а�уудал 
+      байгаа бол <link linkend="gmirror-troubleshooting">�лдааг олж за�варлах</link>
+      х��гийг харна уу.</para>
+
+      <para>Энд хүр�х�д толин ту�гал нь зөвхөн ганц ди�к 
+      <devicename>ada1</devicename>-� тогтох болно.</para>
+
+      <para><devicename>mirror/gm0</devicename>-� амжилттай 
+      ачаал�ны дараа �үүлийн алхам бол <devicename>ada0</devicename>-г 
+      толин ту�гал руу оруулах �вдал юм.</para>
+
+      <important>
+	<para><devicename>ada0</devicename>-г толин ту�гал руу 
+	оруулах үед хуучин агуулга нь толин ту�гал д��рх агуулгаар 
+	дарагдаж бичигдд�г. <devicename>ada0</devicename>-г 
+	толин ту�гал руу н�м�х����� өмнө <devicename>mirror/gm0</devicename> нь 
+	<devicename>ada0</devicename>-н өгөгдлийг �г агуулж байгаа 
+	���хийг шалгаарай. &man.dump.8; ба &man.restore.8;-г 
+	ашиглан хуул�ан агуулгатай холбоотой �мар н�г а�уудал үү���н бол 
+	файлын �и�темийг <devicename>ada0</devicename>-� холбохоор 
+	болгож <filename>/etc/fstab</filename>-г тохируулж дахин 
+	ачаалан д��рх алхмуудыг дахин �хн��� нь хийж үз�х х�р�гт�й.</para>
+      </important>
+
+      <screen>&prompt.root; <userinput>gmirror insert gm0 ada0</userinput>
+GEOM_MIRROR: Device gm0: rebuilding provider ada0</screen>
+
+      <para>Хоёр ди�кний хоорондох �инхрончлол шууд �х�лн�.
+      &man.gmirror.8; <command>status</command> тушаал �вцыг 
+      харуулна.</para>
+
+      <screen>&prompt.root; <userinput>gmirror status</userinput>
+      Name    Status  Components
+mirror/gm0  DEGRADED  ada1 (ACTIVE)
+                      ada0 (SYNCHRONIZING, 64%)</screen>
+
+      <para>Тодорхой хугацааны дараа �инхрончлол дуу�на.</para>
+
+      <screen>GEOM_MIRROR: Device gm0: rebuilding provider ada0 finished.
+&prompt.root; <userinput>gmirror status</userinput>
+      Name    Status  Components
+mirror/gm0  COMPLETE  ada1 (ACTIVE)
+                      ada0 (ACTIVE)</screen>
+
+      <para><devicename>mirror/gm0</devicename> нь одоо 
+      <devicename>ada0</devicename> ба <devicename>ada1</devicename> г���н 
+      хоёр ди�к��� тогтох бөгөөд агуулгууд нь н�г н�г�нт�йг�� 
+      автоматаар �инхрончлогд�он байна. �шиглагдаж байгаа үед 
+      <devicename>mirror/gm0</devicename> нь �г л �хний ганц ди�к 
+      шиг ажиллах болно.</para>
+    </sect2>
 
-	<screen>OK? <userinput>load geom_mirror</userinput>
-OK? <userinput>boot</userinput></screen>
+    <sect2 id="gmirror-troubleshooting">
+      <title>�лдааг олж за�варлах</title>
 
-	<para>Х�р�в �н� нь ажилла�ан бол модул �мар н�г шалтгаанаар буруу
-	  ачаалагд�ан байна. <filename>/boot/loader.conf</filename> файлд
-	  тохирох мөр байгаа ���хийг шалгах х�р�гт�й. Х�р�в а�уудалтай х�в��р
-	  байвал дараах:</para>
+      <sect3>
+	<title>�чаалахтай холбоотой а�уудлууд</title>
 
-	<programlisting>options	GEOM_MIRROR</programlisting>
+	<sect4>
+	  <title>BIOS тохиргоо</title>
 
-	<para>мөрийг цөмийн тохиргооны файлд байрлуулж дахин бүт��ж �уулгаарай.
-	  Инг�х нь �н� а�уудлыг арилгах ё�той.</para>
+	  <para>BIOS тохиргоог шин��р толин ту�гал болго�он 
+	  ди�кнүүдийн аль н�гн��� ачаалахаар болгож тохируулах
+	  х�р�гт�й байж магадгүй юм. �ль ч ди�кийг ачаалахад 
+	  ашиглаж болно. Толин ту�галын н�г х���г учраа� т�дг��р нь 
+	  ижил өгөгдөлт�й байдаг.</para>
+	</sect4>
+
+	<sect4>
+	  <title>�чаалах үеийн а�уудлууд</title>
+
+	  <para>Х�р�в ачаалалт ийм м�д�гд�лт�й зог��он бол 
+	  толин ту�гал төхөөрөмж а�уудалтай байж болох юм:</para>
+
+	  <screen>Mounting from ufs:/dev/mirror/gm0s1a failed with error 19.
+
+Loader variables:
+  vfs.root.mountfrom=ufs:/dev/mirror/gm0s1a
+  vfs.root.mountfrom.options=rw
+
+Manual root filesystem specification:
+  &lt;fstype&gt;:&lt;device&gt; [options]
+      Mount &lt;device&gt; using filesystem &lt;fstype&gt;
+      and with the specified (optional) option list.
+
+    eg. ufs:/dev/da0s1a
+        zfs:tank
+        cd9660:/dev/acd0 ro
+          (which is equivalent to: mount -t cd9660 -o ro /dev/acd0 /)
+
+  ?               List valid disk boot devices
+  .               Yield 1 second (for background tasks)
+  &lt;empty line&gt;    Abort manual input
+
+mountroot&gt;</screen>
+
+           <para><filename>geom_mirror</filename> модулийг
+	   <filename>/boot/loader.conf</filename>-т оруулж дуудахаа
+	   март�ан бол �н� а�уудал гарна. Үүнийг за�ахын тулд 
+	   &os;-9 ��в�л түүн��� хойшхи хувилбарын CD ��в�л USB ди�кн��� 
+	   ачаалаад �хний а�уулт д��р <literal>Shell</literal>-г 
+	   �онгох х�р�гт�й. Дараа нь толин ту�галын модулийг дуудаж 
+	   толин ту�гал төхөөрөмжийг холбох х�р�гт�й:</para>
+
+	  <screen>&prompt.root; <userinput>gmirror load</userinput>
+&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput></screen>
+
+	  <para>Толин ту�галын модулийг дуудах мөрийг 
+	  <filename>/mnt/boot/loader.conf</filename>-д оруулж 
+	  за�варлана:</para>
+
+	  <programlisting>geom_mirror_load="YES"</programlisting>
+
+	  <para>Файлыг хадгалж дахин ачаална.</para>
+
+	  <para><literal>error 19</literal> гаргаж байгаа 
+	  бу�ад а�уудлуудыг за�варлахад илүү хүч зарах 
+	  шаардлагатай. ��ууж лавлах д�лг�ц д��р 
+	  <literal>ufs:/dev/ada0s1a</literal> г�ж оруулж өгнө. 
+	  Си�тем х�дийг��р <devicename>ada0</devicename>-� 
+	  ачаалах ё�той боловч бүрхүүл �онгох а�ууж лавлах д�лг�ц 
+	  дахин гарч ирн�. <filename>/etc/fstab</filename> 
+	  файл буруу байгаа учраа� т�р юм. Оруулах товчийг �н� 
+	  үед дарах х�р�гт�й. Толин ту�галын оронд �х ди�кн��� 
+	  (<devicename>ada0</devicename>) файлын �и�темийг холбохоор 
+	  болгож <filename>/etc/fstab</filename>-г тохируулж өөрчлөлтийг 
+	  буцаах х�р�гт�й. Си�темийг дахин ачаалж алхмуудыг дахин 
+	  оролдож үз�х х�р�гт�й.</para>
+
+	  <screen>Enter full pathname of shell or RETURN for /bin/sh:
+&prompt.root; <userinput>cp /etc/fstab.orig /etc/fstab</userinput>
+&prompt.root; <userinput>reboot</userinput></screen>
+	</sect4>
       </sect3>
     </sect2>
 
     <sect2>
-      <title>Ди�кийн �вдр�л��� буцаж ��рг��х нь</title>
+      <title>Ди�к ажиллахаа болиход ��рг��х</title>
 
-      <para>Ди�кийг тольдохын гайхамшигтай тал нь ди�к
-	�вдр�х�д �мар ч өгөгдөл алдалгүйг��р түүнийг �ольж болоход
-	оршино.</para>
-
-      <para>Өмнөх <acronym>RAID</acronym>1 тохиргоог байна г�ж
-	үз��д <devicename>da1</devicename> �вд�р��н бөгөөд
-	�олих х�р�гт�й байгаа г�ж үзье. Солихын тулд аль ди�к
-	�вд�р�нийг м�д��д �и�темийг унтраана.
-	Одоо ди�кийг шин��р �ольж �и�темийг а�ааж болно.
-	Си�темийг дахин ачаал�ны дараа ди�кийг �олихын тулд
-	дараах тушаалуудыг ашиглаж болно:</para>
+      <para>Толин ту�галын гайхамшигтай тал бол аль н�г ди�к ажиллахаа 
+      байхад толин ту�гал д��рх өгөгдөл алдагддаггүй �вдал 
+      юм.</para>
+
+      <para><devicename>ada0</devicename> нь д��рх жиш��н д��р толин ту�гал 
+      үү�г�ж байгаа ди�кнүүдийн н�г юм. Х�р�в <devicename>ada0</devicename>
+      ажиллахаа боливол нөгөө ажиллаж байгаа ди�к болох <devicename>ada1</devicename>-� 
+      өгөгдлөө өгөн толин ту�гал ажилла�ан х�в��р байх болно.</para>
+
+      <para>�жиллахаа боль�он ди�кийг �олихын тулд компьютерыг 
+      унтрааж �вд�р��н ди�кийг ижил ��в�л илүү х�мж��т�й ди�к��р 
+      �олих х�р�гт�й. Үйлдв�рл�гчид ди�кний х�мж��г гигабайтаар 
+      х�мжихд�� дурын утга ашигладаг бөгөөд итг�лт�й байхын тулд 
+      зөвхөн <command>diskinfo -v</command> тушаалаар харагдах 
+      �екторын тоог харьцуулах �вдал юм. Толин ту�галын х�мж��н��� том 
+      ди�к болох боловч шин� ди�к д��рх илүү зай ашиглагдахгүй.</para>
+
+      <para>Компьютер а��аны дараа толин ту�гал <quote>degraded</quote> 
+      буюу <quote>ажиллагаа �аар�ан</quote> горимд н�г ди�кт�йг��р 
+      ажиллах болно. Толин ту�гал нь залгагдаагүй байгаа ди�кийг 
+      мартаж ажиллана:</para>
 
       <screen>&prompt.root; <userinput>gmirror forget gm0</userinput></screen>
 
-      <screen>&prompt.root; <userinput>gmirror insert gm0 /dev/da1</userinput></screen>
-
-      <para>Дахин бүт��лтийн �вцыг х�нахын тулд
-	<command>gmirror</command> <option>status</option> тушаалыг
-	ашиглана. Эн� нь ийм амархан юм.</para>
+      <para>Хуучин мета өгөгдлийг <link
+	  linkend="GEOM-mirror-metadata">�оль�он ди�к��� арилгах
+        х�р�гт�й</link>. Дараа нь �н� жиш��н д��рх 
+	<devicename>ada4</devicename> ди�кийг толин ту�гал руу оруулна:</para>
+
+      <screen>&prompt.root; <userinput>gmirror insert gm0 /dev/ada4</userinput></screen>
+
+      <para>Шин� ди�к толин ту�галд ороход дахин �инхрончлол
+      хийгд�ж �х�лн�. Толин ту�галын өгөгдлийг шин� ди�к рүү хуулах 
+      проце�� удаж болно. Толин ту�галын үйл ажиллагаа хуулж байх �вцад 
+      удаашрах учраа� компьютерын х�р�гл�� бага үед шин� ди�кийг 
+      хийх нь зүйт�й.</para>
+
+      <para>Үйл �вцыг <command>gmirror status</command> тушаалаар 
+      монитор хийж болох бөгөөд �инхрончлол хийгд�ж байгаа ди�кнүүд 
+      болон ажиллаж байгаа хувийг �н� тушаал харуулдаг. Дахин �инхрончлолын 
+      үед төлөв <computeroutput>DEGRADED</computeroutput> байж байгаад 
+      проце�� дуу�ахдаа <computeroutput>COMPLETE</computeroutput> болж 
+      өөрчлөгдөнө.</para>
     </sect2>
   </sect1>
 

From owner-svn-doc-head@FreeBSD.ORG  Wed Nov  7 03:57:35 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 55B17A64;
 Wed,  7 Nov 2012 03:57:35 +0000 (UTC)
 (envelope-from ganbold@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 38FDD8FC0A;
 Wed,  7 Nov 2012 03:57:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA73vZra040003;
 Wed, 7 Nov 2012 03:57:35 GMT (envelope-from ganbold@svn.freebsd.org)
Received: (from ganbold@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA73vZfB039998;
 Wed, 7 Nov 2012 03:57:35 GMT (envelope-from ganbold@svn.freebsd.org)
Message-Id: <201211070357.qA73vZfB039998@svn.freebsd.org>
From: Ganbold Tsagaankhuu <ganbold@FreeBSD.org>
Date: Wed, 7 Nov 2012 03:57:35 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39957 - in head/mn_MN.UTF-8/books/handbook: basics
 config geom virtualization
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Nov 2012 03:57:35 -0000

Author: ganbold
Date: Wed Nov  7 03:57:34 2012
New Revision: 39957
URL: http://svnweb.freebsd.org/changeset/doc/39957

Log:
  MFen: Resync with the English version of the handbook
  
  Obtained from: FreeBSD Mongolian Documentation project

Modified:
  head/mn_MN.UTF-8/books/handbook/basics/chapter.xml
  head/mn_MN.UTF-8/books/handbook/config/chapter.xml
  head/mn_MN.UTF-8/books/handbook/geom/chapter.xml
  head/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml

Modified: head/mn_MN.UTF-8/books/handbook/basics/chapter.xml
==============================================================================
--- head/mn_MN.UTF-8/books/handbook/basics/chapter.xml	Wed Nov  7 01:17:26 2012	(r39956)
+++ head/mn_MN.UTF-8/books/handbook/basics/chapter.xml	Wed Nov  7 03:57:34 2012	(r39957)
@@ -2,7 +2,7 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 39831
+     Original revision 39947
 
      $FreeBSD$
 -->
@@ -1963,12 +1963,11 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 	<filename>/etc/inetd.conf</filename> г�ж байрла�ан бөгөөд  <command>inetd</command>-ийг тохируулгын файлаа дахин уншуулахын тулд 	<literal>SIGHUP</literal> дохиог илг��х болно.</para>
 
       <step>
-	<para>Илг��х проце��ийн проце�� ID дугаарыг м�д�х х�р�гт�й. Инг�хийн тулд  &man.ps.1; ба &man.grep.1; тушаалуудыг ашиглана.  &man.grep.1;
-	  тушаал нь өмнөх тушаалынхаа гаралтаа� хайлт хийх�д х�р�гл�гдд�г бөгөөд хайх мөрөө зааж өгдөг. Эн� тушаал нь �нгийн х�р�гл�гч��� гүйц�тг�гд�ж болох бөгөөд харин &man.inetd.8; програм нь
-	  <username>root</username> х�р�гл�гч��р гүйц�тг�гд��н тул &man.ps.1; тушаалыг  <option>ax</option> �онголттой цуг гүйц�тг�х ё�той.</para>
+	<para>Илг��х проце��ийн проце�� ID дугаарыг м�д�х х�р�гт�й. 
+Инг�хийн тулд &man.pgrep.1; тушаалыг ашиглана.</para>
 
-	<screen>&prompt.user; <userinput>ps -ax | grep inetd</userinput>
-  198  ??  IWs    0:00.00 inetd -wW</screen>
+        <screen>&prompt.user; <userinput>pgrep -l inetd</userinput>
+  198  inetd -wW</screen>
 
 	<para>За т�г�х��р, &man.inetd.8;-ийн PID дугаар нь 198 г�ж �н� тохиолдолд х�лж байна.  Зарим тохиолдолд
 	  <literal>grep inetd</literal> г���н тушаал нь өөрөө �н� гаралтад байж байдаг. Учир нь,  &man.ps.1; програм нь уг тушаалыг ажиллуулж байгаа проце��ийг ол�он үед т�гж гаргаж харуулдаг.</para>

Modified: head/mn_MN.UTF-8/books/handbook/config/chapter.xml
==============================================================================
--- head/mn_MN.UTF-8/books/handbook/config/chapter.xml	Wed Nov  7 01:17:26 2012	(r39956)
+++ head/mn_MN.UTF-8/books/handbook/config/chapter.xml	Wed Nov  7 03:57:34 2012	(r39957)
@@ -2,7 +2,7 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 39901
+     Original revision 39914
 
      $FreeBSD$
 -->

Modified: head/mn_MN.UTF-8/books/handbook/geom/chapter.xml
==============================================================================
--- head/mn_MN.UTF-8/books/handbook/geom/chapter.xml	Wed Nov  7 01:17:26 2012	(r39956)
+++ head/mn_MN.UTF-8/books/handbook/geom/chapter.xml	Wed Nov  7 03:57:34 2012	(r39957)
@@ -2,7 +2,7 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 39910
+     Original revision 39917
 
      $FreeBSD$
 -->

Modified: head/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
==============================================================================
--- head/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml	Wed Nov  7 01:17:26 2012	(r39956)
+++ head/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml	Wed Nov  7 03:57:34 2012	(r39957)
@@ -2,7 +2,7 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 39283
+     Original revision 39948
 
      $FreeBSD$
 -->
@@ -1231,11 +1231,16 @@ add path 'usb/*' mode 0660 group operato
     <sect2 id="virtualization-virtualbox-host-dvd-cd-access">
       <title>&virtualbox; хо�тын DVD/CD хандалт</title>
 
-      <para>Дараах мөрийг <filename>/boot/loader.conf</filename>
-	файлд н�мж <command>atapicam</command> цөмийн модулийг
-	дуудах х�р�гт�й:</para>
-
-      <programlisting>atapicam_load="YES"</programlisting>
+      <para>Хо�тын DVD/CD хөтчүүд�д зочин �и�тем��� хандахдаа 
+      физик хөтчийг хуваалцан х�р�гл�х замаар ханддаг. 
+      GUI д��р үүнийг виртуал машины Settings д�х Storage цонхноо� 
+      тохируулдаг. Эхл��д хоо�он IDE CD/DVD төхөөрөмж үү�г�н�. 
+      Дараа нь виртуал CD/DVD хөтөч �онгохын тулд гарч ир�х ц��н���
+      хо�тын хөтчийг �онгоно. <literal>Passthrough</literal> г�ж 
+      ха�глагд�ан �онгох боломжтой хайрцаг гарч ирн�. 
+      Эн� нь виртуал машиныг тоног төхөөрөмж шууд ашиглах боломжтой 
+      болгодог. Жиш�� нь дууны CD ��в�л х�р�в �онгогд�он бол 
+      зөвхөн шарах боломж г�х м�тийг дурдаж болно.</para>
 
       <para><application>&virtualbox;</application> DVD/CD-г ажиллуухын
 	  тулд <acronym>HAL</acronym>-г ажиллуулах ё�той бөгөөд инг�хийн
@@ -1244,7 +1249,7 @@ add path 'usb/*' mode 0660 group operato
 
       <programlisting>hald_enable="YES"</programlisting>
 
-      <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/hald start</userinput></screen>
+      <screen>&prompt.root; <userinput>service hald start</userinput></screen>
 
       <para><application>&virtualbox;</application> DVD/CD-г х�р�гл�гч
 	ашиглахын тулд т�д�нд <filename class="devicefile">/dev/xpt0</filename>,
@@ -1252,12 +1257,17 @@ add path 'usb/*' mode 0660 group operato
 	  class="devicefile">/dev/cd<replaceable>N</replaceable></filename>,
 	болон <filename
 	  class="devicefile">/dev/pass<replaceable>N</replaceable></filename>
-	файлуудад хандах зөвшөөрөл х�р�гт�й. Дараах мөрүүдийг
-	<filename>/etc/devfs.conf</filename> файлд н�мж өгнө:</para>
+	файлуудад хандах зөвшөөрөл х�р�гт�й. Үүнийг хийхд�� 
+	<application>&virtualbox;</application> х�р�гл�гчийг operator бүл�г рүү
+	н�мж шийдн�. Эн� бүл�г нь ба� д��р дурд�ан төхөөрөмжүүдийн анхдагч 
+	бүл�г юм. Эдг��р төхөөрөмжүүдийн зөвшөөрлүүдийг за�ахдаа дараах мөрүүдийг
+	<filename>/etc/devfs.conf</filename> файлд н�мж хийж өгнө:</para>
 
-      <programlisting>perm cd0 0600
+      <programlisting>perm cd* 0600
 perm xpt0 0660
-perm pass0 0660</programlisting>
+perm pass* 0660</programlisting>
+
+      <screen>&prompt.root; <userinput>/etc/rc.d/devfs restart</userinput></screen>
     </sect2>
 
 <!--

From owner-svn-doc-head@FreeBSD.ORG  Wed Nov  7 12:30:38 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 36302F0E;
 Wed,  7 Nov 2012 12:30:38 +0000 (UTC)
 (envelope-from taras@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 17F188FC0C;
 Wed,  7 Nov 2012 12:30:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA7CUbdL026853;
 Wed, 7 Nov 2012 12:30:37 GMT (envelope-from taras@svn.freebsd.org)
Received: (from taras@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA7CUbVv026851;
 Wed, 7 Nov 2012 12:30:37 GMT (envelope-from taras@svn.freebsd.org)
Message-Id: <201211071230.qA7CUbVv026851@svn.freebsd.org>
From: Taras Korenko <taras@FreeBSD.org>
Date: Wed, 7 Nov 2012 12:30:37 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39958 - head/ru_RU.KOI8-R/books/handbook/kernelconfig
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Nov 2012 12:30:38 -0000

Author: taras
Date: Wed Nov  7 12:30:37 2012
New Revision: 39958
URL: http://svnweb.freebsd.org/changeset/doc/39958

Log:
  MFen:
  + handbook/kernelconfig/chapter.xml       r37856  --> r39631

Modified:
  head/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml

Modified: head/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml	Wed Nov  7 03:57:34 2012	(r39957)
+++ head/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml	Wed Nov  7 12:30:37 2012	(r39958)
@@ -5,7 +5,7 @@
      $FreeBSD$
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml,v 1.35 2007/06/26 11:42:42 den Exp $
 
-     Original revision: r37856
+     Original revision: r39631
 -->
 
 <chapter id="kernelconfig">
@@ -267,12 +267,12 @@ following line in &man.loader.conf.5;:
       ÎÁÌÉÞÉÅ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÍÏÄÕÌÑ.</para>
 
     <warning>
-      <para>äÏ×ÏÌØÎÏ ÌÅÇËÏ ÕÄÁÌÉÔØ ×ÓÔÒÏÅÎÎÕÀ ÐÏÄÄÅÒÖËÕ ÕÓÔÒÏÊÓÔ×Á ÉÌÉ
+      <para>äÏ×ÏÌØÎÏ ÌÅÇËÏ ÕÄÁÌÉÔØ ÐÏÄÄÅÒÖËÕ ÕÓÔÒÏÊÓÔ×Á ÉÌÉ
 	ÏÐÃÉÀ, ÐÏÌÕÞÉ× ÔÅÍ ÓÁÍÙÍ ÎÅÒÁÂÏÔÏÓÐÏÓÏÂÎÏÅ ÑÄÒÏ.  îÁÐÒÉÍÅÒ, ÅÓÌÉ
 	ÄÒÁÊ×ÅÒ &man.ata.4; ÉÚßÑÔ ÉÚ ËÏÎÆÉÇÕÒÁÃÉÉ ÑÄÒÁ, ÔÏ ÓÉÓÔÅÍÁ,
 	ÉÓÐÏÌØÚÕÀÝÁÑ ÄÉÓËÉ <acronym>ATA</acronym>, ÍÏÖÅÔ ÎÅ ÚÁÇÒÕÚÉÔØÓÑ
-	ÂÅÚ ÚÁÐÉÓÉ, ÄÏÂÁ×ÌÅÎÎÏÊ × <filename>loader.conf</filename>.
-	åÓÌÉ ÅÓÔØ ÓÏÍÎÅÎÉÑ, ÐÒÏ×ÅÒØÔÅ ÍÏÄÕÌØ, É ÔÏÌØËÏ ÐÏÔÏÍ ÏÓÔÁ×ØÔÅ
+	ÂÅÚ ÚÁÐÉÓÉ Ï ÍÏÄÕÌÅ, ÄÏÂÁ×ÌÅÎÎÏÊ × <filename>loader.conf</filename>.
+	åÓÌÉ ÅÓÔØ ÓÏÍÎÅÎÉÑ, ÐÒÏ×ÅÒØÔÅ ÎÁÌÉÞÉÅ ÍÏÄÕÌÑ, É ÔÏÌØËÏ ÐÏÔÏÍ ÉÓËÌÀÞÁÊÔÅ
 	ÐÏÄÄÅÒÖËÕ × ÑÄÒÅ.</para>
     </warning>
   </sect1>
@@ -317,17 +317,12 @@ following line in &man.loader.conf.5;:
       ÉÚÍÅÎÉÔØ ÉÍÅÎÁ ËÁÔÁÌÏÇÏ×.</para>
 
     <note>
-      <para>åÓÌÉ ËÁÔÁÌÏÇ <filename>/usr/src/sys</filename> ÏÔÓÕÔÓÔ×ÕÅÔ × ×ÁÛÅÊ
+      <para>åÓÌÉ ËÁÔÁÌÏÇ <filename>/usr/src/</filename> ÏÔÓÕÔÓÔ×ÕÅÔ × ×ÁÛÅÊ
 	ÓÉÓÔÅÍÅ (ÉÌÉ ÜÔÏÔ ËÁÔÁÌÏÇ ÐÕÓÔ), ÔÏ ÜÔÏ ÚÎÁÞÉÔ, ÞÔÏ ÉÓÈÏÄÎÙÅ ÔÅËÓÔÙ
 	ÎÅ ÂÙÌÉ ÕÓÔÁÎÏ×ÌÅÎÙ.  îÁÉÂÏÌÅÅ ÐÒÏÓÔÏÊ ÓÐÏÓÏ ÕÓÔÁÎÏ×ÉÔØ ÉÈ
-	&mdash; ÚÁÐÕÓÔÉÔØ <command>sysinstall</command>
-	ËÁË ÐÏÌØÚÏ×ÁÔÅÌØ <username>root</username>, ×ÙÂÒÁÔØ
-	<guimenuitem>Configure</guimenuitem>, ÐÏÔÏÍ
-	<guimenuitem>Distributions</guimenuitem>, ÐÏÔÏÍ
-	<guimenuitem>src</guimenuitem>,
-	É ÐÏÓÌÅ ×ÓÅÇÏ &mdash; <guimenuitem>All</guimenuitem>.  äÁÌÅÅ,
-	ÐÒÏ×ÅÒØÔÅ ÎÁÌÉÞÉÅ ÓÉÍ×ÏÌÉÞÅÓËÏÊ ÓÓÙÌËÉ <filename>/sys/</filename>,
-	É, ÅÓÌÉ ÐÏÔÒÅÂÕÅÔÓÑ, ÓÏÚÄÁÊÔŠţ:</para>
+	&mdash; ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ &man.csup.1;, ËÁË ÏÐÉÓÁÎÏ ×
+	<xref linkend="synching"/>.  äÁÌÅÅ, ÓÏÚÄÁÊÔÅ ÓÉÍ×ÏÌÉÞÅÓËÕÀ ÓÓÙÌËÕ ÎÁ
+	<filename class="directory">/usr/src/sys/</filename>:</para>
 
       <screen>&prompt.root; <userinput>ln -s /usr/src/sys /sys</userinput></screen>
     </note>
@@ -550,7 +545,7 @@ options         IPDIVERT
 	ÄÌÑ ÔÅÓÔÉÒÏ×ÁÎÉÑ), ×ÙÐÏÌÎÉÔÅ ÏÔ ÉÍÅÎÉ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌÑ
 	(<username>root</username>) ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>i386</replaceable>/conf &gt;&gt; make LINT</userinput></screen>
+      <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>i386</replaceable>/conf &amp;&amp; make LINT</userinput></screen>
     </note>
 
     <indexterm>
@@ -758,8 +753,11 @@ options          NFS_ROOT          # NFS
 
     <programlisting>options          GEOM_PART_GPT     # GUID Partition Tables.</programlisting>
 
-    <para>üÔÏÔ ÐÁÒÁÍÅÔÒ ÄÅÌÁÅÔ ×ÏÚÍÏÖÎÙÍ ÎÁÌÉÞÉÅ ÂÏÌØÛÏÇÏ ËÏÌÉÞÅÓÔ×Á
-      ÒÁÚÄÅÌÏ× ÎÁ ÏÄÎÏÍ ÄÉÓËÅ.</para>
+    <para>äÏÂÁ×ÌÑÅÔ ÐÏÄÄÅÒÖËÕ <ulink
+      url="http://en.wikipedia.org/wiki/GUID_Partition_Table">ôÁÂÌÉà òÁÚÄÅÌÏ×
+	GUID</ulink>.  üÔÏÔ ÐÁÒÁÍÅÔÒ ÄÅÌÁÅÔ ×ÏÚÍÏÖÎÙÍ ÎÁÌÉÞÉÅ ÂÏÌØÛÏÇÏ
+      ËÏÌÉÞÅÓÔ×Á ÒÁÚÄÅÌÏ× ÎÁ ÏÄÎÏÍ ÄÉÓËÅ, ÄÏ 128 × ÓÔÁÎÄÁÒÔÎÏÊ
+      ËÏÎÆÉÇÕÒÁÃÉÉ.</para>
 
     <programlisting>options          COMPAT_43         # Compatible with BSD 4.3 [KEEP THIS!]</programlisting>
 

From owner-svn-doc-head@FreeBSD.ORG  Wed Nov  7 13:11:34 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E906BC8B;
 Wed,  7 Nov 2012 13:11:34 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B3DFC8FC08;
 Wed,  7 Nov 2012 13:11:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA7DBYeU033661;
 Wed, 7 Nov 2012 13:11:34 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA7DBYxH033659;
 Wed, 7 Nov 2012 13:11:34 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201211071311.qA7DBYxH033659@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 7 Nov 2012 13:11:34 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39959 - head/ja_JP.eucJP/htdocs/search
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Nov 2012 13:11:35 -0000

Author: ryusuke
Date: Wed Nov  7 13:11:34 2012
New Revision: 39959
URL: http://svnweb.freebsd.org/changeset/doc/39959

Log:
  - Merge the following from the English version and bump original revision number.
  
  	-> r39951	head/ja_JP.eucJP/htdocs/search/sitemap.xml

Modified:
  head/ja_JP.eucJP/htdocs/search/sitemap.xml

Modified: head/ja_JP.eucJP/htdocs/search/sitemap.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/search/sitemap.xml	Wed Nov  7 12:30:37 2012	(r39958)
+++ head/ja_JP.eucJP/htdocs/search/sitemap.xml	Wed Nov  7 13:11:34 2012	(r39959)
@@ -3,6 +3,7 @@
         "http://www.FreeBSD.org/XML/www/share/xml/sitemap.dtd">
 
 <!-- $FreeBSD$ -->
+<!-- Original revision: r39951 -->
 
 <sitemap>
   <term>
@@ -876,36 +877,6 @@
   </term>
 
   <term>
-    <text>Alpha</text>
-    <destination>&base;/platforms/alpha.html</destination>
-  </term>
-
-  <term>
-    <text>Compaq Alpha</text>
-    <destination>&base;/platforms/alpha.html</destination>
-  </term>
-
-  <term>
-    <text>DEC Alpha</text>
-    <destination>&base;/platforms/alpha.html</destination>
-  </term>
-
-  <term>
-    <text>DIGITAL Alpha</text>
-    <destination>&base;/platforms/alpha.html</destination>
-  </term>
-
-  <term>
-    <text>FreeBSD/alpha</text>
-    <destination>&base;/platforms/alpha.html</destination>
-  </term>
-
-  <term>
-    <text>HP Alpha</text>
-    <destination>&base;/platforms/alpha.html</destination>
-  </term>
-
-  <term>
     <text>AMD64</text>
     <destination>&base;/platforms/amd64.html</destination>
   </term>
@@ -1618,11 +1589,6 @@
 
   <category name="¥×¥é¥Ã¥È¥Õ¥©¡¼¥à">
     <item>
-      <text>FreeBSD/alpha</text>
-      <destination>&base;/platforms/alpha.html</destination>
-    </item>
-
-    <item>
       <text>FreeBSD/amd64</text>
       <destination>&base;/platforms/amd64.html</destination>
     </item>

From owner-svn-doc-head@FreeBSD.ORG  Thu Nov  8 15:44:33 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1CA63B96;
 Thu,  8 Nov 2012 15:44:33 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F1BF38FC15;
 Thu,  8 Nov 2012 15:44:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA8FiWkE003486;
 Thu, 8 Nov 2012 15:44:32 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA8FiW2T003485;
 Thu, 8 Nov 2012 15:44:32 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201211081544.qA8FiW2T003485@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Thu, 8 Nov 2012 15:44:32 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39960 - head/ja_JP.eucJP/articles/contributing
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Nov 2012 15:44:33 -0000

Author: ryusuke
Date: Thu Nov  8 15:44:32 2012
New Revision: 39960
URL: http://svnweb.freebsd.org/changeset/doc/39960

Log:
  - Merge the following from the English version and bump original revision number.
  
  	r39924 -> r39955	head/ja_JP.eucJP/articles/contributing/article.xml

Modified:
  head/ja_JP.eucJP/articles/contributing/article.xml

Modified: head/ja_JP.eucJP/articles/contributing/article.xml
==============================================================================
--- head/ja_JP.eucJP/articles/contributing/article.xml	Wed Nov  7 13:11:34 2012	(r39959)
+++ head/ja_JP.eucJP/articles/contributing/article.xml	Thu Nov  8 15:44:32 2012	(r39960)
@@ -10,7 +10,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39924
+     Original revision: r39955
      $FreeBSD$
 -->
 
@@ -500,7 +500,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-      &#36;Id&#36;</programlisting>
+        &dollar;&os;&dollar;</programlisting>
 
       <para>Êص¹¤ò¤Ï¤«¤ë¤¿¤á¡¢
 	¤³¤Î¥Æ¥­¥¹¥È¤Î¥³¥Ô¡¼¤Ï¼¡¤Î¾ì½ê¤ËÃÖ¤¤¤Æ¤¢¤ê¤Þ¤¹¡£

From owner-svn-doc-head@FreeBSD.ORG  Fri Nov  9 10:06:12 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 084F1712;
 Fri,  9 Nov 2012 10:06:12 +0000 (UTC)
 (envelope-from jkois@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C42538FC0C;
 Fri,  9 Nov 2012 10:06:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9A6BnJ047077;
 Fri, 9 Nov 2012 10:06:11 GMT (envelope-from jkois@svn.freebsd.org)
Received: (from jkois@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA9A6Bfj047076;
 Fri, 9 Nov 2012 10:06:11 GMT (envelope-from jkois@svn.freebsd.org)
Message-Id: <201211091006.qA9A6Bfj047076@svn.freebsd.org>
From: Johann Kois <jkois@FreeBSD.org>
Date: Fri, 9 Nov 2012 10:06:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39961 - head/de_DE.ISO8859-1/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Nov 2012 10:06:12 -0000

Author: jkois
Date: Fri Nov  9 10:06:11 2012
New Revision: 39961
URL: http://svnweb.freebsd.org/changeset/doc/39961

Log:
  r39806 -> r39950
  
  Resnyc the German news section.
  
  Obtained from:  The FreeBSD German Documentation Project

Modified:
  head/de_DE.ISO8859-1/share/xml/news.xml

Modified: head/de_DE.ISO8859-1/share/xml/news.xml
==============================================================================
--- head/de_DE.ISO8859-1/share/xml/news.xml	Thu Nov  8 15:44:32 2012	(r39960)
+++ head/de_DE.ISO8859-1/share/xml/news.xml	Fri Nov  9 10:06:11 2012	(r39961)
@@ -4,7 +4,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r39806
+     basiert auf: r39950
 -->
 
 <!-- Simple schema for FreeBSD Project news.
@@ -39,6 +39,44 @@
     <name>2012</name>
 
     <month>
+      <name>11</name>
+
+      <day>
+	<name>5</name>
+
+	<event>
+	  <p>Neuer Committer: <a
+	    href="mailto:bryanv@FreeBSD.org">Bryan Venteicher</a> (src)</p>
+	</event>
+      </day>
+
+      <day>
+	<name>4</name>
+
+	<event>
+	  <p>Neuer Committer: <a
+	    href="mailto:gblach@FreeBSD.org">Grzegorz Blach</a> (ports)</p>
+	</event>
+      </day>
+
+      <day>
+	<name>3</name>
+
+	<event>
+	  <title>&os;&nbsp;9.1-RC3 verfügbar</title>
+
+	  <p>Der dritte Release Candidate aus dem &os;-9.1-Releasezyklus
+	    ist <a
+	    href="&lists.stable;/2012-November/070401.html">verfügbar</a>.
+	    ISO-Images für die Architekturen amd64, i386, sparc64 sowie
+	    powerpc64 sind inzwischen auf den meisten <a
+	    href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">&os;
+	    Spiegelservern</a> vorhanden.</p>
+	</event>
+      </day>
+    </month>
+
+    <month>
       <name>10</name>
 
       <day>

From owner-svn-doc-head@FreeBSD.ORG  Fri Nov  9 12:14:00 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A471EE5B;
 Fri,  9 Nov 2012 12:14:00 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 886E48FC0A;
 Fri,  9 Nov 2012 12:14:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9CE0kZ067307;
 Fri, 9 Nov 2012 12:14:00 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA9CE021067305;
 Fri, 9 Nov 2012 12:14:00 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211091214.qA9CE021067305@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Fri, 9 Nov 2012 12:14:00 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39962 - head/en_US.ISO8859-1/articles/committers-guide
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Nov 2012 12:14:00 -0000

Author: eadler
Date: Fri Nov  9 12:14:00 2012
New Revision: 39962
URL: http://svnweb.freebsd.org/changeset/doc/39962

Log:
  SVK is no longer actively developed.
  
  Approved by:	jkois (mentor)

Modified:
  head/en_US.ISO8859-1/articles/committers-guide/article.xml

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Fri Nov  9 10:06:11 2012	(r39961)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Fri Nov  9 12:14:00 2012	(r39962)
@@ -370,7 +370,7 @@
     <sect2 id="svn-getting-started">
       <title>Getting Started</title>
 
-      <para>There are three ways to obtain a working copy of the tree
+      <para>There are a few ways to obtain a working copy of the tree
 	from Subversion.  This section will explain them.</para>
 
       <sect3>
@@ -466,119 +466,6 @@
 	  information on how to set one up.</para>
       </sect3>
 
-      <sect3>
-	<title>Checkout from a Local Mirror Using
-	  <acronym>SVK</acronym></title>
-
-	<para>The third alternative is to use <acronym>SVK</acronym>
-	  to maintain a local mirror.  It is a version control system
-	  build on top of Subversion's storage engine.  It is
-	  identical to Subversion in most respects, except that it
-	  allows for setting up parts of repositories as mirrors of
-	  other repositories, and keeping local branches for merging
-	  back into the upstream repositories.  There are extensions
-	  that allow <acronym>SVK</acronym> to mirror
-	  Perforce repositories in addition
-	  to Subversion ones.</para>
-
-	<para>Like everything, <acronym>SVK</acronym> has its
-	  disadvantages, one being that local revision numbers will
-	  not match upstream revision numbers.  This makes it
-	  difficult to <command>svk log</command>, <command>svk
-	    diff</command>, or <command>svk update</command> to an
-	  arbitrary upstream revision.</para>
-
-	<para>To set up a mirror of the &os; repository, do:</para>
-
-	<screen>&prompt.user; <userinput>svk mirror svn+ssh://svn.freebsd.org/base //freebsd/base</userinput></screen>
-
-	<para>The local <acronym>SVK</acronym> repository will be
-	  stored in <filename
-	    class="directory">~/.svk/local/</filename>, but can be
-	  moved to an alternate location.  If it is moved,
-	  <filename>~/.svk/config</filename> should be amended
-	  manually to reflect the move.</para>
-
-	<para>Any path can be used, not just the one in the example
-	  above.  A common pattern is to place mirrors under
-	  <literal>//mirror</literal>, e.g.,
-	  <filename
-	    class="directory">//mirror/freebsd/base/</filename>, and
-	  local branches under <literal>//local</literal>.</para>
-
-	<para>To pull down the contents of the repository to the
-	  mirror:</para>
-
-	<screen>&prompt.user; <userinput>svk sync //freebsd/base</userinput></screen>
-
-	<note>
-	  <para><command>svk sync</command> will take a very long
-	    time, possibly several days over a slow network
-	    connection.  &a.peter; has a tarball that can be used to
-	    jumpstart the mirror, but only if one does not exist
-	    already.</para>
-	</note>
-
-	<para>To use the tarball referenced above:</para>
-
-	<screen>&prompt.user; <userinput>cd ~</userinput>
-&prompt.user; <userinput>scp freefall:/home/peter/dot_svk_r179646.tbz2 .</userinput>
-&prompt.user; <userinput>tar xf dot_svk_r179646.tbz2</userinput></screen>
-
-	<para>Then edit <filename>~/.svk/config</filename> and replace
-	  <filename
-	    class="directory">/scratch/tmp/peter/.svk/local/</filename>
-	  with the equivalent of <filename
-	    class="directory">/home/<replaceable>jarjar</replaceable>/.svk/local/</filename>.</para>
-
-	<para>You can check out files directly from your mirror, once
-	  it has been created:</para>
-
-	<screen>&prompt.user; <userinput>svk checkout //freebsd/base/head /usr/src</userinput></screen>
-
-	<para>Unlike <acronym>SVN</acronym>, <acronym>SVK</acronym>
-	  does not store metadata or reference copies in the working
-	  copy.  All metadata is recorded in
-	  <filename>~/.svk/config</filename>; reference copies are not
-	  used at all because <acronym>SVK</acronym> always operates
-	  on a local repository.</para>
-
-	<para>When committing from a working copy like the one above,
-	  <acronym>SVN</acronym> will commit directly to the upstream
-	  repository, then synchronise the mirror.</para>
-
-	<para>However, the <quote>killer app</quote> for
-	  <acronym>SVK</acronym> is the ability to work without a
-	  network connection.  To do that, a local branch must be set
-	  up:</para>
-
-	<screen>&prompt.user; <userinput>svk mkdir //local/freebsd</userinput>
-&prompt.user; <userinput>svk copy //freebsd/base/head //local/freebsd/head</userinput></screen>
-
-	<para>Once again, any path can be used, it does not have to
-	  specifically be the one in the example.</para>
-
-	<para>Before use, the local branch has to be synchronized,
-	  like so:</para>
-
-	<screen>&prompt.user; <userinput>svk pull //local/freebsd/head</userinput></screen>
-
-	<para>Then check out from the newly created local
-	  branch:</para>
-
-	<screen>&prompt.user; <userinput>svk checkout //local/freebsd/head /usr/src</userinput></screen>
-
-	<para>The point of this exercise is showing that it is
-	  possible to commit work-in-progress to a local branch, and
-	  only push it to the upstream repository when work is
-	  complete.  The easy way to push is with <command>svk
-	    push</command>, but there is a serious disadvantage to it:
-	  it will push every single commit made to the local branch
-	  incrementally instead of lumping them all into a single
-	  commit.  Therefore, using <command>svk smerge</command> is
-	  preferable.</para>
-      </sect3>
-
       <sect3 id="subversion-primer-base-layout">
 	<title><literal>RELENG_*</literal> Branches and General
 	  Layout</title>

From owner-svn-doc-head@FreeBSD.ORG  Fri Nov  9 13:46:42 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 769CB74C;
 Fri,  9 Nov 2012 13:46:42 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5B0798FC0A;
 Fri,  9 Nov 2012 13:46:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9DkgYE082554;
 Fri, 9 Nov 2012 13:46:42 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA9DkgOe082553;
 Fri, 9 Nov 2012 13:46:42 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211091346.qA9DkgOe082553@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Fri, 9 Nov 2012 13:46:42 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39963 - head/en_US.ISO8859-1/articles/contributing
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Nov 2012 13:46:42 -0000

Author: eadler
Date: Fri Nov  9 13:46:41 2012
New Revision: 39963
URL: http://svnweb.freebsd.org/changeset/doc/39963

Log:
  The core team does not provide 'tighter review'.  For code that
  shouldn't be released into HEAD there are mailing lists for review.
  
  Approved by:	jkois (mentor)

Modified:
  head/en_US.ISO8859-1/articles/contributing/article.xml

Modified: head/en_US.ISO8859-1/articles/contributing/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributing/article.xml	Fri Nov  9 12:14:00 2012	(r39962)
+++ head/en_US.ISO8859-1/articles/contributing/article.xml	Fri Nov  9 13:46:41 2012	(r39963)
@@ -400,9 +400,8 @@
 	welcome.</para>
 
       <para>If your change is of a potentially sensitive nature,
-	e.g. you are unsure of copyright issues governing its further
-	distribution or you are simply not ready to release it without
-	a tighter review first, then you should send it to &a.core;
+	such as if you are unsure of copyright issues governing its further
+	distribution then you should send it to &a.core;
 	directly rather than submitting it with &man.send-pr.1;.  The
 	&a.core; reaches a much smaller group of people who
 	do much of the day-to-day work on FreeBSD.  Note that this

From owner-svn-doc-head@FreeBSD.ORG  Fri Nov  9 13:46:44 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C0178750;
 Fri,  9 Nov 2012 13:46:44 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8BFB28FC08;
 Fri,  9 Nov 2012 13:46:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9DkixB082592;
 Fri, 9 Nov 2012 13:46:44 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA9Dkibw082591;
 Fri, 9 Nov 2012 13:46:44 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211091346.qA9Dkibw082591@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Fri, 9 Nov 2012 13:46:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39964 - head/en_US.ISO8859-1/articles/contributing
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Nov 2012 13:46:44 -0000

Author: eadler
Date: Fri Nov  9 13:46:44 2012
New Revision: 39964
URL: http://svnweb.freebsd.org/changeset/doc/39964

Log:
  Always prefer unified diff to context diff.
  
  While here add '-N' to the diff line for directories
  
  Approved by:	jkois (mentor)

Modified:
  head/en_US.ISO8859-1/articles/contributing/article.xml

Modified: head/en_US.ISO8859-1/articles/contributing/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributing/article.xml	Fri Nov  9 13:46:41 2012	(r39963)
+++ head/en_US.ISO8859-1/articles/contributing/article.xml	Fri Nov  9 13:46:44 2012	(r39964)
@@ -342,39 +342,22 @@
 
       <para>The preferred &man.diff.1; format for submitting patches
 	is the unified output format generated by <command>diff
-	  -u</command>.  However, for patches that substantially
-	change a region of code, a context output format diff
-	generated by <command>diff -c</command> may be more readable
-	and thus preferable.</para>
+	  -u</command>.</para>
 
       <indexterm>
 	<primary><command>diff</command></primary>
       </indexterm>
 
-      <para>For example:</para>
-
-      <screen>&prompt.user; <userinput>diff -c oldfile newfile</userinput></screen>
-
-      <para>or</para>
-
-      <screen>&prompt.user; <userinput>diff -c -r olddir newdir</userinput></screen>
-
-      <para>would generate such a set of context diffs for the given
-	source file or directory hierarchy.</para>
-
-      <para>Likewise,</para>
-
       <screen>&prompt.user; <userinput>diff -u oldfile newfile</userinput></screen>
 
       <para>or</para>
 
-      <screen>&prompt.user; <userinput>diff -u -r olddir newdir</userinput></screen>
+      <screen>&prompt.user; <userinput>diff -u -r -N olddir newdir</userinput></screen>
 
-      <para>would do the same, except in the unified diff
-	format.</para>
+      <para>would generate a set of unified diffs for the given source
+	file or directory hierarchy.</para>
 
-      <para>See the manual page for &man.diff.1; for more
-	details.</para>
+      <para>See &man.diff.1; for more information.</para>
 
       <para>Once you have a set of diffs (which you may test with the
 	&man.patch.1; command), you should submit them for inclusion

From owner-svn-doc-head@FreeBSD.ORG  Fri Nov  9 16:10:08 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 535E6291;
 Fri,  9 Nov 2012 16:10:08 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2E6628FC16;
 Fri,  9 Nov 2012 16:10:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9GA8Ho006928;
 Fri, 9 Nov 2012 16:10:08 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA9GA8QY006926;
 Fri, 9 Nov 2012 16:10:08 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201211091610.qA9GA8QY006926@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Fri, 9 Nov 2012 16:10:07 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39965 - in head/nl_NL.ISO8859-1/books/handbook: basics
 virtualization
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Nov 2012 16:10:08 -0000

Author: rene
Date: Fri Nov  9 16:10:07 2012
New Revision: 39965
URL: http://svnweb.freebsd.org/changeset/doc/39965

Log:
  MFen the Dutch Handbook:
  - basics 39831 -> 39947
  - virtualization 39631 -> 39948

Modified:
  head/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml

Modified: head/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml	Fri Nov  9 13:46:44 2012	(r39964)
+++ head/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml	Fri Nov  9 16:10:07 2012	(r39965)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/basics/chapter.xml
-     %SRCID%	39831
+     %SRCID%	39947
 -->
 
 <chapter id="basics">
@@ -2296,21 +2296,12 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <step>
 	<para>Eerst moet het proces ID worden opgezocht van het proces
 	  waar een signaal naar verzonden moeten worden.  Dit kan door
-	  &man.ps.1; en &man.grep.1; te gebruiken.  &man.grep.1; wordt
-	  gebruikt om in de uitvoer te zoeken en te kijken naar de
-	  string die de gebruiker opgeeft.  Dit commando wordt gedraaid
-	  als een normale gebruiker en &man.inetd.8; wordt gedraaid
-	  onder de gebruiker <username>root</username>, dus aan
-	  &man.ps.1; moet de optie <option>ax</option> meegegeven
-	  worden.</para>
+	  &man.pgrep.1; te gebruiken.</para>
 
-	<screen>&prompt.user; <userinput>ps -ax | grep inetd</userinput>
-  198  ??  IWs    0:00.00 inetd -wW</screen>
+	<screen>&prompt.user; <userinput>pgrep -l inetd</userinput>
+198  inetd -wW</screen>
 
-	<para>Dus PID van &man.inetd.8; is 198.  In sommige gevallen
-	  kan <literal>grep inetd</literal> ook voorkomen in de
-	  uitvoer.  Dit komt door de manier waarop &man.ps.1; de lijst
-	  van draaiende processen moet vinden.</para>
+	<para>Dus het PID van &man.inetd.8; is 198.</para>
       </step>
 
       <step>

Modified: head/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml	Fri Nov  9 13:46:44 2012	(r39964)
+++ head/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml	Fri Nov  9 16:10:07 2012	(r39965)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
-     %SRCID%	39631
+     %SRCID%	39948
 -->
 
 <chapter id="virtualization">
@@ -1255,11 +1255,15 @@ add path 'usb/*' mode 0660 group operato
     <sect2 id="virtualization-virtualbox-host-dvd-cd-access">
       <title>DVD/CD-toegang van de gastheer in &virtualbox;</title>
 
-      <para>De kernelmodule <command>atapicam</command> moet geladen zijn door
-	de volgende regel toe te voegen aan
-	<filename>/boot/loader.conf</filename>:</para>
-
-      <programlisting>atapicam_load="YES"</programlisting>
+      <para>Toegang tot de CD/DVD-stations van de gastheer wordt bereikt door
+	het delen van de fysieke stations.  In de GUI kan dit vanuit het scherm
+	Opslag in de Instellingen van de virtuele machine worden ingesteld.
+	Maak eerst een leeg IDE CD-/DVD-apparaat aan.  Kies daarna het
+	Gastheerstation van het popup-menu voor het kiezen van het virtuele
+	CD-/DVD-station.  Later zal er een checkbox genaamd
+	<literal>Passthrough</literal> verschijnen.  Dit stelt de virtuele
+	machine in staat om de hardware direct te gebruiken.  Audio-CDs en
+	branders bijvoorbeeld werken alleen als deze optie is aangezet.</para>
 
       <para><acronym>HAL</acronym> moet draaien om de DVD/CD-functies van
 	<application>&virtualbox;</application> te laten werken, zet het dus aan
@@ -1268,7 +1272,7 @@ add path 'usb/*' mode 0660 group operato
 
       <programlisting>hald_enable="YES"</programlisting>
 
-      <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/hald start</userinput></screen>
+      <screen>&prompt.root; <userinput>service hald start</userinput></screen>
 
       <para>Om gebruikers de DVD/CD-functionaliteit van
 	<application>&virtualbox;</application> te laten gebruiken, dienen ze
@@ -1277,12 +1281,18 @@ add path 'usb/*' mode 0660 group operato
 	  class="devicefile">/dev/cd<replaceable>N</replaceable></filename> en
 	<filename
 	  class="devicefile">/dev/pass<replaceable>N</replaceable></filename>.
-	Voeg de volgende regels toe aan
-	<filename>/etc/devfs.conf</filename>:</para>
+	Dit wordt normaliter gedaan door de gebruiker van
+	<application>&virtualbox;</application> lid te maken van de groep
+	operator, wat ook de standaardgroep is voor bovengenoemde apparaten.
+	De rechten van deze apparaten dienen gecorrigeerd te worden door de
+	volgende regels aan <filename>/etc/devfs.conf</filename> toe te
+	voegen:</para>
 
-      <programlisting>perm cd0 0600
+      <programlisting>perm cd* 0600
 perm xpt0 0660
-perm pass0 0660</programlisting>
+perm pass* 0660</programlisting>
+
+      <screen>&prompt.root; <userinput>/etc/rc.d/devfs restart</userinput></screen>
     </sect2>
 
 <!--

From owner-svn-doc-head@FreeBSD.ORG  Fri Nov  9 17:39:44 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 28E916D7;
 Fri,  9 Nov 2012 17:39:44 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0DD868FC0A;
 Fri,  9 Nov 2012 17:39:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9HdhA8022347;
 Fri, 9 Nov 2012 17:39:43 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA9HdhhS022346;
 Fri, 9 Nov 2012 17:39:43 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201211091739.qA9HdhhS022346@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Fri, 9 Nov 2012 17:39:43 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39966 - head/nl_NL.ISO8859-1/articles/contributing
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Nov 2012 17:39:44 -0000

Author: rene
Date: Fri Nov  9 17:39:43 2012
New Revision: 39966
URL: http://svnweb.freebsd.org/changeset/doc/39966

Log:
  MFen 39924 -> 39964

Modified:
  head/nl_NL.ISO8859-1/articles/contributing/article.xml

Modified: head/nl_NL.ISO8859-1/articles/contributing/article.xml
==============================================================================
--- head/nl_NL.ISO8859-1/articles/contributing/article.xml	Fri Nov  9 16:10:07 2012	(r39965)
+++ head/nl_NL.ISO8859-1/articles/contributing/article.xml	Fri Nov  9 17:39:43 2012	(r39966)
@@ -10,7 +10,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/articles/contributing/article.xml
-     %SRCID%	39924
+     %SRCID%	39964
 -->
 
 <article lang="nl">
@@ -360,38 +360,22 @@
 
       <para>Het geprefereerde &man.diff.1;-formaat voor het opsturen van
 	patches is het verenigde uitvoerformaat gegenereerd door
-	<command>diff -u</command>.  Echter, voor patches die
-	substantieel een gebied aan code wijzigen, kan een diff in
-	contextuitvoerformaat gegenereerd door
-	<command>diff -c</command> leesbaarder en dus verkiesbaar
-	zijn.</para>
+	<command>diff -u</command>.</para>
 
       <indexterm>
 	<primary><command>diff</command></primary>
       </indexterm>
 
-      <para>Bijvoorbeeld:</para>
-
-      <screen>&prompt.user; <userinput>diff -c oudbestand nieuwbestand</userinput></screen>
-
-      <para>of</para>
-
-      <screen>&prompt.user; <userinput>diff -c -r oudemap nieuwemap</userinput></screen>
-
-      <para>zal zo'n verzameling van contextdiffs aanmaken voor het gegeven
-	broncodebestand of maphiërarchie.</para>
-
-      <para>Evenzo zal</para>
-
       <screen>&prompt.user; <userinput>diff -u oudbestand nieuwbestand</userinput></screen>
 
       <para>of</para>
 
-      <screen>&prompt.user; <userinput>diff -u -r oudemap nieuwemap</userinput></screen>
+      <screen>&prompt.user; <userinput>diff -u -r -N oudemap nieuwemap</userinput></screen>
 
-      <para>hetzelfde doen, maar dan in het verenigde diff-formaat.</para>
+      <para>zouden een verzameling van verenigde diffs genereren voor het
+	gegeven bronbestand of maphiërarchie.</para>
 
-      <para>Zie de hulppagina van &man.diff.1; voor meer details.</para>
+      <para>Zie &man.diff.1; voor meer details.</para>
 
       <para>Als u eenmaal een verzameling aan diffs heeft (welke u kunt
 	testen met het commando &man.patch.1;), dient u ze op te sturen
@@ -418,11 +402,10 @@
 	&man.shar.1; zijn aangemaakt zijn ook welkom.</para>
 
       <para>Als uw verandering mogelijk gevoelig van aard is,
-	bijvoorbeeld als u onzeker bent over copyright-dingen die de
-	verdere distributie ervan dicteren of als u eenvoudigweg niet
-	klaar bent om het uit te geven zonder een voorafgaand nauwer
-	review, dan dient u het direct naar &a.core; te sturen in plaats
-	van het met &man.send-pr.1; op te sturen.  De &a.core; bereikt
+	bijvoorbeeld als u onzeker bent over copyright-zaken die de
+	verdere distributie ervan dicteren, dan dient u het direct naar
+	&a.core; te sturen in plaats
+	van het met &man.send-pr.1; op te sturen.  Het &a.core; bereikt
 	een veel kleinere groep mensen die veel dagelijks werk op &os;
 	doen.  Merk op dat deze groep het ook <emphasis>erg
 	  druk</emphasis> heeft, daarom dient u alleen mail naar hen te
@@ -528,7 +511,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-        &#36;Id&#36;</programlisting>
+        &dollar;Id&dollar;</programlisting>
 
       <para>Voor uw gemak staat een kopie van deze tekst in
 	<filename>/usr/share/examples/etc/bsd-style-copyright</filename>.</para>

From owner-svn-doc-head@FreeBSD.ORG  Fri Nov  9 18:06:54 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id F1140203;
 Fri,  9 Nov 2012 18:06:53 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D5FE48FC13;
 Fri,  9 Nov 2012 18:06:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9I6rW3026851;
 Fri, 9 Nov 2012 18:06:53 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA9I6rHe026850;
 Fri, 9 Nov 2012 18:06:53 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201211091806.qA9I6rHe026850@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Fri, 9 Nov 2012 18:06:53 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39967 - head/en_US.ISO8859-1/articles/contributors
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Nov 2012 18:06:54 -0000

Author: jgh (ports committer)
Date: Fri Nov  9 18:06:53 2012
New Revision: 39967
URL: http://svnweb.freebsd.org/changeset/doc/39967

Log:
  - add Christian Heckendorf for audio/harp
  
  PR:		173480
  Feature safe:	yes

Modified:
  head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml

Modified: head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Fri Nov  9 17:39:43 2012	(r39966)
+++ head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Fri Nov  9 18:06:53 2012	(r39967)
@@ -1722,6 +1722,11 @@
     </listitem>
 
     <listitem>
+      <para>Christian Heckendorf
+	<email>heckend@bu.edu</email></para>
+    </listitem>
+
+    <listitem>
       <para>Christian Lackas
 	<email>delta@lackas.net</email></para>
     </listitem>

From owner-svn-doc-head@FreeBSD.ORG  Fri Nov  9 18:53:22 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9A2C0510;
 Fri,  9 Nov 2012 18:53:22 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6588A8FC16;
 Fri,  9 Nov 2012 18:53:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9IrMIc034591;
 Fri, 9 Nov 2012 18:53:22 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA9IrMib034589;
 Fri, 9 Nov 2012 18:53:22 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211091853.qA9IrMib034589@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Fri, 9 Nov 2012 18:53:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39968 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Nov 2012 18:53:22 -0000

Author: eadler
Date: Fri Nov  9 18:53:21 2012
New Revision: 39968
URL: http://svnweb.freebsd.org/changeset/doc/39968

Log:
  make world no longer functions exactly as described and its use is
  generally discouraged except with DESTDIR defined.
  
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Fri Nov  9 18:06:53 2012	(r39967)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Fri Nov  9 18:53:21 2012	(r39968)
@@ -9685,35 +9685,6 @@ hint.sio.7.irq="12"</programlisting>
       </qandaentry>
 
       <qandaentry>
-	<question id="makeworld-clobbers">
-	  <para>Why does
-	    <command>make <maketarget>world</maketarget></command>
-	    clobber my existing installed binaries?</para>
-	</question>
-
-	<answer>
-	  <para>Yes, this is the general idea; as its name might
-	    suggest,
-	    <command>make <maketarget>world</maketarget></command>
-	    rebuilds every system binary from scratch, so you can be
-	    certain of having a clean and consistent environment at the
-	    end (which is why it takes so long).</para>
-
-	  <para>If the environment variable <envar>DESTDIR</envar>
-	    is defined while running
-	    <command>make <maketarget>world</maketarget></command> or
-	    <command>make <maketarget>install</maketarget></command>,
-	    the newly-created binaries will be deposited in a directory
-	    tree identical to the installed one, rooted at
-	    <literal>${DESTDIR}</literal>.  Some random combination of
-	    shared libraries modifications and program rebuilds can
-	    cause this to fail in
-	    <command>make <maketarget>world</maketarget></command>
-	    however.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="ctm">
 	  <para>Can I follow <emphasis>-CURRENT</emphasis> with limited
 	    Internet access?</para>

From owner-svn-doc-head@FreeBSD.ORG  Fri Nov  9 18:53:24 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B66AB511;
 Fri,  9 Nov 2012 18:53:24 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9C30D8FC08;
 Fri,  9 Nov 2012 18:53:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9IrOx4034631;
 Fri, 9 Nov 2012 18:53:24 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA9IrO2q034630;
 Fri, 9 Nov 2012 18:53:24 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211091853.qA9IrO2q034630@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Fri, 9 Nov 2012 18:53:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39969 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Nov 2012 18:53:24 -0000

Author: eadler
Date: Fri Nov  9 18:53:24 2012
New Revision: 39969
URL: http://svnweb.freebsd.org/changeset/doc/39969

Log:
  Answer the question "how do I go back from pkgng?"
  
  This is the first mention of pkgng in the FAQ
  
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Fri Nov  9 18:53:21 2012	(r39968)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Fri Nov  9 18:53:24 2012	(r39969)
@@ -4272,6 +4272,27 @@ kern.timecounter.hardware: TSC -&gt; i82
 	    </para>
 	</answer>
       </qandaentry>
+
+      <qandaentry>
+	<question id="convert-back-from-pkgng">
+	  <para>How can I convert from pkgng to the old package
+	    tools?</para>
+	</question>
+
+	<answer>
+	  <para>Short answer: it is not possible.</para>
+
+	  <para>Longer answer: if you have made any changes using
+	    <command>pkg</command> converting back is non-trivial and
+	    requires lots of manual editing of internal package
+	    database files.  However, if you have just run
+	    <command>pkg2ng</command> then you may remove
+	    <filename>/var/db/pkg/local.sqlite</filename>
+	    and extract
+	    <filename>/var/backups/pkgdb.bak.tbz</filename>.
+	  </para>
+	</answer>
+      </qandaentry>
     </qandaset>
   </chapter>
 

From owner-svn-doc-head@FreeBSD.ORG  Sat Nov 10 07:33:29 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E29B2B28;
 Sat, 10 Nov 2012 07:33:29 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C8B068FC0C;
 Sat, 10 Nov 2012 07:33:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAA7XTnL054837;
 Sat, 10 Nov 2012 07:33:29 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAA7XTbV054836;
 Sat, 10 Nov 2012 07:33:29 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201211100733.qAA7XTbV054836@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 10 Nov 2012 07:33:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39970 - head/ja_JP.eucJP/articles/contributing
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Nov 2012 07:33:30 -0000

Author: ryusuke
Date: Sat Nov 10 07:33:29 2012
New Revision: 39970
URL: http://svnweb.freebsd.org/changeset/doc/39970

Log:
  - Merge the following from the English version:
  
  	r39955 -> r39964	head/ja_JP.eucJP/articles/contributing/article.xml

Modified:
  head/ja_JP.eucJP/articles/contributing/article.xml

Modified: head/ja_JP.eucJP/articles/contributing/article.xml
==============================================================================
--- head/ja_JP.eucJP/articles/contributing/article.xml	Fri Nov  9 18:53:24 2012	(r39969)
+++ head/ja_JP.eucJP/articles/contributing/article.xml	Sat Nov 10 07:33:29 2012	(r39970)
@@ -10,7 +10,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39955
+     Original revision: r39964
      $FreeBSD$
 -->
 
@@ -348,31 +348,24 @@
 	¤ÎÊݼéôÅö¼Ô¤ØÁ÷¤ëº¹Ê¬¥Õ¥¡¥¤¥ë¤ÎÀ¸À®¤Ç¤¹¡£¤³¤ì¤Ï &man.diff.1;
 	¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¤ª¤³¤Ê¤¤¤Þ¤¹¡£</para>
 
+      <para>º¹Ê¬¥Õ¥¡¥¤¥ë¤ÎÄó½Ð¤Ë¤ª¤¤¤Æ¹¥¤Þ¤·¤¤ &man.diff.1; ¤Î·Á¼°¤Ï¡¢
+	<command>diff -u</command> ¤Ë¤è¤êÀ¸À®¤µ¤ì¤ë
+	unified diff ·Á¼°¤Ç¤¹¡£</para>
+
       <indexterm>
 	<primary><command>diff</command></primary>
       </indexterm>
 
-      <para>¤¿¤È¤¨¤Ð¡¢</para>
-
-      <screen>&prompt.user; <userinput>diff -c oldfile newfile</userinput></screen>
-
-      <para>¤Þ¤¿¤Ï</para>
-
-      <screen>&prompt.user; <userinput>diff -c -r olddir newdir</userinput></screen>
-
-      <para>¤Ç¡¢»ØÄꤵ¤ì¤¿¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥Ç¥£¥ì¥¯¥È¥ê³¬ÁؤËÂФ¹¤ë¥³¥ó¥Æ¥­¥¹¥È·Á¼°¤Îº¹Ê¬¤¬À¸À®¤µ¤ì¤Þ¤¹¡£</para>
-
-      <para>ƱÍͤˡ¢</para>
-
       <screen>&prompt.user; <userinput>diff -u oldfile newfile</userinput></screen>
 
       <para>¤Þ¤¿¤Ï¡¢</para>
 
-      <screen>&prompt.user; <userinput>diff -u -r olddir newdir</userinput></screen>
+      <screen>&prompt.user; <userinput>diff -u -r -N olddir newdir</userinput></screen>
 
-      <para>¤Ç¡¢unified diff ·Á¼°¤Ç¤¢¤ë°Ê³°¤ÏƱ¤¸·ë²Ì¤¬ÆÀ¤é¤ì¤Þ¤¹¡£</para>
+      <para>¤Ç¡¢»ØÄꤵ¤ì¤¿¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥Ç¥£¥ì¥¯¥È¥ê³¬ÁؤËÂФ¹¤ë
+	unified diff ·Á¼°¤Îº¹Ê¬¤¬À¸À®¤µ¤ì¤Þ¤¹¡£</para>
 
-      <para>¾Ü¤·¤¤ÀâÌÀ¤Ï &man.diff.1; ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <para>¾Ü¤·¤¤ÀâÌÀ¤Ï &man.diff.1; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <para>º¹Ê¬¥Õ¥¡¥¤¥ë (&man.patch.1; ¥³¥Þ¥ó¥É¤Ç¥Æ¥¹¥È¤Ç¤­¤Þ¤¹)
 	¤òºî¤Ã¤¿¤é¡¢¤½¤ì¤é¤ò FreeBSD
@@ -396,8 +389,7 @@
 	¥×¥í¥°¥é¥à¤Ë¤«¤±¤Æ¤¯¤À¤µ¤¤¡£&man.shar.1;
 	¥¢¡¼¥«¥¤¥Ö¤â´¿·Þ¤·¤Þ¤¹¡£</para>
 
-      <para>¤¿¤È¤¨¤Ð¡¢ºÆÇÛÉÛ¤ËŬÍѤµ¤ì¤ëÃøºî¸¢¤ÎÌäÂê¤Ë¼«¿®¤¬¤Ê¤¤¤È¤«¡¢
-	¤è¤ê¸·¤·¤¤¥ì¥Ó¥å¡¼¤ò¹Ô¤ï¤Ê¤±¤ì¤Ð¤É¤¦¤·¤Æ¤â¥ê¥ê¡¼¥¹¤Ç¤­¤Ê¤¤¾ì¹ç¤Ê¤É¡¢
+      <para>¤¿¤È¤¨¤Ð¡¢ºÆÇÛÉÛ¤ËŬÍѤµ¤ì¤ëÃøºî¸¢¤ÎÌäÂê¤Ë¼«¿®¤¬¤Ê¤¤¤È¤¤¤Ã¤¿¡¢
 	¤¢¤Ê¤¿¤ÎÊѹ¹¤¬Èù̯¤ÊÀ­¼Á¤Î¤â¤Î¤Ç¤¢¤ë²ÄǽÀ­¤¬¤¢¤ì¤Ð¡¢
 	&man.send-pr.1; ¤ÇÄó½Ð¤¹¤ë¤è¤ê¤à¤·¤íľÀÜ &a.core;
 	¤ØÁ÷¤Ã¤Æ¤¯¤À¤µ¤¤¡£&a.core; °¸¤Î¥á¡¼¥ë¤Ï¡¢

From owner-svn-doc-head@FreeBSD.ORG  Sat Nov 10 13:27:29 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 72945996;
 Sat, 10 Nov 2012 13:27:29 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5851B8FC0C;
 Sat, 10 Nov 2012 13:27:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAADRTS6018651;
 Sat, 10 Nov 2012 13:27:29 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAADRTbI018650;
 Sat, 10 Nov 2012 13:27:29 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211101327.qAADRTbI018650@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 10 Nov 2012 13:27:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39972 - head/en_US.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Nov 2012 13:27:29 -0000

Author: eadler
Date: Sat Nov 10 13:27:28 2012
New Revision: 39972
URL: http://svnweb.freebsd.org/changeset/doc/39972

Log:
  Prefer links to svnweb over cvsweb.
  
  Approved by:	jkois (mentor)

Modified:
  head/en_US.ISO8859-1/htdocs/art.xml

Modified: head/en_US.ISO8859-1/htdocs/art.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/art.xml	Sat Nov 10 10:50:31 2012	(r39971)
+++ head/en_US.ISO8859-1/htdocs/art.xml	Sat Nov 10 13:27:28 2012	(r39972)
@@ -36,7 +36,7 @@
 	</tr>
 	<tr>
 	  <td align="center" colspan="6">Created by &a.phk;<br/>Source:
-	    <a href="http://cvsweb.FreeBSD.org/src/share/examples/BSD_daemon/">
+	    <a href="http://svnweb.freebsd.org/base/head/share/examples/BSD_daemon/">
 	      /usr/share/examples/BSD_daemon/</a> on FreeBSD
 	    systems.</td>
 	</tr>
@@ -119,7 +119,7 @@
 
     <p>&a.phk;'s rendering of the BSD Daemon is released under <q>THE
 	BEER-WARE LICENSE</q>.  See the <a
-	href="http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/src/share/examples/BSD_daemon/README?content-type=text/plain">README</a>
+	href="http://svnweb.freebsd.org/base/head/share/examples/BSD_daemon/README?view=markup">README</a>
       for more information.</p>
 
     <h2 id="trademark">Trademarks</h2>

From owner-svn-doc-head@FreeBSD.ORG  Sat Nov 10 13:31:24 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 88966BAD;
 Sat, 10 Nov 2012 13:31:24 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6E4F18FC08;
 Sat, 10 Nov 2012 13:31:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAADVOjs019348;
 Sat, 10 Nov 2012 13:31:24 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAADVOeG019347;
 Sat, 10 Nov 2012 13:31:24 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211101331.qAADVOeG019347@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 10 Nov 2012 13:31:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39973 - head/en_US.ISO8859-1/htdocs/cgi
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Nov 2012 13:31:24 -0000

Author: eadler
Date: Sat Nov 10 13:31:24 2012
New Revision: 39973
URL: http://svnweb.freebsd.org/changeset/doc/39973

Log:
  Prefer svnweb to cvsweb.
  
  Approved by:	bcr (mentor)

Modified:
  head/en_US.ISO8859-1/htdocs/cgi/man.cgi

Modified: head/en_US.ISO8859-1/htdocs/cgi/man.cgi
==============================================================================
--- head/en_US.ISO8859-1/htdocs/cgi/man.cgi	Sat Nov 10 13:27:28 2012	(r39972)
+++ head/en_US.ISO8859-1/htdocs/cgi/man.cgi	Sat Nov 10 13:31:24 2012	(r39973)
@@ -1652,7 +1652,7 @@ macros like `appeared in NetBSD version 
 <li>Some OSs provide only formated manual pages (catpages), e.g. NetBSD
 and OpenBSD. In this case it is not possible to create Postscript
 and troff output.</li>
-<li>The <a href="http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree">
+<li>The <a href="http://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree?view=markup">
 Unix family tree, BSD part</a>.</li>
 <li>The <a href="http://www.freebsd.org/cgi/ports.cgi">
 FreeBSD Ports Changes</a> script.</li>

From owner-svn-doc-head@FreeBSD.ORG  Sat Nov 10 14:05:27 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5360C733;
 Sat, 10 Nov 2012 14:05:27 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3764A8FC0A;
 Sat, 10 Nov 2012 14:05:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAAE5R0N026320;
 Sat, 10 Nov 2012 14:05:27 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAAE5Rc2026318;
 Sat, 10 Nov 2012 14:05:27 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211101405.qAAE5Rc2026318@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 10 Nov 2012 14:05:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39974 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Nov 2012 14:05:27 -0000

Author: eadler
Date: Sat Nov 10 14:05:26 2012
New Revision: 39974
URL: http://svnweb.freebsd.org/changeset/doc/39974

Log:
  ids are lowecase since the SGML->XML migration.
  
  Approved by:	jkois (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sat Nov 10 13:31:24 2012	(r39973)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sat Nov 10 14:05:26 2012	(r39974)
@@ -371,12 +371,12 @@
 
 	<answer>
 	  <para><ulink
-	      url="&url.books.handbook;/current-stable.html#CURRENT">&os.current;</ulink>
+	      url="&url.books.handbook;/current-stable.html#current">&os.current;</ulink>
 	    is the development version of the operating system, which
 	    will in due course become the new &os.stable; branch.  As
 	    such, it is really only of interest to developers working on
 	    the system and die-hard hobbyists.  See the <ulink
-	      url="&url.books.handbook;/current-stable.html#CURRENT">relevant section</ulink>
+	      url="&url.books.handbook;/current-stable.html#current">relevant section</ulink>
 	    in the <ulink
 	      url="&url.books.handbook;/index.html">Handbook</ulink> for
 	    details on running <emphasis>-CURRENT</emphasis>.</para>
@@ -457,9 +457,9 @@
 	<answer>
 	  <para>Back when &os;&nbsp;2.0.5 was released, &os; development
 	    branched in two.  One branch was named <ulink
-	      url="&url.books.handbook;/current-stable.html#STABLE">-STABLE</ulink>,
+	      url="&url.books.handbook;/current-stable.html#stable">-STABLE</ulink>,
 	    one <ulink
-	      url="&url.books.handbook;/current-stable.html#CURRENT">-CURRENT</ulink>.
+	      url="&url.books.handbook;/current-stable.html#current">-CURRENT</ulink>.
 	    <emphasis>&os;-STABLE</emphasis> is intended for Internet
 	    Service Providers and other commercial enterprises for whom
 	    sudden shifts or experimental features are quite
@@ -542,7 +542,7 @@
 	      url="&url.base;/administration.html#t-core">core team</ulink> of
 	    9 people.  There is a much larger team of more than 350
 	    <ulink
-	      url="&url.articles.contributors;/article.html#STAFF-COMMITTERS">committers</ulink>
+	      url="&url.articles.contributors;/article.html#staff-committers">committers</ulink>
 	    who are authorized to make changes directly to the &os;
 	    source tree.</para>
 
@@ -1004,7 +1004,7 @@
 
 	<answer>
 	  <para>You can find full information in the <ulink
-	      url="&url.books.handbook;/eresources.html#ERESOURCES-MAIL">Handbook entry on mailing-lists</ulink>.</para>
+	      url="&url.books.handbook;/eresources.html#eresources-mail">Handbook entry on mailing-lists</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -3017,7 +3017,7 @@ quit</programlisting>
 	    memory for network buffers (specifically, mbuf clusters).
 	    You can increase the amount of VM available for mbuf
 	    clusters by following the instructions in the <ulink
-	      url="&url.books.handbook;/configtuning-kernel-limits.html#NMBCLUSTERS">Network Limits</ulink>
+	      url="&url.books.handbook;/configtuning-kernel-limits.html#nmbclusters">Network Limits</ulink>
 	    section of the Handbook.</para>
 	</answer>
       </qandaentry>
@@ -7803,7 +7803,7 @@ Key F15        A        A        Menu Wo
 	<answer>
 	  <para>You should first read the &man.ppp.8; manual page and
 	    the <ulink
-	      url="&url.books.handbook;/ppp-and-slip.html#USERPPP">PPP section of the handbook</ulink>.
+	      url="&url.books.handbook;/ppp-and-slip.html#userppp">PPP section of the handbook</ulink>.
 	    Enable logging with the following command:</para>
 
 	  <programlisting>set log Phase Chat Connect Carrier lcp ipcp ccp command</programlisting>
@@ -9714,7 +9714,7 @@ hint.sio.7.irq="12"</programlisting>
 	<answer>
 	  <para>Yes, you can do this <emphasis>without</emphasis>
 	    downloading the whole source tree by using the <ulink
-	      url="&url.books.handbook;/synching.html#CTM">CTM facility</ulink>.
+	      url="&url.books.handbook;/synching.html#ctm">CTM facility</ulink>.
 	    </para>
 	</answer>
       </qandaentry>

From owner-svn-doc-head@FreeBSD.ORG  Sat Nov 10 14:47:53 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id F2C2C36A;
 Sat, 10 Nov 2012 14:47:52 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BF1EA8FC08;
 Sat, 10 Nov 2012 14:47:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAAElql4035606;
 Sat, 10 Nov 2012 14:47:52 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAAElqlK035604;
 Sat, 10 Nov 2012 14:47:52 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201211101447.qAAElqlK035604@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 10 Nov 2012 14:47:52 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39975 - in head/en_US.ISO8859-1:
 books/handbook/eresources share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Nov 2012 14:47:53 -0000

Author: gjb
Date: Sat Nov 10 14:47:52 2012
New Revision: 39975
URL: http://svnweb.freebsd.org/changeset/doc/39975

Log:
  Add freebsd-infiniband list.
  
  PR:		173530
  Submitted by:	David Wolfskill (david%catwhisker!org)

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

Modified: head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml	Sat Nov 10 14:05:26 2012	(r39974)
+++ head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml	Sat Nov 10 14:47:52 2012	(r39975)
@@ -323,6 +323,11 @@
 	    </row>
 
 	    <row>
+	      <entry>&a.infiniband.name;</entry>
+	      <entry>Infiniband on FreeBSD</entry>
+	    </row>
+
+	    <row>
 	      <entry>&a.ipfw.name;</entry>
 	      <entry>Technical discussion concerning the redesign of the IP
 		firewall code</entry>
@@ -1249,6 +1254,17 @@
 	</varlistentry>
 
 	<varlistentry>
+	  <term>&a.infiniband.name;</term>
+
+	  <listitem>
+	    <para><emphasis>Infiniband on &os;</emphasis></para>
+
+	    <para>Technical mailing list discussing Infiniband, OFED,
+	      and OpenSM on &os;.</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
 	  <term>&a.ipfw.name;</term>
 
 	  <listitem>

Modified: head/en_US.ISO8859-1/share/xml/mailing-lists.ent
==============================================================================
--- head/en_US.ISO8859-1/share/xml/mailing-lists.ent	Sat Nov 10 14:05:26 2012	(r39974)
+++ head/en_US.ISO8859-1/share/xml/mailing-lists.ent	Sat Nov 10 14:47:52 2012	(r39975)
@@ -235,6 +235,10 @@
 <!ENTITY a.ia64 "<ulink url='&a.ia64.url;'>FreeBSD IA64 porting mailing list</ulink>">
 <!ENTITY a.ia64.name "<ulink url='&a.ia64.url;'>freebsd-ia64</ulink>">
 
+<!ENTITY a.infiniband.url "&a.mailman.listinfo;/freebsd-infiniband">
+<!ENTITY a.infiniband "<ulink url='&a.infiniband.url;'>Infiniband on FreeBSD</ulink>">
+<!ENTITY a.infiniband.name "<ulink url='&a.infiniband.url;'>freebsd-infiniband</ulink>">
+
 <!ENTITY a.ipfw.url "&a.mailman.listinfo;/freebsd-ipfw">
 <!ENTITY a.ipfw "<ulink url='&a.ipfw.url;'>FreeBSD IPFW code mailing list</ulink>">
 <!ENTITY a.ipfw.name "<ulink url='&a.ipfw.url;'>freebsd-ipfw</ulink>">

From owner-svn-doc-head@FreeBSD.ORG  Sat Nov 10 16:43:36 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 51BF7191;
 Sat, 10 Nov 2012 16:43:36 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 381348FC08;
 Sat, 10 Nov 2012 16:43:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAAGhaXf060040;
 Sat, 10 Nov 2012 16:43:36 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAAGhabX060035;
 Sat, 10 Nov 2012 16:43:36 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211101643.qAAGhabX060035@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 10 Nov 2012 16:43:35 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39976 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Nov 2012 16:43:36 -0000

Author: eadler
Date: Sat Nov 10 16:43:35 2012
New Revision: 39976
URL: http://svnweb.freebsd.org/changeset/doc/39976

Log:
  Directly answer the question "What is the goal of the FreeBSD Project?"
  and move the (slightly modified) comments over to the question
  "Does the FreeBSD license have any restrictions?"
  
  Discussed on:	doc
  Approved by:	jkois (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sat Nov 10 14:47:52 2012	(r39975)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sat Nov 10 16:43:35 2012	(r39976)
@@ -154,32 +154,11 @@
 	</question>
 
 	<answer>
-	  <para>The goal of the &os; Project is to provide software that
-	    may be used for any purpose and without strings attached.
-	    Many of us have a significant investment in the code (and
-	    project) and would certainly not mind a little financial
-	    compensation now and then, but we definitely do not insist
-	    on it.  We believe that our first and foremost
-	    <quote>mission</quote> is to provide code to any and all
-	    comers, and for whatever purpose, so that the code gets the
-	    widest possible use and provides the widest possible
-	    benefit.  This is, we believe, one of the most fundamental
-	    goals of Free Software and one that we enthusiastically
-	    support.</para>
-
-	  <para>That code in our source tree which falls under the
-	    <ulink
-	      url="http://www.FreeBSD.org/copyright/COPYING">GNU General Public License (GPL)</ulink>
-	    or <ulink
-	      url="http://www.FreeBSD.org/copyright/COPYING.LIB">GNU Library General Public License (LGPL)</ulink>
-	    comes with slightly more strings attached, though at least
-	    on the side of enforced access rather than the usual
-	    opposite.  Due to the additional complexities that can
-	    evolve in the commercial use of GPL software, we do,
-	    however, endeavor to replace such software with submissions
-	    under the more relaxed <ulink
-	      url="http://www.FreeBSD.org/copyright/freebsd-license.html">&os; license</ulink>
-	    whenever possible.</para>
+	  <para>The goal of the &os; Project is to provide a
+	    stable and fast general purpose
+	    operating system that may
+	    be used for any purpose
+	    without strings attached.</para>
 	</answer>
       </qandaentry>
 
@@ -205,6 +184,34 @@
 	      <para>Do not sue us if it breaks.</para>
 	    </listitem>
 	  </itemizedlist>
+
+	  <para>Many of us have a significant investment in the
+	    project
+	    and would certainly not mind a little financial
+	    compensation now and then, but we definitely do not insist
+	    on it.  We believe that our first and foremost
+	    <quote>mission</quote> is to provide code to any and all
+	    comers, and for whatever purpose, so that the code gets
+	    the
+	    widest possible use and provides the widest possible
+	    benefit.  This, we believe, is one of the most
+	    fundamental
+	    goals of Free Software and one that we enthusiastically
+	    support.</para>
+
+	  <para>Code in our source tree which falls under the
+	    <ulink
+	      url="http://www.FreeBSD.org/copyright/COPYING">GNU General Public License (GPL)</ulink>
+	    or <ulink
+	      url="http://www.FreeBSD.org/copyright/COPYING.LIB">GNU Library General Public License (LGPL)</ulink>
+	    comes with slightly more strings attached, though at least
+	    on the side of enforced access rather than the usual
+	    opposite.  Due to the additional complexities that can
+	    evolve in the commercial use of GPL software, we do,
+	    however, endeavor to replace such software with submissions
+	    under the more relaxed <ulink
+	      url="http://www.FreeBSD.org/copyright/freebsd-license.html">&os; license</ulink>
+	    whenever possible.</para>
 	</answer>
       </qandaentry>
 

From owner-svn-doc-head@FreeBSD.ORG  Sat Nov 10 20:49:19 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9EE7AFC0;
 Sat, 10 Nov 2012 20:49:19 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6930A8FC0C;
 Sat, 10 Nov 2012 20:49:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAAKnJJo005591;
 Sat, 10 Nov 2012 20:49:19 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAAKnJkh005589;
 Sat, 10 Nov 2012 20:49:19 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201211102049.qAAKnJkh005589@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Sat, 10 Nov 2012 20:49:19 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39977 - in head/nl_NL.ISO8859-1:
 books/handbook/eresources share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Nov 2012 20:49:19 -0000

Author: rene
Date: Sat Nov 10 20:49:19 2012
New Revision: 39977
URL: http://svnweb.freebsd.org/changeset/doc/39977

Log:
  MFen the Dutch Handbook:
  - eresources 39651 -> 39975
  - mailing-lists.ent 39651 -> 39975

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

Modified: head/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml	Sat Nov 10 16:43:35 2012	(r39976)
+++ head/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml	Sat Nov 10 20:49:19 2012	(r39977)
@@ -6,7 +6,7 @@
      Vertaald door: Siebrand Mazeland / Rene Ladan
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/eresources/chapter.xml
-     %SRCID%	39651
+     %SRCID%	39975
 -->
 
 <appendix id="eresources">
@@ -386,6 +386,12 @@
 	    </row>
 
 	    <row>
+	      <entry>&a.infiniband.name;</entry>
+
+	      <entry>Infiniband op &os;</entry>
+	    </row>
+
+	    <row>
 	      <entry>&a.ipfw.name;</entry>
 
 	      <entry>Technische discussie over het herontwerp van de
@@ -1453,6 +1459,17 @@
 	</varlistentry>
 
 	<varlistentry>
+	  <term>&a.infiniband.name;</term>
+
+	  <listitem>
+	    <para><emphasis>Infiniband op &os;</emphasis></para>
+
+	    <para>Technische mailinglijst over Infiniband, OFED en OpenSM op
+	      &os;.</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
 	  <term>&a.ipfw.name;</term>
 
 	  <listitem>

Modified: head/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
==============================================================================
--- head/nl_NL.ISO8859-1/share/xml/mailing-lists.ent	Sat Nov 10 16:43:35 2012	(r39976)
+++ head/nl_NL.ISO8859-1/share/xml/mailing-lists.ent	Sat Nov 10 20:49:19 2012	(r39977)
@@ -5,7 +5,7 @@
     Vertaald door: Siebrand Mazeland / Rene Ladan
 
     %SOURCE%	en_US.ISO8859-1/share/xml/mailing-lists.ent
-    %SRCID%	39651
+    %SRCID%	39975
 -->
 
 <!ENTITY a.mailman.listinfo "http://lists.FreeBSD.org/mailman/listinfo">
@@ -239,6 +239,10 @@
 <!ENTITY a.ia64 "<ulink url='&a.ia64.url;'>&os; IA64 porting mailinglijst</ulink>">
 <!ENTITY a.ia64.name "<ulink url='&a.ia64.url;'>freebsd-ia64</ulink>">
 
+<!ENTITY a.infiniband.url "&a.mailman.listinfo;/freebsd-infiniband">
+<!ENTITY a.infiniband "<ulink url='&a.infiniband.url;'>Infiniband op &os;</ulink>">
+<!ENTITY a.infiniband.name "<ulink url='&a.infiniband.url;'>freebsd-infiniband</ulink>">
+
 <!ENTITY a.ipfw.url "&a.mailman.listinfo;/freebsd-ipfw">
 <!ENTITY a.ipfw "<ulink url='&a.ipfw.url;'>&os; IPFW code mailinglijst</ulink>">
 <!ENTITY a.ipfw.name "<ulink url='&a.ipfw.url;'>freebsd-ipfw</ulink>">