svn commit: r51246 - in head/en_US.ISO8859-1/books/porters-handbook: flavors special

[Mathieu Arnold]

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>