Normalise the how ‘debian/control’ and ‘.dsc’ files are called.

[debian/debian-policy.git] / policy.sgml

diff --git a/policy.sgml b/policy.sgml
index 9b4a93e958c6f87a7615698db42dbc5686db2cad..7377752406f340721ab0370771ba478087060399 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -2717,7 +2717,7 @@ Package: libc6
        </p>
 
        <p>
-         The source package control file is generated by
+         The Debian source control file is generated by
          <prgn>dpkg-source</prgn> when it builds the source
          archive, from other files in the source package,
          described above.  When unpacking, it is checked against
@@ -2974,34 +2974,42 @@ Package: libc6
          </p>
 
          <p>
-           In the source package control file <file>.dsc</file>, this
-           field may contain either the architecture
-           wildcard <tt>any</tt> or a list of architectures and
-           architecture wildcards separated by spaces. If a list is
-           given, it may include (or consist solely of) the special
+           In the Debian source control file <file>.dsc</file>, this
+           field contains a list of architectures and architecture
+           wildcards separated by spaces. When the list contains the
+           architecture wildcard <tt>any</tt>, the only other value
+           allowed in the list is <tt>all</tt>.
+         </p>
+
+         <p>
+           The list may include (or consist solely of) the special
            value <tt>all</tt>.  In other words, in <file>.dsc</file>
            files unlike the <file>debian/control</file>, <tt>all</tt> may
            occur in combination with specific architectures.
-           The <tt>Architecture</tt> field in the source package control
+           The <tt>Architecture</tt> field in the Debian source control
            file <file>.dsc</file> is generally constructed from
            the <tt>Architecture</tt> fields in
            the <file>debian/control</file> in the source package.
          </p>
 
          <p>
-           Specifying <tt>any</tt> indicates that the source package
+           Specifying only <tt>any</tt> indicates that the source package
            isn't dependent on any particular architecture and should
            compile fine on any one. The produced binary package(s)
-           will either be specific to whatever the current build
-           architecture is or will be architecture-independent.
+           will be specific to whatever the current build architecture is.
          </p>
 
          <p>
            Specifying only <tt>all</tt> indicates that the source package
-           will only build architecture-independent packages.  If this is
-           the case, <tt>all</tt> must be used rather than <tt>any</tt>;
-           <tt>any</tt> implies that the source package will build at
-           least one architecture-dependent package.
+           will only build architecture-independent packages.
+         </p>
+
+         <p>
+           Specifying <tt>any all</tt> indicates that the source package
+           isn't dependent on any particular architecture. The set of
+           produced binary packages will include at least one
+           architecture-dependant package and one architecture-independent
+           package.
          </p>
 
          <p>
@@ -3719,7 +3727,7 @@ Checksums-Sha256:
          Additional user-defined fields may be added to the
          source package control file.  Such fields will be
          ignored, and not copied to (for example) binary or
-         source package control files or upload control files.
+         Debian source control files or upload control files.
        </p>
 
        <p>
@@ -3736,7 +3744,7 @@ Checksums-Sha256:
          field name after the hyphen will be used in the output
          file.  Where the letter <tt>B</tt> is used the field
          will appear in binary package control files, where the
-         letter <tt>S</tt> is used in source package control
+         letter <tt>S</tt> is used in Debian source control
          files and where <tt>C</tt> is used in upload control
          (<tt>.changes</tt>) files.
        </p>
@@ -3747,7 +3755,7 @@ Checksums-Sha256:
          <example>
   XBS-Comment: I stand between the candle and the star.
          </example>
-         then the binary and source package control files will contain the
+         then the binary and Debian source control files will contain the
          field
          <example>
   Comment: I stand between the candle and the star.
@@ -11272,4 +11280,4 @@ END-INFO-DIR-ENTRY
 <!-- Local variables: -->
 <!-- indent-tabs-mode: t -->
 <!-- End: -->
-<!-- vim:set ai et sts=2 sw=2 tw=76: -->
+<!-- vim:set ai sts=2 sw=2 tw=76: -->