From owner-svn-doc-head@freebsd.org  Sun Sep  3 02:37:01 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 88C5CE13849;
 Sun,  3 Sep 2017 02:37:01 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 63A487E359;
 Sun,  3 Sep 2017 02:37:01 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v832b0ZT034522;
 Sun, 3 Sep 2017 02:37:00 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v832b06O034520;
 Sun, 3 Sep 2017 02:37:00 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201709030237.v832b06O034520@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ryusuke set sender to
 ryusuke@FreeBSD.org using -f
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sun, 3 Sep 2017 02:37:00 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50796 - head/ja_JP.eucJP/share/xml
X-SVN-Group: doc-head
X-SVN-Commit-Author: ryusuke
X-SVN-Commit-Paths: head/ja_JP.eucJP/share/xml
X-SVN-Commit-Revision: 50796
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Sep 2017 02:37:01 -0000

Author: ryusuke
Date: Sun Sep  3 02:37:00 2017
New Revision: 50796
URL: https://svnweb.freebsd.org/changeset/doc/50796

Log:
  - Merge the following from the English version:
  
  	r50783 -> r50795	head/ja_JP.eucJP/share/xml/news.xml
  	r50727 -> r50795	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	Sat Sep  2 20:58:31 2017	(r50795)
+++ head/ja_JP.eucJP/share/xml/news.xml	Sun Sep  3 02:37:00 2017	(r50796)
@@ -23,7 +23,7 @@
 	would like to work on.  ***
 
     $FreeBSD$
-    Original revision: r50783
+    Original revision: r50795
 -->
 <news>
   <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -32,6 +32,28 @@
 
   <year>
     <name>2017</name>
+
+    <month>
+      <name>9</name>
+
+      <day>
+	<name>2</name>
+
+	<event>
+	  <title>&os;&nbsp;10.4-BETA3 公開</title>
+
+	  <p>&os;&nbsp;10.4 リリースサイクルから 3 回目の
+	    BETA ビルドが公開されました (<a
+	      href="&lists.stable;/2017-September/087748.html">アナウンス</a>)。
+	    <a
+	      href="&url.doc.base;/books/handbook/mirrors-ftp.html">&os;
+	      ミラーサイト</a> から amd64, armv6, i386,
+	    ia64, powerpc, powerpc64 および sparc64 アーキテクチャの
+	    ISO イメージを入手できます。</p>
+	</event>
+      </day>
+
+    </month>
 
     <month>
       <name>8</name>

Modified: head/ja_JP.eucJP/share/xml/release.l10n.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/release.l10n.ent	Sat Sep  2 20:58:31 2017	(r50795)
+++ head/ja_JP.eucJP/share/xml/release.l10n.ent	Sun Sep  3 02:37:00 2017	(r50796)
@@ -2,7 +2,7 @@
 
 <!--
      $FreeBSD$
-     Original revision: r50727
+     Original revision: r50795
  -->
 
 <![%beta2.testing;[
@@ -39,7 +39,7 @@
 	    </td>
 	    <td>
 	      <ul class="txtdownloadlist">
-		<!--<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>-->
+		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-GUMSTIX.img.xz">GUMSTIX</a></li>
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>

From owner-svn-doc-head@freebsd.org  Sun Sep  3 15:59:39 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D261E12229;
 Sun,  3 Sep 2017 15:59:39 +0000 (UTC)
 (envelope-from jkois@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1958E6FF29;
 Sun,  3 Sep 2017 15:59:39 +0000 (UTC)
 (envelope-from jkois@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v83FxcL1061582;
 Sun, 3 Sep 2017 15:59:38 GMT (envelope-from jkois@FreeBSD.org)
Received: (from jkois@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v83Fxcgj061580;
 Sun, 3 Sep 2017 15:59:38 GMT (envelope-from jkois@FreeBSD.org)
Message-Id: <201709031559.v83Fxcgj061580@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jkois set sender to
 jkois@FreeBSD.org using -f
From: Johann Kois <jkois@FreeBSD.org>
Date: Sun, 3 Sep 2017 15:59:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50797 - head/de_DE.ISO8859-1/share/xml
X-SVN-Group: doc-head
X-SVN-Commit-Author: jkois
X-SVN-Commit-Paths: head/de_DE.ISO8859-1/share/xml
X-SVN-Commit-Revision: 50797
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Sep 2017 15:59:39 -0000

Author: jkois
Date: Sun Sep  3 15:59:38 2017
New Revision: 50797
URL: https://svnweb.freebsd.org/changeset/doc/50797

Log:
  MFde    r50795  FreeBSD 10.4-BETA3

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

Modified: head/de_DE.ISO8859-1/share/xml/news.xml
==============================================================================
--- head/de_DE.ISO8859-1/share/xml/news.xml	Sun Sep  3 02:37:00 2017	(r50796)
+++ head/de_DE.ISO8859-1/share/xml/news.xml	Sun Sep  3 15:59:38 2017	(r50797)
@@ -4,7 +4,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r50783
+     basiert auf: r50795
 -->
 
 <!-- Simple schema for FreeBSD Project news.
@@ -37,6 +37,27 @@
 
   <year>
     <name>2017</name>
+
+    <month>
+      <name>9</name>
+
+      <day>
+	<name>2</name>
+
+	<event>
+	  <title>&os;&nbsp;10.4-BETA3 verf�gbar</title>
+
+	  <p>Die dritte BETA-Version aus dem &os;&nbsp;10.4-Releasezyklus ist
+	    <a
+	    href="&lists.stable;/2017-September/087748.html">verf�gbar</a>.
+	    ISO-Images f�r die Architekturen amd64, armv6, i386, ia64,
+	    powerpc, powerpc64 sowie sparc64 sind 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>8</name>

Modified: head/de_DE.ISO8859-1/share/xml/release.l10n.ent
==============================================================================
--- head/de_DE.ISO8859-1/share/xml/release.l10n.ent	Sun Sep  3 02:37:00 2017	(r50796)
+++ head/de_DE.ISO8859-1/share/xml/release.l10n.ent	Sun Sep  3 15:59:38 2017	(r50797)
@@ -2,7 +2,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r50727
+     basiert auf: r50795
 -->
 
 <![%beta2.testing;[
@@ -44,7 +44,7 @@
 	    </td>
 	    <td>
 	      <ul class="txtdownloadlist">
-		<!--<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>-->
+		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-GUMSTIX.img.xz">GUMSTIX</a></li>
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>

From owner-svn-doc-head@freebsd.org  Mon Sep  4 06:08:38 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2EFA1E16658;
 Mon,  4 Sep 2017 06:08:38 +0000 (UTC)
 (envelope-from rcyu@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F26A566B6C;
 Mon,  4 Sep 2017 06:08:37 +0000 (UTC)
 (envelope-from rcyu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8468baQ007677;
 Mon, 4 Sep 2017 06:08:37 GMT (envelope-from rcyu@FreeBSD.org)
Received: (from rcyu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8468bFt007675;
 Mon, 4 Sep 2017 06:08:37 GMT (envelope-from rcyu@FreeBSD.org)
Message-Id: <201709040608.v8468bFt007675@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rcyu set sender to
 rcyu@FreeBSD.org using -f
From: Ruey-Cherng Yu <rcyu@FreeBSD.org>
Date: Mon, 4 Sep 2017 06:08:37 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50798 - head/zh_TW.UTF-8/share/xml
X-SVN-Group: doc-head
X-SVN-Commit-Author: rcyu
X-SVN-Commit-Paths: head/zh_TW.UTF-8/share/xml
X-SVN-Commit-Revision: 50798
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Sep 2017 06:08:38 -0000

Author: rcyu
Date: Mon Sep  4 06:08:36 2017
New Revision: 50798
URL: https://svnweb.freebsd.org/changeset/doc/50798

Log:
  Traditional Chinese translation of the news items ( Aug 25th, Sep 2nd)

Modified:
  head/zh_TW.UTF-8/share/xml/news.xml

Modified: head/zh_TW.UTF-8/share/xml/news.xml
==============================================================================
--- head/zh_TW.UTF-8/share/xml/news.xml	Sun Sep  3 15:59:38 2017	(r50797)
+++ head/zh_TW.UTF-8/share/xml/news.xml	Mon Sep  4 06:08:36 2017	(r50798)
@@ -33,6 +33,28 @@
     <name>2017</name>
 
     <month>
+      <name>9</name>
+
+      <day>
+	<name>2</name>
+
+	<event>
+	  <title>&os;&nbsp;10.4-BETA3 ��寂��篋�</title>
+
+	  <p> &os;&nbsp;10.4���膃�筝���� BETA �������憜群��寂�����
+	    ������amd64���armv6���
+	    i386���aarch64���powerpc���powerpc64���sparc64
+	    ���ISO �����閡�罅�綏牙��<a
+	      href="&lists.stable;/2017-September/087748.html">��寂��</a>
+	    鐚����篁ュ��紊���悟��<a
+	      href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+	      ��≦�霱�</a>���緇����</p>
+	</event>
+      </day>
+
+    </month>
+
+    <month>
       <name>8</name>
 
       <day>
@@ -50,6 +72,16 @@
 	      href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
 	      ��≦�霱�</a>���緇����</p>
 	</event>
+      </day>
+
+      <day>
+        <name>25</name>
+
+        <event>
+	  <p>��遺算 committer:
+            <a href="mailto:pizzamig@FreeBSD.org">Luca Pizzamiglio</a>
+            (ports)</p>
+        </event>
       </day>
 
       <day>

From owner-svn-doc-head@freebsd.org  Mon Sep  4 09:29:52 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8951FE1E674;
 Mon,  4 Sep 2017 09:29:52 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 633416C94C;
 Mon,  4 Sep 2017 09:29:52 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v849Tpab088104;
 Mon, 4 Sep 2017 09:29:51 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v849TpCr088103;
 Mon, 4 Sep 2017 09:29:51 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201709040929.v849TpCr088103@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ryusuke set sender to
 ryusuke@FreeBSD.org using -f
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Mon, 4 Sep 2017 09:29:51 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50799 - head/ja_JP.eucJP/htdocs/internal
X-SVN-Group: doc-head
X-SVN-Commit-Author: ryusuke
X-SVN-Commit-Paths: head/ja_JP.eucJP/htdocs/internal
X-SVN-Commit-Revision: 50799
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Sep 2017 09:29:52 -0000

Author: ryusuke
Date: Mon Sep  4 09:29:51 2017
New Revision: 50799
URL: https://svnweb.freebsd.org/changeset/doc/50799

Log:
  - Merge the following from the English version:
  
  	r49038 -> r50719	head/ja_JP.eucJP/htdocs/internal/developer.xml

Modified:
  head/ja_JP.eucJP/htdocs/internal/developer.xml

Modified: head/ja_JP.eucJP/htdocs/internal/developer.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/internal/developer.xml	Mon Sep  4 06:08:36 2017	(r50798)
+++ head/ja_JP.eucJP/htdocs/internal/developer.xml	Mon Sep  4 09:29:51 2017	(r50799)
@@ -4,74 +4,79 @@
 <!ENTITY title "FreeBSD コミッターのためのリソース">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r49038 -->
+<!-- Original revision: r50719 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-      <title>&title;</title>
+  <head>
+    <title>&title;</title>
 
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
+  </head>
 
     <body class="navinclude.docs">
 
-<h2><a href="&enbase;/doc/en_US.ISO8859-1/articles/committers-guide/">コミッターのためのガイド</a></h2>
+    <h2><a
+	href="&enbase;/doc/en_US.ISO8859-1/articles/committers-guide/">コミッターのためのガイド</a></h2>
 
-<p>すべての新規コミッターを対象とした、技術的な詳細とポリシーの詳細を含む包括的な文書です。
-前者については、
-<a href="&enbase;/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html">
-Subversion VCS</a>,
-<a href="&enbase;/doc/en_US.ISO8859-1/articles/committers-guide/bugzilla.html">
-Bugzilla</a> バグ追跡システム、および
-<a href="&enbase;/doc/en_US.ISO8859-1/articles/committers-guide/ssh.guide.html">
-SSH Quick-Start Guide</a> 章をご覧ください。</p>
+    <p>すべての新規コミッターを対象とした、
+      技術的な詳細とポリシーの詳細を含む包括的な文書です。
+      前者については、<a
+	href="&enbase;/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html">
+	Subversion VCS</a>, <a
+	href="&enbase;/doc/en_US.ISO8859-1/articles/committers-guide/bugzilla.html">
+	Bugzilla</a> バグ追跡システム、および <a
+	href="&enbase;/doc/en_US.ISO8859-1/articles/committers-guide/ssh.guide.html">
+	SSH Quick-Start Guide</a> 章をご覧ください。</p>
 
-<p>新しいコミッターが知るべきほとんどすべてのことが記述されています。
-より多くのことを知るために、新しい貢献者のための FreeBSD ドキュメンテーションプロジェクト入門や
-Ports ガイドも参照してください。</p>
+    <p>新しいコミッターが知るべきほとんどすべてのことが記述されています。
+      より多くのことを知るために、新しい貢献者のための &os;
+      ドキュメンテーションプロジェクト入門や Ports ガイドも参照してください。</p>
 
-<h2><a href="&enbase;/doc/en_US.ISO8859-1/books/fdp-primer/">新しい貢献者のための FreeBSD ドキュメンテーションプロジェクト入門</a></h2>
+    <h2><a
+	href="&enbase;/doc/en_US.ISO8859-1/books/fdp-primer/">新しい貢献者のための
+	&os; ドキュメンテーションプロジェクト入門</a></h2>
 
-<p>この入門書には、FreeBSD
-ドキュメンテーションプロジェクトへの貢献を始めるために知っておくべきすべてのことが書いてあります。
-あなたが使うであろう (必須や推奨される) ツールやソフトウェアから、
-ドキュメンテーションプロジェクトの背後にある哲学まで記述しています。
-</p>
+    <p>この入門書には、&os;
+      ドキュメンテーションプロジェクトへの貢献を始めるために知っておくべきすべてのことが書いてあります。
+      あなたが使うであろう (必須や推奨される) ツールやソフトウェアから、
+      ドキュメンテーションプロジェクトの背後にある哲学まで記述しています。</p>
 
-<h2><a href="&enbase;/doc/en_US.ISO8859-1/books/porters-handbook/index.html">port 作成者のためのハンドブック</a></h2>
+    <h2><a
+	href="&enbase;/doc/en_US.ISO8859-1/books/porters-handbook/index.html">port 作成者のためのハンドブック</a></h2>
 
-<p>FreeBSD ports 作成者のためのガイド。公式的な
-<a href="&enbase;/doc/en_US.ISO8859-1/books/porters-handbook/versions.html">
-__FreeBSD_version の値のテーブル</a> があります。</p>
+    <p>&os; ports 作成者のためのガイド。公式的な <a
+	href="&enbase;/doc/en_US.ISO8859-1/books/porters-handbook/versions.html">__FreeBSD_version の値のテーブル</a> があります。</p>
 
-<h2><a href="&enbase;/doc/en_US.ISO8859-1/books/fdp-primer/the-website-build.html">
-FreeBSD Web ページの構築方法</a></h2>
+    <h2><a
+	href="&enbase;/doc/en_US.ISO8859-1/books/fdp-primer/the-website-build.html">
+	&os; Web ページの構築方法</a></h2>
 
-<p>この文書は、FreeBSD Web ページを手動で SVN
-リポジトリから構築して更新する方法を解説しています。</p>
+    <p>この文書は、&os; Web ページを手動で SVN
+      リポジトリから構築して更新する方法を解説しています。</p>
 
-<h2>FreeBSD のプロジェクト</h2>
-<ul>
-  <li><a href="&base;/docproj/docproj.html">FreeBSD
-    ドキュメンテーションプロジェクト</a></li>
-  <li><a href="&enbase;/releng/index.html">FreeBSD
-    リリースエンジニアリング</a></li>
-  <li><a href="&base;/platforms/index.html">FreeBSD
-    ハードウェアプラットフォームプロジェクト</a></li>
-  <li><a href="&base;/projects/index.html">FreeBSD 開発プロジェクト</a></li>
-</ul>
+    <h2>&os; のプロジェクト</h2>
+      <ul>
+	<li><a href="&base;/docproj/docproj.html">&os;
+	  ドキュメンテーションプロジェクト</a></li>
+	<li><a href="&enbase;/releng/index.html">&os;
+	  リリースエンジニアリング</a></li>
+	<li><a href="&base;/platforms/index.html">&os;
+	  ハードウェアプラットフォームプロジェクト</a></li>
+	<li><a href="&base;/projects/index.html">&os; 開発プロジェクト</a></li>
+    </ul>
 
-<h2>その他のリソース</h2>
-<ul>
-  <li><a href="&base;/developers/cvs.html">ソースコードリポジトリ</a></li>
-  <li><a href="&base;/support.html">バグ報告</a></li>
-  <li><a href="&base;/security/index.html">FreeBSD のセキュリティ情報</a></li>
-  <li><a href="&base;/copyright/copyright.html">著作権</a></li>
-  <li><a href="http://wiki.FreeBSD.org">FreeBSD Wiki</a></li>
-  <li><a href="http://perforce.FreeBSD.org">開発中のプロジェクトの Perforce リポジトリ</a></li>
-</ul>
+    <h2>その他のリソース</h2>
+    <ul>
+      <li><a href="&base;/developers/cvs.html">ソースコードリポジトリ</a></li>
+      <li><a href="&base;/support.html">バグ報告</a></li>
+      <li><a href="&base;/security/index.html">&os; のセキュリティ情報</a></li>
+      <li><a href="&base;/copyright/copyright.html">著作権</a></li>
+      <li><a href="http://wiki.FreeBSD.org">&os; Wiki</a></li>
+      <li><a href="http://perforce.FreeBSD.org">開発中のプロジェクトの
+	  Perforce リポジトリ</a></li>
+    </ul>
 
-<p><a href="internal.html">FreeBSD Internal ホーム</a></p>
+    <p><a href="internal.html">&os; Internal ホーム</a></p>
 
   </body>
 </html>

From owner-svn-doc-head@freebsd.org  Mon Sep  4 12:10:25 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3B08E03CE8;
 Mon,  4 Sep 2017 12:10:24 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C0833714B2;
 Mon,  4 Sep 2017 12:10:24 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v84CANfk052786;
 Mon, 4 Sep 2017 12:10:23 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v84CANaj052785;
 Mon, 4 Sep 2017 12:10:23 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201709041210.v84CANaj052785@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 4 Sep 2017 12:10:23 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50800 -
 head/en_US.ISO8859-1/books/porters-handbook/slow-porting
X-SVN-Group: doc-head
X-SVN-Commit-Author: mat
X-SVN-Commit-Paths: head/en_US.ISO8859-1/books/porters-handbook/slow-porting
X-SVN-Commit-Revision: 50800
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Sep 2017 12:10:25 -0000

Author: mat
Date: Mon Sep  4 12:10:23 2017
New Revision: 50800
URL: https://svnweb.freebsd.org/changeset/doc/50800

Log:
  Add a section about conditional patching with EXTRA_PATCHES.
  
  Reviewed by:	wblock
  Sponsored by:	Absolight
  Differential Revision:	https://reviews.freebsd.org/D12165

Modified:
  head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml

Modified: head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml	Mon Sep  4 09:29:51 2017	(r50799)
+++ head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml	Mon Sep  4 12:10:23 2017	(r50800)
@@ -450,6 +450,50 @@ DOS2UNIX_GLOB=	*.c *.cpp *.h</programlisting>
       <programlisting>USES=	dos2unix
 DOS2UNIX_WRKSRC=	${WRKDIR}</programlisting>
     </sect2>
+
+    <sect2 xml:id="slow-patch-extra">
+      <title>Patching Conditionally</title>
+
+      <para>Some ports need patches that are only applied for specific
+	&os; versions or when a particular option is enabled or
+	disabled.  Conditional patches are specified by placing the
+	full paths to the patch files in
+	<varname>EXTRA_PATCHES</varname>.</para>
+
+      <example xml:id="slow-patch-extra-ex1">
+	<title>Applying a Patch for a Specific &os; Version</title>
+
+	<programlisting>.include &lt;bsd.port.options.mk&gt;
+
+# Patch in the iconv const qualifier before this
+.if ${OPSYS} == FreeBSD &amp;&amp; ${OSVERSION} &lt; 1100069
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-fbsd10
+.endif
+
+.include &lt;bsd.port.mk&gt;</programlisting>
+
+      </example>
+
+      <example xml:id="slow-patch-extra-ex2">
+	<title>Optionaly Applying a Patch</title>
+
+	<para>When an <link linkend="makefile-options">option</link>
+	  requires a patch, use
+	  <varname><replaceable>opt</replaceable>_EXTRA_PATCHES</varname>
+	  and
+	  <varname><replaceable>opt</replaceable>_EXTRA_PATCHES_OFF</varname>
+	  to make the patch conditional on the
+	  <literal><replaceable>opt</replaceable></literal> option.
+	  See <xref linkend="options-variables"/> for more
+	  information.</para>
+
+	<programlisting>OPTIONS_DEFINE=	  FOO BAR
+FOO_EXTRA_PATCHES=  ${PATCHDIR}/extra-patch-foo
+BAR_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-bar.c \
+		${PATCHDIR}/extra-patch-bar.h</programlisting>
+      </example>
+
+    </sect2>
   </sect1>
 
   <sect1 xml:id="slow-configure">

From owner-svn-doc-head@freebsd.org  Mon Sep  4 14:50:51 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 304C4E0B501;
 Mon,  4 Sep 2017 14:50:51 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F3433765A2;
 Mon,  4 Sep 2017 14:50:50 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v84EooGx017680;
 Mon, 4 Sep 2017 14:50:50 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v84Eoon1017679;
 Mon, 4 Sep 2017 14:50:50 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201709041450.v84Eoon1017679@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 4 Sep 2017 14:50:50 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50801 -
 head/en_US.ISO8859-1/books/porters-handbook/slow-porting
X-SVN-Group: doc-head
X-SVN-Commit-Author: mat
X-SVN-Commit-Paths: head/en_US.ISO8859-1/books/porters-handbook/slow-porting
X-SVN-Commit-Revision: 50801
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Sep 2017 14:50:51 -0000

Author: mat
Date: Mon Sep  4 14:50:49 2017
New Revision: 50801
URL: https://svnweb.freebsd.org/changeset/doc/50801

Log:
  Remove superflous empty line.
  
  Sponsored by:	Absolight

Modified:
  head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml

Modified: head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml	Mon Sep  4 12:10:23 2017	(r50800)
+++ head/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml	Mon Sep  4 14:50:49 2017	(r50801)
@@ -471,7 +471,6 @@ EXTRA_PATCHES=	${PATCHDIR}/extra-patch-fbsd10
 .endif
 
 .include &lt;bsd.port.mk&gt;</programlisting>
-
       </example>
 
       <example xml:id="slow-patch-extra-ex2">

From owner-svn-doc-head@freebsd.org  Wed Sep  6 00:44:20 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F590E04FB2;
 Wed,  6 Sep 2017 00:44:20 +0000 (UTC)
 (envelope-from shurd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3730C77570;
 Wed,  6 Sep 2017 00:44:20 +0000 (UTC)
 (envelope-from shurd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v860iJac051953;
 Wed, 6 Sep 2017 00:44:19 GMT (envelope-from shurd@FreeBSD.org)
Received: (from shurd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v860iJ7f051952;
 Wed, 6 Sep 2017 00:44:19 GMT (envelope-from shurd@FreeBSD.org)
Message-Id: <201709060044.v860iJ7f051952@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: shurd set sender to
 shurd@FreeBSD.org using -f
From: Stephen Hurd <shurd@FreeBSD.org>
Date: Wed, 6 Sep 2017 00:44:19 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50802 - head/share/xml
X-SVN-Group: doc-head
X-SVN-Commit-Author: shurd
X-SVN-Commit-Paths: head/share/xml
X-SVN-Commit-Revision: 50802
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Sep 2017 00:44:20 -0000

Author: shurd (src,ports committer)
Date: Wed Sep  6 00:44:19 2017
New Revision: 50802
URL: https://svnweb.freebsd.org/changeset/doc/50802

Log:
  Announce my shiny new src bit
  
  Approved by:	sbruno (mentor)
  Differential Revision:	https://reviews.freebsd.org/D12225

Modified:
  head/share/xml/news.xml

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Mon Sep  4 14:50:49 2017	(r50801)
+++ head/share/xml/news.xml	Wed Sep  6 00:44:19 2017	(r50802)
@@ -35,6 +35,16 @@
       <name>9</name>
 
       <day>
+        <name>2</name>
+
+        <event>
+          <p>New committer:
+            <a href="mailto:shurd@FreeBSD.org">Stephen Hurd</a>
+            (src)</p>
+        </event>
+      </day>
+
+      <day>
 	<name>2</name>
 
 	<event>

From owner-svn-doc-head@freebsd.org  Wed Sep  6 14:07:39 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 89226E04895;
 Wed,  6 Sep 2017 14:07:39 +0000 (UTC)
 (envelope-from shurd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 355A0642FF;
 Wed,  6 Sep 2017 14:07:39 +0000 (UTC)
 (envelope-from shurd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v86E7cYf079382;
 Wed, 6 Sep 2017 14:07:38 GMT (envelope-from shurd@FreeBSD.org)
Received: (from shurd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v86E7cLO079381;
 Wed, 6 Sep 2017 14:07:38 GMT (envelope-from shurd@FreeBSD.org)
Message-Id: <201709061407.v86E7cLO079381@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: shurd set sender to
 shurd@FreeBSD.org using -f
From: Stephen Hurd <shurd@FreeBSD.org>
Date: Wed, 6 Sep 2017 14:07:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50803 - head/share/xml
X-SVN-Group: doc-head
X-SVN-Commit-Author: shurd
X-SVN-Commit-Paths: head/share/xml
X-SVN-Commit-Revision: 50803
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Sep 2017 14:07:39 -0000

Author: shurd (src,ports committer)
Date: Wed Sep  6 14:07:38 2017
New Revision: 50803
URL: https://svnweb.freebsd.org/changeset/doc/50803

Log:
  Fix incorrect separate day tag for each event in the same day
  
  Approved by:	sbruno (mentor, implied)
  Differential Revision:	https://reviews.freebsd.org/D12242

Modified:
  head/share/xml/news.xml

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Wed Sep  6 00:44:19 2017	(r50802)
+++ head/share/xml/news.xml	Wed Sep  6 14:07:38 2017	(r50803)
@@ -35,17 +35,13 @@
       <name>9</name>
 
       <day>
-        <name>2</name>
+	<name>2</name>
 
         <event>
           <p>New committer:
             <a href="mailto:shurd@FreeBSD.org">Stephen Hurd</a>
             (src)</p>
         </event>
-      </day>
-
-      <day>
-	<name>2</name>
 
 	<event>
 	  <title>&os;&nbsp;10.4-BETA3 Available</title>

From owner-svn-doc-head@freebsd.org  Thu Sep  7 11:21:09 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 595F1E18B0F;
 Thu,  7 Sep 2017 11:21:09 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D146674977;
 Thu,  7 Sep 2017 11:21:08 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v87BL7hv000174;
 Thu, 7 Sep 2017 11:21:07 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v87BL79a000171;
 Thu, 7 Sep 2017 11:21:07 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201709071121.v87BL79a000171@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Thu, 7 Sep 2017 11:21:07 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50804 - in head/en_US.ISO8859-1:
 articles/committers-guide articles/vinum books/porters-handbook/upgrading
X-SVN-Group: doc-head
X-SVN-Commit-Author: mat
X-SVN-Commit-Paths: in head/en_US.ISO8859-1: articles/committers-guide
 articles/vinum books/porters-handbook/upgrading
X-SVN-Commit-Revision: 50804
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Sep 2017 11:21:09 -0000

Author: mat
Date: Thu Sep  7 11:21:07 2017
New Revision: 50804
URL: https://svnweb.freebsd.org/changeset/doc/50804

Log:
  Fix up formatting issues in <screen> entries.
  
  PR:		222006 (for the committer's guide)
  Submitted by:	Paul Townsend
  Sponsored by:	Absolight

Modified:
  head/en_US.ISO8859-1/articles/committers-guide/article.xml
  head/en_US.ISO8859-1/articles/vinum/article.xml
  head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Wed Sep  6 14:07:38 2017	(r50803)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Thu Sep  7 11:21:07 2017	(r50804)
@@ -4100,12 +4100,12 @@ Relnotes:           yes</programlisting>
 	      sequence:</para>
 
 	    <screen>&prompt.root; <userinput>make install</userinput>
-	      &prompt.root; <userinput>make package</userinput>
-	      &prompt.root; <userinput>make deinstall</userinput>
-	      &prompt.root; <userinput>pkg add <replaceable>package you built above</replaceable></userinput>
-	      &prompt.root; <userinput>make deinstall</userinput>
-	      &prompt.root; <userinput>make reinstall</userinput>
-	      &prompt.root; <userinput>make package</userinput></screen>
+&prompt.root; <userinput>make package</userinput>
+&prompt.root; <userinput>make deinstall</userinput>
+&prompt.root; <userinput>pkg add <replaceable>package you built above</replaceable></userinput>
+&prompt.root; <userinput>make deinstall</userinput>
+&prompt.root; <userinput>make reinstall</userinput>
+&prompt.root; <userinput>make package</userinput></screen>
 
 	    <para>The <link
 		xlink:href="&url.books.porters-handbook;/index.html">Porters

Modified: head/en_US.ISO8859-1/articles/vinum/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/vinum/article.xml	Wed Sep  6 14:07:38 2017	(r50803)
+++ head/en_US.ISO8859-1/articles/vinum/article.xml	Thu Sep  7 11:21:07 2017	(r50804)
@@ -514,20 +514,20 @@
 	following output:</para>
 
       <programlisting width="97">
-      &prompt.root; gvinum -&gt; <userinput>create config1</userinput>
-      Configuration summary
-      Drives:         1 (4 configured)
-      Volumes:        1 (4 configured)
-      Plexes:         1 (8 configured)
-      Subdisks:       1 (16 configured)
+&prompt.root; gvinum -&gt; <userinput>create config1</userinput>
+Configuration summary
+Drives:         1 (4 configured)
+Volumes:        1 (4 configured)
+Plexes:         1 (8 configured)
+Subdisks:       1 (16 configured)
 
-	D a                     State: up       Device /dev/da3h      Avail: 2061/2573 MB (80%)
+  D a                     State: up       Device /dev/da3h      Avail: 2061/2573 MB (80%)
 
-	V myvol                 State: up       Plexes:       1 Size:      512 MB
+  V myvol                 State: up       Plexes:       1 Size:      512 MB
 
-	P myvol.p0            C State: up       Subdisks:     1 Size:      512 MB
+  P myvol.p0            C State: up       Subdisks:     1 Size:      512 MB
 
-	S myvol.p0.s0           State: up       PO:        0  B Size:      512 MB</programlisting>
+  S myvol.p0.s0           State: up       PO:        0  B Size:      512 MB</programlisting>
 
       <para>This output shows the brief listing format of
 	&man.gvinum.8;.  It is represented graphically in <xref

Modified: head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml	Wed Sep  6 14:07:38 2017	(r50803)
+++ head/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml	Thu Sep  7 11:21:07 2017	(r50804)
@@ -381,7 +381,7 @@
 
 	<informalexample>
 	  <screen>&prompt.user; <userinput>cd <replaceable>/home/user/ports</replaceable></userinput>
-  &prompt.user; <userinput>env PORTSDIR=$PWD Tools/scripts/MOVEDlint.awk</userinput></screen>
+&prompt.user; <userinput>env PORTSDIR=$PWD Tools/scripts/MOVEDlint.awk</userinput></screen>
 	</informalexample>
       </note>
     </sect2>

From owner-svn-doc-head@freebsd.org  Thu Sep  7 11:56:19 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 030CFE1A3EA;
 Thu,  7 Sep 2017 11:56:19 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6F95280361;
 Thu,  7 Sep 2017 11:56:18 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v87BuHmj016079;
 Thu, 7 Sep 2017 11:56:17 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v87BuHFI016072;
 Thu, 7 Sep 2017 11:56:17 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201709071156.v87BuHFI016072@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Thu, 7 Sep 2017 11:56:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50805 - in head/en_US.ISO8859-1: articles/fonts
 articles/freebsd-update-server articles/hubs books/developers-handbook/ipv6
 books/developers-handbook/tools books/handbook/network-serve...
X-SVN-Group: doc-head
X-SVN-Commit-Author: mat
X-SVN-Commit-Paths: in head/en_US.ISO8859-1: articles/fonts
 articles/freebsd-update-server articles/hubs books/developers-handbook/ipv6
 books/developers-handbook/tools books/handbook/network-servers
 books/handbook/virtua...
X-SVN-Commit-Revision: 50805
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Sep 2017 11:56:19 -0000

Author: mat
Date: Thu Sep  7 11:56:16 2017
New Revision: 50805
URL: https://svnweb.freebsd.org/changeset/doc/50805

Log:
  Fix some extra spacing in screen entries.
  
  While there, replace some with programlisting when more suited.
  
  Sponsored by:	Absolight

Modified:
  head/en_US.ISO8859-1/articles/fonts/article.xml
  head/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
  head/en_US.ISO8859-1/articles/hubs/article.xml
  head/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
  head/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
  head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
  head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml

Modified: head/en_US.ISO8859-1/articles/fonts/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/fonts/article.xml	Thu Sep  7 11:21:07 2017	(r50804)
+++ head/en_US.ISO8859-1/articles/fonts/article.xml	Thu Sep  7 11:56:16 2017	(r50805)
@@ -307,7 +307,7 @@
       look like:</para>
 
     <informalexample>
-      <screen>-bitstream-charter-medium-r-normal-xxx-0-0-0-0-p-0-iso8859-1
+      <programlisting>-bitstream-charter-medium-r-normal-xxx-0-0-0-0-p-0-iso8859-1
      |        |      |    |   |     |  | | | | | |    \    \
      |        |      |    |   |     \  \ \ \ \ \ \     +----+- character set
      |        |      |    |   \      \  \ \ \ \ \ +- average width
@@ -317,7 +317,7 @@
      |        |      |      \	  \	 \  \ +- points
      |        |      |       \     \	  \  +- pixels
      |        |      |        \     \	   \
-  foundry  family  weight   slant  width  additional style</screen>
+  foundry  family  weight   slant  width  additional style</programlisting>
     </informalexample>
 
     <para>A new name needs to be created for each new font.  If you
@@ -438,8 +438,7 @@ end readonly def
       simply using
 
       <informalexample>
-	<screen>&hellip;-normal-r-normal-&hellip;-p-&hellip;
-	</screen>
+	<screen>&hellip;-normal-r-normal-&hellip;-p-&hellip;</screen>
       </informalexample>
 
       as the name, and then use
@@ -725,8 +724,7 @@ EOF</userinput>
 	  <para>In the work area, you will need to make the utility.
 	    Just type:</para>
 
-	  <screen><prompt>#</prompt> <userinput>make -f Makefile.sub afmtodit</userinput>
-	  </screen>
+	  <screen><prompt>#</prompt> <userinput>make -f Makefile.sub afmtodit</userinput></screen>
 
 	  <para>You may also need to copy
 	    <filename>/usr/contrib/groff/devps/generate/textmap</filename>
@@ -745,8 +743,7 @@ EOF</userinput>
 	<para>Create the <filename>.afm</filename> file by
 	  typing:</para>
 
-	<screen><prompt>%</prompt> <userinput>gs -dNODISPLAY -q -- ttf2pf.ps <replaceable>TTF_name</replaceable> <replaceable>PS_font_name</replaceable> <replaceable>AFM_name</replaceable></userinput>
-	</screen>
+	<screen><prompt>%</prompt> <userinput>gs -dNODISPLAY -q -- ttf2pf.ps <replaceable>TTF_name</replaceable> <replaceable>PS_font_name</replaceable> <replaceable>AFM_name</replaceable></userinput></screen>
 
 	<para>Where, <replaceable>TTF_name</replaceable> is your
 	  TrueType font file, <replaceable>PS_font_name</replaceable>
@@ -770,8 +767,7 @@ EOF</userinput>
 Aladdin Ghostscript 5.10 (1997-11-23)
 Copyright (C) 1997 Aladdin Enterprises, Menlo Park, CA.  All rights reserved.
 This software comes with NO WARRANTY: see the file PUBLIC for details.
-Converting 3of9.ttf to 3of9.pfa and 3of9.afm.
-	</screen>
+Converting 3of9.ttf to 3of9.pfa and 3of9.afm.</screen>
 
 	<para>If you want the converted fonts to be stored in
 	  <filename>A.pfa</filename> and <filename>B.afm</filename>,
@@ -781,8 +777,7 @@ Converting 3of9.ttf to 3of9.pfa and 3of9.afm.
 Aladdin Ghostscript 5.10 (1997-11-23)
 Copyright (C) 1997 Aladdin Enterprises, Menlo Park, CA.  All rights reserved.
 This software comes with NO WARRANTY: see the file PUBLIC for details.
-Converting 3of9.ttf to A.pfa and B.afm.
-	</screen>
+Converting 3of9.ttf to A.pfa and B.afm.</screen>
       </listitem>
 
       <listitem>
@@ -798,9 +793,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
 	  <filename>generate/textmap</filename> as being in this
 	  directory.)</para>
 
-	<screen><prompt>%</prompt> <userinput>afmtodit -d DESC -e text.enc file.afm \
-	    generate/textmap <replaceable>PS_font_name</replaceable></userinput>
-	</screen>
+	<screen><prompt>%</prompt> <userinput>afmtodit -d DESC -e text.enc file.afm generate/textmap <replaceable>PS_font_name</replaceable></userinput></screen>
 
 	<para>Where, <filename>file.afm</filename> is the
 	  <replaceable>AFM_name</replaceable> created by
@@ -812,10 +805,8 @@ Converting 3of9.ttf to A.pfa and B.afm.
 	  <command>tiff2pf.ps</command> command above, then the 3of9
 	  Barcode font can be created using the command:</para>
 
-	<screen><prompt>%</prompt> <userinput>afmtodit -d DESC -e text.enc 3of9.afm \
-                 generate/textmap 3of9</userinput>
-	</screen>
-
+	<screen><prompt>%</prompt> <userinput>afmtodit -d DESC -e text.enc 3of9.afm generate/textmap 3of9</userinput></screen>
+ 
 	<para>Ensure that the resulting
 	  <replaceable>PS_font_name</replaceable> file (e.g.,
 	  <filename>3of9</filename> in the example above) is located

Modified: head/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/freebsd-update-server/article.xml	Thu Sep  7 11:21:07 2017	(r50804)
+++ head/en_US.ISO8859-1/articles/freebsd-update-server/article.xml	Thu Sep  7 11:56:16 2017	(r50805)
@@ -785,15 +785,15 @@ the new builds.</screen>
 	  release and architecture and you are ready to build off your
 	  custom release.</para>
 
-	<screen># Compare ${WORKDIR}/release and ${WORKDIR}/$1, identify which parts
-	# of the world|doc subcomponent are missing from the latter, and
-	# build a tarball out of them.
-	findextradocs () {
-	}
+	<programlisting># Compare ${WORKDIR}/release and ${WORKDIR}/$1, identify which parts
+# of the world|doc subcomponent are missing from the latter, and
+# build a tarball out of them.
+findextradocs () {
+}
 
-	# Add extra docs to ${WORKDIR}/$1
-	addextradocs () {
-	}</screen>
+# Add extra docs to ${WORKDIR}/$1
+addextradocs () { 
+}</programlisting>
       </listitem>
       <listitem>
 	<para>Adding <option>-j
@@ -806,7 +806,7 @@ the new builds.</screen>
 	  recommended, as it may cause the build to become
 	  unreliable.</para>
 
-	<screen>               # Build the world
+	<programlisting>              # Build the world
 		   log "Building world"
 		   cd /usr/src &amp;&amp;
 		   make -j 2 ${COMPATFLAGS} buildworld 2&gt;&amp;1
@@ -815,7 +815,7 @@ the new builds.</screen>
 		   log "Distributing world"
 		   cd /usr/src/release &amp;&amp;
 		   make -j 2 obj &amp;&amp;
-		   make ${COMPATFLAGS} release.1 release.2 2&gt;&amp;1</screen>
+		   make ${COMPATFLAGS} release.1 release.2 2&gt;&amp;1</programlisting>
       </listitem>
 
       <listitem>
@@ -826,9 +826,9 @@ the new builds.</screen>
 	  update mirrors, however this tip is not necessary unless you
 	  wish to provide a redundant service.</para>
 
-	<screen> _http._tcp.update.myserver.com.                  IN SRV   0 2 80   host1.myserver.com.
-							     SRV   0 1 80   host2.myserver.com.
-							     SRV   0 0 80   host3.myserver.com.</screen>
+	<programlisting>_http._tcp.update.myserver.com.		IN SRV   0 2 80   host1.myserver.com.
+					IN SRV   0 1 80   host2.myserver.com.
+					IN SRV   0 0 80   host3.myserver.com.</programlisting>
       </listitem>
     </itemizedlist>
   </sect1>

Modified: head/en_US.ISO8859-1/articles/hubs/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/hubs/article.xml	Thu Sep  7 11:21:07 2017	(r50804)
+++ head/en_US.ISO8859-1/articles/hubs/article.xml	Thu Sep  7 11:56:16 2017	(r50805)
@@ -305,8 +305,7 @@
             </para>
           </note>
           <para>A command line to mirror FreeBSD might look like:</para>
-          <screen>&prompt.user; <userinput>rsync -vaHz --delete rsync://ftp4.de.FreeBSD.org/FreeBSD/ /pub/FreeBSD/</userinput>
-          </screen>
+          <screen>&prompt.user; <userinput>rsync -vaHz --delete rsync://ftp4.de.FreeBSD.org/FreeBSD/ /pub/FreeBSD/</userinput></screen>
           <para>Consult the documentation for <application>rsync</application>,
           which is also available at
           <link xlink:href="http://rsync.samba.org/">http://rsync.samba.org/</link>,
@@ -325,8 +324,7 @@
 	The FreeBSD website should only be mirrored via
 	<application>rsync</application>.</para>
       <para>A command line to mirror the FreeBSD web site might look like:</para>
-      <screen>&prompt.user; <userinput>rsync -vaHz --delete rsync://bit0.us-west.freebsd.org/FreeBSD-www-data/ /usr/local/www/</userinput>
-      </screen>
+      <screen>&prompt.user; <userinput>rsync -vaHz --delete rsync://bit0.us-west.freebsd.org/FreeBSD-www-data/ /usr/local/www/</userinput></screen>
    </sect2>
    <sect2 xml:id="mirror-pkgs">
      <title>Mirroring Packages</title>

Modified: head/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml	Thu Sep  7 11:21:07 2017	(r50804)
+++ head/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml	Thu Sep  7 11:56:16 2017	(r50805)
@@ -382,8 +382,7 @@
 	example, you may see something like:
 	</para>
 
-	<screen>	fe80:1::200:f8ff:fe01:6317
-	</screen>
+	<screen>	fe80:1::200:f8ff:fe01:6317</screen>
 
 	<para>in the routing table and interface address structure (struct
 	in6_ifaddr).  The address above is a link-local unicast address
@@ -831,8 +830,7 @@ fe80:2::%ep0/64               link#2                  
                         lo0 = 8
 			cce0 = 10
                 3282 one ext mbuf
-                0 two or more ext mbuf
-	</screen>
+                0 two or more ext mbuf</screen>
 
 	<para>Each input function calls IP6_EXTHDR_CHECK in the beginning to
 	check if the region between IP6 and its header is continuous.
@@ -875,8 +873,7 @@ fe80:2::%ep0/64               link#2                  
                 socket gets IPv4 conn.)
                 ---                     ---
 FreeBSD 4.x     configurable            supported
-                default: enabled
-	</screen>
+                default: enabled</screen>
 
 	<para>The following sections will give you more details, and how you can
 	configure the behavior.</para>
@@ -921,11 +918,10 @@ FreeBSD 4.x     configurable            supported
 	<para>To resolve this issue more easily, there is system dependent
 	&man.setsockopt.2; option, IPV6_BINDV6ONLY, used like below.</para>
 
-	<screen>	int on;
+	<programlisting>	int on;
 
 	setsockopt(s, IPPROTO_IPV6, IPV6_BINDV6ONLY,
-		   (char *)&amp;on, sizeof (on)) &lt; 0));
-	</screen>
+		   (char *)&amp;on, sizeof (on)) &lt; 0));</programlisting>
 
 	<para>When this call succeed, then this socket only receive IPv6
 	packets.</para>
@@ -1015,11 +1011,10 @@ FreeBSD 4.x     configurable            supported
 	    wildcard bind (enabled by default).  You can disable it on
 	    each socket basis with &man.setsockopt.2; like below.</para>
 
-	<screen>	int on;
+	<programlisting>	int on;
 
 	setsockopt(s, IPPROTO_IPV6, IPV6_BINDV6ONLY,
-		   (char *)&amp;on, sizeof (on)) &lt; 0));
-	</screen>
+		   (char *)&amp;on, sizeof (on)) &lt; 0));</programlisting>
 
 	    <para>Wildcard AF_INET6 socket grabs IPv4 connection if and only
 	    if the following conditions are satisfied:</para>
@@ -1062,21 +1057,19 @@ FreeBSD 4.x     configurable            supported
 	<para>As a result, RFC2553 defines struct sockaddr_storage as
 	follows:</para>
 
-	<screen>	struct sockaddr_storage {
+	<programlisting>	struct sockaddr_storage {
 		u_char	__ss_len;	/* address length */
 		u_char	__ss_family;	/* address family */
 		/* and bunch of padding */
-	};
-	</screen>
+	};</programlisting>
 
 	<para>On the contrary, XNET draft defines as follows:</para>
 
-	<screen>	struct sockaddr_storage {
+	<programlisting>	struct sockaddr_storage {
 		u_char	ss_len;		/* address length */
 		u_char	ss_family;	/* address family */
 		/* and bunch of padding */
-	};
-	</screen>
+	};</programlisting>
 
 	<para>In December 1999, it was agreed that RFC2553bis should pick
 	the latter (XNET) definition.</para>
@@ -1103,9 +1096,8 @@ FreeBSD 4.x     configurable            supported
 	    <para>never touch __ss_family.  cast to sockaddr * and use sa_family
 	    like:</para>
 
-	    <screen>	struct sockaddr_storage ss;
-	family = ((struct sockaddr *)&amp;ss)-&gt;sa_family
-	    </screen>
+	    <programlisting>	struct sockaddr_storage ss;
+	family = ((struct sockaddr *)&amp;ss)-&gt;sa_family</programlisting>
 
 	  </listitem>
 	</orderedlist>
@@ -1197,8 +1189,7 @@ FreeBSD 4.x     configurable            supported
 	FAITH-relay dual stack node
 	  ^
 	  | IPv6 TCP toward 2001:0DB8:0200:ffff::163.221.202.12
-	source IPv6 node
-	</screen>
+	source IPv6 node</screen>
 
 	<para>&man.faithd.8; must be invoked on FAITH-relay dual stack
 	node.</para>
@@ -1519,9 +1510,7 @@ ECN forbidden   copy TOS bits except for ECN    drop T
 ECN allowed     copy TOS bits except for ECN    use inner TOS bits with some
                 CE (masked with 0xfe) from      change.  if outer ECN CE bit
                 inner to outer.                 is 1, enable ECN CE bit on
-                set ECN CE bit to 0.            the inner.
-
-	</screen>
+                set ECN CE bit to 0.            the inner.</screen>
 
 	<para>General strategy for configuration is as follows:</para>
 	<itemizedlist>

Modified: head/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml	Thu Sep  7 11:21:07 2017	(r50804)
+++ head/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml	Thu Sep  7 11:56:16 2017	(r50805)
@@ -440,8 +440,7 @@
 
 	  <informalexample>
 	    <screen>&prompt.user; <userinput>cc foobar.c</userinput>               <lineannotation>executable is a.out</lineannotation>
-&prompt.user; <userinput>cc -o foobar foobar.c</userinput>     <lineannotation>executable is foobar</lineannotation>
-	    </screen>
+&prompt.user; <userinput>cc -o foobar foobar.c</userinput>     <lineannotation>executable is foobar</lineannotation></screen>
 	  </informalexample>
 	</listitem>
       </varlistentry>
@@ -455,8 +454,7 @@
 	    you are using a <filename>Makefile</filename>.</para>
 
 	  <informalexample>
-	    <screen>&prompt.user; <userinput>cc -c foobar.c</userinput>
-	    </screen>
+	    <screen>&prompt.user; <userinput>cc -c foobar.c</userinput></screen>
 	  </informalexample>
 
 	  <para>This will produce an <firstterm>object file</firstterm> (not an
@@ -483,8 +481,7 @@
 	    satisfied it works properly.</para>
 
 	  <informalexample>
-	    <screen>&prompt.user; <userinput>cc -g foobar.c</userinput>
-	    </screen>
+	    <screen>&prompt.user; <userinput>cc -g foobar.c</userinput></screen>
 	  </informalexample>
 
 	  <para>This will produce a debug version of the
@@ -513,8 +510,7 @@
 	    compiler's optimizer.</para>
 
 	  <informalexample>
-	    <screen>&prompt.user; <userinput>cc -O -o foobar foobar.c</userinput>
-	    </screen>
+	    <screen>&prompt.user; <userinput>cc -O -o foobar foobar.c</userinput></screen>
 	  </informalexample>
 
 	  <para>This will produce an optimized version of
@@ -610,8 +606,7 @@
 	    line.</para>
 
 	  <informalexample>
-	    <screen>&prompt.user; <userinput>cc -o foobar foobar.c -lm</userinput>
-	    </screen>
+	    <screen>&prompt.user; <userinput>cc -o foobar foobar.c -lm</userinput></screen>
 	  </informalexample>
 
 	  <para>This will link the math library functions into
@@ -643,8 +638,7 @@
 	      like this.  What does it mean?</para>
 
 	    <informalexample>
-	      <screen>/var/tmp/cc0143941.o: Undefined symbol `_sin' referenced from text segment
-	      </screen>
+	      <screen>/var/tmp/cc0143941.o: Undefined symbol `_sin' referenced from text segment</screen>
 	    </informalexample>
 	  </question>
 
@@ -655,8 +649,7 @@
 	      so:</para>
 
 	    <informalexample>
-	      <screen>&prompt.user; <userinput>cc -o foobar foobar.c -lm</userinput>
-	      </screen>
+	      <screen>&prompt.user; <userinput>cc -o foobar foobar.c -lm</userinput></screen>
 	    </informalexample>
 	  </answer>
 	</qandaentry>
@@ -683,8 +676,7 @@ int main() {
 	    <para>and I compiled it as:</para>
 
 	    <informalexample>
-	      <screen>&prompt.user; <userinput>cc temp.c -lm</userinput>
-	      </screen>
+	      <screen>&prompt.user; <userinput>cc temp.c -lm</userinput></screen>
 	    </informalexample>
 
 	    <para>like you said I should, but I get this when I run
@@ -692,8 +684,7 @@ int main() {
 
 	    <informalexample>
 	      <screen>&prompt.user; <userinput>./a.out</userinput>
-2.1 ^ 6 = 1023.000000
-	      </screen>
+2.1 ^ 6 = 1023.000000</screen>
 	    </informalexample>
 
 	    <para>This is <emphasis>not</emphasis> the right answer!
@@ -735,8 +726,7 @@ int main() {
 
 	    <informalexample>
 	      <screen>&prompt.user; <userinput>./a.out</userinput>
-2.1 ^ 6 = 85.766121
-	      </screen>
+2.1 ^ 6 = 85.766121</screen>
 	    </informalexample>
 
 	    <para>If you are using any of the mathematical functions,
@@ -762,8 +752,7 @@ int main() {
 	      option:</para>
 
 	    <informalexample>
-	      <screen>&prompt.user; <userinput>cc -o foobar foobar.c</userinput>
-	      </screen>
+	      <screen>&prompt.user; <userinput>cc -o foobar foobar.c</userinput></screen>
 	    </informalexample>
 	  </answer>
 	</qandaentry>
@@ -803,8 +792,7 @@ int main() {
 	      checking the current directory.  Either type:</para>
 
 	    <informalexample>
-	      <screen>&prompt.user; <userinput>./test</userinput>
-	      </screen>
+	      <screen>&prompt.user; <userinput>./test</userinput></screen>
 	    </informalexample>
 
 	    <para>or choose a better name for your program!</para>
@@ -960,14 +948,12 @@ free(foo);
 	  <answer>
 	    <para>Yes, just go to another console or xterm, do</para>
 
-	    <screen>&prompt.user; <userinput>ps</userinput>
-	    </screen>
+	    <screen>&prompt.user; <userinput>ps</userinput></screen>
 
 	    <para>to find out the process ID of your program, and
 	      do</para>
 
-	    <screen>&prompt.user; <userinput>kill -ABRT <replaceable>pid</replaceable></userinput>
-	    </screen>
+	    <screen>&prompt.user; <userinput>kill -ABRT <replaceable>pid</replaceable></userinput></screen>
 
 	    <para>where
 	      <parameter><replaceable>pid</replaceable></parameter> is
@@ -1589,7 +1575,7 @@ Cannot access memory at address 0x7020796d.
 	not, gentle reader, here is how to do it (courtesy of the
 	<command>gdb</command> info pages):</para>
 
-      <screen><lineannotation>&hellip;</lineannotation>
+      <programlisting><lineannotation>&hellip;</lineannotation>
 if ((pid = fork()) &lt; 0)		/* _Always_ check this */
 	error();
 else if (pid == 0) {		/* child */
@@ -1599,7 +1585,7 @@ else if (pid == 0) {		/* child */
 		sleep(10);	/* Wait until someone attaches to us */
 	<lineannotation>&hellip;</lineannotation>
 } else {			/* parent */
-	<lineannotation>&hellip;</lineannotation></screen>
+	<lineannotation>&hellip;</lineannotation></programlisting>
 
       <para>Now all you have to do is attach to the child, set
 	<symbol>PauseMode</symbol> to <literal>0</literal>, and wait
@@ -1821,8 +1807,7 @@ else if (pid == 0) {		/* child */
 	    if you are doing something outside Emacs and you want to
 	    edit a file, you can just type in</para>
 
-	  <screen>&prompt.user; <userinput>emacsclient <replaceable>filename</replaceable></userinput>
-	  </screen>
+	  <screen>&prompt.user; <userinput>emacsclient <replaceable>filename</replaceable></userinput></screen>
 
 	  <para>and then you can edit the file in your
 	    Emacs!

Modified: head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Thu Sep  7 11:21:07 2017	(r50804)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Thu Sep  7 11:56:16 2017	(r50805)
@@ -4244,9 +4244,7 @@ $include Kexample.com.+005+nnnnn.ZSK.key    ; ZSK</pro
 	    located in <filename>example.com.db</filename> would look
 	    similar to</para>
 
-	  <screen>&prompt.user; <userinput>dnssec-signzone -o
-	example.com -k Kexample.com.+005+nnnnn.KSK example.com.db
-	Kexample.com.+005+nnnnn.ZSK.key</userinput></screen>
+	  <screen>&prompt.user; <userinput>dnssec-signzone -o example.com -k Kexample.com.+005+nnnnn.KSK example.com.db Kexample.com.+005+nnnnn.ZSK.key</userinput></screen>
 
 	  <para>The key supplied to the <option>-k</option> argument
 	    is the <acronym>KSK</acronym> and the other key file is

Modified: head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml	Thu Sep  7 11:21:07 2017	(r50804)
+++ head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml	Thu Sep  7 11:56:16 2017	(r50805)
@@ -932,8 +932,7 @@ perm    vboxnetctl 0660</programlisting>
       machine, the user needs to be a member of the <systemitem
       class="groupname">operator</systemitem> group.</para>
 
-      <screen>&prompt.root; <userinput>pw groupmod operator -m
-      <replaceable>yourusername</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>pw groupmod operator -m <replaceable>yourusername</replaceable></userinput></screen>
 
       <para>Restart the login session and
       <application>&virtualbox;</application> for these changes to take

From owner-svn-doc-head@freebsd.org  Thu Sep  7 13:46:24 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B74B2E1EC48;
 Thu,  7 Sep 2017 13:46:24 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7763D72B89;
 Thu,  7 Sep 2017 13:46:24 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v87DkNcU061705;
 Thu, 7 Sep 2017 13:46:23 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v87DkN2R061704;
 Thu, 7 Sep 2017 13:46:23 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201709071346.v87DkN2R061704@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ryusuke set sender to
 ryusuke@FreeBSD.org using -f
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Thu, 7 Sep 2017 13:46:23 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50806 - head/ja_JP.eucJP/share/xml
X-SVN-Group: doc-head
X-SVN-Commit-Author: ryusuke
X-SVN-Commit-Paths: head/ja_JP.eucJP/share/xml
X-SVN-Commit-Revision: 50806
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Sep 2017 13:46:25 -0000

Author: ryusuke
Date: Thu Sep  7 13:46:23 2017
New Revision: 50806
URL: https://svnweb.freebsd.org/changeset/doc/50806

Log:
  - Merge the following from the English version:
  
  	r50795 -> r50803	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	Thu Sep  7 11:56:16 2017	(r50805)
+++ head/ja_JP.eucJP/share/xml/news.xml	Thu Sep  7 13:46:23 2017	(r50806)
@@ -23,7 +23,7 @@
 	would like to work on.  ***
 
     $FreeBSD$
-    Original revision: r50795
+    Original revision: r50803
 -->
 <news>
   <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -38,6 +38,12 @@
 
       <day>
 	<name>2</name>
+
+        <event>
+	  <p>新コミッタ就任:
+            <a href="mailto:shurd@FreeBSD.org">Stephen Hurd</a>
+            (src)</p>
+        </event>
 
 	<event>
 	  <title>&os;&nbsp;10.4-BETA3 公開</title>

From owner-svn-doc-head@freebsd.org  Fri Sep  8 00:26:11 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 61F28E1A8FA;
 Fri,  8 Sep 2017 00:26:11 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EE69380FCF;
 Fri,  8 Sep 2017 00:26:10 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v880Q9bY024868;
 Fri, 8 Sep 2017 00:26:09 GMT (envelope-from marius@FreeBSD.org)
Received: (from marius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v880Q96e024867;
 Fri, 8 Sep 2017 00:26:09 GMT (envelope-from marius@FreeBSD.org)
Message-Id: <201709080026.v880Q96e024867@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marius set sender to
 marius@FreeBSD.org using -f
From: Marius Strobl <marius@FreeBSD.org>
Date: Fri, 8 Sep 2017 00:26:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50807 - head/en_US.ISO8859-1/htdocs/releases/10.4R
X-SVN-Group: doc-head
X-SVN-Commit-Author: marius
X-SVN-Commit-Paths: head/en_US.ISO8859-1/htdocs/releases/10.4R
X-SVN-Commit-Revision: 50807
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Sep 2017 00:26:11 -0000

Author: marius (src,ports committer)
Date: Fri Sep  8 00:26:09 2017
New Revision: 50807
URL: https://svnweb.freebsd.org/changeset/doc/50807

Log:
  - Due to failure of building a (working) WANDBOARD image as of 10.4-BETA3,
    OpenSSH 7.3p1 which went into stable/10 after that, it doesn't feel like
    we are ready for the RC phase just yet. So 10.4-BETA4 has been inserted
    into the 10.4 cycle and the optional 10.4-RC3 de-schedule for now.
  - Mark the start of 10.4-BETA4 builds as done.

Modified:
  head/en_US.ISO8859-1/htdocs/releases/10.4R/schedule.xml

Modified: head/en_US.ISO8859-1/htdocs/releases/10.4R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/10.4R/schedule.xml	Thu Sep  7 13:46:23 2017	(r50806)
+++ head/en_US.ISO8859-1/htdocs/releases/10.4R/schedule.xml	Fri Sep  8 00:26:09 2017	(r50807)
@@ -102,8 +102,15 @@
     </tr>
 
     <tr>
-      <td>&local.branch.releng; branch</td>
+      <td>BETA4 builds begin&nbsp;*</td>
       <td>8&nbsp;September&nbsp;2017</td>
+      <td>8&nbsp;September&nbsp;2017</td>
+      <td>Fourth beta test snapshot.</td>
+    </tr>
+
+    <tr>
+      <td>&local.branch.releng; branch</td>
+      <td>15&nbsp;September&nbsp;2017</td>
       <td>-</td>
       <td>Subversion branch created; future release engineering
 	proceeds on this branch.</td>
@@ -111,14 +118,14 @@
 
     <tr>
       <td>RC1 builds begin</td>
-      <td>8&nbsp;September&nbsp;2017</td>
+      <td>15&nbsp;September&nbsp;2017</td>
       <td>-</td>
       <td>First release candidate.</td>
     </tr>
 
     <tr>
       <td>&local.branch.stable;&nbsp;thaw</td>
-      <td>10&nbsp;September&nbsp;2017</td>
+      <td>17&nbsp;September&nbsp;2017</td>
       <td>-</td>
       <td>The code freeze on the &local.branch.stable; branch
 	is lifted.</td>
@@ -126,16 +133,9 @@
 
     <tr>
       <td>RC2 builds begin</td>
-      <td>15&nbsp;September&nbsp;2017</td>
+      <td>22&nbsp;September&nbsp;2017</td>
       <td>-</td>
       <td>Second release candidate.</td>
-    </tr>
-
-    <tr>
-      <td>RC3 builds begin&nbsp;*</td>
-      <td>22&nbsp;September&nbsp;2017&nbsp;</td>
-      <td>-</td>
-      <td>Third release candidate.</td>
     </tr>
 
     <tr>

From owner-svn-doc-head@freebsd.org  Fri Sep  8 14:20:56 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7A9CBE1A7AB;
 Fri,  8 Sep 2017 14:20:56 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5538480FE8;
 Fri,  8 Sep 2017 14:20:56 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v88EKtP8065146;
 Fri, 8 Sep 2017 14:20:55 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v88EKtnV065141;
 Fri, 8 Sep 2017 14:20:55 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201709081420.v88EKtnV065141@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Fri, 8 Sep 2017 14:20:55 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50808 - in head/en_US.ISO8859-1/books/handbook: config
 disks mail network-servers
X-SVN-Group: doc-head
X-SVN-Commit-Author: wblock
X-SVN-Commit-Paths: in head/en_US.ISO8859-1/books/handbook: config disks mail
 network-servers
X-SVN-Commit-Revision: 50808
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Sep 2017 14:20:56 -0000

Author: wblock
Date: Fri Sep  8 14:20:54 2017
New Revision: 50808
URL: https://svnweb.freebsd.org/changeset/doc/50808

Log:
  Reduce the impact of example $FreeBSD$ version strings by enclosing them
  in <phrase> elements.  The its:notranslate property can then be set on
  these individual lines rather than a whole <screen> or <programlisting>.
  
  Sponsored by:	iXsystems

Modified:
  head/en_US.ISO8859-1/books/handbook/config/chapter.xml
  head/en_US.ISO8859-1/books/handbook/disks/chapter.xml
  head/en_US.ISO8859-1/books/handbook/mail/chapter.xml
  head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/config/chapter.xml	Fri Sep  8 00:26:09 2017	(r50807)
+++ head/en_US.ISO8859-1/books/handbook/config/chapter.xml	Fri Sep  8 14:20:54 2017	(r50808)
@@ -262,9 +262,9 @@ run_rc_command "$1"</programlisting>
     <para>Here is a sample entry from the system crontab,
       <filename>/etc/crontab</filename>:</para>
 
-    <programlisting its:translate="no"># /etc/crontab - root's crontab for FreeBSD
+    <programlisting># /etc/crontab - root's crontab for FreeBSD
 #
-# &dollar;FreeBSD&dollar;
+# <phrase its:translate="no">&dollar;FreeBSD&dollar;</phrase>
 # <co xml:id="co-comments"/>
 SHELL=/bin/sh
 PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin <co xml:id="co-env"/>
@@ -1315,7 +1315,7 @@ ifconfig_fxp0_alias7="inet 202.0.75.20 netmask 255.255
 	remote log host.  As an example, here is the default
 	<filename>syslog.conf</filename> from &os;:</para>
 
-      <programlisting its:translate="no"># &dollar;&os;&dollar;
+      <programlisting># <phrase its:translate="no">&dollar;&os;&dollar;</phrase>
 #
 #       Spaces ARE valid field separators in this file. However,
 #       other *nix-like systems still insist on using tabs as field
@@ -1450,8 +1450,8 @@ cron.*                                          /var/l
 	and programs to signal when the log is rotated.  Here is the
 	default configuration in &os;:</para>
 
-      <programlisting its:translate="no"># configuration file for newsyslog
-# &dollar;FreeBSD&dollar;
+      <programlisting># configuration file for newsyslog
+# <phrase its:translate="no">&dollar;FreeBSD&dollar;</phrase>
 #
 # Entries which do not specify the '/pid_file' field will cause the
 # syslogd process to be signalled when that log file is rotated.  This
@@ -1926,7 +1926,7 @@ nameserver 147.11.100.30</programlisting>
 	  external <acronym>DNS</acronym> servers for commonly
 	  accessed names.</para>
 
-	<programlisting its:translate="no"># &dollar;&os;&dollar;
+	<programlisting># <phrase its:translate="no">&dollar;&os;&dollar;</phrase>
 #
 #
 # Host Database

Modified: head/en_US.ISO8859-1/books/handbook/disks/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Fri Sep  8 00:26:09 2017	(r50807)
+++ head/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Fri Sep  8 14:20:54 2017	(r50808)
@@ -2706,8 +2706,8 @@ Quotas for user test:
 	    <acronym>UFS</acronym> file system, set the sector_size to
 	    2048:</para>
 
-	  <screen its:translate="no">&prompt.root; <userinput>gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c.lock</userinput>
-# &dollar;FreeBSD: src/sbin/gbde/template.txt,v 1.1.36.1 2009/08/03 08:13:06 kensmith Exp $
+	  <screen>&prompt.root; <userinput>gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c.lock</userinput>
+# <phrase its:translate="no">&dollar;FreeBSD: src/sbin/gbde/template.txt,v 1.1.36.1 2009/08/03 08:13:06 kensmith Exp $</phrase>
 #
 # Sector size is the smallest unit of data which can be read or written.
 # Making it too small decreases performance and decreases available space.

Modified: head/en_US.ISO8859-1/books/handbook/mail/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mail/chapter.xml	Fri Sep  8 00:26:09 2017	(r50807)
+++ head/en_US.ISO8859-1/books/handbook/mail/chapter.xml	Fri Sep  8 14:20:54 2017	(r50808)
@@ -364,7 +364,7 @@ FreeBSD.org mail is handled by 10 mx1.FreeBSD.org</scr
 	    addresses can be found in the &os; sample configuration,
 	    <filename>/etc/mail/access.sample</filename>:</para>
 
-	  <programlisting its:translate="no"># &dollar;FreeBSD&dollar;
+	  <programlisting># <phrase its:translate="no">&dollar;FreeBSD&dollar;</phrase>
 #
 # Mail relay access control list.  Default is to reject mail unless the
 # destination is local, or listed in /etc/mail/local-host-names
@@ -705,7 +705,7 @@ daily_submit_queuerun="NO"</programlisting>
       <para>The default <filename>/etc/mail/mailer.conf</filename>
 	looks like this:</para>
 
-      <programlisting its:translate="no"># &dollar;FreeBSD&dollar;
+      <programlisting># <phrase its:translate="no">&dollar;FreeBSD&dollar;</phrase>
 #
 # Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
 #

Modified: head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Fri Sep  8 00:26:09 2017	(r50807)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Fri Sep  8 14:20:54 2017	(r50808)
@@ -3335,7 +3335,7 @@ freebsd.org. (A)
 	<sect4>
 	  <title><filename>/etc/namedb/named.conf</filename></title>
 
-	  <programlisting its:translate="no">// &dollar;FreeBSD&dollar;
+	  <programlisting>// <phrase its:translate="no">&dollar;FreeBSD&dollar;</phrase>
 //
 // Refer to the named.conf(5) and named(8) man pages, and the documentation
 // in /usr/share/doc/bind9 for more details.

From owner-svn-doc-head@freebsd.org  Fri Sep  8 14:29:07 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA3E8E1AF45;
 Fri,  8 Sep 2017 14:29:07 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 89AB181623;
 Fri,  8 Sep 2017 14:29:07 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v88ET6TY068974;
 Fri, 8 Sep 2017 14:29:06 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v88ET6Oi068973;
 Fri, 8 Sep 2017 14:29:06 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201709081429.v88ET6Oi068973@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Fri, 8 Sep 2017 14:29:06 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50809 - head/share/mk
X-SVN-Group: doc-head
X-SVN-Commit-Author: wblock
X-SVN-Commit-Paths: head/share/mk
X-SVN-Commit-Revision: 50809
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Sep 2017 14:29:07 -0000

Author: wblock
Date: Fri Sep  8 14:29:06 2017
New Revision: 50809
URL: https://svnweb.freebsd.org/changeset/doc/50809

Log:
  Remove the temporary assembled document after generating a PO file to
  make sure it does not hide changes in the English parent from translators.
  
  Sponsored by:	iXsystems

Modified:
  head/share/mk/doc.docbook.mk

Modified: head/share/mk/doc.docbook.mk
==============================================================================
--- head/share/mk/doc.docbook.mk	Fri Sep  8 14:20:54 2017	(r50808)
+++ head/share/mk/doc.docbook.mk	Fri Sep  8 14:29:06 2017	(r50809)
@@ -369,7 +369,7 @@ ${PO_LANG}.po:	${DOC}.translate.xml
 		${MSGMERGE} -o ${PO_LANG}.po.new ${PO_LANG}.po ${PO_LANG}.po.tmp ; \
 		${MSGATTRIB} --no-obsolete -o ${PO_LANG}.po.new ${PO_LANG}.po ; \
 		${MV} ${PO_LANG}.po.new ${PO_LANG}.po ; \
-		${RM} ${PO_LANG}.po.tmp ; \
+		${RM} ${PO_LANG}.po.tmp ${DOC}.translate.xml ; \
 	  else \
 	  	${ECHO} "${PO_LANG}.po created, please check and correct the settings in the header" ; \
 		${MV} ${PO_LANG}.po.tmp ${PO_LANG}.po ; \

From owner-svn-doc-head@freebsd.org  Fri Sep  8 17:52:37 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EE3EBE01314;
 Fri,  8 Sep 2017 17:52:37 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AF956644B6;
 Fri,  8 Sep 2017 17:52:37 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v88HqaZA053548;
 Fri, 8 Sep 2017 17:52:36 GMT (envelope-from bhd@FreeBSD.org)
Received: (from bhd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v88HqamV053547;
 Fri, 8 Sep 2017 17:52:36 GMT (envelope-from bhd@FreeBSD.org)
Message-Id: <201709081752.v88HqamV053547@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bhd set sender to bhd@FreeBSD.org
 using -f
From: Bjoern Heidotting <bhd@FreeBSD.org>
Date: Fri, 8 Sep 2017 17:52:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50810 - head/de_DE.ISO8859-1/books/handbook/zfs
X-SVN-Group: doc-head
X-SVN-Commit-Author: bhd
X-SVN-Commit-Paths: head/de_DE.ISO8859-1/books/handbook/zfs
X-SVN-Commit-Revision: 50810
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Sep 2017 17:52:38 -0000

Author: bhd
Date: Fri Sep  8 17:52:36 2017
New Revision: 50810
URL: https://svnweb.freebsd.org/changeset/doc/50810

Log:
  Update to r50758:
  
  - Add missing quote in 'zfs set sharenfs' command
  - Use root prompt in various places to reflect reality
  - Add missing <userinput> tags
  - Remove a useless 'zfs list' command
  - Use sysrc instead of echo command

Modified:
  head/de_DE.ISO8859-1/books/handbook/zfs/chapter.xml

Modified: head/de_DE.ISO8859-1/books/handbook/zfs/chapter.xml
==============================================================================
--- head/de_DE.ISO8859-1/books/handbook/zfs/chapter.xml	Fri Sep  8 14:29:06 2017	(r50809)
+++ head/de_DE.ISO8859-1/books/handbook/zfs/chapter.xml	Fri Sep  8 17:52:36 2017	(r50810)
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     basiert auf: r50688
+     basiert auf: r50758
 -->
 
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -2362,12 +2362,12 @@ mypool/var/tmp                         262K  93.2G   1
 mypool/var/tmp@my_recursive_snapshot    88K      -   152K  -
 mypool/var/tmp@after_cp               53.5K      -   118K  -
 mypool/var/tmp@diff_snapshot              0      -   120K  -
-&prompt.user; <userinput>ls /var/tmp</userinput>
-passwd          passwd.copy
-&prompt.user; <userinput>rm /var/tmp/passwd*</userinput>
-&prompt.user; <userinput>ls /var/tmp</userinput>
+&prompt.root; <userinput>ls /var/tmp</userinput>
+passwd          passwd.copy     vi.recover
+&prompt.root; <userinput>rm /var/tmp/passwd*</userinput>
+&prompt.root; <userinput>ls /var/tmp</userinput>
 vi.recover
-&prompt.user;</screen>
+&prompt.root;</screen>
 
 	<para>Zu diesem Zeitpunkt bemerkt der Benutzer, dass zuviele
 	  Dateien gel�scht wurden und m�chte diese zur�ck haben.
@@ -2378,7 +2378,7 @@ vi.recover
 	  Schnappschuss wieder zu beginnen, geben Sie ein:</para>
 
 	<screen>&prompt.root; <userinput>zfs rollback <replaceable>mypool/var/tmp@diff_snapshot</replaceable></userinput>
-&prompt.user; <userinput>ls /var/tmp</userinput>
+&prompt.root; <userinput>ls /var/tmp</userinput>
 passwd          passwd.copy     vi.recover</screen>
 
 	<para>Die Operation zum Zur�ckrollen versetzt das Dataset in
@@ -2418,7 +2418,7 @@ mypool/var/tmp@diff_snapshot</screen>
 &prompt.root; <userinput>zfs list -rt snapshot <replaceable>mypool/var/tmp</replaceable></userinput>
 NAME                                   USED  AVAIL  REFER  MOUNTPOINT
 mypool/var/tmp@my_recursive_snapshot     8K      -   152K  -
-&prompt.user; <userinput>ls /var/tmp</userinput>
+&prompt.root; <userinput>ls /var/tmp</userinput>
 vi.recover</screen>
 
 	<para>Die Ausgabe von <command>zfs list -t snapshot</command>
@@ -2449,10 +2449,10 @@ vi.recover</screen>
 	<screen>&prompt.root; <userinput>zfs get snapdir <replaceable>mypool/var/tmp</replaceable></userinput>
 NAME            PROPERTY  VALUE    SOURCE
 mypool/var/tmp  snapdir   hidden   default
-&prompt.user; <userinput>ls -a /var/tmp</userinput>
+&prompt.root; <userinput>ls -a /var/tmp</userinput>
 .               ..              passwd          vi.recover
 &prompt.root; <userinput>zfs set snapdir=visible <replaceable>mypool/var/tmp</replaceable></userinput>
-&prompt.user; <userinput>ls -a /var/tmp</userinput>
+&prompt.root; <userinput>ls -a /var/tmp</userinput>
 .               ..              .zfs            passwd          vi.recover</screen>
 
 	<para>Einzelne Dateien lassen sich einfach auf einen
@@ -2469,7 +2469,7 @@ mypool/var/tmp  snapdir   hidden   default
 	  wiederhergestellt wird:</para>
 
 	<screen>&prompt.root; <userinput>rm /var/tmp/passwd</userinput>
-&prompt.user; <userinput>ls -a /var/tmp</userinput>
+&prompt.root; <userinput>ls -a /var/tmp</userinput>
 .               ..              .zfs            vi.recover
 &prompt.root; <userinput>ls /var/tmp/.zfs/snapshot</userinput>
 after_cp                my_recursive_snapshot
@@ -2882,7 +2882,7 @@ mypool@replica2                                 0     
 	  <listitem>
 	    <para>Auf dem sendenden System:</para>
 
-	    <screen>&prompt.root; <command>zfs allow -u someuser send,snapshot <replaceable>mypool</replaceable></command></screen>
+	    <screen>&prompt.root; <userinput>zfs allow -u someuser send,snapshot <replaceable>mypool</replaceable></userinput></screen>
 	  </listitem>
 
 	  <listitem>
@@ -2892,12 +2892,12 @@ mypool@replica2                                 0     
 	      Dateisystem einzuh�ngen.  Auf dem empfangenden System
 	      nehmen Sie dazu die folgenden Einstellungen vor:</para>
 
-	    <screen>&prompt.root; sysctl vfs.usermount=1
+	    <screen>&prompt.root; <userinput>sysctl vfs.usermount=1</userinput>
 vfs.usermount: 0 -> 1
-&prompt.root; echo vfs.usermount=1 >> /etc/sysctl.conf
+&prompt.root; <userinput>sysrc -f /boot/sysctl.conf vfs.usermount=1</userinput>
 &prompt.root; <userinput>zfs create <replaceable>recvpool/backup</replaceable></userinput>
 &prompt.root; <userinput>zfs allow -u <replaceable>someuser</replaceable> create,mount,receive <replaceable>recvpool/backup</replaceable></userinput>
-&prompt.root; chown <replaceable>someuser</replaceable> <replaceable>/recvpool/backup</replaceable></screen>
+&prompt.root; <userinput>chown <replaceable>someuser</replaceable> <replaceable>/recvpool/backup</replaceable></userinput></screen>
 	  </listitem>
 	</itemizedlist>
 
@@ -3214,10 +3214,9 @@ pool 2.84G 2.19M 2.83G  0% 1.00x ONLINE -</screen>
 	Ports-Sammlung dreimal in verschiedene Verzeichnisse auf dem
 	deduplizierten Pool kopiert.</para>
 
-      <screen>&prompt.root; <userinput>zpool list</userinput>
-for d in dir1 dir2 dir3; do
-for> mkdir $d &amp;&amp; cp -R /usr/ports $d &amp;
-for> done</screen>
+      <screen>&prompt.root; <userinput>for d in dir1 dir2 dir3; do</userinput>
+> <userinput>mkdir $d &amp;&amp; cp -R /usr/ports $d &amp;</userinput>
+> <userinput>done</userinput></screen>
 
       <para>Redundante Daten werden erkannt und dedupliziert:</para>
 

From owner-svn-doc-head@freebsd.org  Sat Sep  9 00:06:47 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9D708E134C3;
 Sat,  9 Sep 2017 00:06:47 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7975A706C6;
 Sat,  9 Sep 2017 00:06:47 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8906kA9004912;
 Sat, 9 Sep 2017 00:06:46 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8906kGc004911;
 Sat, 9 Sep 2017 00:06:46 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201709090006.v8906kGc004911@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Sat, 9 Sep 2017 00:06:46 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50811 - head/share/tools/convert2utf8
X-SVN-Group: doc-head
X-SVN-Commit-Author: wblock
X-SVN-Commit-Paths: head/share/tools/convert2utf8
X-SVN-Commit-Revision: 50811
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Sep 2017 00:06:47 -0000

Author: wblock
Date: Sat Sep  9 00:06:46 2017
New Revision: 50811
URL: https://svnweb.freebsd.org/changeset/doc/50811

Log:
  Add a utility to convert documentation language subdirectories to UTF-8.

Added:
  head/share/tools/convert2utf8/
  head/share/tools/convert2utf8/convert2utf8   (contents, props changed)

Added: head/share/tools/convert2utf8/convert2utf8
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/tools/convert2utf8/convert2utf8	Sat Sep  9 00:06:46 2017	(r50811)
@@ -0,0 +1,194 @@
+#!/usr/bin/env perl
+# ts=4
+
+# Copyright (c) 2017 Warren Block
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# * SUCH DAMAGE.
+# *
+# $FreeBSD$
+
+# convert a FreeBSD documentation language subdirectory to UTF-8
+
+use strict;
+use warnings;
+use utf8;
+use open qw/:std :utf8/;
+
+use File::Basename;
+use Getopt::Std;
+
+our ($opt_d, $opt_e, $opt_h, $opt_n, $opt_v);
+
+my $file  = '/usr/bin/file';
+my $find  = '/usr/bin/find';
+my $grep  = '/usr/bin/grep';
+my $iconv = '/usr/bin/iconv';
+my $make  = '/usr/bin/make';
+my $svn   = '/usr/local/bin/svn';
+my $xargs = '/usr/bin/xargs';
+
+my $docdir = '/usr/doc/en_US.ISO8859-1';
+my $exclpath = 'htdocs/releases/*/*.html';
+my $verbose = 0;
+
+sub usage {
+	my $prog = basename($0);
+	print "$prog: convert FreeBSD documentation language subdirectory to UTF-8\n\n";
+	print "Usage: $prog -h\n";
+	print "       $prog [-v] [-n] [-d docdir] [-e excludepath]\n\n";
+	print "       -v  verbose\n";
+	print "       -n  trial run\n";
+	print "       -d docdir (default $docdir)\n";
+	print "       -e excludepath (relative to docdir, default $exclpath)\n\n";
+	print "This program converts FreeBSD documentation files in legacy\n";
+	print "encoding directories like en_US.ISO8859-1 to UTF-8.  The\n";
+	print "documentation directory must be a Subversion checkout.  After\n";
+	print "files are converted, the directory is renamed to *.UTF-8.\n\n";
+	print "The default exclude path prevents conversion of statically-\n";
+	print "generated HTML files in htdocs/releases/*/*.html.\n";
+	exit 0;
+}
+
+sub check_local_copy {
+	my ($dn) = @_;
+	print "checking local copy\n" if $verbose;
+	my $rev = `$svn info $dn`;
+	my $localrev = $1 if ( `$svn info $dn` =~ /Revision: (\d+)/ );
+	die "** error checking local revision\n" if $?;
+	print "localrev = $localrev\n" if $verbose;
+	my $remoterev = $1 if ( `$svn info $dn -rHEAD` =~ /Revision: (\d+)/ );
+	die "** error checking remote revision\n" if $?;
+	print "remoterev = $remoterev\n" if $verbose;
+	die "** local copy not up to date, run svn up\n" if $localrev != $remoterev;
+}
+
+sub make_clean {
+	my ($dn) = @_;
+	print "cleaning '$dn'\n" if $verbose;
+	my $cmd = "$make -C $dn FORMATS=html,html-split,pdf,epub clean";
+	if ( $opt_n ) {
+		print "$cmd\n" if $verbose;
+	} else {
+		`$cmd`;
+	}
+}
+
+sub find_files {
+	my ($dn) = @_;
+	print "finding files to be converted in '$dn'\n" if $verbose;
+	print "excluding files matching \"$dn$exclpath/*\"\n" if $verbose;
+	return map(/^(.*):/, `$find $dn -not -path \"$dn$exclpath\" -type f -print0 | $xargs -0 $file | $grep 'XML\\|SGML\\|BSD'`);
+}
+
+sub convert_file {
+	my ($fn, $bd, $iso, $from, $to) = @_;
+	my $lcto = lc($to);
+	print "converting '$fn' from $from to $to\n" if $verbose;
+
+	# convert to utf-8 variable
+	my $contents = `$iconv -f $from -t $to $fn`;
+	die "** error converting '$file'\n" if $?;
+
+	# do fixups:
+	# change <?xml version="1.0" encoding="whatever" ?> to target code
+	$contents =~ s/encoding=".*?"/encoding="$lcto"/g;
+	# change HTML charset, but do not change :charset=: strings
+	$contents =~ s/[^:]charset=((?:[-a-z0-9])+)/charset=$lcto/g;
+	# change "en_US.ISO8859-1"
+	$contents =~ s/$bd/$iso.$to/g;
+	# change <!ENTITY xml.encoding        'iso-8859-1'>
+	$contents =~ s/<!ENTITY xml\.encoding(\s+).*>/<!ENTITY xml.encoding$1'$lcto'>/;
+	# print "$contents\n" if $verbose;
+
+	# change character entities?
+
+	unless ( $opt_n ) {
+		# overwrite original
+		open my $fh, ">", "$fn" or die "** could not open '$fn' to write: $!\n";
+		print $fh $contents;
+		close $fh or die "** could not close '$fn': $!\n";
+	}
+}
+
+sub rename_dir {
+	my ($fromdir, $todir) = @_;
+	my $cmd = "$svn mv $docdir $todir";
+	if ( $opt_n ) {
+		print "$cmd\n" if $verbose;
+	} else {
+		`$cmd`;
+	}
+}
+
+
+sub main {
+	getopts('d:e:hnv');
+
+	usage() if $opt_h;
+	$verbose = 1 if $opt_v;
+	$docdir = $opt_d if $opt_d;
+	$exclpath = $opt_e if $opt_e;
+
+	# sanitize exclude path, find is very picky about matches
+	# convert multiple slashes to single
+	$exclpath =~ s%/{2,}%/%;
+	die "** exclude path '$exclpath' must be relative (under '$docdir')\n" if $exclpath =~ m%^/%;
+
+	my $basedir = basename($docdir);
+	die "** '$docdir' does not have a standard ISO xy_AB directory name\n" unless $basedir =~ /^([a-z]{2}_[A-Z]{1,3})\./;
+	my $isolang = $1;
+
+	die "** no language code on target directory\n" unless $basedir =~ /\.(.*)$/;
+	my $fromcode = $1;
+
+	die "** no Makefile in '$docdir'\n" unless -f "$docdir/Makefile";
+
+	my $tocode = "UTF-8";
+	my $targdir = dirname($docdir) . "/$isolang.$tocode";
+
+	if ( $verbose ) {
+		print "docdir   = '$docdir'\n";
+		print "basedir  = '$basedir'\n";
+		print "isolang  = '$isolang'\n";
+		print "fromcode = '$fromcode'\n";
+		print "tocode   = '$tocode'\n";
+		print "targdir  = '$targdir'\n";
+	}
+
+	check_local_copy($docdir);
+
+	make_clean($docdir);
+
+	my @files = find_files($docdir);
+
+	for my $f (@files) {
+		convert_file($f, $basedir, $isolang, $fromcode, $tocode);
+	}
+
+	rename_dir($docdir, $targdir);
+
+	print "Done.\n";
+	print "XML files in $docdir converted from $fromcode to $tocode, directory renamed to $targdir\n";
+}
+
+main();

From owner-svn-doc-head@freebsd.org  Sat Sep  9 01:12:47 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 99F82E16EE1;
 Sat,  9 Sep 2017 01:12:47 +0000 (UTC) (envelope-from bcr@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 66A89727AF;
 Sat,  9 Sep 2017 01:12:47 +0000 (UTC) (envelope-from bcr@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v891CkPD033027;
 Sat, 9 Sep 2017 01:12:46 GMT (envelope-from bcr@FreeBSD.org)
Received: (from bcr@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v891CkjA033026;
 Sat, 9 Sep 2017 01:12:46 GMT (envelope-from bcr@FreeBSD.org)
Message-Id: <201709090112.v891CkjA033026@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bcr set sender to bcr@FreeBSD.org
 using -f
From: Benedict Reuschling <bcr@FreeBSD.org>
Date: Sat, 9 Sep 2017 01:12:46 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50812 - head/en_US.ISO8859-1/books/handbook/desktop
X-SVN-Group: doc-head
X-SVN-Commit-Author: bcr
X-SVN-Commit-Paths: head/en_US.ISO8859-1/books/handbook/desktop
X-SVN-Commit-Revision: 50812
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Sep 2017 01:12:47 -0000

Author: bcr
Date: Sat Sep  9 01:12:46 2017
New Revision: 50812
URL: https://svnweb.freebsd.org/changeset/doc/50812

Log:
  Fix an instance of "firefox" not being capitalized within
  <application> tags in the desktop chapter.
  
  PR:		222152
  Submitted by:	Paul Townsend (pt@zendware.com)

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

Modified: head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml	Sat Sep  9 00:06:46 2017	(r50811)
+++ head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml	Sat Sep  9 01:12:46 2017	(r50812)
@@ -190,7 +190,7 @@
       <para>Keep the default configuration options when compiling the
 	port.</para>
 
-      <para>Once installed, start <application>firefox</application>,
+      <para>Once installed, start <application>Firefox</application>,
 	enter <literal>about:plugins</literal> in the location bar and
 	press <keycap>Enter</keycap>.  A page listing the installed
 	plugins will be displayed.  The

From owner-svn-doc-head@freebsd.org  Sat Sep  9 11:03:00 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0E07AE0FAE6;
 Sat,  9 Sep 2017 11:03:00 +0000 (UTC)
 (envelope-from tcberner@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DD40964418;
 Sat,  9 Sep 2017 11:02:59 +0000 (UTC)
 (envelope-from tcberner@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v89B2x3q074311;
 Sat, 9 Sep 2017 11:02:59 GMT (envelope-from tcberner@FreeBSD.org)
Received: (from tcberner@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v89B2xKM074310;
 Sat, 9 Sep 2017 11:02:59 GMT (envelope-from tcberner@FreeBSD.org)
Message-Id: <201709091102.v89B2xKM074310@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tcberner set sender to
 tcberner@FreeBSD.org using -f
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Date: Sat, 9 Sep 2017 11:02:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50813 - head/share/pgpkeys
X-SVN-Group: doc-head
X-SVN-Commit-Author: tcberner
X-SVN-Commit-Paths: head/share/pgpkeys
X-SVN-Commit-Revision: 50813
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Sep 2017 11:03:00 -0000

Author: tcberner (ports committer)
Date: Sat Sep  9 11:02:58 2017
New Revision: 50813
URL: https://svnweb.freebsd.org/changeset/doc/50813

Log:
  Update my PGP key.

Modified:
  head/share/pgpkeys/tcberner.key

Modified: head/share/pgpkeys/tcberner.key
==============================================================================
--- head/share/pgpkeys/tcberner.key	Sat Sep  9 01:12:46 2017	(r50812)
+++ head/share/pgpkeys/tcberner.key	Sat Sep  9 11:02:58 2017	(r50813)
@@ -1,43 +1,75 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh tcberner D9F7782DF21AACEF ;
+sh addkey.sh tcberner 021DB73A50293AD0 ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   2048R/D9F7782DF21AACEF 2016-07-08 [verf辰llt: 2019-07-08]
-  Schl.-Fingerabdruck = CF7E 1348 3DC0 BC6B D9A3  B024 D9F7 782D F21A ACEF
-uid                          Tobias C. Berner <tcberner@FreeBSD.org>
-sub   2048R/33BC79B02F9E7F57 2016-07-08 [verf辰llt: 2019-07-08]
+pub   rsa2048/021DB73A50293AD0 2017-09-08 [SC] [verf辰llt: 2019-09-08]
+  Schl.-Fingerabdruck = BA58 38E2 61D1 A3C8 0960  C50B 021D B73A 5029 3AD0
+uid                            Tobias Christian Berner <tcberner@FreeBSD.org>
+uid                            Tobias Christian Berner <tcberner@gmail.com>
+sub   rsa2048/F06E731A05C1E357 2017-09-08 [E] [verf辰llt: 2019-09-08]
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQENBFd/5csBCADptTkRi2o/Zb4OMk5jmYvXKe1GaiFcYtXb0UJ2Y16ENohsyfqK
-swXs7KyiHaX9eFqAXZSkMcBKxYVrtzcUAaSR9Zfs8Cd1hq8+S3uCUC2/Dj+2TLyu
-z4ewjnYyPSWbu/ccaexAKxWjiLJryJJqWZ4igCEh+jSscouTGBHYlIONspad1yWM
-UORXC3dRrpsWs9XZziQiomx/aMF/Z2PpdPKVo8ZVyyu9j/FHmngjee3PRMQmypDA
-1K7Cc2O9nrALawr8dW6QjpU2ZJfdUlLNQy1RIDPnPMu2lNibAYOYcA1GBkYL2yR2
-2cdeD/xL06mDC64W/lLYxshQ60q4pwUXYt5ZABEBAAG0J1RvYmlhcyBDLiBCZXJu
-ZXIgPHRjYmVybmVyQEZyZWVCU0Qub3JnPokBPQQTAQoAJwUCV3/lywIbAwUJBaOa
-gAULCQgHAwUVCgkICwUWAwIBAAIeAQIXgAAKCRDZ93gt8hqs7wUtCADHy0W1YOxw
-t5LuCNa3NMdxhef7iveabi7B4BIOuRBfqeAttMc/ByWM3orSA9jk9ebrWOq8LQsu
-U1yM/dHdfookXMKwTm1xKWhTclMoEQwTte9cQkDjrOapUNp8u/2RG1D0OxrdBiYB
-Py6nhasZfEN/JzmXfQfBX4gVosSUDUWnP9dyzGamz6REyv+mol26kdMfZ5aRfMxK
-pHnzo5P9gJdTUuYZhj/rb3VAxOKYJFmJLwNJszT/Ue/ShwyV6rlEvJuEHeOITjpx
-w7uzI5oO23GW3vEte3KrDcaNJ5RAAE/ew4Ka8BUXKqeuaLtHYJPvaZ/7ueqyO4r3
-Shde7A14bQHNuQENBFd/5csBCAC46iyn2K3DnsKt+OMpt8YWFJfwKOqMSVJNuO9J
-zCPkeJjq3xc7wLpRhmZOhIWbWNzk2OUUmA+okdgHKqhScAm+juyyW5bClK7FLzdf
-sQG1v3nHZaHRAqb3K8V6vyEvZwxnrsxNEYESp07sqJtwFG2MRLR3ehrm8WgcFRhk
-I/wBoYXo5pCvtGeKDXV07eJPEezNkIeFwDpvP/o7Up+ISvgftu3U6stzyUBKf2Op
-nbmgbe9V6GKPvFV3wZPIOl5imk9xhlh62G7tg84SuegKTjPdaS1QaWU6upwtQhnz
-LqyWbsMqsYmgRgrrEkkCOJ6FSnGv1MqQ5fhOg1FUaGQjql/9ABEBAAGJASUEGAEK
-AA8FAld/5csCGwwFCQWjmoAACgkQ2fd4LfIarO8DOggA2IFP0KCUvutvQFL5QG+Q
-7cxVVTrh/6BWw6MWAGb9o80Gxs0EIVr3SGq3yOE54N42qVinalpsCgTweGAYgMHl
-Z+lWHGji7mko0H3kv3ps9aarL+ZYEbgit5Td0Y9cdFAcWTzce9u1whpCXx11kfj3
-CEIAAoVkqEmCBqEtjKXNNI1H1P3EGDRvdli8wzKJ8Vv8yTRYCmvSfFV/zBZlGZ0K
-dq+E02ZaCEJ1z71djlk+Il4lF2lsvbTejylQHSSG4GHjJwXQus5YB+lcwq/WBrRZ
-TDx+Js0J6HeU0XpF0it8+Qc2XpXx4wEz360jZUdEs7SML3DvLLA7llXQ8c5r0+Eg
-uQ==
-=4kdQ
+mQENBFmzKWcBCAChpKg15eChjLc68a6jLgh28l3LuIivxo6U1a6DUVzfCMXeFGvD
+z2O4M9geJWiy7TF/Wx/EWvYaFwlWWgW/dsFHQddAzvvdtQti5mBEW3ETKXZZJRkj
+S6YQqIdL75aE+w8mtR8ceB+ZByS5FszR0tkUasb/FI1AriUeV84VBtDeYshpny7c
+6iiy+TRuh9RusAMeVmANdpxwAjdu6/ha2AbokRkjhBf90yUnEvikOYpQ1oq/1b4r
+vv/2JhqRnl+CfGMFdjCuqM00422XOHB00qAp26LSd502OGKPlep5ngjrqk2n1jil
+zA3amvpY2N291WSFFzcP1/YtOHSmOg4ja3tHABEBAAG0LFRvYmlhcyBDaHJpc3Rp
+YW4gQmVybmVyIDx0Y2Jlcm5lckBnbWFpbC5jb20+iQFUBBMBCgA+FiEEulg44mHR
+o8gJYMULAh23OlApOtAFAlmzKngCGwMFCQPCZwAFCwkIBwMFFQoJCAsFFgMCAQAC
+HgECF4AACgkQAh23OlApOtAVrQgAlJtNBWbnrLy9eeqfR7vGhAUPEHvXQQMyU7eC
+Q73PO+GBbYK7CLsIe28Z+Dkvtqm6Bo/bUg4sX5AwzRuPtOK5XSdcOLnhTmwsuJGH
+RUfY0ILB0yHHkcsanL9V9TRmoGfN/b7V7yoR6TOy4xhBsXBhXSRPC4m+WsMEvt/j
+3OiAdCrVqdiH3wgYxeTpzhlitF/NSBiR3vg9QGt+Rxe9uQiiZBBfznUmzILSrBX8
+kUpdO0NA6lFGpOk12e6hCmXTkd63CIsWwqnvWo3DgD3P9NvtbMZqECQWu13fUat4
+Sx2v9SMrex1e3yHZmoxOkk5AM4ZaahCUQC2yYv8stJELmqPMvYkCHAQQAQgABgUC
+WbOw9gAKCRB/6j2mFpx31g7sEACzFS0Eh5WGYf+IVX91lrIWzoZRBBSOAEqZwRsX
+YuaRfuCki+u/ccvv6pjyki2DOU+VoFBok9JX0GamfC2t8wnW98dPXde5T5ZDFsPL
+NFhi7XAqxcFhYxh5scu6TYICmtDz89Eeo7VE1u6uyEbalE4BRG8uTssOKOv8pKqH
+6kao0rRLt6rphnAOJIm0zFnDoh4190LWF7UbLSSNkbdw1IA/JNSd0GeJSBAy3AjS
++Dpn5WbtKq5QXuYDSx9jUDWn3zl6sj3ywFu0dawNvwxW7lpC4lOMvjyFTUJNjE9x
+fb572WS9kNKyi1jmPDfi7MlqYgIz9TDTiJ7sGDrBn2ETdxwXDpIzo9OfPm+xg4Ll
+DWmSLND+AHLQXy2A/7puqqlqpCfRgNCG+57CQ9QZqhQUioy8PAQUSpiS47478gJY
+A1Bug2PrMAxVWURXMCM8i7nQ8BXiq9Ufu8rpZ0U0Jtu+gVN05YDNTyJinaOnKLU6
+yqmsGiEMy1INXY77rlyYOWVVhmrDfnDdKW5vOqVlPyZLSKh0QiYL7AeAfclnktSp
+4xenxXA8rxODWwiRyWD9QHCuzSlCecvX3m4EpJKvoy1eBk3oFd1R4V+awFZKrHaM
+sWYjPsRPA7JmKpzddr24pVMO9fA22DsG3CTz9UH0iMQK4C3zuICxsVqe1zvKUIob
+r5b4sbQuVG9iaWFzIENocmlzdGlhbiBCZXJuZXIgPHRjYmVybmVyQEZyZWVCU0Qu
+b3JnPokBVwQTAQoAQQIbAwUJA8JnAAULCQgHAwUVCgkICwUWAwIBAAIeAQIXgBYh
+BLpYOOJh0aPICWDFCwIdtzpQKTrQBQJZsytqAhkBAAoJEAIdtzpQKTrQLBoH/37L
+hXw4m0dIMBPKHAYJJO1/tlY4cAfCkXtv9yJDBjWvPyF0/Zt7r4LgWc7QDdIkkH/W
+GMHXOBNtPyqvl1Pbm91Uc7BzxYtLYUgbJYHcymDpkEdmItMptKnAqIw6fjnXdj8w
+ZRxu4vBtH+hF62vEilSDT2pchWlFGQTmVAddj6oCbNSJfaZICttZK7xTMZA8ccs2
+cTssPQAov0bv/6YDbVL2Rsj4XX3/e+um9wTBfVL4lyF5NQdmee17XjHKJaetv+R+
+2r8CvfCYcQ/hsqMJMI5qL3fPr2M35pzACKoR+XESMKQ5h2wMZdeUA6FIUFRfTB7H
+oUJRm4mqxEoJtZiOaOiJAhwEEAEIAAYFAlmzsPYACgkQf+o9phacd9ZYow/7BJ6b
+f56Hqpmr+cXeu0SvGx1dnPZ54ighcFCny6Cod37X6A8zAC6hhy+faEQZcMmjOCrJ
+8Yu7dTADoRSRIs3DGcb9Cp6liK+4BHulUlS9CzZDFvOXp33t7J2Ic16BicAnU57z
+jHIzHs0M/WM+saqz0lYYVxU/mJb2+6o4x8nB2M/7OfNt9lwti5T1FrNChqx8qOK+
+kpaeCBaXazttt0nCAzFBX1HQ4TP+b+ROv/cbdkaFOOv6k5X/nEIhtgy62w987Mqj
+aB2VeAg8svGpJMZS6XQ0OzxwhhdU94Y9RPOEqJea2dGGH9nM3llXla3CTUSElZ5Y
+jz8rlYgo/TazjHWzu56kmer9oyJ/geu6aPbbsLmsNyxnDz+qYgmXm5cPBHymvKan
+tDskPxxna/nUzQpnHZ6s80x7fJ4CqlrP2MH+xd7lhyEJRUwmhsLo2En/UjyGn/wb
+hVi2s5DrUy9twXY6N4fxldCPSFjGj9qo6xQst2aZ4S2Ec+r+xV40Akz4J5uXPesj
+Ce+d+7fG0OLY+Siw0lgk/hWsMIHZJU1+4JHDu4eaunRa4iuJtpeO+Oq+zw8mo1mz
+mjNnKiVaxH6KHTtp73tPdOtHu2EXXd/t74hAkz/UFGfjXJPBSrL1OqLQ0h1+0SbR
+1bKopdNQDDFHVeimdoPbIDETvBUkyzu7ASiyKPK5AQ0EWbMpZwEIAJSSAOOkMkSB
+lo4CRYOaExIT2Cz+ecophTzxDuOK5dza7Zd6UdF6HgWU9CaL3jt+zHFjhXxywzpa
+KBo19t0+ymbVcg/kLTdQscGiCi1+QyqHB8Yb75oPLIX3/nMfBwzAnTYzZcG/r3TR
+ET4X783K5Y+QTBLOMwTqjbTWrFHGw0bte04cK/z1ylvr62Nv+g4aKx9PT5doO3Z3
+9xl0J2FadX3/jJ8aFOkIYmANIdWcAdxZmg368Gi5KkamgFXxgfvaV1UfsAjFxtwv
+bakyiMRNg4eMYQjNUXtVsuuBfg4cuv9kNP/3lhRprWEWnaSi6FxU4vh/eZJOLMS3
+ITR961ijdG8AEQEAAYkBPAQYAQoAJhYhBLpYOOJh0aPICWDFCwIdtzpQKTrQBQJZ
+sylnAhsMBQkDwmcAAAoJEAIdtzpQKTrQHDQIAJSLCjkhlBjLQWve4k9hb0Leofxt
+Fz8+Ps/Q6Vzx5yLHGvpY3ZhK5QZPnl7KeoNHZL/UYicOIDKX9w9EnJF+6bL0Yj/H
+4Zdq17SOx+kYXi9rfB3/tOnHShZ18PopzZJ+EjCZ4PDNyBIuIxEjPdUZoU7ADwg+
+1PaQcdA5YUPjga3wIjMpusgsyGi9BiOzmxhkpizx0aD9g2EuOVpehm2vEfG/vdtI
+eL4+ziwx56lyR51suzi9PaGfqRd+KjyomitLIUGFXoQ3SWhY4I1DpmFSpwv8bD/k
+FZocjxCNJ/e9SlmVCqEULnDC/3KNVtCPhPYrXZnv0x1QelQoBuHpYmHMz70=
+=Kv19
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-head@freebsd.org  Sat Sep  9 13:35:19 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 01F6DE16E1E;
 Sat,  9 Sep 2017 13:35:19 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D0274697F2;
 Sat,  9 Sep 2017 13:35:18 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v89DZHmI035984;
 Sat, 9 Sep 2017 13:35:17 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v89DZH6g035983;
 Sat, 9 Sep 2017 13:35:17 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201709091335.v89DZH6g035983@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Sat, 9 Sep 2017 13:35:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50814 - head/share/tools/convert2utf8
X-SVN-Group: doc-head
X-SVN-Commit-Author: wblock
X-SVN-Commit-Paths: head/share/tools/convert2utf8
X-SVN-Commit-Revision: 50814
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Sep 2017 13:35:19 -0000

Author: wblock
Date: Sat Sep  9 13:35:17 2017
New Revision: 50814
URL: https://svnweb.freebsd.org/changeset/doc/50814

Log:
  Exclude all files in htdocs/releases, and better check and sanitize the
  exclude path used.

Modified:
  head/share/tools/convert2utf8/convert2utf8

Modified: head/share/tools/convert2utf8/convert2utf8
==============================================================================
--- head/share/tools/convert2utf8/convert2utf8	Sat Sep  9 11:02:58 2017	(r50813)
+++ head/share/tools/convert2utf8/convert2utf8	Sat Sep  9 13:35:17 2017	(r50814)
@@ -48,7 +48,7 @@ my $svn   = '/usr/local/bin/svn';
 my $xargs = '/usr/bin/xargs';
 
 my $docdir = '/usr/doc/en_US.ISO8859-1';
-my $exclpath = 'htdocs/releases/*/*.html';
+my $exclpath = 'htdocs/releases/*/*';
 my $verbose = 0;
 
 sub usage {
@@ -64,8 +64,9 @@ sub usage {
 	print "encoding directories like en_US.ISO8859-1 to UTF-8.  The\n";
 	print "documentation directory must be a Subversion checkout.  After\n";
 	print "files are converted, the directory is renamed to *.UTF-8.\n\n";
-	print "The default exclude path prevents conversion of statically-\n";
-	print "generated HTML files in htdocs/releases/*/*.html.\n";
+	print "The default exclude path prevents conversion of all files\n";
+	print "htdocs/releases/*/*.  These files are typically statically-\n";
+	print "generated historical files.\n";
 	exit 0;
 }
 
@@ -94,10 +95,17 @@ sub make_clean {
 }
 
 sub find_files {
-	my ($dn) = @_;
+	my ($dn,$exclpath) = @_;
+
+	my $fullexclpath = "$dn/$exclpath";
+	# sanitize exclude path, find is very picky about matches
+	# convert multiple slashes to single
+	$fullexclpath =~ s%/{2,}%/%;
+	die "** exclude path '$exclpath' must be relative (under '$docdir')\n" if $exclpath =~ m%^/%;
+
 	print "finding files to be converted in '$dn'\n" if $verbose;
-	print "excluding files matching \"$dn$exclpath/*\"\n" if $verbose;
-	return map(/^(.*):/, `$find $dn -not -path \"$dn$exclpath\" -type f -print0 | $xargs -0 $file | $grep 'XML\\|SGML\\|BSD'`);
+	print "excluding files matching \"$fullexclpath/*\"\n" if $verbose;
+	return map(/^(.*):/, `$find $dn -not -path \"$fullexclpath\" -type f -print0 | $xargs -0 $file | $grep 'XML\\|SGML\\|BSD'`);
 }
 
 sub convert_file {
@@ -149,11 +157,6 @@ sub main {
 	$docdir = $opt_d if $opt_d;
 	$exclpath = $opt_e if $opt_e;
 
-	# sanitize exclude path, find is very picky about matches
-	# convert multiple slashes to single
-	$exclpath =~ s%/{2,}%/%;
-	die "** exclude path '$exclpath' must be relative (under '$docdir')\n" if $exclpath =~ m%^/%;
-
 	my $basedir = basename($docdir);
 	die "** '$docdir' does not have a standard ISO xy_AB directory name\n" unless $basedir =~ /^([a-z]{2}_[A-Z]{1,3})\./;
 	my $isolang = $1;
@@ -179,7 +182,7 @@ sub main {
 
 	make_clean($docdir);
 
-	my @files = find_files($docdir);
+	my @files = find_files($docdir, $exclpath);
 
 	for my $f (@files) {
 		convert_file($f, $basedir, $isolang, $fromcode, $tocode);

From owner-svn-doc-head@freebsd.org  Sat Sep  9 18:55:10 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF3B0E0268A;
 Sat,  9 Sep 2017 18:55:10 +0000 (UTC)
 (envelope-from dbaio@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9C61B73B98;
 Sat,  9 Sep 2017 18:55:10 +0000 (UTC)
 (envelope-from dbaio@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v89It9AK066450;
 Sat, 9 Sep 2017 18:55:09 GMT (envelope-from dbaio@FreeBSD.org)
Received: (from dbaio@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v89It9Zv066449;
 Sat, 9 Sep 2017 18:55:09 GMT (envelope-from dbaio@FreeBSD.org)
Message-Id: <201709091855.v89It9Zv066449@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dbaio set sender to
 dbaio@FreeBSD.org using -f
From: "Danilo G. Baio" <dbaio@FreeBSD.org>
Date: Sat, 9 Sep 2017 18:55:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50815 - head/en_US.ISO8859-1/articles/contributors
X-SVN-Group: doc-head
X-SVN-Commit-Author: dbaio
X-SVN-Commit-Paths: head/en_US.ISO8859-1/articles/contributors
X-SVN-Commit-Revision: 50815
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Sep 2017 18:55:10 -0000

Author: dbaio (ports committer)
Date: Sat Sep  9 18:55:09 2017
New Revision: 50815
URL: https://svnweb.freebsd.org/changeset/doc/50815

Log:
  Add Christian Geier to contributors
  
  Maintainer of: devel/py-click-log
  	devel/py-click-threading
  	devel/py-urwidtrees
  	devel/py3-click-log
  	devel/py3-click-threading
  	mail/py-notmuch

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	Sat Sep  9 13:35:17 2017	(r50814)
+++ head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Sat Sep  9 18:55:09 2017	(r50815)
@@ -1792,6 +1792,11 @@
   </listitem>
 
   <listitem>
+    <para>Christian Geier
+      <email>geier@lostpackets.de</email></para>
+  </listitem>
+
+  <listitem>
     <para>Christian Gusenbauer
       <email>c47g@gmx.at</email></para>
   </listitem>

From owner-svn-doc-head@freebsd.org  Sat Sep  9 21:09:46 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 00DF7E0A499;
 Sat,  9 Sep 2017 21:09:46 +0000 (UTC)
 (envelope-from dbaio@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C401C7DB85;
 Sat,  9 Sep 2017 21:09:45 +0000 (UTC)
 (envelope-from dbaio@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v89L9iug020909;
 Sat, 9 Sep 2017 21:09:44 GMT (envelope-from dbaio@FreeBSD.org)
Received: (from dbaio@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v89L9iui020908;
 Sat, 9 Sep 2017 21:09:44 GMT (envelope-from dbaio@FreeBSD.org)
Message-Id: <201709092109.v89L9iui020908@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dbaio set sender to
 dbaio@FreeBSD.org using -f
From: "Danilo G. Baio" <dbaio@FreeBSD.org>
Date: Sat, 9 Sep 2017 21:09:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50816 - head/en_US.ISO8859-1/articles/contributors
X-SVN-Group: doc-head
X-SVN-Commit-Author: dbaio
X-SVN-Commit-Paths: head/en_US.ISO8859-1/articles/contributors
X-SVN-Commit-Revision: 50816
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Sep 2017 21:09:46 -0000

Author: dbaio (ports committer)
Date: Sat Sep  9 21:09:44 2017
New Revision: 50816
URL: https://svnweb.freebsd.org/changeset/doc/50816

Log:
  Add Nicolas Embriz to contributors
  
  Maintainer of: security/ssh-vault
  	sysutils/epazote
  	sysutils/immortal
  	www/go-www
  
  PR:		222123, 222124

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	Sat Sep  9 18:55:09 2017	(r50815)
+++ head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Sat Sep  9 21:09:44 2017	(r50816)
@@ -7675,6 +7675,11 @@
   </listitem>
 
   <listitem>
+    <para>Nicolas Embriz
+      <email>nbari@tequila.io</email></para>
+  </listitem>
+
+  <listitem>
     <para>Nicolas Jombart
       <email>ecu@ipv42.net</email></para>
   </listitem>

From owner-svn-doc-head@freebsd.org  Sat Sep  9 21:57:13 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E38B8E0CE4A;
 Sat,  9 Sep 2017 21:57:13 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BFD887F401;
 Sat,  9 Sep 2017 21:57:13 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v89LvCc7041126;
 Sat, 9 Sep 2017 21:57:12 GMT (envelope-from marius@FreeBSD.org)
Received: (from marius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v89LvCse041122;
 Sat, 9 Sep 2017 21:57:12 GMT (envelope-from marius@FreeBSD.org)
Message-Id: <201709092157.v89LvCse041122@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marius set sender to
 marius@FreeBSD.org using -f
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 9 Sep 2017 21:57:12 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50817 - in head: en_US.ISO8859-1/share/xml share/xml
X-SVN-Group: doc-head
X-SVN-Commit-Author: marius
X-SVN-Commit-Paths: in head: en_US.ISO8859-1/share/xml share/xml
X-SVN-Commit-Revision: 50817
X-SVN-Commit-Repository: doc
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Sep 2017 21:57:14 -0000

Author: marius (src,ports committer)
Date: Sat Sep  9 21:57:12 2017
New Revision: 50817
URL: https://svnweb.freebsd.org/changeset/doc/50817

Log:
  - The 10.4-BETA4 set includes the WANDBOARD image again, so uncomment
    its betarel2 entry.
  - Announce 10.4-BETA4 and bump betarel2.vers to BETA4 accordingly.
  
  Approved by:	re (implicit)

Modified:
  head/en_US.ISO8859-1/share/xml/release.l10n.ent
  head/share/xml/news.xml
  head/share/xml/release.ent

Modified: head/en_US.ISO8859-1/share/xml/release.l10n.ent
==============================================================================
--- head/en_US.ISO8859-1/share/xml/release.l10n.ent	Sat Sep  9 21:09:44 2017	(r50816)
+++ head/en_US.ISO8859-1/share/xml/release.l10n.ent	Sat Sep  9 21:57:12 2017	(r50817)
@@ -45,7 +45,7 @@
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-GUMSTIX.img.xz">GUMSTIX</a></li>
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>
 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
-		<!--<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-WANDBOARD.img.xz">WANDBOARD</a></li>-->
+		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-WANDBOARD.img.xz">WANDBOARD</a></li>
 	      </ul>
 	    </td>
 	    <td>

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Sat Sep  9 21:09:44 2017	(r50816)
+++ head/share/xml/news.xml	Sat Sep  9 21:57:12 2017	(r50817)
@@ -35,6 +35,22 @@
       <name>9</name>
 
       <day>
+	<name>9</name>
+
+	<event>
+	  <title>&os;&nbsp;10.4-BETA4 Available</title>
+
+	  <p>The fourth BETA build for the &os;&nbsp;10.4 release cycle
+	    is now available.  ISO images for the amd64, armv6, i386,
+	    ia64, powerpc, powerpc64 and sparc64 architectures are <a
+	      href="&lists.stable;/2017-September/087791.html">available</a>
+	    on most of our <a
+	      href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+	      mirror sites</a>.</p>
+	</event>
+      </day>
+
+      <day>
 	<name>2</name>
 
         <event>

Modified: head/share/xml/release.ent
==============================================================================
--- head/share/xml/release.ent	Sat Sep  9 21:09:44 2017	(r50816)
+++ head/share/xml/release.ent	Sat Sep  9 21:57:12 2017	(r50817)
@@ -55,7 +55,7 @@
 <!ENTITY beta2.testing "INCLUDE">
 <!ENTITY % beta2.testing "INCLUDE">
 <!ENTITY betarel2.current '10.4'>
-<!ENTITY betarel2.vers 'BETA3'>
+<!ENTITY betarel2.vers 'BETA4'>
 <!ENTITY u.betarel2.schedule '&base;/releases/&betarel2.current;R/schedule.html'>
 
 <!ENTITY rel.current.major '11'>