From 8846684813d3c3c4abb19b2bbc32e498b64a19de Mon Sep 17 00:00:00 2001
From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Sun, 31 Oct 2010 16:53:41 -0700
Subject: Bug 607323: Be clearer in the release notes that a new Apache
 configuration is required r=LpSolit, a=mkanat

---
 template/en/default/pages/release-notes.html.tmpl | 33 +++++++++++++++++------
 1 file changed, 25 insertions(+), 8 deletions(-)

(limited to 'template/en/default/pages')

diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index 8e689b1a3..020e0a98f 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -325,14 +325,11 @@
 
 <h3 id="v40_feat_apache_config">New Apache Configuration</h3>
 
-<p>(Note: If your [% terms.Bugzilla %] runs under mod_perl or runs on some
-  other webserver than Apache, this section does not apply to you.)</p>
-
-<p>The Apache configuration used for [% terms.Bugzilla %] has changed.
-  In particular, a different AllowOverride statement is required.
-  See the
-  <a href="[% docs_urlbase FILTER html %]configuration.html#http-apache">Configuration</a>
-  section of the [% terms.Bugzilla %] Guide for details.</p>
+<p>If you run [% terms.Bugzilla %] under Apache (as most people do),
+  you most likely require a <strong>new Apache configuration</strong> 
+  for this version of [% terms.Bugzilla %]. See the 
+  <a href="#v40_upgrading">Notes On Upgrading From a Previous Version</a>
+  section for details.</p>
 
 <h3 id="v40_feat_other">Other Enhancements and Changes</h3>
 
@@ -577,6 +574,26 @@
 
 <h2 id="v40_upgrading">Notes On Upgrading From a Previous Version</h2>
 
+<h3>IMPORTANT: Apache Configuration Change</h3>
+
+<p>(Note: If your [% terms.Bugzilla %] runs under mod_perl or runs on some
+  other webserver than Apache, this section does not apply to you.)</p>
+
+<p>You will need to update the configuration of Apache for 
+  [%+ terms.Bugzilla %]. In particular, this line in the [% terms.Bugzilla %]
+  <kbd>&lt;Directory&gt;</kbd> block:</p>
+
+<blockquote><code>AllowOverride Limit</code></blockquote>
+
+<p>needs to become:</p>
+
+<blockquote><code>AllowOverride Limit FileInfo Indexes</code></blockquote>
+ 
+<p>For full details on how to configure Apache for [% terms.Bugzilla %],
+  see the
+  <a href="[% docs_urlbase FILTER html %]configuration.html#http-apache">Configuration</a>
+  section of the [% terms.Bugzilla %] Guide.</p>
+
 <h3>New .htaccess file</h3>
 
 <p>In previous versions of [% terms.Bugzilla %], there was a file
-- 
cgit v1.2.3-24-g4f1b