Merge branch 'master' into bug23712-rra

diff --combined policy.sgml
index 3fc844647317a43c5026842c7811f0523888baae,edd1faf06122a997b531de8b4db7e0ac5de3a821..b61ab26140fc17f3735e0e085a67af520c6e4cb5
--- 1/policy.sgml
--- 2/policy.sgml
+++ b/policy.sgml
@@@ -15,7 -15,7 +15,7 @@@
  
        <abstract>
        This manual describes the policy requirements for the Debian
-       GNU/Linux distribution.  This includes the structure and
+       distribution.  This includes the structure and
        contents of the Debian archive and several design issues of
        the operating system, as well as technical requirements that
        each package must satisfy to be included in the distribution.
@@@ -50,7 -50,7 +50,7 @@@
  
        <p>
          A copy of the GNU General Public License is available as
-         <file>/usr/share/common-licenses/GPL</file> in the Debian GNU/Linux
+         <file>/usr/share/common-licenses/GPL</file> in the Debian
          distribution or on the World Wide Web at
          <url id="http://www.gnu.org/copyleft/gpl.html"
               name="the GNU General Public Licence">. You can also
@@@ -68,7 -68,7 +68,7 @@@
        <heading>Scope</heading>
        <p>
          This manual describes the policy requirements for the Debian
-         GNU/Linux distribution. This includes the structure and
+         distribution. This includes the structure and
          contents of the Debian archive and several design issues of the
          operating system, as well as technical requirements that
          each package must satisfy to be included in the
@@@ -314,7 -314,7 +314,7 @@@
        <heading>The Debian Archive</heading>
  
        <p>
-       The Debian GNU/Linux system is maintained and distributed as a
+       The Debian system is maintained and distributed as a
        collection of <em>packages</em>. Since there are so many of
        them (currently well over 15000), they are split into
        <em>sections</em> and given <em>priorities</em> to simplify
@@@ -348,8 -348,7 +348,7 @@@
        </p>
  
        <p>
-       The <em>main</em> archive area forms the <em>Debian GNU/Linux
-       distribution</em>.
+       The <em>main</em> archive area forms the <em>Debian distribution</em>.
        </p>
  
        <p>
@@@ -796,7 -795,7 +795,7 @@@
        <heading>Binary packages</heading>
  
        <p>
-       The Debian GNU/Linux distribution is based on the Debian
+       The Debian distribution is based on the Debian
        package management system, called <prgn>dpkg</prgn>. Thus,
        all packages in the Debian distribution must be provided
        in the <tt>.deb</tt> file format.
@@@ -1168,7 -1167,7 +1167,7 @@@
  
        <p>
          The <tt>base system</tt> is a minimum subset of the Debian
-         GNU/Linux system that is installed before everything else
+         system that is installed before everything else
          on a new system. Only very few packages are allowed to form
          part of the base system, in order to keep the required disk
          usage very small.
@@@ -7949,6 -7948,22 +7948,6 @@@ ln -fs ../sbin/sendmail debian/tmp/usr/
        <sect1>
          <heading>Sharing configuration files</heading>
  
 -        <p>
 -          Packages which specify the same file as a
 -          <tt>conffile</tt> must be tagged as <em>conflicting</em>
 -          with each other.  (This is an instance of the general rule
 -          about not sharing files.  Note that neither alternatives
 -          nor diversions are likely to be appropriate in this case;
 -          in particular, <prgn>dpkg</prgn> does not handle diverted
 -          <tt>conffile</tt>s well.)
 -        </p>
 -
 -        <p>
 -          The maintainer scripts must not alter a <tt>conffile</tt>
 -          of <em>any</em> package, including the one the scripts
 -          belong to.
 -        </p>
 -
          <p>
            If two or more packages use the same configuration file
            and it is reasonable for both to be installed at the same
@@@ -7998,34 -8013,6 +7997,34 @@@
            and which manages the shared configuration files.  (The
            <tt>sgml-base</tt> package is a good example.)
          </p>
 +
 +        <p>
 +          If the configuration file cannot be shared as described above,
 +          the packages must be marked as conflicting with each other.
 +          Two packages that specify the same file as
 +          a <tt>conffile</tt> must conflict.  This is an instance of the
 +          general rule about not sharing files.  Neither alternatives
 +          nor diversions are likely to be appropriate in this case; in
 +          particular, <prgn>dpkg</prgn> does not handle diverted
 +          <tt>conffile</tt>s well.
 +        </p>
 +
 +        <p>
 +          When two packages both declare the same <tt>conffile</tt>, they
 +          may see left-over configuration files from each other even
 +          though they conflict with each other.  If a user removes
 +          (without purging) one of the packages and installs the other,
 +          the new package will take over the <tt>conffile</tt> from the
 +          old package.  If the file was modified by the user, it will be
 +          treated the same as any other locally
 +          modified <tt>conffile</tt> during an upgrade.
 +        </p>
 +
 +        <p>
 +          The maintainer scripts must not alter a <tt>conffile</tt>
 +          of <em>any</em> package, including the one the scripts
 +          belong to.
 +        </p>
        </sect1>
  
        <sect1>
@@@ -9574,8 -9561,7 +9573,7 @@@ END-INFO-DIR-ENTR
        <p>
          Packages in the <em>contrib</em> or <em>non-free</em> archive
          areas should state in the copyright file that the package is not
-         part of the Debian GNU/Linux distribution and briefly explain
-         why.
+         part of the Debian distribution and briefly explain why.
        </p>
  
        <p>
@@@ -9746,9 -9732,8 +9744,8 @@@
        <prgn>dpkg</prgn> is a suite of programs for creating binary
        package files and installing and removing them on Unix
        systems.<footnote>
-           <prgn>dpkg</prgn> is targeted primarily at Debian
-           GNU/Linux, but may work on or be ported to other
-           systems.
+           <prgn>dpkg</prgn> is targeted primarily at Debian, but may
+           work on or be ported to other systems.
        </footnote>
        </p>