X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=policy.sgml;h=b61bc1952217b50ff6c9a30fcef3b287c5c69b5e;hb=429d50686b4385b6a0ce0554e418459ed84da657;hp=b8db0ab79ed0068d49d9a0a57ed77f83cf7ecf6f;hpb=4a15cbc3ffaa6b1a4a91fda73447ef1e76c7aabf;p=debian%2Fdebian-policy.git

diff --git a/policy.sgml b/policy.sgml
index b8db0ab..b61bc19 100644
--- 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>
@@ -6336,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>
@@ -7918,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>