Packages in main may not recommend packages in non-free

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

diff --git a/policy.sgml b/policy.sgml
index 38f209663a5e7ec782cd73a2dc26f9c40f1b2771..b61bc1952217b50ff6c9a30fcef3b287c5c69b5e 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>
@@ -3302,6 +3302,7 @@ Package: libc6
              Those starting with a single space are part of a paragraph.
              Successive lines of this form will be word-wrapped when
              displayed. The leading space will usually be stripped off.
+             The line must contain at least one non-whitespace character.
            </item>
 
            <item>
@@ -3312,7 +3313,8 @@ Package: libc6
              will be allowed to trail off to the right. None, one or two
              initial spaces may be deleted, but the number of spaces
              deleted from each line will be the same (so that you can have
-             indenting work correctly, for example).
+             indenting work correctly, for example).  The line must
+             contain at least one non-whitespace character.
            </item>
 
            <item>
@@ -6334,12 +6336,11 @@ install -m644 debian/shlibs.<var>package</var> debian/<var>package</var>/DEBIAN/
            For example, the <tt>emacsen-common</tt> package could
            contain something like
            <example compact="compact">
-if [ ! -e /usr/local/share/emacs ]
-then
-  if mkdir /usr/local/share/emacs 2>/dev/null
-  then
-    chown root:staff /usr/local/share/emacs
-    chmod 2775 /usr/local/share/emacs
+if [ ! -e /usr/local/share/emacs ]; then
+  if mkdir /usr/local/share/emacs 2>/dev/null; then
+    if chown root:staff /usr/local/share/emacs; then
+      chmod 2775 /usr/local/share/emacs || true
+    fi
   fi
 fi
            </example>
@@ -7496,9 +7497,8 @@ exec /usr/lib/foo/foo "$@"
          package that provides online documentation (other than just
          manual pages) to register these documents with
          <package>doc-base</package> by installing a
-         <package>doc-base</package> control file via the
-         <prgn/install-docs/ script at installation time and
-         de-register the manuals again when the package is removed.
+         <package>doc-base</package> control file in
+         <file>/usr/share/doc-base/</file>.
        </p> 
        <p>
          Please refer to the documentation that comes with the
@@ -7917,11 +7917,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>