Changelog for the id tags in the upgrading-checklist

[debian/debian-policy.git] / policy.sgml

diff --git a/policy.sgml b/policy.sgml
index 4aeae3639795ae5ee8fcc682cd9acffdc35bbe81..854fde66d2e4e1d29bddb7f9dbb2201988ccdcc6 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -488,9 +488,9 @@
            In addition, the packages in <em>main</em>
            <list compact="compact">
              <item>
-                 must not require a package outside of <em>main</em>
-                 for compilation or execution (thus, the package must
-                 not declare a "Depends", "Recommends", or
+                 must not require or recommend a package outside
+                 of <em>main</em> for compilation or execution (thus, the
+                 package must not declare a "Depends", "Recommends", or
                  "Build-Depends" relationship on a non-<em>main</em>
                  package),
              </item>
@@ -709,12 +709,13 @@
          list of sections.  At present, they are:
          <em>admin</em>, <em>cli-mono</em>, <em>comm</em>, <em>database</em>,
          <em>devel</em>, <em>debug</em>, <em>doc</em>, <em>editors</em>,
-         <em>electronics</em>, <em>embedded</em>, <em>fonts</em>,
-         <em>games</em>, <em>gnome</em>, <em>graphics</em>, <em>gnu-r</em>,
-         <em>gnustep</em>, <em>hamradio</em>, <em>haskell</em>,
-         <em>httpd</em>, <em>interpreters</em>, <em>java</em>, <em>kde</em>,
-         <em>kernel</em>, <em>libs</em>, <em>libdevel</em>, <em>lisp</em>,
-         <em>localization</em>, <em>mail</em>, <em>math</em>, <em>misc</em>,
+         <em>education</em>, <em>electronics</em>, <em>embedded</em>,
+         <em>fonts</em>, <em>games</em>, <em>gnome</em>, <em>graphics</em>,
+         <em>gnu-r</em>, <em>gnustep</em>, <em>hamradio</em>, <em>haskell</em>,
+         <em>httpd</em>, <em>interpreters</em>, <em>introspection</em>,
+         <em>java</em>, <em>kde</em>, <em>kernel</em>, <em>libs</em>,
+         <em>libdevel</em>, <em>lisp</em>, <em>localization</em>,
+         <em>mail</em>, <em>math</em>, <em>metapackages</em>, <em>misc</em>,
          <em>net</em>, <em>news</em>, <em>ocaml</em>, <em>oldlibs</em>,
          <em>otherosfs</em>, <em>perl</em>, <em>php</em>, <em>python</em>,
          <em>ruby</em>, <em>science</em>, <em>shells</em>, <em>sound</em>,
@@ -7917,11 +7918,23 @@ fname () {
        <heading>Symbolic links</heading>
 
        <p>
-         In general, symbolic links within a top-level directory
-         should be relative, and symbolic links pointing from one
-         top-level directory into another should be absolute. (A
-         top-level directory is a sub-directory of the root
-         directory <file>/</file>.)
+         In general, symbolic links within a top-level directory should
+         be relative, and symbolic links pointing from one top-level
+         directory to or into another should be absolute. (A top-level
+         directory is a sub-directory of the root
+         directory <file>/</file>.)  For example, a symbolic link
+         from <file>/usr/lib/foo</file> to <file>/usr/share/bar</file>
+         should be relative (<file>../share/bar</file>), but a symbolic
+         link from <file>/var/run</file> to <file>/run</file> should be
+         absolute.<footnote>
+           This is necessary to allow top-level directories to be
+           symlinks.  If linking <file>/var/run</file>
+           to <file>/run</file> were done with the relative symbolic
+           link <file>../run</file>, but <file>/var</file> were a
+           symbolic link to <file>/srv/disk1</file>, the symbolic link
+           would point to <file>/srv/run</file> rather than the intended
+           target.
+         </footnote>
        </p>
 
        <p>
@@ -9744,9 +9757,8 @@ END-INFO-DIR-ENTRY
 
        <p>
          In addition, the copyright file must say where the upstream
-         sources (if any) were obtained.  It should name the original
-         authors of the package and the Debian maintainer(s) who were
-         involved with its creation.
+         sources (if any) were obtained, and should name the original
+         authors.
        </p>
 
        <p>