X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=policy.sgml;h=7bb703bef00b6767fe6eb064b7113c4b03f509b5;hb=6271e034249125d29a5612d864a26f8bde1538ad;hp=fbbe4a307c08cf0ee810a0b8ceb9f111723b8582;hpb=2aa2a2ed39619fc8b6d7f9dc9dc74a8d3b536025;p=debian%2Fdebian-policy.git

diff --git a/policy.sgml b/policy.sgml
index fbbe4a3..7bb703b 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -229,9 +229,8 @@
 	  <enumlist>
 	    <item>Russ Allbery</item>
 	    <item>Bill Allombert</item>
-	    <item>Andrew McMillan</item>
-	    <item>Manoj Srivastava</item>
-	    <item>Colin Watson</item>
+	    <item>Andreas Barth</item>
+	    <item>Jonathan Nieder</item>
 	  </enumlist>
         </p>
 
@@ -7055,6 +7054,11 @@ Built-Using: grub2 (= 1.99-9), loadlin (= 1.6e-1)
 		    kernel information.</footnote>
 		</p>
 	      </item>
+	      <item>
+                <p>
+                  The <file>/var/www</file> directory is additionally allowed. 
+                </p>
+	      </item>
 	      <item>
 		<p>
                   The requirement for <file>/usr/local/lib&lt;qual&gt;</file>
@@ -9785,7 +9789,7 @@ http://localhost/cgi-bin/.../<var>cgi-bin-name</var>
 		<package>doc-base</package> package.  If access to the
 		web document root is unavoidable then use
 		<example compact="compact">
-/var/www
+/var/www/html
 		</example>
 		as the Document Root.  This might be just a symbolic
 		link to the location where the system administrator