From: Daniel Gruno Date: Wed, 16 Jan 2013 18:57:32 +0000 (+0000) Subject: xforms X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9877c651bce09bddb043b0d53f761403ab3e3165;p=thirdparty%2Fapache%2Fhttpd.git xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1434110 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en index 196fa885906..8e047d249c8 100644 --- a/docs/manual/mod/mod_authz_core.html.en +++ b/docs/manual/mod/mod_authz_core.html.en @@ -274,7 +274,7 @@ sections. Module:mod_authz_core

When authorization is enabled, it is normally inherited by each - subsequent configuration section, + subsequent configuration section, unless a different set of authorization directives are specified. This is the default action, which corresponds to an explicit setting of AuthMerging Off.

@@ -491,7 +491,7 @@ Require group admin

When multiple Require directives are used in a single - configuration section + configuration section and are not contained in another authorization directive like <RequireAll>, they are implicitly contained within a @@ -504,7 +504,7 @@ Require group admin

Exercise caution when setting authorization directives in Location sections that overlap with content served out of the filesystem. - By default, these configuration sections overwrite authorization configuration + By default, these configuration sections overwrite authorization configuration in Directory, and Files sections.

The AuthMerging directive diff --git a/docs/manual/mod/mod_so.xml.fr b/docs/manual/mod/mod_so.xml.fr index 0d30682abee..2a88fe92eed 100644 --- a/docs/manual/mod/mod_so.xml.fr +++ b/docs/manual/mod/mod_so.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_so.xml.ja b/docs/manual/mod/mod_so.xml.ja index 7427f96679e..7d7d568db40 100644 --- a/docs/manual/mod/mod_so.xml.ja +++ b/docs/manual/mod/mod_so.xml.ja @@ -1,7 +1,7 @@ - + + +