From: Russ Allbery <rra@debian.org>
Date: Mon, 19 Jul 2010 16:39:49 +0000 (-0700)
Subject: Merge branch 'master' into bug555977-rra
X-Git-Url: https://git.donarmstrong.com/?p=debian%2Fdebian-policy.git;a=commitdiff_plain;h=a9762da5353775966d89977b84ae4f17c6074854

Merge branch 'master' into bug555977-rra
---

a9762da5353775966d89977b84ae4f17c6074854
diff --cc policy.sgml
index 9451405,e5a5a40..c0415c1
--- a/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>