Merge branch 'master' into bug232448-rra

diff --combined policy.sgml
index 3a7047578d69259c58394df4b47dbdd1b84f4e5d,e5a5a40470a3f6ee62acc7038c06c440ac083395..fec9c4fcf41f61832cce0a94c092062b9a2acfc3
--- 1/policy.sgml
--- 2/policy.sgml
+++ b/policy.sgml
@@@ -5389,14 -5389,6 +5389,14 @@@ Replaces: mail-transport-agen
        (<prgn>ld</prgn>) when compiling packages, as it will only look for
        <file>libgdbm.so</file> when compiling dynamically.
        </p>
 +
 +      <p>
 +      If the package provides Ada Library Information
 +      (<file>*.ali</file>) files for use with GNAT, these files must be
 +      installed read-only (mode 0444) so that GNAT will not attempt to
 +      recompile them.  This overrides the normal file mode requirements
 +      given in <ref id="permissions-owners">.
 +      </p>
        </sect>
  
        <sect id="sharedlibs-intradeps">
@@@ -7954,7 -7946,7 +7954,7 @@@ endscrip
        </p>
        </sect>
  
 -      <sect>
 +      <sect id="permissions-owners">
        <heading>Permissions and owners</heading>
  
        <p>
@@@ -8281,10 -8273,14 +8281,14 @@@ don
  
        <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>
@@@ -8629,7 -8625,9 +8633,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>
@@@ -8706,6 -8704,9 +8712,9 @@@
                  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>