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

diff --git a/policy.sgml b/policy.sgml
index c5fd305..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>
 
@@ -1746,11 +1745,14 @@ zope.
 
 	<p>
 	  The maintainer name and email address used in the changelog
-	  should be the details of the person uploading <em>this</em>
-	  version.  They are <em>not</em> necessarily those of the
-	  usual package maintainer.<footnote>
-	    If the developer uploading the package is not one of the usual
-	    maintainers of the package (as listed in
+	  should be the details of the person who prepared this release of
+	  the package.  They are <em>not</em> necessarily those of the
+	  uploader or usual package maintainer.<footnote>
+	    In the case of a sponsored upload, the uploader signs the
+	    files, but the changelog maintainer name and address are those
+	    of the person who prepared this release.  If the preparer of
+	    the release is not one of the usual maintainers of the package
+	    (as listed in
 	    the <qref id="f-Maintainer"><tt>Maintainer</tt></qref>
 	    or <qref id="f-Uploaders"><tt>Uploaders</tt></qref> control
 	    fields of the package), the first line of the changelog is
@@ -3673,7 +3675,7 @@ Files:
 	  <p>
 	    The special value <tt>byhand</tt> for the section in a
 	    <tt>.changes</tt> file indicates that the file in question
-	    is not an ordinary package file and must by installed by
+	    is not an ordinary package file and must be installed by
 	    hand by the distribution maintainers.  If the section is
 	    <tt>byhand</tt> the priority should be <tt>-</tt>.
 	  </p>
@@ -6972,8 +6974,7 @@ Built-Using: grub2 (= 1.99-9), loadlin (= 1.6e-1)
                   <footnote>
                     This is necessary in order to reserve the directories for
                     use in cross-installation of library packages from other
-                    architectures, as part of the planned deployment of
-                    <tt>multiarch</tt>.
+                    architectures, as part of <tt>multiarch</tt>.
                   </footnote>
                 </p>
                 <p>
@@ -7053,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>
@@ -9783,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