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

Merge branch 'master' into bug184064-rra
---

diff --git a/policy.sgml b/policy.sgml
index 6943397..e5a5a40 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -8273,10 +8273,14 @@ done
 
 	<p>
 	  These two files are managed through the <prgn>dpkg</prgn>
-	  "alternatives" mechanism.  Thus every package providing an
-	  editor or pager must call the
-	  <prgn>update-alternatives</prgn> script to register these
-	  programs.
+	  "alternatives" mechanism.  Every package providing an editor or
+	  pager must call the <prgn>update-alternatives</prgn> script to
+	  register as an alternative for <file>/usr/bin/editor</file>
+	  or <file>/usr/bin/pager</file> as appropriate.  The alternative
+	  should have a slave alternative
+	  for <file>/usr/share/man/man1/editor.1.gz</file>
+	  or <file>/usr/share/man/man1/pager.1.gz</file> pointing to the
+	  corresponding manual page.
 	</p>
 
 	<p>
@@ -8621,7 +8625,9 @@ name ["<var>syshostname</var>"]:
 	    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>
@@ -8698,6 +8704,9 @@ name ["<var>syshostname</var>"]:
 		  configuration, add 10 points; otherwise add none.
 	      </item>
 	    </list>
+	    That alternative should have a slave alternative
+	    for <file>/usr/share/man/man1/x-window-manager.1.gz</file>
+	    pointing to the corresponding manual page.
 	  </p>
 	</sect1>