From owner-svn-doc-head@freebsd.org  Sun Apr 30 06:20: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 92906D5632C;
 Sun, 30 Apr 2017 06:20:46 +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 489FC1D31;
 Sun, 30 Apr 2017 06:20:46 +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 v3U6KjRU097271;
 Sun, 30 Apr 2017 06:20:45 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3U6KjKC097270;
 Sun, 30 Apr 2017 06:20:45 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201704300620.v3U6KjKC097270@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, 30 Apr 2017 06:20:45 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50213 - head/ja_JP.eucJP/books/handbook/cutting-edge
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 30 Apr 2017 06:20:46 -0000

Author: ryusuke
Date: Sun Apr 30 06:20:45 2017
New Revision: 50213
URL: https://svnweb.freebsd.org/changeset/doc/50213

Log:
  - Merge the following from the English version:
  
  	r49531 -> r50201	head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Sat Apr 29 09:11:00 2017	(r50212)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Sun Apr 30 06:20:45 2017	(r50213)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r49531
+     Original revision: r50201
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -2035,18 +2035,18 @@ a good job of merging.
 	      たとえば、<application>svn</application> を実行したとき、
 	      次にあげるようなファイルが更新されていたとします。</para>
 
-	    <screen><filename>src/games/cribbage/instr.c</filename>
-<filename>src/games/sail/pl_main.c</filename>
-<filename>src/release/sysinstall/config.c</filename>
-<filename>src/release/sysinstall/media.c</filename>
-<filename>src/share/mk/bsd.port.mk</filename></screen>
+	    <screen><filename>src/games/factor/factor.c</filename>
+<filename>src/games/fortune/fortune/fortune.c</filename>
+<filename>src/usr.sbin/bsdinstall/distextract/distextract.c</filename>
+<filename>src/usr.sbin/bsdinstall/partedit/diskeditor.c</filename>
+<filename>src/share/man/man7/intro.7</filename></screen>
 
 	    <para>このときには、改めてシステム全体を再構築する必要はないでしょう。
 	      そのかわり、適切なサブディレクトリに移って
 	      <command>make all install</command> を行ってください。
 	      しかし、たとえば <filename>src/lib/libc/stdlib</filename>
 	      のような大きな変更が行なわれた場合には、
-	      システム全体を再構築することを検討してください。</para>
+	      システム全体の完全な再構築が強く推奨されます。</para>
 
 	    <para>2 週間ごとにシステムを再構築して、
 	      その 2 週間分の変更を取り込むユーザもいますし、

From owner-svn-doc-head@freebsd.org  Sun Apr 30 09:36:58 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 E3B74D562F5;
 Sun, 30 Apr 2017 09:36:58 +0000 (UTC)
 (envelope-from rene@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 B56541E5A;
 Sun, 30 Apr 2017 09:36:58 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3U9avii078066;
 Sun, 30 Apr 2017 09:36:57 GMT (envelope-from rene@FreeBSD.org)
Received: (from rene@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3U9avFN078064;
 Sun, 30 Apr 2017 09:36:57 GMT (envelope-from rene@FreeBSD.org)
Message-Id: <201704300936.v3U9avFN078064@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rene set sender to
 rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 30 Apr 2017 09:36:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50214 - head/en_US.ISO8859-1/articles/contributors
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 30 Apr 2017 09:36:59 -0000

Author: rene
Date: Sun Apr 30 09:36:57 2017
New Revision: 50214
URL: https://svnweb.freebsd.org/changeset/doc/50214

Log:
  Move bf@ to the developer alumni.
  
  With hat:	portmgr-secretary

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

Modified: head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Sun Apr 30 06:20:45 2017	(r50213)
+++ head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Sun Apr 30 09:36:57 2017	(r50214)
@@ -321,10 +321,6 @@ xmlns:xlink="http://www.w3.org/1999/xlin
   </listitem>
 
   <listitem>
-    <para>&a.bf.email;</para>
-  </listitem>
-
-  <listitem>
     <para>&a.madpilot.email;</para>
   </listitem>
 

Modified: head/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml	Sun Apr 30 06:20:45 2017	(r50213)
+++ head/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml	Sun Apr 30 09:36:57 2017	(r50214)
@@ -4,6 +4,10 @@
 xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
 
   <listitem>
+    <para>&a.bf.email; (2010 - 2015)</para>
+  </listitem>
+
+  <listitem>
     <para>&a.olivierd.email; (2012 - 2017)</para>
   </listitem>
 

From owner-svn-doc-head@freebsd.org  Mon May  1 09:25:18 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 7EA7CD5883B;
 Mon,  1 May 2017 09:25:18 +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 4E106EF;
 Mon,  1 May 2017 09:25: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 v419PHa2070193;
 Mon, 1 May 2017 09:25:17 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v419PHcD070192;
 Mon, 1 May 2017 09:25:17 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201705010925.v419PHcD070192@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, 1 May 2017 09:25:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50216 - head/en_US.ISO8859-1/articles/committers-guide
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 01 May 2017 09:25:18 -0000

Author: mat
Date: Mon May  1 09:25:17 2017
New Revision: 50216
URL: https://svnweb.freebsd.org/changeset/doc/50216

Log:
  Split a long paragraph in two.
  
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Mon May  1 09:25:11 2017	(r50215)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Mon May  1 09:25:17 2017	(r50216)
@@ -4457,9 +4457,11 @@ Relnotes:           yes</programlisting>
 	      that time, build problems were fixed, and the release
 	      packages were built.  This practice is no longer used,
 	      as the packages for the releases are built from the
-	      current stable, quarterly branch.  For more information
-	      on how to merge commits to the quarterly branch, see
-	      <xref linkend="ports-qa-misc-request-mfh"/>.</para>
+	      current stable, quarterly branch.</para>
+
+	    <para>For more information on how to merge commits to the
+	      quarterly branch, see <xref
+		linkend="ports-qa-misc-request-mfh"/>.</para>
 	  </answer>
 	</qandaentry>
       </qandadiv>

From owner-svn-doc-head@freebsd.org  Mon May  1 09:25:21 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 09897D5884D;
 Mon,  1 May 2017 09:25:21 +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 CDFC9FF;
 Mon,  1 May 2017 09:25:20 +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 v419PJhh070236;
 Mon, 1 May 2017 09:25:19 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v419PJcn070235;
 Mon, 1 May 2017 09:25:19 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201705010925.v419PJcn070235@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, 1 May 2017 09:25:19 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50217 - head/en_US.ISO8859-1/articles/committers-guide
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 01 May 2017 09:25:21 -0000

Author: mat
Date: Mon May  1 09:25:19 2017
New Revision: 50217
URL: https://svnweb.freebsd.org/changeset/doc/50217

Log:
  Add some emphasis to important bits.
  
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Mon May  1 09:25:17 2017	(r50216)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Mon May  1 09:25:19 2017	(r50217)
@@ -4582,12 +4582,14 @@ Do you want to commit? (no = start a she
 		revision at a time.  If there have been other updates
 		to the port since the branch was created that have not
 		been merged because they were not security related.
-		Add the different revisions in the order they were
-		committed on the <command>mfh</command> command line.
+		Add the different revisions <emphasis>in the order
+		  they were committed</emphasis> on the
+		<command>mfh</command> command line.
 		The new commit log message will contain the combined
 		log messages from all the original commits.  These
-		messages must be edited to show what is actually being
-		done with the new commit.</para>
+		messages <emphasis>must</emphasis> be edited to show
+		what is actually being done with the new
+		commit.</para>
 
 	      <screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh r407208 r407713 r407722 r408567 r408943 r410728</userinput></screen>
 	    </tip>

From owner-svn-doc-head@freebsd.org  Mon May  1 09:25: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 3F935D5882B;
 Mon,  1 May 2017 09:25:13 +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 0F01EE3;
 Mon,  1 May 2017 09:25:12 +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 v419PCKP070152;
 Mon, 1 May 2017 09:25:12 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v419PCQ1070151;
 Mon, 1 May 2017 09:25:12 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201705010925.v419PCQ1070151@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, 1 May 2017 09:25:12 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50215 - head/en_US.ISO8859-1/articles/committers-guide
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 01 May 2017 09:25:13 -0000

Author: mat
Date: Mon May  1 09:25:11 2017
New Revision: 50215
URL: https://svnweb.freebsd.org/changeset/doc/50215

Log:
  Split the request and the merge actions into two separate questions.
  
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Sun Apr 30 09:36:57 2017	(r50214)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Mon May  1 09:25:11 2017	(r50215)
@@ -4487,7 +4487,16 @@ Relnotes:           yes</programlisting>
 	      to the &a.ports-secteam; and the &a.portmgr; with the revision
 	      number and a small description of why the commit needs
 	      to be merged.</para>
+	  </answer>
+	</qandaentry>
+
+	<qandaentry xml:id="ports-qa-misc-commit-mfh">
+	  <question>
+	    <para>What is the procedure for merging commits to the
+	      quarterly branch?</para>
+	  </question>
 
+	  <answer>
 	    <para>A script is provided to automate merging a specific
 	      commit: <filename>ports/Tools/scripts/mfh</filename>.
 	      It is used as follows:</para>

From owner-svn-doc-head@freebsd.org  Mon May  1 09:25:23 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 97795D58856;
 Mon,  1 May 2017 09:25:23 +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 622E1130;
 Mon,  1 May 2017 09:25:23 +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 v419PMR2070280;
 Mon, 1 May 2017 09:25:22 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v419PMnw070279;
 Mon, 1 May 2017 09:25:22 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201705010925.v419PMnw070279@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, 1 May 2017 09:25:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50218 - head/en_US.ISO8859-1/articles/committers-guide
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 01 May 2017 09:25:23 -0000

Author: mat
Date: Mon May  1 09:25:22 2017
New Revision: 50218
URL: https://svnweb.freebsd.org/changeset/doc/50218

Log:
  Expand a bit the usage of the quarterly branch in the mfh command line.
  
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Mon May  1 09:25:19 2017	(r50217)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Mon May  1 09:25:22 2017	(r50218)
@@ -4597,10 +4597,13 @@ Do you want to commit? (no = start a she
 	    <note>
 	      <para>The mfh script can also take an optional first
 		argument, the branch where the merge is being done.
-		It does, however, select the latest branch, so
-		specifying the branch is discouraged.</para>
+		Only the latest quarterly branch is supported, so
+		specifying the branch is discouraged.  To be safe, the
+		script will give a warning if the quarterly branch is
+		not the latest:</para>
 
-	      <screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh 2016Q1 r407208 r407713</userinput></screen>
+	      <screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh 2016Q1 r407208 r407713</userinput>
+/!\ The latest branch is 2016Q2, do you really want to commit to 2016Q1? [y/n]</screen>
 	    </note>
 	  </answer>
 	</qandaentry>

From owner-svn-doc-head@freebsd.org  Tue May  2 15:01: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 0F098D5A718;
 Tue,  2 May 2017 15:01: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 D521616F9;
 Tue,  2 May 2017 15:01: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 v42F1ns4010604;
 Tue, 2 May 2017 15:01:49 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v42F1nq7010603;
 Tue, 2 May 2017 15:01:49 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201705021501.v42F1nq7010603@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: Tue, 2 May 2017 15:01:49 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50219 - head/en_US.ISO8859-1/books/porters-handbook/uses
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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: Tue, 02 May 2017 15:01:51 -0000

Author: mat
Date: Tue May  2 15:01:49 2017
New Revision: 50219
URL: https://svnweb.freebsd.org/changeset/doc/50219

Log:
  Add test to the list of possible USE_PERL5 values, and remove install,
  it never was a thing.
  
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Mon May  1 09:25:22 2017	(r50218)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue May  2 15:01:49 2017	(r50219)
@@ -1711,8 +1711,8 @@ USE_MATE=	menus:build intlhack</programl
 	<para><varname>USE_PERL5</varname>: Phases in which to use
 	  <application>Perl</application>, can be
 	  <literal>extract</literal>, <literal>patch</literal>,
-	  <literal>build</literal>, <literal>install</literal>, or
-	  <literal>run</literal>.  It can also be
+	  <literal>build</literal>, <literal>run</literal>, or
+	  <literal>test</literal>.  It can also be
 	  <literal>configure</literal>, <literal>modbuild</literal>,
 	  or <literal>modbuildtiny</literal> when
 	  <filename>Makefile.PL</filename>,

From owner-svn-doc-head@freebsd.org  Tue May  2 17:04:58 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 A8A15D5A130;
 Tue,  2 May 2017 17:04:58 +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 7A8C6F6;
 Tue,  2 May 2017 17:04:58 +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 v42H4vSf065085;
 Tue, 2 May 2017 17:04:57 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v42H4vVo065084;
 Tue, 2 May 2017 17:04:57 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201705021704.v42H4vVo065084@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: Tue, 2 May 2017 17:04:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50220 - head/en_US.ISO8859-1/books/porters-handbook/uses
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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: Tue, 02 May 2017 17:04:58 -0000

Author: mat
Date: Tue May  2 17:04:57 2017
New Revision: 50220
URL: https://svnweb.freebsd.org/changeset/doc/50220

Log:
  Document USES=grantlee.
  
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue May  2 15:01:49 2017	(r50219)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue May  2 17:04:57 2017	(r50220)
@@ -1135,6 +1135,25 @@ USE_GNOME=	gnomemenus3:build intlhack</p
       is not present in the base system.</para>
   </sect1>
 
+  <sect1 xml:id="uses-grantlee">
+    <title><literal>grantlee</literal></title>
+
+    <para>Possible arguments: <literal>4</literal>,
+      <literal>5</literal>, <literal>selfbuild</literal></para>
+
+    <para>Handle dependency on <application>Grantlee</application>.
+      Specify <literal>4</literal> to depend on the
+      <application>Qt4</application> based version, <package
+	role="port">devel/grantlee</package>.  Specify
+      <literal>5</literal> to depend on the
+      <application>Qt5</application> based version, <package
+	role="port">devel/grantlee5</package>.
+      <literal>selfbuild</literal> is used internally by <package
+	role="port">devel/grantlee</package> and <package
+	role="port">devel/grantlee5</package> to get their versions
+      numbers.</para>
+  </sect1>
+
   <sect1 xml:id="uses-gssapi">
     <title><literal>gssapi</literal></title>
 

From owner-svn-doc-head@freebsd.org  Tue May  2 17:05:02 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 B21DAD5A170;
 Tue,  2 May 2017 17:05:02 +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 756C9103;
 Tue,  2 May 2017 17:05:02 +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 v42H51pb065144;
 Tue, 2 May 2017 17:05:01 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v42H51uE065143;
 Tue, 2 May 2017 17:05:01 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201705021705.v42H51uE065143@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: Tue, 2 May 2017 17:05:01 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50221 - head/en_US.ISO8859-1/books/porters-handbook/uses
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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: Tue, 02 May 2017 17:05:02 -0000

Author: mat
Date: Tue May  2 17:05:01 2017
New Revision: 50221
URL: https://svnweb.freebsd.org/changeset/doc/50221

Log:
  Document USES=linux.
  
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue May  2 17:04:57 2017	(r50220)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue May  2 17:05:01 2017	(r50221)
@@ -1404,6 +1404,314 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssa
       dependency.</para>
   </sect1>
 
+  <sect1 xml:id="uses-linux">
+    <title><literal>linux</literal></title>
+
+    <para>Possible arguments: <literal>c6</literal>,
+      <literal>c7</literal></para>
+
+    <para>Ports <application>Linux</application> compatibility
+      framework.  Specify <literal>c6</literal> to depend on
+      <application>CentOS</application> 6 packags.  Specify
+      <literal>c7</literal> to depend on
+      <application>CentOS</application> 7 packages.  The available
+      packages are:</para>
+
+    <!--
+    $ sed -ne 's/^linux_\(.*\)_DEP=.*/\1/p' Mk/Uses/linux.mk |sort -u|sed -e 's,.*,<listitem> <para><literal>&</literal></para> </listitem> ,'
+    -->
+    <itemizedlist>
+      <listitem>
+	<para><literal>allegro</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>alsa-plugins-oss</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>alsa-plugins-pulseaudio</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>alsalib</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>atk</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>avahi-libs</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>base</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>cairo</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>cups-libs</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>curl</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>cyrus-sasl2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>dbusglib</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>dbuslibs</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>devtools</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>dri</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>expat</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>flac</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>fontconfig</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gdkpixbuf2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gnutls</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>graphite2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gtk2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>harfbuzz</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>jasper</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>jbigkit</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>jpeg</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libasyncns</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libaudiofile</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libelf</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgcrypt</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgfortran</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgpg-error</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libmng</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libogg</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libpciaccess</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libsndfile</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libsoup</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libssh2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libtasn1</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libthai</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libtheora</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libv4l</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libvorbis</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libxml2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>mikmod</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>naslibs</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>ncurses-base</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>nspr</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>nss</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>openal</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>openal-soft</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>openldap</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>openmotif</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>openssl</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>pango</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>pixman</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>png</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>pulseaudio-libs</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>qt</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>qt-x11</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>qtwebkit</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>scimlibs</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>sdl12</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>sdlimage</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>sdlmixer</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>sqlite3</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>tcl85</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>tcp_wrappers-libs</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>tiff</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>tk85</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>ucl</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>xorglibs</literal></para>
+      </listitem>
+    </itemizedlist>
+
+  </sect1>
+
   <sect1 xml:id="uses-localbase">
     <title><literal>localbase</literal></title>
 

From owner-svn-doc-head@freebsd.org  Tue May  2 17:05:06 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 6892AD5A199;
 Tue,  2 May 2017 17:05:06 +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 3A99B133;
 Tue,  2 May 2017 17:05:06 +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 v42H55OZ065190;
 Tue, 2 May 2017 17:05:05 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v42H55wZ065189;
 Tue, 2 May 2017 17:05:05 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201705021705.v42H55wZ065189@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: Tue, 2 May 2017 17:05:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50222 - head/en_US.ISO8859-1/books/porters-handbook/uses
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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: Tue, 02 May 2017 17:05:06 -0000

Author: mat
Date: Tue May  2 17:05:05 2017
New Revision: 50222
URL: https://svnweb.freebsd.org/changeset/doc/50222

Log:
  Document USES=lxqt.
  
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue May  2 17:05:01 2017	(r50221)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue May  2 17:05:05 2017	(r50222)
@@ -1741,6 +1741,17 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssa
       <literal>52+</literal>).</para>
   </sect1>
 
+  <sect1 xml:id="uses-lxqt">
+    <title><literal>lxqt</literal></title>
+
+    <para>Possible arguments: (none)</para>
+
+    <para>Handle dependencies for the <application>LXQt Desktop
+	Environment</application>.  Use <varname>USE_LXQT</varname> to
+      select the components needed for the port.  See <xref
+	linkend="using-lxqt"/> for more information.</para>
+  </sect1>
+
   <sect1 xml:id="uses-makeinfo">
     <title><literal>makeinfo</literal></title>
 

From owner-svn-doc-head@freebsd.org  Tue May  2 17:05: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 35ED2D5A1E3;
 Tue,  2 May 2017 17:05:10 +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 0646E175;
 Tue,  2 May 2017 17:05:09 +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 v42H59Mr065234;
 Tue, 2 May 2017 17:05:09 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v42H59mN065233;
 Tue, 2 May 2017 17:05:09 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201705021705.v42H59mN065233@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: Tue, 2 May 2017 17:05:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50223 - head/en_US.ISO8859-1/books/porters-handbook/uses
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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: Tue, 02 May 2017 17:05:10 -0000

Author: mat
Date: Tue May  2 17:05:08 2017
New Revision: 50223
URL: https://svnweb.freebsd.org/changeset/doc/50223

Log:
  Add USES=meson.
  
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue May  2 17:05:05 2017	(r50222)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue May  2 17:05:08 2017	(r50223)
@@ -1866,6 +1866,14 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssa
 USE_MATE=	menus:build intlhack</programlisting>
   </sect1>
 
+  <sect1 xml:id="uses-meson">
+    <title><literal>meson</literal></title>
+
+    <para>Possible arguments: (none)</para>
+
+    <para>Provide support for Meson based projects.</para>
+  </sect1>
+
   <sect1 xml:id="uses-metaport">
     <title><literal>metaport</literal></title>
 

From owner-svn-doc-head@freebsd.org  Tue May  2 17:05:14 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 1DF1FD5A220;
 Tue,  2 May 2017 17:05:14 +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 C87771CF;
 Tue,  2 May 2017 17:05:13 +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 v42H5Cjf065281;
 Tue, 2 May 2017 17:05:12 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v42H5CU0065280;
 Tue, 2 May 2017 17:05:12 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201705021705.v42H5CU0065280@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: Tue, 2 May 2017 17:05:12 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50224 - head/en_US.ISO8859-1/books/porters-handbook/uses
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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: Tue, 02 May 2017 17:05:14 -0000

Author: mat
Date: Tue May  2 17:05:12 2017
New Revision: 50224
URL: https://svnweb.freebsd.org/changeset/doc/50224

Log:
  Document USES=samba.
  
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue May  2 17:05:08 2017	(r50223)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue May  2 17:05:12 2017	(r50224)
@@ -2508,6 +2508,49 @@ USE_PYQT=	core doc_build designer_run</p
 	role="port">devel/readline</package></para>
   </sect1>
 
+  <sect1 xml:id="uses-samba">
+    <title><literal>samba</literal></title>
+
+    <para>Possible arguments: <literal>build</literal>,
+      <literal>env</literal>, <literal>lib</literal>,
+      <literal>run</literal></para>
+
+    <para>Handle dependency on <application>Samba</application>.
+      <literal>env</literal> will not add any dependency and only set
+      up the variables.  <literal>build</literal> and
+      <literal>run</literal> will add build-time and run-time
+      dependency on <filename>smbd</filename>.  <literal>lib</literal>
+      will add a dependency on <filename>libsmbclient.so</filename>.
+      The variables that are exported are:</para>
+
+    <variablelist>
+      <varlistentry>
+	<term><varname>SAMBAPORT</varname></term>
+	<listitem>
+	  <para>The origin of the default
+	    <application>Samba</application> port.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><varname>SAMBAINCLUDES</varname></term>
+	<listitem>
+	  <para>The location of the <application>Samba</application>
+	    header files.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><varname>SAMBALIBS</varname></term>
+	<listitem>
+	  <para>The directory where the
+	    <application>Samba</application> shared libraries are
+	    available.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </sect1>
+
   <sect1 xml:id="uses-scons">
     <title><literal>scons</literal></title>
 

From owner-svn-doc-head@freebsd.org  Tue May  2 17:05:17 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 C4F1BD5A258;
 Tue,  2 May 2017 17:05:17 +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 95501221;
 Tue,  2 May 2017 17:05:17 +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 v42H5Ge6065325;
 Tue, 2 May 2017 17:05:16 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v42H5GPv065324;
 Tue, 2 May 2017 17:05:16 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201705021705.v42H5GPv065324@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: Tue, 2 May 2017 17:05:16 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50225 - head/en_US.ISO8859-1/books/porters-handbook/uses
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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: Tue, 02 May 2017 17:05:17 -0000

Author: mat
Date: Tue May  2 17:05:16 2017
New Revision: 50225
URL: https://svnweb.freebsd.org/changeset/doc/50225

Log:
  Document USES=varnish.
  
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue May  2 17:05:12 2017	(r50224)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue May  2 17:05:16 2017	(r50225)
@@ -2932,6 +2932,19 @@ ksh_CMD=	${LOCALBASE}/bin/ksh</programli
     </itemizedlist>
   </sect1>
 
+  <sect1 xml:id="uses-varnish">
+    <title><literal>varnish</literal></title>
+
+    <para>Possible arguments: <literal>4</literal>,
+      <literal>5</literal></para>
+
+    <para>Handle dependencies on <application>Varnish
+	Cache</application>.  <literal>4</literal> will add a
+      dependency on <package role="port">www/varnish4</package>.
+      <literal>5</literal> will add a dependency on <package
+	role="port">www/varnish5</package>.</para>
+  </sect1>
+
   <sect1 xml:id="uses-webplugin">
     <title><literal>webplugin</literal></title>
 

From owner-svn-doc-head@freebsd.org  Tue May  2 17:05:21 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 C7638D5A286;
 Tue,  2 May 2017 17:05:21 +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 86847288;
 Tue,  2 May 2017 17:05:21 +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 v42H5Ktl065372;
 Tue, 2 May 2017 17:05:20 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v42H5K18065371;
 Tue, 2 May 2017 17:05:20 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201705021705.v42H5K18065371@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: Tue, 2 May 2017 17:05:20 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50226 - head/en_US.ISO8859-1/books/porters-handbook/uses
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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: Tue, 02 May 2017 17:05:21 -0000

Author: mat
Date: Tue May  2 17:05:20 2017
New Revision: 50226
URL: https://svnweb.freebsd.org/changeset/doc/50226

Log:
  Keep up-to-date with changes in existing USES.
  
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue May  2 17:05:16 2017	(r50225)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue May  2 17:05:20 2017	(r50226)
@@ -8,19 +8,19 @@
 
 <!--
 
-  Document up-to date with r416240 revision of the ports tree.
+  Document up-to date with r439950 revision of the ports tree.
 
   This file documents the values of the USES make variable.  The
   format is easy to grasp from the already-added entries below (or use
   this scheme below as a skeleton):
 
-<sect1 xml:id="uses-FEATURE">
-  <title><literal>FEATURE</literal></title>
+  <sect1 xml:id="uses-FEATURE">
+    <title><literal>FEATURE</literal></title>
 
-  <para>Possible arguments: ARGUMENTS</para>
+    <para>Possible arguments: ARGUMENTS</para>
 
-  <para>DESCRIPTION</para>
-</sect1>
+    <para>DESCRIPTION</para>
+  </sect1>
 
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink=
@@ -407,11 +407,14 @@
     <title><literal>cran</literal></title>
 
     <para>Possible arguments: (none),
-      <literal>auto-plist</literal></para>
+      <literal>auto-plist</literal>,
+      <literal>compiles</literal></para>
 
     <para>Uses the Comprehensive R Archive Network.  Specify
       <varname>auto-plist</varname> to automatically generate
-      <filename>pkg-plist</filename>.</para>
+      <filename>pkg-plist</filename>.  Specify
+      <literal>compiles</literal> if the port has code that need to be
+      compiled.</para>
   </sect1>
 
   <sect1 xml:id="uses-desktop-file-utils">
@@ -496,14 +499,14 @@
   <sect1 xml:id="uses-drupal">
     <title><literal>drupal</literal></title>
 
-    <para>Possible arguments: <literal>6</literal>,
+    <para>Possible arguments:
       <literal>7</literal>, <literal>module</literal>,
       <literal>theme</literal></para>
 
     <para>Automate installation of a port that is a
       <application>Drupal</application> theme or module.  Use with the
       version of Drupal that the port is expecting.  For example,
-      <literal>USES=drupal:6,module</literal> says that this port
+      <literal>USES=drupal:7,module</literal> says that this port
       creates a Drupal 6 module.  A Drupal 7 theme can be specified
       with <literal>USES=drupal:7,theme</literal>.</para>
   </sect1>
@@ -711,6 +714,11 @@
       should be listed in <varname>USE_GNOME</varname>.  The available
       components are:</para>
 
+    <!--
+      From any port with USES=gnome, run:
+      $ make -V '${_USE_GNOME_ALL:O:u:C,.*,<listitem> <para><literal>&</literal></para> </listitem> ,}'
+      replace all spaces with new lines and reindent.
+      -->
     <itemizedlist>
       <listitem>
 	<para><literal>atk</literal></para>
@@ -721,10 +729,6 @@
       </listitem>
 
       <listitem>
-	<para><literal>atspi</literal></para>
-      </listitem>
-
-      <listitem>
 	<para><literal>cairo</literal></para>
       </listitem>
 
@@ -745,10 +749,6 @@
       </listitem>
 
       <listitem>
-	<para><literal>gal2</literal></para>
-      </listitem>
-
-      <listitem>
 	<para><literal>gconf2</literal></para>
       </listitem>
 
@@ -805,10 +805,6 @@
       </listitem>
 
       <listitem>
-	<para><literal>gnomespeech</literal></para>
-      </listitem>
-
-      <listitem>
 	<para><literal>gnomevfs2</literal></para>
       </listitem>
 
@@ -853,10 +849,6 @@
       </listitem>
 
       <listitem>
-	<para><literal>gtksharp10</literal></para>
-      </listitem>
-
-      <listitem>
 	<para><literal>gtksharp20</literal></para>
       </listitem>
 
@@ -905,10 +897,6 @@
       </listitem>
 
       <listitem>
-	<para><literal>libgda4</literal></para>
-      </listitem>
-
-      <listitem>
 	<para><literal>libgda5</literal></para>
       </listitem>
 
@@ -917,10 +905,6 @@
       </listitem>
 
       <listitem>
-	<para><literal>libgdamm</literal></para>
-      </listitem>
-
-      <listitem>
 	<para><literal>libgdamm5</literal></para>
       </listitem>
 
@@ -1715,11 +1699,14 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssa
   <sect1 xml:id="uses-localbase">
     <title><literal>localbase</literal></title>
 
-    <para>Possible arguments: (none)</para>
+    <para>Possible arguments: (none), <literal>ldflags</literal></para>
 
     <para>Ensures that libraries from dependencies in
       <varname>LOCALBASE</varname> are used instead of the ones from
-      the base system.  Ports that depend on libraries that are also
+      the base system.  Specify <literal>ldflags</literal> to add
+      <literal>-L${LOCALBASE}/lib</literal> to
+      <varname>LDFLAGS</varname> instead of <varname>LIBS</varname>.
+      Ports that depend on libraries that are also
       present in the base system should use this.  It is also used
       internally by a few other <varname>USES</varname>.</para>
   </sect1>
@@ -1854,6 +1841,10 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssa
       </listitem>
 
       <listitem>
+	<para><literal>session</literal></para>
+      </listitem>
+
+      <listitem>
 	<para><literal>settingsdaemon</literal></para>
       </listitem>
     </itemizedlist>
@@ -1899,7 +1890,9 @@ USE_MATE=	menus:build intlhack</programl
       Fall back to the default version, MySQL-5.6.  The possible
       versions are <literal>55</literal>, <literal>55m</literal>,
       <literal>55p</literal>, <literal>56</literal>,
-      <literal>56p</literal>, <literal>57</literal>,
+      <literal>56p</literal>, <literal>56w</literal>,
+      <literal>57</literal>, <literal>57p</literal>,
+      <literal>80</literal>,
       <literal>100m</literal>, and <literal>101m</literal>.  The
       <literal>m</literal> and <literal>p</literal> suffixes are for
       the <application>MariaDB</application> and
@@ -1920,11 +1913,23 @@ USE_MATE=	menus:build intlhack</programl
   <sect1 xml:id="uses-mono">
     <title><literal>mono</literal></title>
 
-    <para>Possible arguments: (none)</para>
+    <para>Possible arguments: (none), <literal>nuget</literal></para>
 
     <para>Adds a dependency on the <application>Mono</application>
       (currently only C#) framework by setting the appropriate
       dependencies.</para>
+
+    <para>Specify <literal>nuget</literal> when the port uses nuget
+      packages.  <varname>NUGET_DEPENDS</varname> needs to be set with
+      the names and versions of the nuget packages in the format
+      <literal><replaceable>name</replaceable>=<replaceable>version</replaceable></literal>.
+      An optional package origin can be added using
+      <literal><replaceable>name</replaceable>=<replaceable>version</replaceable>:<replaceable>origin</replaceable></literal>.</para>
+
+    <para>The helper target, <buildtarget>buildnuget</buildtarget>,
+      will output the content of the <varname>NUGET_DEPENDS</varname>
+      based on the provided
+      <filename>packages.config</filename>.</para>
   </sect1>
 
   <sect1 xml:id="uses-motif">
@@ -1954,9 +1959,8 @@ USE_MATE=	menus:build intlhack</programl
 
     <para>Possible arguments: (none)</para>
 
-    <para>Uses <application>ninja</application> to build the port.
-      End users can set <varname>NINJA_VERBOSE</varname> for verbose
-      output.</para>
+    <para>Uses <application>ninja</application> to build the
+      port.</para>
   </sect1>
 
   <sect1 xml:id="uses-objc">
@@ -1996,9 +2000,9 @@ USE_MATE=	menus:build intlhack</programl
       hierarchy.  For example, it fixes the installation directory
       of <command>pkgconfig</command>'s <filename>.pc</filename> files
       to <filename>${PREFIX}/libdata/pkgconfig</filename>.  If
-      the port uses <command>automake</command>, set
-      <varname>PATHFIX_MAKEFILEIN</varname> to
-      <filename>Makefile.am</filename> if needed.</para>
+      the port uses <literal>USES=autoreconf</literal>,
+      <filename>Makefile.am</filename> will be added to
+      <varname>PATHFIX_MAKEFILEIN</varname> automatically.</para>
 
     <para>If the port <link
 	linkend="uses-cmake"><literal>USES=cmake</literal></link> it
@@ -2095,7 +2099,8 @@ USE_MATE=	menus:build intlhack</programl
       <literal>ext</literal>, <literal>zend</literal>,
       <literal>build</literal>, <literal>cli</literal>,
       <literal>cgi</literal>, <literal>mod</literal>,
-      <literal>web</literal>, <literal>embed</literal></para>
+      <literal>web</literal>, <literal>embed</literal>,
+      <literal>pecl</literal></para>
 
     <para>Provide support for <application>PHP</application>.  Add a
       runtime dependency on the default PHP version, <package
@@ -2174,6 +2179,15 @@ USE_MATE=	menus:build intlhack</programl
 	    <application>PHP</application>.</para>
 	</listitem>
       </varlistentry>
+
+      <varlistentry>
+	<term><literal>pecl</literal></term>
+	<listitem>
+	  <para>Provide defaults for fetching
+	    <application>PHP</application> extensions from the PECL
+	    repository.</para>
+	</listitem>
+      </varlistentry>
     </variablelist>
 
     <para>Variables are used to specify which
@@ -2583,12 +2597,20 @@ USE_PYQT=	core doc_build designer_run</p
       interpreters, most notably <filename>/usr/bin/perl</filename>
       and <filename>/bin/bash</filename>.  The shebagngfix macro fixes
       shebang lines in scripts listed in
-      <varname>SHEBANG_FILES</varname>.  The shebangfix macro is run
-      from <literal>${WRKSRC}</literal>, so it can contain paths that
+      <varname>SHEBANG_REGEX</varname>,
+      <varname>SHEBANG_GLOB</varname>, or
+      <varname>SHEBANG_FILES</varname>.
+      <varname>SHEBANG_REGEX</varname> contains an extended regular
+      expressions, and is used with the <literal>-iregex</literal>
+      argument of &man.find.1;.  <varname>SHEBANG_GLOB</varname>
+      contains a pattern used with the <literal>-name</literal>
+      argument of &man.find.1;.  The shebangfix macro is run
+      from <literal>${WRKSRC}</literal>, so
+      <varname>SHEBANG_FILES</varname> can contain paths that
       are relative to <literal>${WRKSRC}</literal>.  It can also deal
       with absolute paths if files outside of
       <literal>${WRKSRC}</literal> require patching.  For
-      example:</para>
+      example when using <varname>SHEBANG_FILES</varname>:</para>
 
     <programlisting>USES=	shebangfix
 SHEBANG_FILES=	scripts/foobar.pl scripts/*.sh</programlisting>
@@ -2636,7 +2658,8 @@ SHEBANG_FILES=	scripts/foobar.pl scripts
 	    <varname><replaceable>interp</replaceable>_OLD_CMD</varname>:
 	    <literal>"/usr/bin/env <replaceable>interp</replaceable>"
 	      /bin/<replaceable>interp</replaceable>
-	      /usr/bin/<replaceable>interp</replaceable></literal>.</para>
+	      /usr/bin/<replaceable>interp</replaceable>
+	      /usr/local/bin/<replaceable>interp</replaceable></literal>.</para>
 	</listitem>
       </varlistentry>
     </variablelist>

From owner-svn-doc-head@freebsd.org  Wed May  3 18:04:26 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 3C0B5D5CDA2;
 Wed,  3 May 2017 18:04:26 +0000 (UTC)
 (envelope-from emaste@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 08AF69EE;
 Wed,  3 May 2017 18:04:25 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v43I4OHe089442;
 Wed, 3 May 2017 18:04:24 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v43I4OS8089441;
 Wed, 3 May 2017 18:04:24 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201705031804.v43I4OS8089441@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 3 May 2017 18:04:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50227 - head/en_US.ISO8859-1/articles/committers-guide
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 03 May 2017 18:04:26 -0000

Author: emaste (src committer)
Date: Wed May  3 18:04:24 2017
New Revision: 50227
URL: https://svnweb.freebsd.org/changeset/doc/50227

Log:
  committer's guide: document MFC to: and MFC with:
  
  There are a couple of different forms of these in use. Add "MFC to:" and
  "MFC with:" tags consistent with the existing "MFC after:", and provide
  a description so that consistent values can be used.
  
  There are ongoing discussions about "X-MFC-*" tags which still need to be
  resolved and documented here, or general guidance on X-MFC-*.
  
  Reviewed by:	bcr, ngie
  Differential Revision:	https://reviews.freebsd.org/D10585

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

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Tue May  2 17:05:20 2017	(r50226)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Wed May  3 18:04:24 2017	(r50227)
@@ -2586,6 +2586,21 @@ freebsd-mfc-after = 2 weeks</programlist
 	  </row>
 
 	  <row>
+	    <entry><literal>MFC to:</literal></entry>
+	    <entry>If the commit should be merged to a subset of
+	      stable branches, specify the branch names.</entry>
+	  </row>
+
+	  <row>
+	    <entry><literal>MFC with:</literal></entry>
+	    <entry>If the commit should be merged together with
+	      a previous one in a single
+	      <acronym>MFC</acronym> commit (for example, where
+	      this commit corrects a bug in the previous change),
+	      specify the corresponding revision number.</entry>
+	  </row>
+
+	  <row>
 	    <entry><literal>Relnotes:</literal></entry>
 	    <entry>If the change is a candidate for inclusion in
 	      the release notes for the next release from the branch,

From owner-svn-doc-head@freebsd.org  Wed May  3 20:44: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 3BBACD5C1BB;
 Wed,  3 May 2017 20:44:46 +0000 (UTC)
 (envelope-from wulf@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 EDF43CB0;
 Wed,  3 May 2017 20:44:45 +0000 (UTC)
 (envelope-from wulf@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v43KiieL057313;
 Wed, 3 May 2017 20:44:44 GMT (envelope-from wulf@FreeBSD.org)
Received: (from wulf@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v43KiiDo057306;
 Wed, 3 May 2017 20:44:44 GMT (envelope-from wulf@FreeBSD.org)
Message-Id: <201705032044.v43KiiDo057306@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wulf set sender to
 wulf@FreeBSD.org using -f
From: Vladimir Kondratyev <wulf@FreeBSD.org>
Date: Wed, 3 May 2017 20:44:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50228 - in head: en_US.ISO8859-1/articles/contributors
 share/pgpkeys share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 03 May 2017 20:44:46 -0000

Author: wulf (src committer)
Date: Wed May  3 20:44:44 2017
New Revision: 50228
URL: https://svnweb.freebsd.org/changeset/doc/50228

Log:
  As new src committer:
  - add my PGP key, add myself to needed lists and create news entry;
  - remove myself from Additional Contributers list.
  
  Approved by:	gonzo (mentor)

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

Modified: head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Wed May  3 18:04:24 2017	(r50227)
+++ head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Wed May  3 20:44:44 2017	(r50228)
@@ -10905,11 +10905,6 @@
   </listitem>
 
   <listitem>
-    <para>Vladimir Kondratiev
-      <email>wulf@mail.mipt.ru</email></para>
-  </listitem>
-
-  <listitem>
     <para>Vladimir Kurtikov
       <email>vk@vk.pp.ru</email></para>
   </listitem>

Modified: head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Wed May  3 18:04:24 2017	(r50227)
+++ head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Wed May  3 20:44:44 2017	(r50228)
@@ -609,6 +609,10 @@ xmlns:xlink="http://www.w3.org/1999/xlin
   </listitem>
 
   <listitem>
+    <para>&a.wulf.email;</para>
+  </listitem>
+
+  <listitem>
     <para>&a.koobs.email;</para>
   </listitem>
 

Modified: head/share/pgpkeys/pgpkeys-developers.xml
==============================================================================
--- head/share/pgpkeys/pgpkeys-developers.xml	Wed May  3 18:04:24 2017	(r50227)
+++ head/share/pgpkeys/pgpkeys-developers.xml	Wed May  3 20:44:44 2017	(r50228)
@@ -1071,6 +1071,11 @@
       &pgpkey.sergei;
     </sect2>
 
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-wulf">
+      <title>&a.wulf.email;</title>
+      &pgpkey.wulf;
+    </sect2>
+
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-maxim">
       <title>&a.maxim.email;</title>
       &pgpkey.maxim;

Modified: head/share/pgpkeys/pgpkeys.ent
==============================================================================
--- head/share/pgpkeys/pgpkeys.ent	Wed May  3 18:04:24 2017	(r50227)
+++ head/share/pgpkeys/pgpkeys.ent	Wed May  3 20:44:44 2017	(r50228)
@@ -523,6 +523,7 @@
 <!ENTITY pgpkey.wollman SYSTEM "wollman.key">
 <!ENTITY pgpkey.woodsb02 SYSTEM "woodsb02.key">
 <!ENTITY pgpkey.wosch SYSTEM "wosch.key">
+<!ENTITY pgpkey.wulf SYSTEM "wulf.key">
 <!ENTITY pgpkey.wxs SYSTEM "wxs.key">
 <!ENTITY pgpkey.xmj SYSTEM "xmj.key">
 <!ENTITY pgpkey.xride SYSTEM "xride.key">

Added: head/share/pgpkeys/wulf.key
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/pgpkeys/wulf.key	Wed May  3 20:44:44 2017	(r50228)
@@ -0,0 +1,53 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh wulf 836BBE2070295F75 ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa2048/836BBE2070295F75 2017-05-02 [SC] [expires: 2020-05-01]
+      Key fingerprint = 9309 C9AA 8988 C07F EC89  5125 836B BE20 7029 5F75
+uid                            Vladimir Kondratyev <vladimir@kondratyev.su>
+uid                            Vladimir Kondratyev <wulf@FreeBSD.org>
+sub   rsa2048/0C710B4482108464 2017-05-02 [E] [expires: 2020-05-01]
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+QuMH
+=OqkT
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

Modified: head/share/xml/authors.ent
==============================================================================
--- head/share/xml/authors.ent	Wed May  3 18:04:24 2017	(r50227)
+++ head/share/xml/authors.ent	Wed May  3 20:44:44 2017	(r50228)
@@ -2421,6 +2421,9 @@
 <!ENTITY a.wsanchez "Wilfredo S&aacute;nchez">
 <!ENTITY a.wsanchez.email "&a.wsanchez; <email xmlns='http://docbook.org/ns/docbook'>wsanchez@FreeBSD.org</email>">
 
+<!ENTITY a.wulf "Vladimir Kondratyev">
+<!ENTITY a.wulf.email "&a.wulf; <email xmlns='http://docbook.org/ns/docbook'>wulf@FreeBSD.org</email>">
+
 <!ENTITY a.wxs "Wesley Shields">
 <!ENTITY a.wxs.email "&a.wxs; <email xmlns='http://docbook.org/ns/docbook'>wxs@FreeBSD.org</email>">
 

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Wed May  3 18:04:24 2017	(r50227)
+++ head/share/xml/news.xml	Wed May  3 20:44:44 2017	(r50228)
@@ -32,6 +32,21 @@
     <name>2017</name>
 
     <month>
+      <name>4</name>
+
+      <day>
+        <name>27</name>
+
+        <event>
+          <p>New committer:
+            <a href="mailto:wulf@FreeBSD.org">Vladimir Kondratyev</a>
+            (src)</p>
+        </event>
+      </day>
+
+    </month>
+
+    <month>
       <name>3</name>
 
       <day>

From owner-svn-doc-head@freebsd.org  Thu May  4 03:51:14 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 4BDBFD5D35C;
 Thu,  4 May 2017 03:51:14 +0000 (UTC) (envelope-from bjk@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 ECD0F1065;
 Thu,  4 May 2017 03:51:13 +0000 (UTC) (envelope-from bjk@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v443pDW8036837;
 Thu, 4 May 2017 03:51:13 GMT (envelope-from bjk@FreeBSD.org)
Received: (from bjk@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v443pDBH036836;
 Thu, 4 May 2017 03:51:13 GMT (envelope-from bjk@FreeBSD.org)
Message-Id: <201705040351.v443pDBH036836@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bjk set sender to bjk@FreeBSD.org
 using -f
From: Benjamin Kaduk <bjk@FreeBSD.org>
Date: Thu, 4 May 2017 03:51:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50229 - head/en_US.ISO8859-1/htdocs/news/status
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 04 May 2017 03:51:14 -0000

Author: bjk
Date: Thu May  4 03:51:12 2017
New Revision: 50229
URL: https://svnweb.freebsd.org/changeset/doc/50229

Log:
  Some corrections to the 2017Q1 pNFS entry
  
  I had mixed up the File Layout and Flex File Layout; only the latter
  allows NFSv3 servers to act as data servers.
  
  Also lowercase Read/Write/Data/MetaData to match the prevailing
  style.
  
  Discussed with: rmacklem

Modified:
  head/en_US.ISO8859-1/htdocs/news/status/report-2017-01-2017-03.xml

Modified: head/en_US.ISO8859-1/htdocs/news/status/report-2017-01-2017-03.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/report-2017-01-2017-03.xml	Wed May  3 20:44:44 2017	(r50228)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2017-01-2017-03.xml	Thu May  4 03:51:12 2017	(r50229)
@@ -261,20 +261,21 @@
     <body>
       <p>Parallel NFS (pNFS) is an extension to the NFSv4 protocol that
 	allows for file accesses within a single logical mount to be
-	performed against multiple NFS file servers, "in parallel".
-	Thus, a pNFS server separats the MetaData operations from the
-	Data operations (Read/Write/Setattr of size N), letting
-	existing NFSv3 servers be used for the bulk data storage
-	while still taking advantage of NFSv4 protocol enhancements,
-	among other things.</p>
+	performed against multiple file servers, with the potential
+	for data access to occur in parallel.  The pNFS
+	&quot;layout&quot; specifies how the division occurs, with
+	metadata operations occuring against the main server, and
+	bulk data operations (read/write/setattr/etc.) occuring via
+	a layout-specific scheme between the client and data
+	servers.</p>
 
       <p>My first attempt at a pNFS server using GlusterFS was a dud.
 	It worked, but performance was so poor that it was not
 	usable.  This attempt that I call Plan B, only uses &os;,
-	with one &os; server handling the MetaData operations and K
-	&os; servers configured to serve Data.  An NFSv4.1 client
+	with one &os; server handling the metadata operations and K
+	&os; servers configured to serve data.  An NFSv4.1 client
 	that supports the pNFS File Layout will be able to
-	Read/Write to the Data servers directly, spreading out the
+	read/write to the data servers directly, spreading out the
 	RPC load and allowing growth beyond that of what a single
 	&os; NFS server could achieve.</p>
 

From owner-svn-doc-head@freebsd.org  Thu May  4 13:06:32 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 B4B04D5E8A7;
 Thu,  4 May 2017 13:06:32 +0000 (UTC)
 (envelope-from emaste@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 86337759;
 Thu,  4 May 2017 13:06:32 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v44D6VHo065882;
 Thu, 4 May 2017 13:06:31 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v44D6VbH065881;
 Thu, 4 May 2017 13:06:31 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201705041306.v44D6VbH065881@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 4 May 2017 13:06:31 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50230 - head/en_US.ISO8859-1/articles/committers-guide
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 04 May 2017 13:06:32 -0000

Author: emaste (src committer)
Date: Thu May  4 13:06:31 2017
New Revision: 50230
URL: https://svnweb.freebsd.org/changeset/doc/50230

Log:
  committers guide: mention that multiple PRs may be specified on the same line
  
  Reviewed by:	bcr, gavin

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

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Thu May  4 03:51:12 2017	(r50229)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Thu May  4 13:06:31 2017	(r50230)
@@ -2513,10 +2513,9 @@ freebsd-mfc-after = 2 weeks</programlist
 	  <row>
 	    <entry><literal>PR:</literal></entry>
 	    <entry>The problem report (if any) which is affected
-	      (typically, by being closed) by this commit.  Only
-	      include one PR per line as the automated scripts which
-	      parse this line cannot understand more than
-	      one.</entry>
+	      (typically, by being closed) by this commit.
+	      Multiple PRs may be specified on one line, separated by
+	      commas or spaces.</entry>
 	  </row>
 
 	  <row>

From owner-svn-doc-head@freebsd.org  Fri May  5 07:06:26 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 23724D5E665;
 Fri,  5 May 2017 07:06:26 +0000 (UTC)
 (envelope-from philip@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 E620025A;
 Fri,  5 May 2017 07:06:25 +0000 (UTC)
 (envelope-from philip@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4576OCN013905;
 Fri, 5 May 2017 07:06:24 GMT (envelope-from philip@FreeBSD.org)
Received: (from philip@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4576O3J013904;
 Fri, 5 May 2017 07:06:24 GMT (envelope-from philip@FreeBSD.org)
Message-Id: <201705050706.v4576O3J013904@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: philip set sender to
 philip@FreeBSD.org using -f
From: Philip Paeps <philip@FreeBSD.org>
Date: Fri, 5 May 2017 07:06:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50231 - head/share/pgpkeys
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 05 May 2017 07:06:26 -0000

Author: philip (src,ports committer)
Date: Fri May  5 07:06:24 2017
New Revision: 50231
URL: https://svnweb.freebsd.org/changeset/doc/50231

Log:
  Annual update of my PGP key expiry date.

Modified:
  head/share/pgpkeys/philip.key

Modified: head/share/pgpkeys/philip.key
==============================================================================
--- head/share/pgpkeys/philip.key	Thu May  4 13:06:31 2017	(r50230)
+++ head/share/pgpkeys/philip.key	Fri May  5 07:06:24 2017	(r50231)
@@ -3,14 +3,14 @@
 sh addkey.sh philip 31AEB9B5FDBBCB0E ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   rsa2048/31AEB9B5FDBBCB0E 2015-06-14 [expires: 2018-06-13]
+pub   rsa2048/31AEB9B5FDBBCB0E 2015-06-14 [SC] [expires: 2019-07-01]
       Key fingerprint = 2CD1 92C2 6EE7 B7D1 F552  6619 31AE B9B5 FDBB CB0E
 uid                            Philip Paeps <philip@trouble.is>
 uid                            Philip Paeps <philip@freebsd.org>
 uid                            Philip Paeps <philip@nixsys.be>
-sub   rsa2048/7C62BC4776C9F29E 2015-06-14 [expires: 2017-06-29]
-sub   rsa2048/935DB8343AF25C94 2015-06-14 [expires: 2017-06-29]
-sub   rsa2048/CFF632544136DF54 2015-06-14 [expires: 2017-06-29]
+sub   rsa2048/7C62BC4776C9F29E 2015-06-14 [S] [expires: 2018-06-01]
+sub   rsa2048/935DB8343AF25C94 2015-06-14 [E] [expires: 2018-06-01]
+sub   rsa2048/CFF632544136DF54 2015-06-14 [A] [expires: 2018-06-01]
 
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
@@ -22,84 +22,86 @@ V2GxOjF2PrZA0QnzgwlSqG2dfdSrMl3cFTeoHPGK
 5iLvKPnSTpAzRoQjGazniLSH+BvmtmUkgI0BCV1184f1GWGaxe6OoXsgXzuKWTEv
 v/h1YRvNBa9taRFo3qg1TMJIJW9EGxulTdT4w5wrbLFkVIRDTE7X0PcDZnoNP8OC
 iu6taGhFBYxsqX/FwqULuV4S/9KGRss4PFuzABEBAAG0IFBoaWxpcCBQYWVwcyA8
-cGhpbGlwQHRyb3VibGUuaXM+iQFrBBMBCgBVKhpodHRwczovL3Ryb3VibGUuaXMv
-cGdwL3NpZ25pbmctcG9saWN5LmFzYwIbAwUJBaOagAULCQgHAwUVCgkICwUWAwIB
-AAIeAQIXgAUCVX3j8wIZAQAKCRAxrrm1/bvLDh97B/4iOQQoY+UEjxyjCyOBiaHp
-lu4bAlumU3TKTneKaznu5yoB7XrEfr0abTzF8KruQT6BZbx26kuNrJLPshlsGpk6
-j2JXw4jfFnLtniLymSW9g/WifR+443PRkqCbN0HZzZz2LCmACm011v3pusji37j7
-QzW+UM4WcaOhzbp7PAZjWZiA4Rw4RVCNwsSdSXyUtycQ/KmHqnQz0y2i5Bzu0zqd
-QwuH++K4B3W9XxKNgvPYZhI6wbP2zsmBRfaQZRvtAPXS1DLv0asJZIB/508LYc8d
-8qsv3fMAEwByGm3PG2ltCyeXFa3cBqDliV2L2SUaxTLzmGAQBnmUvV123cEZssNv
-tCBQaGlsaXAgUGFlcHMgPHBoaWxpcEBmb3NkZW0ub3JnPokBbgQwAQoAWAUCVq8u
-8CoaaHR0cHM6Ly90cm91YmxlLmlzL3BncC9zaWduaW5nLXBvbGljeS5hc2MmHSBJ
-IGFtIG5vIGxvbmdlciBpbnZvbHZlZCB3aXRoIEZPU0RFTS4ACgkQMa65tf27yw6v
-4gf7BSTlelITyAYEqWruj0hWuXsv8SnsPcWron2GnoD7Ww+zYvnCdqcvZs/aEtaS
-N5zE6gsGA1Ek/SJyOmfvZGFbPw9u1VvKs15JeyHqueFRwTxAbO/3Lr6d21JDYh4N
-7oPagR4GKQfqO73NqmrTNtEIn6Zz5M1jeY+LY1OhD2A5P5ABnF6XjTQEp/GPpe2F
-7yG9lq9oR3BjxpTBrygvAGP78Lc75u6mfnCSflnzsnTcDZ5UQd4PrvQ/iHnxbCKA
-wmrd5mV5vtpQJxwIsO78wyomZJd8vha6btpuqL7Wdmn00e97JReo4feIoLL7TiB8
-8kK2m/xDRexrlVSN81iBR38VKrQhUGhpbGlwIFBhZXBzIDxwaGlsaXBAZnJlZWJz
-ZC5vcmc+iQFoBBMBCgBSBQJVfeOUKhpodHRwczovL3Ryb3VibGUuaXMvcGdwL3Np
-Z25pbmctcG9saWN5LmFzYwIbAwUJBaOagAULCQgHAwUVCgkICwUWAwIBAAIeAQIX
-gAAKCRAxrrm1/bvLDqwMB/9ZZWx3L27bhfWHOChWYNkpDEcnvRd3pXKMV2s3MXcg
-XrAJKgIJN8OCTPav2lAxti3FnbJ5xaT28oRGfkh3/Oz5UrcGfuIqr4CRjHhKk1a1
-M8LrMryA+hW4W/5/b2VZuBoxxMl3akNUjErVAgIAcj8CCyUbUdku7zziSYx4EbPo
-UDXAR9UpMbNz6Kj4Go/e6fhOn5oCKYcHbf7BLrY9C7wyOLfb2pp4LmprQ01vi5WQ
-jb8u5gcqM+YpOyDF/7G4RoRxTCaWkbmG9hHaoXTM8NHtDpe9uieAwhNSULSHo97v
-N0MuPugv7eNL8I3lvPdlwg/RaqGFLPh8fbpMeeCU6c6VtB9QaGlsaXAgUGFlcHMg
-PHBoaWxpcEBuaXhzeXMuYmU+iQFoBBMBCgBSBQJVfeOhKhpodHRwczovL3Ryb3Vi
-bGUuaXMvcGdwL3NpZ25pbmctcG9saWN5LmFzYwIbAwUJBaOagAULCQgHAwUVCgkI
-CwUWAwIBAAIeAQIXgAAKCRAxrrm1/bvLDm5lB/4jHF6P1lg53LTMniElec7ztW3i
-cfnUP/+xPivQZMNYzlU+PquoTKS2u+eGEOStFExsStsUyUjeJtJ7thAcRxoOR+sC
-8S9EmP/Iq8KRdZlbMzt0zdvDvDh8SX9grqFrqT+bjHyrXzdwKcqq40sU98Lk1geV
-tTTI6qOcmTFhk4/SGKR2GzUPOkKK895qLqKGNK0fMbcJ3htvhBRhv79gN/LWSdaE
-Ufww36705lxxfvo3/lmcSwYr0Wf9jfFxdEpLEOfDUiJSUXFIs9LWIYSSf5p+ByLH
-b8jOkT5BvjN/br9OTx/0mreljV7tOqZQFI+LfgVlHmBLqbVSH1xkxFLBU7ZPuQEN
-BFV9464BCACgabIt/2/oFH0RC+lPREZfvcU2Nyu7VYrpFR7YQ5g0GbY+I5eeyMZl
-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
-hbsH6nM=
-=PIph
+cGhpbGlwQHRyb3VibGUuaXM+iQGCBBMBCgBsKhpodHRwczovL3Ryb3VibGUuaXMv
+cGdwL3NpZ25pbmctcG9saWN5LmFzYwIbAwULCQgHAwUVCgkICwUWAwIBAAIeAQIX
+gAIZARYhBCzRksJu57fR9VJmGTGuubX9u8sOBQJZCwozBQkHnBJnAAoJEDGuubX9
+u8sOOdUH/0b2/0j41llUaeYGQwVfzxC9+mXO312IG4ZANk08ztOVytPeUo83lLm9
+mJPHRSIfdcXs56RARqpXCAwxyz6rk0gyH14LHGjnCvuLH5o2YJZY8UzYHhvtK2rG
+SxfCv0h1GsYPMlzVlnUINZaI9Wqs5fEizPwOJDninO+YxNnwlXe7GcRqK76bESQH
+liSyzlwbnNcbrf5NmOQqsVFo4Ggu/RiIkl6mets4EJFRu/vT20LzKeI4NTEmwVpo
+I+0owQVcuDypzy9uXWyPwVLqQGW8t6DKIo2FRV0lAOTXqn4KRLSyvtVTiS64bw83
+c/v6xyy5xSDFg/2X1xqC/shXE4rM7EO0IFBoaWxpcCBQYWVwcyA8cGhpbGlwQGZv
+c2RlbS5vcmc+iQFuBDABCgBYBQJWry7wKhpodHRwczovL3Ryb3VibGUuaXMvcGdw
+L3NpZ25pbmctcG9saWN5LmFzYyYdIEkgYW0gbm8gbG9uZ2VyIGludm9sdmVkIHdp
+dGggRk9TREVNLgAKCRAxrrm1/bvLDq/iB/sFJOV6UhPIBgSpau6PSFa5ey/xKew9
+xauifYaegPtbD7Ni+cJ2py9mz9oS1pI3nMTqCwYDUST9InI6Z+9kYVs/D27VW8qz
+Xkl7Ieq54VHBPEBs7/cuvp3bUkNiHg3ug9qBHgYpB+o7vc2qatM20QifpnPkzWN5
+j4tjU6EPYDk/kAGcXpeNNASn8Y+l7YXvIb2Wr2hHcGPGlMGvKC8AY/vwtzvm7qZ+
+cJJ+WfOydNwNnlRB3g+u9D+IefFsIoDCat3mZXm+2lAnHAiw7vzDKiZkl3y+Frpu
+2m6ovtZ2afTR73slF6jh94igsvtOIHzyQrab/ENF7GuVVI3zWIFHfxUqtCFQaGls
+aXAgUGFlcHMgPHBoaWxpcEBmcmVlYnNkLm9yZz6JAX8EEwEKAGkqGmh0dHBzOi8v
+dHJvdWJsZS5pcy9wZ3Avc2lnbmluZy1wb2xpY3kuYXNjAhsDBQsJCAcDBRUKCQgL
+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
+=A10P
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-head@freebsd.org  Fri May  5 10:33:49 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 33D44D5E3B5;
 Fri,  5 May 2017 10:33:49 +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 10A5917D2;
 Fri,  5 May 2017 10:33:48 +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 v45AXmE6097716;
 Fri, 5 May 2017 10:33:48 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v45AXmRp097715;
 Fri, 5 May 2017 10:33:48 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201705051033.v45AXmRp097715@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: Fri, 5 May 2017 10:33:48 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50232 - head/en_US.ISO8859-1/books/porters-handbook/uses
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 05 May 2017 10:33:49 -0000

Author: mat
Date: Fri May  5 10:33:47 2017
New Revision: 50232
URL: https://svnweb.freebsd.org/changeset/doc/50232

Log:
  Rewrite the USES=shebangfix section.
  
  Reviewed by:	bcr
  Sponsored by:	Absolight
  Differential Revision:	https://reviews.freebsd.org/D10584

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Fri May  5 07:06:24 2017	(r50231)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Fri May  5 10:33:47 2017	(r50232)
@@ -2595,25 +2595,48 @@ USE_PYQT=	core doc_build designer_run</p
 
     <para>A lot of software uses incorrect locations for script
       interpreters, most notably <filename>/usr/bin/perl</filename>
-      and <filename>/bin/bash</filename>.  The shebagngfix macro fixes
+      and <filename>/bin/bash</filename>.  The shebangfix macro fixes
       shebang lines in scripts listed in
       <varname>SHEBANG_REGEX</varname>,
       <varname>SHEBANG_GLOB</varname>, or
-      <varname>SHEBANG_FILES</varname>.
-      <varname>SHEBANG_REGEX</varname> contains an extended regular
-      expressions, and is used with the <literal>-iregex</literal>
-      argument of &man.find.1;.  <varname>SHEBANG_GLOB</varname>
-      contains a pattern used with the <literal>-name</literal>
-      argument of &man.find.1;.  The shebangfix macro is run
-      from <literal>${WRKSRC}</literal>, so
-      <varname>SHEBANG_FILES</varname> can contain paths that
-      are relative to <literal>${WRKSRC}</literal>.  It can also deal
-      with absolute paths if files outside of
-      <literal>${WRKSRC}</literal> require patching.  For
-      example when using <varname>SHEBANG_FILES</varname>:</para>
+      <varname>SHEBANG_FILES</varname>.</para>
 
-    <programlisting>USES=	shebangfix
-SHEBANG_FILES=	scripts/foobar.pl scripts/*.sh</programlisting>
+    <variablelist>
+      <varlistentry>
+	<term><varname>SHEBANG_REGEX</varname></term>
+
+	<listitem>
+	  <para>Contains <emphasis>one</emphasis> extended regular
+	    expressions, and is used with the
+	    <literal>-iregex</literal> argument of &man.find.1;.  See
+	    <xref linkend="uses-shebangfix-ex-regex"/>.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><varname>SHEBANG_GLOB</varname></term>
+
+	<listitem>
+	  <para>Contains a list of patterns used with the
+	    <literal>-name</literal> argument of &man.find.1;.  See
+	    <xref linkend="uses-shebangfix-ex-glob"/>.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><varname>SHEBANG_FILES</varname></term>
+
+	<listitem>
+	  <para>Contains a list of files or &man.sh.1; globs.  The
+	    shebangfix macro is run from <literal>${WRKSRC}</literal>,
+	    so <varname>SHEBANG_FILES</varname> can contain paths that
+	    are relative to <literal>${WRKSRC}</literal>.  It can also
+	    deal with absolute paths if files outside of
+	    <literal>${WRKSRC}</literal> require patching.  See <xref
+	      linkend="uses-shebangfix-ex-files" />.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
 
     <para>Currently
       <application>Bash</application>,
@@ -2653,51 +2676,128 @@ SHEBANG_FILES=	scripts/foobar.pl scripts
 	    are typically obsolete paths, or paths used on other
 	    operating systems that are incorrect on &os;.  They
 	    will be replaced by the correct path in
-	    <varname><replaceable>interp</replaceable>_CMD</varname>.
-	    This list will always be part of
-	    <varname><replaceable>interp</replaceable>_OLD_CMD</varname>:
-	    <literal>"/usr/bin/env <replaceable>interp</replaceable>"
-	      /bin/<replaceable>interp</replaceable>
-	      /usr/bin/<replaceable>interp</replaceable>
-	      /usr/local/bin/<replaceable>interp</replaceable></literal>.</para>
+	    <varname><replaceable>interp</replaceable>_CMD</varname>.</para>
+
+	  <note>
+	    <para>These will <emphasis>always</emphasis> be part of
+	      <varname><replaceable>interp</replaceable>_OLD_CMD</varname>:
+	      <literal>"/usr/bin/env
+		<replaceable>interp</replaceable>"
+		/bin/<replaceable>interp</replaceable>
+		/usr/bin/<replaceable>interp</replaceable>
+		/usr/local/bin/<replaceable>interp</replaceable></literal>.</para>
+	  </note>
+
+	  <tip>
+	    <para><varname><replaceable>interp</replaceable>_OLD_CMD</varname>
+	      contain multiple values.  Any entry with spaces must be
+	      quoted.  See <xref
+		linkend="uses-shebangfix-ex-ksh"/>.</para>
+	  </tip>
 	</listitem>
       </varlistentry>
     </variablelist>
 
-    <para>To add another interpreter, set
-      <varname>SHEBANG_LANG</varname>.  For example:</para>
+    <important>
+      <para>The fixing of shebangs is done during the
+	<buildtarget>patch</buildtarget> phase.  If scripts are
+	created with incorrect shebangs during the
+	<buildtarget>build</buildtarget> phase, the build process (for
+	example, the <filename>configure</filename> script, or the
+	<filename>Makefiles</filename>) must be patched or given the
+	right path (for example, with
+	<varname>CONFIGURE_ENV</varname>,
+	<varname>CONFIGURE_ARGS</varname>,
+	<varname>MAKE_ENV</varname>, or <varname>MAKE_ARGS</varname>)
+	to generate the right shebangs.</para>
 
-    <programlisting>SHEBANG_LANG=	lua</programlisting>
+      <para>Correct paths for supported interpreters
+	are available in
+	<literal><replaceable>interp</replaceable>_CMD</literal>.</para>
+    </important>
 
-    <para><literal><replaceable>interp</replaceable>_OLD_CMD</literal>
-      will contain multiple values.  Any entry with spaces must be
-      quoted.  For example, if it was not already defined, the
-      <application>Ksh</application> entry could be defined as:</para>
+    <example xml:id="uses-shebangfix-ex-lua">
+      <title>Adding Another Interpreter to
+	<literal>USES=shebangfix</literal></title>
+
+      <para>To add another interpreter, set
+	<varname>SHEBANG_LANG</varname>.  For example:</para>
+
+      <programlisting>SHEBANG_LANG=	lua</programlisting>
+    </example>
+
+    <example xml:id="uses-shebangfix-ex-ksh">
+      <title>Specifying all the Paths When Adding an Interpreter to
+	<literal>USES=shebangfix</literal></title>
+
+      <para>If it was not already defined, and there were no default
+	values for
+	<varname><replaceable>interp</replaceable>_OLD_CMD</varname>
+	and <varname><replaceable>interp</replaceable>_CMD</varname>
+	the <application>Ksh</application> entry could be defined
+	as:</para>
 
-    <programlisting>SHEBANG_LANG=	ksh
+      <programlisting>SHEBANG_LANG=	ksh
 ksh_OLD_CMD=	"/usr/bin/env ksh" /bin/ksh /usr/bin/ksh
 ksh_CMD=	${LOCALBASE}/bin/ksh</programlisting>
+    </example>
 
-    <para>Some software uses strange locations for an interpreter.
-      For example, an application might expect
-      <application>Python</application> to be located in
-      <filename>/opt/bin/python2.7</filename>.  The strange path to be
-      replaced can be declared in the port
-      <filename>Makefile</filename>:</para>
+    <example xml:id="uses-shebangfix-ex-strange">
+      <title>Adding a Strange Location for an Interpreter</title>
 
-    <programlisting>python_OLD_CMD=	/opt/bin/python2.7</programlisting>
+      <para>Some software uses strange locations for an interpreter.
+	For example, an application might expect
+	<application>Python</application> to be located in
+	<filename>/opt/bin/python2.7</filename>.  The strange path to
+	be replaced can be declared in the port
+	<filename>Makefile</filename>:</para>
+
+      <programlisting>python_OLD_CMD=	/opt/bin/python2.7</programlisting>
+    </example>
+
+    <example xml:id="uses-shebangfix-ex-regex">
+      <title><literal>USES=shebangfix</literal> with
+	<varname>SHEBANG_REGEX</varname></title>
+
+      <para>To fix all the files in
+	<literal>${WRKSRC}/scripts</literal> ending in
+	<filename>.pl</filename>, <filename>.sh</filename>, or
+	<filename>.cgi</filename> do:</para>
+
+      <programlisting>USES=	shebangfix
+SHEBANG_REGEX=	./scripts/.*\.(sh|pl|cgi)</programlisting>
+
+      <note>
+	<para><varname>SHEBANG_REGEX</varname> is used by running
+	  <command>find -E</command>, which uses modern regular
+	  expressions also known as extended regular expressions.  See
+	  &man.re.format.7; for more information.</para>
+      </note>
+    </example>
+
+    <example xml:id="uses-shebangfix-ex-glob">
+      <title><literal>USES=shebangfix</literal> with
+	<varname>SHEBANG_GLOB</varname></title>
+
+      <para>To fix all the files in <literal>${WRKSRC}</literal>
+	ending in <filename>.pl</filename> or
+	<filename>.sh</filename>, do:</para>
+
+      <programlisting>USES=	shebangfix
+SHEBANG_GLOB=	*.sh *.pl</programlisting>
+    </example>
+
+    <example xml:id="uses-shebangfix-ex-files">
+      <title><literal>USES=shebangfix</literal> with
+	<varname>SHEBANG_FILES</varname></title>
+
+      <para>To fix the files <filename>script/foobar.pl</filename> and
+	<filename>script/*.sh</filename> in
+	<literal>${WRKSRC}</literal>, do:</para>
 
-    <note>
-      <para>The fixing of shebangs is done during the
-	<buildtarget>patch</buildtarget> phase.  If scripts are
-	created with incorrect shebangs during the
-	<buildtarget>build</buildtarget> phase, the build process (for
-	examples, the <filename>configure</filename> script, or the
-	<filename>Makefiles</filename>) must be patched to generate
-	the right shebangs.  Correct paths for supported interpreters
-	are available in
-	<literal><replaceable>interp</replaceable>_CMD</literal>.</para>
-    </note>
+      <programlisting>USES=	shebangfix
+SHEBANG_FILES=	scripts/foobar.pl scripts/*.sh</programlisting>
+    </example>
   </sect1>
 
   <sect1 xml:id="uses-sqlite">

From owner-svn-doc-head@freebsd.org  Fri May  5 13:50:58 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 AC0C1D54C47;
 Fri,  5 May 2017 13:50:58 +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 6404A12BB;
 Fri,  5 May 2017 13:50:58 +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 v45DovV5075249;
 Fri, 5 May 2017 13:50:57 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v45DovZj075247;
 Fri, 5 May 2017 13:50:57 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201705051350.v45DovZj075247@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, 5 May 2017 13:50:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50233 - head/share/mk
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 05 May 2017 13:50:58 -0000

Author: wblock
Date: Fri May  5 13:50:57 2017
New Revision: 50233
URL: https://svnweb.freebsd.org/changeset/doc/50233

Log:
  Use Subversion metadata for version information rather than grepping for
  $FreeBSD$ version strings.

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

Modified: head/share/mk/doc.commands.mk
==============================================================================
--- head/share/mk/doc.commands.mk	Fri May  5 10:33:47 2017	(r50232)
+++ head/share/mk/doc.commands.mk	Fri May  5 13:50:57 2017	(r50233)
@@ -42,6 +42,7 @@ XARGS?=		/usr/bin/xargs
 # Version control
 #
 GIT?=		/usr/local/bin/git
+SVN?=		/usr/local/bin/svn
 
 #
 # Compession and decompression

Modified: head/share/mk/doc.docbook.mk
==============================================================================
--- head/share/mk/doc.docbook.mk	Fri May  5 10:33:47 2017	(r50232)
+++ head/share/mk/doc.docbook.mk	Fri May  5 13:50:57 2017	(r50233)
@@ -100,15 +100,21 @@ LATESTREVISION!=cd ${.CURDIR} && ${GIT} 
 	--stringparam latestrevision.committer "%cn" \
 	--stringparam latestrevision.number "%h"' ${SRCS}
 .else
-# version numbers are expected to be in Subversion, but we cannot
-# require Subversion to be installed just to build the documents,
-# so use grep to find the version strings
-LATESTREVISION!=${GREP} -Ehos '\$$[F]reeBSD: ([^\$$ ]+ ){5}\$$' ${SRCS} | \
-		${AWK} '{ print \
-		  "--stringparam latestrevision.timestamp \""$$4" "$$5"\" " \
-		  "--stringparam latestrevision.committer \""$$6"\" " \
-		  "--stringparam latestrevision.number \""$$3"\" " \
-		}' | ${SORT} | ${TAIL} -n1
+# if using Subversion, get information from metadata
+# rather than embedded version strings
+.if exists(${DOC_PREFIX}/.svn) && exists(${SVN})
+LATESTREVISION!=cd ${.CURDIR} && ${SVN} info ${SRCS} 2>/dev/null | \
+		${AWK} 'BEGIN {	genfmt="--stringparam latestrevision."; \
+				timefmt=genfmt"timestamp \"%s %s\""; \
+				comtfmt=genfmt"committer \"%s\""; \
+				revnfmt=genfmt"number \"%u\""; \
+				fmt=timefmt" "comtfmt"\t\t"revnfmt"\n"; } \
+			/^Last Changed Author:/ { committer=$$4 } \
+		        /^Last Changed Rev:/    { number=$$4 } \
+		        /^Last Changed Date:/   { date=$$4; time=$$5; \
+				printf(fmt, date, time, committer, number) }' \
+		| ${SORT} | ${TAIL} -n1
+.endif
 .endif
 
 # if neither Subversion nor Git revision numbers are available, use
@@ -336,7 +342,7 @@ POSET_CMD=	${SED} -i '' -e '1s,^,\#${IDS
 			     -e 's,^\(\"Language-Team:.*\\n\"\),\1\${.newline}\"Language: ${PO_LANG}\\n\",' \
 			     -e 's,^\"Content-Type: text/plain; charset=.*\\n,\"Content-Type: text/plain; charset=${PO_CHARSET}\\n,'
 
-.if ${.TARGETS:Mpo} || ${.TARGETS:Mtran}
+.if ${.TARGETS:Mpo} || ${.TARGETS:Mtran} || ${.TARGETS:M${DOC}.translate.xml}
 
 MASTER_SRCS!=	${MAKE} -C ${EN_DIR} -V SRCS
 

From owner-svn-doc-head@freebsd.org  Fri May  5 16:45: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 15C14D5F071;
 Fri,  5 May 2017 16:45:10 +0000 (UTC)
 (envelope-from sevan@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 D9ED21C04;
 Fri,  5 May 2017 16:45:09 +0000 (UTC)
 (envelope-from sevan@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v45Gj8Wl053225;
 Fri, 5 May 2017 16:45:08 GMT (envelope-from sevan@FreeBSD.org)
Received: (from sevan@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v45Gj8LV053224;
 Fri, 5 May 2017 16:45:08 GMT (envelope-from sevan@FreeBSD.org)
Message-Id: <201705051645.v45Gj8LV053224@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sevan set sender to
 sevan@FreeBSD.org using -f
From: Sevan Janiyan <sevan@FreeBSD.org>
Date: Fri, 5 May 2017 16:45:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50234 - head/en_US.ISO8859-1/books/handbook/introduction
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 05 May 2017 16:45:10 -0000

Author: sevan
Date: Fri May  5 16:45:08 2017
New Revision: 50234
URL: https://svnweb.freebsd.org/changeset/doc/50234

Log:
  Spelling fix
  s/realtime/real-time
  
  PR:		218734
  Submitted by:	Gracea Roller <gracearoller AT gmail DOT com>
  Reviewed by:	bcr (mentor) wblock (mentor)
  Differential Revision:	https://reviews.freebsd.org/D10454

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

Modified: head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml	Fri May  5 13:50:57 2017	(r50233)
+++ head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml	Fri May  5 16:45:08 2017	(r50234)
@@ -571,7 +571,7 @@
 	    <indexterm>
 	      <primary>Sandvine</primary>
 	    </indexterm> - Sandvine uses &os; as the basis of their
-	    high performance realtime network processing platforms
+	    high performance real-time network processing platforms
 	    that make up their intelligent network policy control
 	    products.</para>
 	</listitem>