From: Eric Covener <covener@apache.org>
Date: Mon, 8 Aug 2011 12:36:39 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.3.15~396
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c0046589a06ece02dadb568bad49349f34f53f8;p=thirdparty%2Fapache%2Fhttpd.git

xforms


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1154944 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 7bffa48036c..d6a8f3034e1 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -479,7 +479,16 @@ NoDecode option available in 2.3.12 and later.</td></tr>
       features (<code class="directive"><a href="#options">Options</a></code> and
       <code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code>).
       An equal sign may be given followed by a comma (but no spaces)
-      separated lists of options that may be set using the <code class="directive"><a href="#options">Options</a></code> command.</dd>
+      separated lists of options that may be set using the <code class="directive"><a href="#options">Options</a></code> command.
+
+      <div class="note"><h3>Implicit disabling of Options</h3>
+      <p>Even though the list of options that may be used in .htaccess files 
+         can be limited with this directive, as long as any <code class="directive"><a href="#options">Options</a></code> directive is allowed any
+         other inherited option can be disabled by using the non-relative
+         syntax.  In other words, this mechanism cannot force a specific option
+         to remain <em>set</em> while allowing any others to be set.
+      </p></div>
+      </dd>
     </dl>
 
     <p>Example:</p>
diff --git a/docs/manual/mod/mod_lua.html.en b/docs/manual/mod/mod_lua.html.en
index adcd002e143..fad096b3129 100644
--- a/docs/manual/mod/mod_lua.html.en
+++ b/docs/manual/mod/mod_lua.html.en
@@ -368,6 +368,7 @@ end
 
 <div class="example"><p><code>
         -- examples of logging messages<br />
+        r:trace1("This is a trace log message") -- trace1 through trace8 can be used <br />
         r:debug("This is a debug log message")<br />
         r:info("This is an info log message")<br />
         r:notice("This is an notice log message")<br />