Add Policy version to DocBook subdocuments, fix whitespace

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

diff --git a/policy.sgml b/policy.sgml
index 2c0c72ad77ed5ebf6b49cded4c26a9ce024b574b..1a61d4f68a39d509e26eeb5aaa6e83ae3cbc8f1e 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -3725,11 +3725,13 @@ Checksums-Sha256:
          <heading><tt>DM-Upload-Allowed</tt></heading>
 
          <p>
-           The most recent version of a package uploaded to unstable or
-           experimental must include the field <tt>DM-Upload-Allowed:
-           yes</tt> in the source section of its source control file for
-           the Debian archive to accept uploads signed with a key in the
-           Debian Maintainer keyring.  See the General
+           Indicates that Debian Maintainers may upload this package to
+           the Debian archive.  The only valid value is <tt>yes</tt>.  If
+           the field <tt>DM-Upload-Allowed: yes</tt> is present in the
+           source section of the source control file of the most recent
+           version of a package in unstable or experimental, the Debian
+           archive will accept uploads of this package signed with a key
+           in the Debian Maintainer keyring.  See the General
            Resolution <url id="http://www.debian.org/vote/2007/vote_003"
            name="Endorse the concept of Debian Maintainers"> for more
            details.
@@ -7978,9 +7980,10 @@ fname () {
          as its interpreter.  Checking your script
          with <prgn>checkbashisms</prgn> from
          the <package>devscripts</package> package or running your script
-         with <prgn>posh</prgn> may help uncover violations of the above
-         requirements.  If in doubt whether a script complies with these
-         requirements, use <file>/bin/bash</file>.
+         with an alternate shell such as <prgn>posh</prgn> may help
+         uncover violations of the above requirements.  If in doubt
+         whether a script complies with these requirements,
+         use <file>/bin/bash</file>.
        </p>
 
        <p>
@@ -10480,10 +10483,10 @@ END-INFO-DIR-ENTRY
                  the <prgn>PATH</prgn> if necessary, and pass its
                  second and subsequent arguments to the command it
                  calls.  If no <var>root-command</var> is supplied
-                 then <var>dpkg-buildpackage</var> will take no
-                 special action to gain root privilege, so that for
-                 most packages it will have to be invoked as root to
-                 start with.</p>
+                 then <var>dpkg-buildpackage</var> will use
+                 the <prgn>fakeroot</prgn> command, which is sufficient
+                 to build most packages without actually requiring root
+                 privileges.</p>
              </item>
              <tag><tt>-b</tt>, <tt>-B</tt></tag>
              <item>