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

diff --git a/policy.sgml b/policy.sgml
index 113429b..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>
@@ -9009,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>
@@ -9696,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 should be
-		referred to as
+		or a subdirectory of that directory, and the script
 		<example compact="compact">
-http://localhost/cgi-bin/<var>cgi-bin-name</var>
+/usr/lib/cgi-bin/.../<var>cgi-bin-name</var>
+		</example>
+		should be referred to as
+		<example compact="compact">
+http://localhost/cgi-bin/.../<var>cgi-bin-name</var>
 		</example>
-		(possibly with a subdirectory name
-		before <var>cgi-bin-name</var>).
 	    </item>
 
 	    <item>