X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=policy.sgml;h=2c0c72ad77ed5ebf6b49cded4c26a9ce024b574b;hb=fd12af4ff32ea9c025a0e9c21127d78cf120051c;hp=3fcae7589b112d313dd0576d4dcdb080b8a63c1a;hpb=81047fb3cf766bf985008a0754d0dd65cd82dd06;p=debian%2Fdebian-policy.git

diff --git a/policy.sgml b/policy.sgml
index 3fcae75..2c0c72a 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -1951,7 +1951,7 @@
 	    </tag>
 	    <item>
 	      <p>
-		A package may also provide both of the targets
+		A package may also provide one or both of the targets
 		<tt>build-arch</tt> and <tt>build-indep</tt>.
 		The <tt>build-arch</tt> target, if provided, should
 		perform all the configuration and compilation required for
@@ -1964,9 +1964,13 @@
 		architecture-independent binary packages (those packages
 		for which the body of the <tt>Architecture</tt> field
 		in <tt>debian/control</tt> is <tt>all</tt>).
-		The <tt>build</tt> target should depend on those of the
-		targets <tt>build-arch</tt> and <tt>build-indep</tt> that
-		are provided in the rules file.<footnote>
+	      </p>
+
+	      <p>
+		If <tt>build-arch</tt> or <tt>build-indep</tt> targets are
+		provided in the rules file, the <tt>build</tt> target
+		should either depend on those targets or take the same
+		actions as invoking those targets would perform.<footnote>
 		  The intent of this split is so that binary-only builds
 		  need not install the dependencies required for
 		  the <tt>build-indep</tt> target.  However, this is not
@@ -2499,18 +2503,21 @@ endif
 	</p>
 
 	<p>
-	  Each paragraph consists of a series of data fields; each
-	  field consists of the field name, followed by a colon and
-	  then the data/value associated with that field.  The field
-	  name is composed of printable ASCII characters (i.e.,
-	  characters that have values between 33 and 126, inclusive)
-	  except colon and must not with a begin with #.  The
-	  field ends at the end of the line or at the end of the
-	  last continuation line (see below).  Horizontal whitespace
-	  (spaces and tabs) may occur immediately before or after the
-	  value and is ignored there; it is conventional to put a
-	  single space after the colon.  For example, a field might
-	  be:
+	  Each paragraph consists of a series of data fields.  Each field
+	  consists of the field name followed by a colon and then the
+	  data/value associated with that field.  The field name is
+	  composed of US-ASCII characters excluding control characters,
+	  space, and colon (i.e., characters in the ranges 33-57 and
+	  59-126, inclusive).  Field names must not begin with the comment
+	  character, <tt>#</tt>.
+	</p>
+
+	<p>
+	  The field ends at the end of the line or at the end of the last
+	  continuation line (see below).  Horizontal whitespace (spaces
+	  and tabs) may occur immediately before or after the value and is
+	  ignored there; it is conventional to put a single space after
+	  the colon.  For example, a field might be:
 	  <example compact="compact">
 Package: libc6
 	  </example>
@@ -6169,11 +6176,11 @@ install -m644 debian/shlibs.<var>package</var> debian/<var>package</var>/DEBIAN/
 	  <heading>File System Structure</heading>
 
 	  <p>
-	    The location of all installed files and directories must
-	    comply with the Filesystem Hierarchy Standard (FHS),
-	    version 2.3, with the exceptions noted below, and except
-	    where doing so would violate other terms of Debian
-	    Policy.  The following exceptions to the FHS apply:
+	    The location of all files and directories must comply with the
+	    Filesystem Hierarchy Standard (FHS), version 2.3, with the
+	    exceptions noted below, and except where doing so would
+	    violate other terms of Debian Policy.  The following
+	    exceptions to the FHS apply:
 
             <enumlist>
               <item>