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

diff --git a/policy.sgml b/policy.sgml
index cc9d5f8..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
@@ -8989,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>
@@ -9474,7 +9496,7 @@ done
 	</sect1>
       </sect>
 
-      <sec id="filenames">
+      <sect id="filenames">
 	<heading>File names</heading>
 
         <p>
@@ -9489,7 +9511,7 @@ done
 	  outside the system PATH must be encoded in UTF-8 and should be
 	  restricted to ASCII when it is possible to do so.
 	</p>
-      </sec>
+      </sect>
     </chapt>