From owner-svn-doc-all@freebsd.org  Fri Dec  1 09:16:36 2017
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@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 06758DF6B10;
 Fri,  1 Dec 2017 09:16:36 +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 D472F7757B;
 Fri,  1 Dec 2017 09:16:35 +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 vB19GYS7044388;
 Fri, 1 Dec 2017 09:16:34 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB19GYVG044386;
 Fri, 1 Dec 2017 09:16:34 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201712010916.vB19GYVG044386@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, 1 Dec 2017 09:16:34 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r51246 - in head/en_US.ISO8859-1/books/porters-handbook:
 flavors special
X-SVN-Group: doc-head
X-SVN-Commit-Author: mat
X-SVN-Commit-Paths: in head/en_US.ISO8859-1/books/porters-handbook: flavors
 special
X-SVN-Commit-Revision: 51246
X-SVN-Commit-Repository: doc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Dec 2017 09:16:36 -0000

Author: mat
Date: Fri Dec  1 09:16:34 2017
New Revision: 51246
URL: https://svnweb.freebsd.org/changeset/doc/51246

Log:
  Small fixes.
  
  Submitted by:	adamw
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/flavors/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/flavors/chapter.xml	Fri Dec  1 07:56:26 2017	(r51245)
+++ head/en_US.ISO8859-1/books/porters-handbook/flavors/chapter.xml	Fri Dec  1 09:16:34 2017	(r51246)
@@ -30,8 +30,9 @@
       flavor.</para>
 
     <important>
-      <para>Flavor names can <emphasis>only</emphasis> contain
-	lowercase letters, numbers, and the underscore
+      <para>To distinguish flavors from options, which are always
+	uppercase letters, flavor names can <emphasis>only</emphasis>
+	contain lowercase letters, numbers, and the underscore
 	<literal>_</literal>.</para>
     </important>
 
@@ -95,13 +96,9 @@ py36_PLIST=	${.CURDIR}/pkg-plist-py3 <co xml:id="flavo
 
 	<callout arearefs="flavors-using-ex2-if">
 	  <para>To guard against <varname>FLAVOR</varname> being
-	    empty, use the FLAVOR:U &man.make.1; construct, but as
-	    this is testing for the default flavor, we have to test
-	    that <varname>FLAVOR</varname> is undefined, or that
-	    <varname>FLAVOR</varname> matches <literal>py2*</literal>,
-	    this can be done by using the argument to
-	    <literal>:U</literal> that will be returned if the
-	    variable is undefined.</para>
+	    empty, which would cause a &man.make.1; error, use
+	    <literal>${FLAVOR:U}</literal> in string comparisons
+	    instead of <literal>${FLAVOR}</literal>.</para>
 	</callout>
 
 	<callout arearefs="flavors-using-ex2-pygobject3
@@ -144,8 +141,8 @@ py36_PLIST=	${.CURDIR}/pkg-plist-py3 <co xml:id="flavo
     <sect2 xml:id="flavors-using-helpers">
       <title>Flavors Helpers</title>
 
-      <para>To make <filename>Makefile</filename> easier to write, a
-	few flavors helpers exist.</para>
+      <para>To make the <filename>Makefile</filename> easier to write,
+	a few flavors helpers exist.</para>
 
       <para>This list of helpers will set their variable:</para>
 

Modified: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml	Fri Dec  1 07:56:26 2017	(r51245)
+++ head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml	Fri Dec  1 09:16:34 2017	(r51246)
@@ -3663,7 +3663,7 @@ SOCKETS_USE=	PHP=sockets
 	  <row>
 	    <entry><literal>USE_PYTHON=optsuffix</literal></entry>
 	    <entry>If the current Python version is not the default
-	      one, the port will have gain
+	      version, the port will gain
 	      <literal>PKGNAMESUFFIX=${PYTHON_PKGNAMESUFFIX}</literal>.
 	      Only useful with flavors.</entry>
 	  </row>