Merge branch 'master' into bug533852-rra

diff --combined policy.sgml
index 39d87e0545c32715f1c7b511476889dfdd4b5995,91ec2e68dd5e692f152676812e2ae2c999d1867f..ece0d271c40fff00d959dc9a24b0f9aa625036a1
--- 1/policy.sgml
--- 2/policy.sgml
+++ b/policy.sgml
@@@ -3260,27 -3260,29 +3260,27 @@@ Package: libc
          <heading><tt>Binary</tt></heading>
  
          <p>
 -          This field is a list of binary packages.
 +          This field is a list of binary packages.  Its syntax and
 +          meaning varies depending on the control file in which it
 +          appears.
          </p>
  
          <p>
 -          When it appears in the <file>.dsc</file> file it is the list
 -          of binary packages which a source package can produce.  It
 -          does not necessarily produce all of these binary packages
 -          for every architecture.  The source control file doesn't
 -          contain details of which architectures are appropriate for
 -          which of the binary packages.
 -        </p>
 -
 -        <p>
 -          When it appears in a <file>.changes</file> file it lists the
 -          names of the binary packages actually being uploaded.
 +          When it appears in the <file>.dsc</file> file, it lists binary
 +          packages which a source package can produce, separated by
 +          commas<footnote>
 +              A space after each comma is conventional.
 +          </footnote>.  It may span multiple lines.  The source package
 +          does not necessarily produce all of these binary packages for
 +          every architecture.  The source control file doesn't contain
 +          details of which architectures are appropriate for which of
 +          the binary packages.
          </p>
  
          <p>
 -          The syntax is a list of binary packages separated by
 -          commas<footnote>
 -              A space after each comma is conventional.
 -          </footnote>. Currently the packages must be separated using
 -          only spaces in the <file>.changes</file> file.
 +          When it appears in a <file>.changes</file> file, it lists the
 +          names of the binary packages being uploaded, separated by
 +          whitespace (not commas).  It may span multiple lines.
          </p>
        </sect1>
  
@@@ -8824,15 -8826,6 +8824,6 @@@ name ["<var>syshostname</var>"]
          </footnote>
        </p>
  
-       <p>
-         Due to limitations in current implementations, all characters
-         in the manual page source should be representable in the usual
-         legacy encoding for that language, even if the file is
-         actually encoded in UTF-8. Safe alternative ways to write many
-         characters outside that range may be found in
-         <manref name="groff_char" section="7">.
-       </p>
- 
        <p>
          If a localized version of a manual page is provided, it should
          either be up-to-date or it should be obvious to the reader that