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/?a=commitdiff_plain;h=a9762da5353775966d89977b84ae4f17c6074854;hp=9e73c7928016ced0af13228de8e4c857ff899584;p=debian%2Fdebian-policy.git

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

diff --git a/debian/changelog b/debian/changelog
index 1a310eb..bc99eb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,12 @@ debian-policy (3.9.1.0) UNRELEASED; urgency=low
     Seconded: Cyril Brulebois <kibi@debian.org>
     Seconded: Steve Langasek <vorlon@debian.org>
     Closes: #186102
+  * Policy: Require slave alternatives for manual pages
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Guillem Jover <guillem@debian.org>
+    Seconded: Jakub Wilk <jwilk@debian.org>
+    Seconded: Emilio Pozuelo Monfort <pochu@debian.org>
+    Closes: #184064
   * Set the version of the Perl Policy to match the version of the Policy
     package.
   * Explain the Perl module package naming policy more explicitly and
diff --git a/policy.sgml b/policy.sgml
index 9451405..c0415c1 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -882,7 +882,7 @@
 	    numbers based on some date formats (sometimes used for
 	    development or "snapshot" releases) will not be ordered
 	    correctly by the package management software.  For
-	    example, <prng>dpkg</prng> will consider "96May01" to be
+	    example, <prgn>dpkg</prgn> will consider "96May01" to be
 	    greater than "96Dec24".
 	  </p>
 
@@ -8300,10 +8300,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>
@@ -8648,7 +8652,9 @@ name ["<var>syshostname</var>"]:
 	    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>
@@ -8725,6 +8731,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>
 
diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 42f787e..0bcb075 100644
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -83,6 +83,12 @@ Not yet released.
   that libraries should be built with threading support and to be
   thread-safe if the library supports this.
   </item>
+<tag>11.4, 11.8.3, 11.8.4</tag>
+  <item>Packages providing alternatives for <prgn>editor</prgn>,
+  <prgn>pager</prgn>, <prgn>x-terminal-emulator</prgn>, or
+  <prgn>x-window-manager</prgn> should also provide a slave alternative
+  for the corresponding manual page.
+  </item>
 <tag>11.5</tag>
   <item>Cgi-bin executable files may be installed in subdirectories
   of <file>/usr/lib/cgi-bin</file> and web servers should serve out