diff options
| -rw-r--r-- | docs/manual/env.xml | 4 | ||||
| -rw-r--r-- | docs/manual/sections.xml | 6 | ||||
| -rw-r--r-- | docs/manual/ssl/ssl_faq.xml | 2 | ||||
| -rw-r--r-- | docs/manual/vhosts/ip-based.html.en | 2 | ||||
| -rw-r--r-- | docs/manual/vhosts/ip-based.xml | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/docs/manual/env.xml b/docs/manual/env.xml index 369eaf8993..3c3a902caf 100644 --- a/docs/manual/env.xml +++ b/docs/manual/env.xml @@ -170,9 +170,9 @@ <module>mod_rewrite</module> </modulelist> <directivelist> - <directive module="mod_authz_host">Allow</directive> + <directive module="mod_access_compat">Allow</directive> <directive module="mod_log_config">CustomLog</directive> - <directive module="mod_authz_host">Deny</directive> + <directive module="mod_access_compat">Deny</directive> <directive module="mod_ext_filter">ExtFilterDefine</directive> <directive module="mod_headers">Header</directive> <directive module="mod_log_config">LogFormat</directive> diff --git a/docs/manual/sections.xml b/docs/manual/sections.xml index c7fb4ac2df..8bbea4758b 100644 --- a/docs/manual/sections.xml +++ b/docs/manual/sections.xml @@ -94,7 +94,7 @@ to work all the time, because it can suppress useful error messages about missing modules.</p> <p>In the following example, the <directive -module="mod_mime_magic">MimeMagicFiles</directive> directive will be +module="mod_mime_magic">MimeMagicFile</directive> directive will be applied only if <module>mod_mime_magic</module> is available.</p> <example> @@ -247,7 +247,7 @@ certain sections or directives are evaluated. For <Location /foo/bar><br /> </Location> </example> -<p><directive type="section" module="core">Alias</directive>es on the other hand, +<p><directive type="section" module="mod_alias">Alias</directive>es on the other hand, are mapped vice-versa:</p> <example> Alias /foo/bar /srv/www/uncommon/bar<br /> @@ -371,7 +371,7 @@ to all requests regardless of the specific URL.</p> <section id="nesting"><title>Nesting of sections</title> <p>Some section types can be nested inside other section types. One the one -hand, <directive type="section" module="core">File</directive> can be used +hand, <directive type="section" module="core">Files</directive> can be used inside <directive type="section" module="core">Directory</directive>. On the other hand, <directive type="section" module="core">If</directive> can be used inside <directive type="section" module="core">Directory</directive>, diff --git a/docs/manual/ssl/ssl_faq.xml b/docs/manual/ssl/ssl_faq.xml index 99a3f8ca39..3c57d28a3d 100644 --- a/docs/manual/ssl/ssl_faq.xml +++ b/docs/manual/ssl/ssl_faq.xml @@ -51,7 +51,7 @@ generate temporary 512 bit RSA private key" when I start Apache?</a></li> Make sure that all parent directories (here <code>/opt</code>, <code>/opt/apache</code> and <code>/opt/apache/logs</code>) have the x-bit set for, at minimum, the UID under which Apache's children are running (see - the <directive module="mpm_common">User</directive> directive).</p> + the <directive module="mod_unixd">User</directive> directive).</p> </section> <section id="entropy"><title>Why does mod_ssl stop with the error diff --git a/docs/manual/vhosts/ip-based.html.en b/docs/manual/vhosts/ip-based.html.en index 83c72943f7..b15a1263ba 100644 --- a/docs/manual/vhosts/ip-based.html.en +++ b/docs/manual/vhosts/ip-based.html.en @@ -78,7 +78,7 @@ Virtual Hosts</a> to help you decide. </p> <li>There are security partitioning issues, such as company1 does not want anyone at company2 to be able to read their data except via the web. In this case you would need two - daemons, each running with different <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code>, <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code>, <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code>, and <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> settings.</li> + daemons, each running with different <code class="directive"><a href="../mod/mod_unixd.html#user">User</a></code>, <code class="directive"><a href="../mod/mod_unixd.html#group">Group</a></code>, <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code>, and <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> settings.</li> <li>You can afford the memory and file descriptor requirements of listening to every IP alias on the diff --git a/docs/manual/vhosts/ip-based.xml b/docs/manual/vhosts/ip-based.xml index 5a5571a8d4..37cb7727f4 100644 --- a/docs/manual/vhosts/ip-based.xml +++ b/docs/manual/vhosts/ip-based.xml @@ -71,8 +71,8 @@ Virtual Hosts</a> to help you decide. </p> does not want anyone at company2 to be able to read their data except via the web. In this case you would need two daemons, each running with different <directive - module="mpm_common">User</directive>, <directive - module="mpm_common">Group</directive>, <directive + module="mod_unixd">User</directive>, <directive + module="mod_unixd">Group</directive>, <directive module="mpm_common">Listen</directive>, and <directive module="core">ServerRoot</directive> settings.</li> |