From: Astrid Kessler Date: Sat, 18 Jan 2003 19:39:06 +0000 (+0000) Subject: - specify some mistakables discussed while reviewing the german translation X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de5d3bbbacd0bc242e8528ce3fc11202e55fb565;p=apache - specify some mistakables discussed while reviewing the german translation - set a link from AccessFileName to AllowOverride - and sections and .htaccess files may be used for more then access control - state an example more precisely Thanks to Michael Schroepl and nd for their suggestions. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98336 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 15423cffea..deccf53df7 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -133,7 +133,7 @@ available
Default
The treatment of requests with trailing pathname information is determined by the handler responsible for the request. The core handler for normal files defaults to rejecting - PATH_INFO. Handlers that serve scripts, such as cgi-script and isapi-isa, generally accept + PATH_INFO requests. Handlers that serve scripts, such as cgi-script and isapi-isa, generally accept PATH_INFO by default.
@@ -171,8 +171,8 @@ available

While processing a request the server looks for the first existing configuration file from this list of names in every directory of the path to the document, if distributed - configuration files are enabled for that directory. For - example:

+ configuration files are enabled for that + directory. For example:

AccessFileName .acl @@ -252,10 +252,10 @@ response without an explicit character set AddOutputFilterByType DEFLATE text/html text/plain

-

If you want the content to be processed by more than one filter, they - have to be separated by semicolons. It's also possible to use one +

If you want the content to be processed by more than one filter, their + names have to be separated by semicolons. It's also possible to use one AddOutputFilterByType directive for each of - them.

+ these filters.

The configuration below causes all script output labeled as text/html to be processed at first by the @@ -274,7 +274,10 @@ response without an explicit character set

Note

Enabling filters with AddOutputFilterByType may fail partially or completely in some cases. For expample, no - filters are applied if the content type falls back to the DefaultType, even if the DefaultType is the same.

+ filters are applied if the MIME-type could not be determined and falls + back to the DefaultType setting, + even if the DefaultType is the + same.

However, if you want to make sure, that the filters will be applied, assign the content type to a resource explicitely, for @@ -307,7 +310,7 @@ response without an explicit character set

When the server finds an .htaccess file (as specified by AccessFileName) it needs to know which directives declared in that file can override - earlier access information.

+ earlier configuration directives.

Only available in <Directory> sections

AllowOverride is valid only in @@ -527,10 +530,10 @@ server cannot determine a type in any other way DefaultType image/gif

-

would be appropriate for a directory which contained many gif +

would be appropriate for a directory which contained many GIF images with filenames missing the .gif extension.

-

Note that unlike ForceType, this directive is only +

Note that unlike ForceType, this directive only provides the default mime-type. All other mime-type definitions, including filename extensions, that might identify the media type will override this default.

@@ -589,8 +592,8 @@ named file-system directory and sub-directories

would match directories in /www/ that consisted of three numbers.

-

If multiple (non-regular expression) <Directory> sections - match the directory (or its parents) containing a document, +

If multiple (non-regular expression) <Directory> sections + match the directory (or one of its parents) containing a document, then the directives are applied in the order of shortest match first, interspersed with the directives from the .htaccess files. For example, with

@@ -617,10 +620,11 @@ named file-system directory and sub-directories (disabling .htaccess files).
  • Apply directive AllowOverride FileInfo (for - directory /home/web).
    • + directory /home).
  • Apply any FileInfo directives in - /home/web/.htaccess
    • + /home/.htaccess, /home/web/.htaccess and + /home/web/dir/.htaccess in that order.

    Regular expressions are not considered until after all of the @@ -637,9 +641,11 @@ named file-system directory and sub-directories

    the regular expression section won't be considered until after - all normal <Directory>s and .htaccess - files have been applied. Then the regular expression will match on - /home/abc/public_html/abc and be applied.

    + all normal <Directory>s and + .htaccess files have been applied. Then the regular + expression will match on /home/abc/public_html/abc and + the corresponding <Directory> will + be applied.

    Note that the default Apache access for <Directory /> is Allow from All. @@ -810,7 +816,7 @@ Location without ever reading the file if the OS supports it.

    This sendfile mechanism avoids seperate read and send operations, - and buffer allocations. But on some platforms or within some + and buffer allocations. But on some platforms or within some filesystems, it is better to disable this feature to avoid operational problems:

    @@ -1036,12 +1042,12 @@ filenames Module:core

    The <Files> directive - provides for access control by filename. It is comparable to the - <Directory> - directive and <Location> directives. It should be - matched with a <Files> directive. The - directives given within this section will be applied to any object - with a basename (last component of filename) matching the + limits the scope of the enclosed directives by filename. It is comparable + to the <Directory> + and <Location> + directives. It should be matched with a </Files> + directive. The directives given within this section will be applied to + any object with a basename (last component of filename) matching the specified filename. <Files> sections are processed in the order they appear in the configuration file, after the <Directory> sections and @@ -1087,7 +1093,8 @@ filenames Module:core

    The <FilesMatch> directive - provides for access control by filename, just as the <Files> directive + limits the scope of the enclosed directives by filename, just as the + <Files> directive does. However, it accepts a regular expression. For example:

    @@ -1347,7 +1354,7 @@ the server configuration files files in a directory that can cause httpd to fail.

    -

    The file path specified may be a fully qualified path (i.e. +

    The file path specified may be an absolute path (i.e. starting with a slash), or may be relative to the ServerRoot directory.

    @@ -1720,7 +1727,7 @@ URLs Module:core

    The <Location> directive - provides for access control by URL. It is similar to the + limits the scope of the enclosed directives by URL. It is similar to the <Directory> directive, and starts a subsection which is terminated with a </Location> directive. <Location> sections are processed in the @@ -1809,8 +1816,8 @@ matching URLs Module:core

    The <LocationMatch> directive - provides for access control by URL, in an identical manner to - <Location>. However, + limits the scope of the enclosed directives by URL, in an identical manner + to <Location>. However, it takes a regular expression as an argument instead of a simple string. For example:

    @@ -2201,7 +2208,7 @@ a resource
    Require group group-name [group-name] ...
    -
    Only users in the named groups can access the resource.
    +
    Only users in the named groups can access the resource.
    Require valid-user
    All valid users can access the resource.
    @@ -2786,7 +2793,7 @@ server - + diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 5003c43ae4..3437e4c1d2 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -53,7 +53,7 @@ available trailing pathname information is determined by the handler responsible for the request. The core handler for normal files defaults to rejecting - PATH_INFO. Handlers that serve scripts, such as PATH_INFO requests. Handlers that serve scripts, such as cgi-script and isapi-isa, generally accept PATH_INFO by default. @@ -93,8 +93,8 @@ available

    While processing a request the server looks for the first existing configuration file from this list of names in every directory of the path to the document, if distributed - configuration files are enabled for that directory. For - example:

    + configuration files are enabled for that + directory. For example:

    AccessFileName .acl @@ -174,10 +174,10 @@ response without an explicit character set AddOutputFilterByType DEFLATE text/html text/plain -

    If you want the content to be processed by more than one filter, they - have to be separated by semicolons. It's also possible to use one +

    If you want the content to be processed by more than one filter, their + names have to be separated by semicolons. It's also possible to use one AddOutputFilterByType directive for each of - them.

    + these filters.

    The configuration below causes all script output labeled as text/html to be processed at first by the @@ -196,9 +196,10 @@ response without an explicit character set Note

    Enabling filters with AddOutputFilterByType may fail partially or completely in some cases. For expample, no - filters are applied if the content type falls back to the DefaultType, even if the DefaultType is the same.

    + filters are applied if the MIME-type could not be determined and falls + back to the DefaultType setting, + even if the DefaultType is the + same.

    However, if you want to make sure, that the filters will be applied, assign the content type to a resource explicitely, for @@ -228,7 +229,7 @@ response without an explicit character set

    When the server finds an .htaccess file (as specified by AccessFileName) it needs to know which directives declared in that file can override - earlier access information.

    + earlier configuration directives.

    Only available in <Directory> sections AllowOverride is valid only in @@ -471,11 +472,11 @@ server cannot determine a type in any other way DefaultType image/gif -

    would be appropriate for a directory which contained many gif +

    would be appropriate for a directory which contained many GIF images with filenames missing the .gif extension.

    Note that unlike ForceType, this directive is only + module="core">ForceType, this directive only provides the default mime-type. All other mime-type definitions, including filename extensions, that might identify the media type will override this default.

    @@ -534,9 +535,9 @@ named file-system directory and sub-directories

    would match directories in /www/ that consisted of three numbers.

    -

    If multiple (non-regular expression) If multiple (non-regular expression) Directory sections - match the directory (or its parents) containing a document, + match the directory (or one of its parents) containing a document, then the directives are applied in the order of shortest match first, interspersed with the directives from the .htaccess files. For example, @@ -564,10 +565,11 @@ named file-system directory and sub-directories (disabling .htaccess files).

  • Apply directive AllowOverride FileInfo (for - directory /home/web).
    • + directory /home).
  • Apply any FileInfo directives in - /home/web/.htaccess
    • + /home/.htaccess, /home/web/.htaccess and + /home/web/dir/.htaccess in that order.

    Regular expressions are not considered until after all of the @@ -584,9 +586,11 @@ named file-system directory and sub-directories

    the regular expression section won't be considered until after - all normal <Directory>s and .htaccess - files have been applied. Then the regular expression will match on - /home/abc/public_html/abc and be applied.

    + all normal Directorys and + .htaccess files have been applied. Then the regular + expression will match on /home/abc/public_html/abc and + the corresponding Directory will + be applied.

    Note that the default Apache access for <Directory /> is Allow from All. @@ -756,7 +760,7 @@ Location without ever reading the file if the OS supports it.

    This sendfile mechanism avoids seperate read and send operations, - and buffer allocations. But on some platforms or within some + and buffer allocations. But on some platforms or within some filesystems, it is better to disable this feature to avoid operational problems:

    @@ -985,13 +989,12 @@ filenames

    The Files directive - provides for access control by filename. It is comparable to the - Directory - directive and Location directives. It should be - matched with a Files directive. The - directives given within this section will be applied to any object - with a basename (last component of filename) matching the + limits the scope of the enclosed directives by filename. It is comparable + to the Directory + and Location + directives. It should be matched with a </Files> + directive. The directives given within this section will be applied to + any object with a basename (last component of filename) matching the specified filename. Files sections are processed in the order they appear in the configuration file, after the

    The FilesMatch directive - provides for access control by filename, just as the Files directive + limits the scope of the enclosed directives by filename, just as the + Files directive does. However, it accepts a regular expression. For example:

    @@ -1052,6 +1055,7 @@ filenames

    would match most common Internet graphics formats.

     + How <Directory>, <Location> and <Files> sections work for an explanation of how these different sections are combined when a request is received @@ -1307,7 +1311,7 @@ the server configuration files files in a directory that can cause httpd to fail.

    -

    The file path specified may be a fully qualified path (i.e. +

    The file path specified may be an absolute path (i.e. starting with a slash), or may be relative to the ServerRoot directory.

    @@ -1680,7 +1684,7 @@ URLs

    The Location directive - provides for access control by URL. It is similar to the + limits the scope of the enclosed directives by URL. It is similar to the Directory directive, and starts a subsection which is terminated with a </Location> directive.

    The LocationMatch directive - provides for access control by URL, in an identical manner to - Location. However, + limits the scope of the enclosed directives by URL, in an identical manner + to Location. However, it takes a regular expression as an argument instead of a simple string. For example:

    @@ -2170,7 +2174,7 @@ a resource
    Require group group-name [group-name] ...
    -
    Only users in the named groups can access the resource.
    +
    Only users in the named groups can access the resource.
    Require valid-user
    All valid users can access the resource.
    @@ -2726,7 +2730,7 @@ server TimeOut Amount of time the server will wait for certain events before failing a request -TimeOut second +TimeOut seconds TimeOut 300 server config diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index bb281c64da..e3588d2dff 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -655,7 +655,7 @@ Certificate verification per child process     -
    Description:Amount of time the server will wait for certain events before failing a request
    Syntax:TimeOut second
    Syntax:TimeOut seconds
    Default:TimeOut 300
    Context:server config
    Status:Core
    ThreadsPerChild numbersM
    Number of threads created by each child process
    ThreadStackSize number 65536 sM
    Determine the stack size for each thread
    TimeOut second 300 sC
    Amount of time the server will wait for +
    TimeOut seconds 300 sC
    Amount of time the server will wait for certain events before failing a request
    TransferLog file|pipesvB
    Specifly location of a log file
    TypesConfig file-path conf/mime.types sB
    The location of the mime.types file