From ed0f1b9dfbd710777f9722310581999d4f24e182 Mon Sep 17 00:00:00 2001
From: Bill Allombert <Bill.Allombert@math.u-bordeaux1.fr>
Date: Thu, 1 May 2014 22:48:30 +0200
Subject: [PATCH] Policy: Change default web document root to /var/www/html
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Wording: Bill Allombert <ballombe@debian.org>
Seconded: Arno Töll <arno@debian.org>
Seconded: Matthias Urlichs <matthias@urlichs.de>
Closes: #491547
---
 debian/changelog         | 7 ++++++-
 policy.sgml              | 7 ++++++-
 upgrading-checklist.sgml | 3 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 226df10..9f0c518 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,11 @@ debian-policy (3.9.6.0) unstable; urgency=low
     Seconded: Andrew McMillan <andrew@morphoss.com>
     Seconded: Gregor Herrmann <gregoa@debian.org>
     Closes: #593611
+  * Policy: Change default web document root to /var/www/html
+    Wording: Bill Allombert <ballombe@debian.org>
+    Seconded: Arno Töll <arno@debian.org>
+    Seconded: Matthias Urlichs <matthias@urlichs.de>
+    Closes: #491547
   * virtual-package-names-list: Update java runtime list
     Wording: Emmanuel Bourg <ebourg@apache.org>
     Seconded: Tony Mancill <tmancill@debian.org>
@@ -79,7 +84,7 @@ debian-policy (3.9.6.0) unstable; urgency=low
     Seconded: Russ Allbery <rra@debian.org>
     Closes: #613143
 
- -- Bill Allombert <ballombe@debian.org>  Sat, 02 Aug 2014 22:04:19 +0200
+ -- Bill Allombert <ballombe@debian.org>  Thu, 07 Aug 2014 14:17:57 +0200
 
 debian-policy (3.9.5.0) unstable; urgency=low
 
diff --git a/policy.sgml b/policy.sgml
index fbbe4a3..6eac491 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -7055,6 +7055,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 +9790,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
diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 6d6b5bd..be42367 100644
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -63,6 +63,9 @@ Released xxx, 2014.
   <item> It is clarified that signature appearing in debian/changelog should be
   the details of the person who prepared this release of the package.
   </item>
+<tag>11.5</tag>
+  <item> The default web document root is now <file>/var/www/html</file>
+  </item>
 <tag>virtual</tag>
   <item><tt>java1-runtime</tt> and <tt>java2-runtime</tt> are removed,
   <tt>javaN-runtime</tt> and <tt>javaN-runtime-headless</tt> are added
-- 
2.39.2