X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=policy.sgml;h=f4e428149dad17f7477142466ca9279b32c31522;hb=4106cec98e9c8f249fdbb03b0686509336df615a;hp=27082429c81303e3bdc0c51c2ac2c38e2892eff1;hpb=c3b208f5570c071ee42b91586ce3d6664256e6f5;p=debian%2Fdebian-policy.git

diff --git a/policy.sgml b/policy.sgml
index 2708242..f4e4281 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -2367,8 +2367,7 @@ endif
           This is an optional, recommended configuration file for the
           <tt>uscan</tt> utility which defines how to automatically scan
           ftp or http sites for newly available updates of the
-          package. This is used
-          by <url id="http://dehs.alioth.debian.org/"> and other Debian QA
+          package. This is used Debian QA
           tools to help with quality control and maintenance of the
           distribution as a whole.
         </p>
@@ -2542,7 +2541,7 @@ endif
 	  composed of US-ASCII characters excluding control characters,
 	  space, and colon (i.e., characters in the ranges 33-57 and
 	  59-126, inclusive).  Field names must not begin with the comment
-	  character, <tt>#</tt>.
+	  character, <tt>#</tt>, nor with the hyphen character, <tt>-</tt>.
 	</p>
 
 	<p>
@@ -7021,15 +7020,14 @@ Built-Using: grub2 (= 1.99-9), loadlin (= 1.6e-1)
 		  stable release of Debian supports <file>/run</file>.
 		</p>
 	      </item>
-              <item>
-                <p>
-                  The following directories in the root filesystem are
-                  additionally allowed: <file>/sys</file> and
-                  <file>/selinux</file>. <footnote>These directories
-                  are used as mount points to mount virtual filesystems
-                  to get access to kernel information.</footnote>
-                </p>
-              </item>
+	      <item>
+		<p>
+		  The <file>/sys</file> directory in the root filesystem is
+		  additionally allowed. <footnote>This directory is used as
+		    mount point to mount virtual filesystems to get access to
+		    kernel information.</footnote>
+		</p>
+	      </item>
 	      <item>
 		<p>
 		  On GNU/Hurd systems, the following additional
@@ -9010,8 +9008,10 @@ ln -fs ../sbin/sendmail debian/tmp/usr/bin/runq
 		  package is purged.
 	      </item>
 	    </list>
-	    Obsolete configuration files without local changes may be
-	    removed by the package during upgrade.
+	    Obsolete configuration files without local changes should be
+	    removed by the package during upgrade.<footnote>
+	      The <prgn>dpkg-maintscript-helper</prgn> tool, available from the
+	      <package>dpkg</package> package, can help for this task.</footnote>
 	  </p>
 
 	  <p>
@@ -9697,15 +9697,16 @@ done
 		Cgi-bin executable files are installed in the
 		directory
 		<example compact="compact">
-/usr/lib/cgi-bin/<var>cgi-bin-name</var>
+/usr/lib/cgi-bin
+		</example>
+		or a subdirectory of that directory, and the script
+		<example compact="compact">
+/usr/lib/cgi-bin/.../<var>cgi-bin-name</var>
 		</example>
-		or a subdirectory of that directory, and should be
-		referred to as
+		should be referred to as
 		<example compact="compact">
-http://localhost/cgi-bin/<var>cgi-bin-name</var>
+http://localhost/cgi-bin/.../<var>cgi-bin-name</var>
 		</example>
-		(possibly with a subdirectory name
-		before <var>cgi-bin-name</var>).
 	    </item>
 
 	    <item>