X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=policy.sgml;h=dad8d23272a2ea75cf109563e836900ab26f9472;hb=df6f6146fb4ec218ca3ead562fda983e5363cd9c;hp=1508231e766f36edcd722f7d0af2151a8e80f204;hpb=1224a530a4f1846cef54de1499f1b035b1298a2d;p=debian%2Fdebian-policy.git

diff --git a/policy.sgml b/policy.sgml
index 1508231..dad8d23 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -2542,7 +2542,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>
@@ -2759,6 +2759,7 @@ Package: libc6
 	  <item><qref id="f-Uploaders"><tt>Uploaders</tt></qref></item>
 	  <item><qref id="f-Homepage"><tt>Homepage</tt></qref></item>
 	  <item><qref id="f-VCS-fields"><tt>Vcs-Browser</tt>, <tt>Vcs-Git</tt>, et al.</qref></item>
+	  <item><qref id="f-Dgit"><tt>Dgit</tt></qref></item>
 	  <item><qref id="f-Standards-Version"><tt>Standards-Version</tt></qref> (recommended)</item>
 	  <item><qref id="sourcebinarydeps"><tt>Build-Depends</tt> et al</qref></item>
 	  <item><qref id="f-Package-List"><tt>Package-List</tt></qref> (recommended)</item>
@@ -3840,6 +3841,26 @@ Checksums-Sha256:
 	    this value is assumed for paragraphs lacking this field.
 	  </p>
 	</sect1>
+
+	<sect1 id="f-Dgit">
+	  <heading><tt>Dgit</tt></heading>
+
+	  <p>
+	    Folded field containing a single git commit hash, presented in
+	    full, followed optionally by whitespace and other data to be
+	    defined in future extensions.
+	  </p>
+
+	  <p>
+	    Declares that the source package corresponds exactly to a
+	    referenced commit in a Git repository available at the canonical
+	    location called <em>dgit-repos</em>, used by <prgn>dgit</prgn>, a
+	    bidirectional gateway between the Debian archive and Git.  The
+	    commit is reachable from at least one reference whose name matches
+	    <tt>refs/dgit/*</tt>.  See the manual page of <prgn>dgit</prgn> for
+	    further details.
+	  </p>
+	</sect1>
       </sect>
 
       <sect>
@@ -7000,15 +7021,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
@@ -8853,7 +8873,9 @@ ln -fs ../sbin/sendmail debian/tmp/usr/bin/runq
 	</p>
 
 	<p>
-	  A symbolic link pointing to a compressed file should always
+	  A symbolic link pointing to a compressed file (in the sense
+	  that it is meant to be uncompressed with <prgn>unzip</prgn>
+	  or <prgn>zless</prgn> etc.) should always
 	  have the same file extension as the referenced file. (For
 	  example, if a file <file>foo.gz</file> is referenced by a
 	  symbolic link, the filename of the link has to end with
@@ -8987,8 +9009,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>
@@ -9471,6 +9495,23 @@ done
 	  </p>
 	</sect1>
       </sect>
+
+      <sect id="filenames">
+	<heading>File names</heading>
+
+        <p>
+	  The name of the files installed by binary packages in the system PATH
+	  (namely <tt>/bin</tt>, <tt>/sbin</tt>, <tt>/usr/bin</tt>,
+	  <tt>/usr/sbin</tt> and <tt>/usr/games</tt>) must be encoded in
+	  ASCII.
+	</p>
+
+	<p>
+	  The name of the files and directories installed by binary packages
+	  outside the system PATH must be encoded in UTF-8 and should be
+	  restricted to ASCII when it is possible to do so.
+	</p>
+      </sect>
     </chapt>
 
 
@@ -9669,24 +9710,7 @@ http://localhost/cgi-bin/<var>cgi-bin-name</var>
 	    </item>
 
 	    <item>
-	      <p>Access to HTML documents</p>
-
-	      <p>
-		HTML documents for a package are stored in
-                <file>/usr/share/doc/<var>package</var></file>
-		and can be referred to as
-		<example compact="compact">
-http://localhost/doc/<var>package</var>/<var>filename</var>
-		</example>
-	      </p>
-
-	      <p>
-                The web server should restrict access to the document
-                tree so that only clients on the same host can read
-                the documents. If the web server does not support such
-                access controls, then it should not provide access at
-                all, or ask about providing access during installation.
-	      </p>
+	      <p>(Deleted)</p>
 	    </item>
 
             <item>