summaryrefslogtreecommitdiffstats
path: root/docs/manual/misc/security_tips.html.en
diff options
context:
space:
mode:
Diffstat (limited to 'docs/manual/misc/security_tips.html.en')
-rw-r--r--docs/manual/misc/security_tips.html.en4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/manual/misc/security_tips.html.en b/docs/manual/misc/security_tips.html.en
index 6650636b2d..320a1f124b 100644
--- a/docs/manual/misc/security_tips.html.en
+++ b/docs/manual/misc/security_tips.html.en
@@ -460,7 +460,7 @@
<code class="directive">mod_access_compat</code>, the behavior in later sections
depends on whether the later section has any directives
from the module. The configuration is inherited until a change is made,
- at which point the configuration is <em>replaced</em>.</p>
+ at which point the configuration is <em>replaced</em> and not merged.</p>
</div></div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/misc/security_tips.html" title="English">&nbsp;en&nbsp;</a> |
@@ -468,6 +468,6 @@
<a href="../ko/misc/security_tips.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="../tr/misc/security_tips.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
</div><div id="footer">
-<p class="apache">Copyright 2011 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2012 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
</body></html> \ No newline at end of file