From 7c3e3639b71c0ab2b1ac9df17c46d4d95474d3e4 Mon Sep 17 00:00:00 2001
From: Jim Jagielski <jim@apache.org>
Date: Wed, 1 Feb 2012 19:15:22 +0000
Subject: [PATCH] Merge r1239174 from trunk:

Document AllowOverride Nonfatal option

Submitted by: niq
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1239274 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/core.xml | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index aac3144776..4044fc409a 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -413,10 +413,29 @@ NoDecode option available in 2.3.12 and later.</compatibility>
       module="mod_authz_host">Deny</directive> and <directive
       module="mod_authz_host">Order</directive>).</dd>
 
-      <dt>Nonfatal</dt>
+      <dt>Nonfatal=[Override|Unknown|All]</dt>
 
       <dd>
-      Allow use of AllowOverride option to treat syntax errors in .htaccess as non-fatal.</dd>
+      Allow use of AllowOverride option to treat syntax errors in
+      .htaccess as non-fatal: instead of causing an Internal Server
+      Error, disallowed or unrecognised directives will be ignored
+      and a warning logged:
+      <ul>
+          <li><strong>Nonfatal=Override</strong> treats directives
+              forbidden by AllowOverride as non-fatal.</li>
+          <li><strong>Nonfatal=Unknown</strong> treats unknown directives
+              as non-fatal.  This covers typos and directives implemented
+              by a module that's not present.</li>
+          <li><strong>Nonfatal=All</strong> treats both the above as non-fatal.</li>
+      </ul>
+      <p>Note that a syntax error in a valid directive will still cause
+      an internal server error.</p>
+      <note class="warning"><title>Security</title>
+          Nonfatal errors may have security implications for .htaccess users.
+          For example, if AllowOverride disallows AuthConfig, users'
+          configuration designed to restrict access to a site will be disabled.
+      </note>
+      </dd>
 
       <dt>Options[=<var>Option</var>,...]</dt>
 
-- 
2.40.0