From 5f16fbb92870016ac4aa0b755c88157af044a3f4 Mon Sep 17 00:00:00 2001
From: "bzrmirror%bugzilla.org"
 <bzrmirror%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 3 Dec 2014 22:26:34 +0000
Subject: [PATCH] synced Directory-config with non-Windows

git-svn-id: svn://10.0.0.236/trunk@265729 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev                     |  2 +-
 mozilla/webtools/bugzilla/.gitrev                     |  2 +-
 .../docs/en/rst/installing/apache-windows.rst         | 11 +++--------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index e6c4b53d118..2e8cbf38277 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-9255
\ No newline at end of file
+9256
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index d02979e6753..c7a3afc2eec 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-f79839e15bc44cd2f8a80f72cce15f4fd7f9aa74
\ No newline at end of file
+3d4b587c9270c272178e1d2be6f7c9e71393c22d
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/docs/en/rst/installing/apache-windows.rst b/mozilla/webtools/bugzilla/docs/en/rst/installing/apache-windows.rst
index 4285a4b2724..10bf1c6dbfe 100644
--- a/mozilla/webtools/bugzilla/docs/en/rst/installing/apache-windows.rst
+++ b/mozilla/webtools/bugzilla/docs/en/rst/installing/apache-windows.rst
@@ -79,16 +79,11 @@ Add the following stanza:
 
    <Directory "C:/Bugzilla">
        ScriptInterpreterSource Registry-Strict
-       Options Indexes FollowSymLinks ExecCGI
-       DirectoryIndex index.cgi index.html 
-       AllowOverride All
-       Order allow,deny
-       Allow from all
+       Options +ExecCGI +FollowSymLinks
+       DirectoryIndex index.cgi index.html
+       AllowOverride Limit FileInfo Indexes Options
    </Directory>
 
-.. todo:: This is still a bit different from the Linux instructions (apart
-   from ScriptInterpreterSource, obviously). Is that intended?
-
 In order for ``ScriptInterpreterSource Registry-Strict`` to work, you also
 need to add an entry to the Registry so Apache will use Perl to execute .cgi
 files.