Merge branch 'master' into bug555977-rra

diff --cc policy.sgml
index 945140505bc02106fd7c61323b6f991915e72e9f,e5a5a40470a3f6ee62acc7038c06c440ac083395..c0415c132b111bffe6bcb6880e6c3cb725fe256a
--- 1/policy.sgml
--- 2/policy.sgml
+++ b/policy.sgml
@@@ -8643,12 -8620,14 +8647,14 @@@ name ["<var>syshostname</var>"]
  
          <p>
            Packages that provide a terminal emulator for the X Window
 -          System which meet the criteria listed below should declare
 -          in their control data that they provide the virtual
 -          package <tt>x-terminal-emulator</tt>.  They should also
 -          register themselves as an alternative for
 +          System which meet the criteria listed below should declare in
 +          their <tt>Provides</tt> control field that they provide the
 +          virtual package <tt>x-terminal-emulator</tt>.  They should
 +          also register themselves as an alternative for
            <file>/usr/bin/x-terminal-emulator</file>, with a priority of
-           20.
+           20.  That alternative should have a slave alternative
+           for <file>/usr/share/man/man1/x-terminal-emulator.1.gz</file>
+           pointing to the corresponding manual page.
          </p>
  
          <p>