From: William A. Rowe Jr Date: Wed, 8 Jul 2015 14:44:23 +0000 (+0000) Subject: Rebuild-all X-Git-Tag: 2.4.16~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8281e01469c0208564934785698a3581e14ca433;p=thirdparty%2Fapache%2Fhttpd.git Rebuild-all git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1689895 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en index 434a816b51e..2c58f0280f6 100644 --- a/docs/manual/expr.html.en +++ b/docs/manual/expr.html.en @@ -46,7 +46,7 @@
  • Other
  • Comparison with SSLRequire
  • Version History
    • -

    See also

    +

    See also

    top

    Grammar in Backus-Naur Form notation

    diff --git a/docs/manual/expr.html.fr b/docs/manual/expr.html.fr index c22294efc6d..2c8b0fd1df9 100644 --- a/docs/manual/expr.html.fr +++ b/docs/manual/expr.html.fr @@ -26,6 +26,8 @@

    Langues Disponibles:  en  |  fr 

    +
    Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.

    Historiquement, il existe de nombreuses variantes dans la syntaxe des expressions permettant d'exprimer une condition dans les diff --git a/docs/manual/expr.xml.fr b/docs/manual/expr.xml.fr index e6c125eefd7..575c8bcdeae 100644 --- a/docs/manual/expr.xml.fr +++ b/docs/manual/expr.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/expr.xml.meta b/docs/manual/expr.xml.meta index d5a2e5e1a51..ea324a8bb25 100644 --- a/docs/manual/expr.xml.meta +++ b/docs/manual/expr.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/core.html.de b/docs/manual/mod/core.html.de index 2c91ca9d414..809bfb4ca64 100644 --- a/docs/manual/mod/core.html.de +++ b/docs/manual/mod/core.html.de @@ -2453,13 +2453,13 @@ resource

    top

    MergeTrailers-Direktive

    - + - +
    Beschreibung:Determins whether trailers are merged into headers
    Beschreibung:Determines whether trailers are merged into headers
    Syntax:MergeTrailers [on|off]
    Voreinstellung:MergeTrailers off
    Kontext:Serverkonfiguration, Virtual Host
    Status:Core
    Modul:core
    Kompatibilität:2.4.10 and later
    Kompatibilität:2.4.11 and later

    Die Dokumentation zu dieser Direktive wurde noch nicht übersetzt. Bitte schauen Sie in die englische Version.

    @@ -2716,7 +2716,7 @@ bestimmten Verzeichnis verf Status:Core Modul:core Kompatibilität:Available in Apache 2.1.5 and later. -On Windows from Apache 2.3.3 and later. +On Windows, from Apache 2.3.3 and later.

    Die Dokumentation zu dieser Direktive wurde noch nicht übersetzt. Bitte schauen Sie in die englische Version.

    Siehe auch

    diff --git a/docs/manual/mod/core.html.es b/docs/manual/mod/core.html.es index 1ff2beaeba6..adf7d59614a 100644 --- a/docs/manual/mod/core.html.es +++ b/docs/manual/mod/core.html.es @@ -2851,13 +2851,13 @@ resource
    top

    MergeTrailers Directiva

    - + - +
    Descripción:Determins whether trailers are merged into headers
    Descripción:Determines whether trailers are merged into headers
    Sintaxis:MergeTrailers [on|off]
    Valor por defecto:MergeTrailers off
    Contexto:server config, virtual host
    Estado:Core
    Módulo:core
    Compatibilidad:2.4.10 and later
    Compatibilidad:2.4.11 and later

    The documentation for this directive has not been translated yet. Please have a look at the English version.

    diff --git a/docs/manual/mod/core.html.ja.utf8 b/docs/manual/mod/core.html.ja.utf8 index 87c6a6a1541..020eddb2be7 100644 --- a/docs/manual/mod/core.html.ja.utf8 +++ b/docs/manual/mod/core.html.ja.utf8 @@ -2394,13 +2394,13 @@ resource
    top

    MergeTrailers ディレクティブ

    - + - +
    説明:Determins whether trailers are merged into headers
    説明:Determines whether trailers are merged into headers
    構文:MergeTrailers [on|off]
    デフォルト:MergeTrailers off
    コンテキスト:サーバ設定ファイル, バーチャルホスト
    ステータス:Core
    モジュール:core
    互換性:2.4.10 and later
    互換性:2.4.11 and later

    このディレクティブの解説文書は まだ翻訳されていません。英語版をご覧ください。

    @@ -2658,7 +2658,7 @@ or specified mutexes ステータス:Core モジュール:core 互換性:Available in Apache 2.1.5 and later. -On Windows from Apache 2.3.3 and later. +On Windows, from Apache 2.3.3 and later.

    このディレクティブの解説文書は まだ翻訳されていません。英語版をご覧ください。

    参照

    diff --git a/docs/manual/mod/core.html.tr.utf8 b/docs/manual/mod/core.html.tr.utf8 index ff02877867e..c5dbea2de23 100644 --- a/docs/manual/mod/core.html.tr.utf8 +++ b/docs/manual/mod/core.html.tr.utf8 @@ -33,6 +33,7 @@  ja  |  tr 

    +
    Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.
    Açıklama:Apache HTTP Sunucusunda daima mevcut olan çekirdek özellikler
    Durum:Çekirdek
    diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en index 9092479e24b..971837238b8 100644 --- a/docs/manual/mod/mod_alias.html.en +++ b/docs/manual/mod/mod_alias.html.en @@ -53,15 +53,6 @@ a different URL. They are often used when a resource has moved to a new location.

    -

    When the Alias, - ScriptAlias and - Redirect directives are used - within a <Location> - or <LocationMatch> - section, expression syntax can be used - to manipulate the destination path or URL. -

    -

    mod_alias is designed to handle simple URL manipulation tasks. For more complicated tasks such as manipulating the query string, use the tools provided by @@ -116,25 +107,14 @@ Alias "/foo" "/gaq" /foo Alias would always match before the /foo/bar Alias, so the latter directive would be ignored.

    - -

    When the Alias, - ScriptAlias and - Redirect directives are used - within a <Location> - or <LocationMatch> - section, these directives will take precedence over any globally - defined Alias, - ScriptAlias and - Redirect directives.

    -
    top

    Alias Directive

    - - +
    Description:Maps URLs to filesystem locations
    Syntax:Alias [URL-path] +
    Syntax:Alias URL-path file-path|directory-path
    Context:server config, virtual host, directory
    Context:server config, virtual host
    Status:Base
    Module:mod_alias
    @@ -189,22 +169,6 @@ Alias "/foo" "/gaq"

    Any number slashes in the URL-path parameter matches any number of slashes in the requested URL-path.

    -

    If the Alias directive is used within a - <Location> - or <LocationMatch> - section the URL-path is omitted, and the file-path is interpreted - using expression syntax.
    - This syntax is available in Apache 2.4.13 and later.

    - - 
    <Location "/image">
-    Alias "/ftp/pub/image"
-</Location>
-<LocationMatch "/error/(?<NUMBER>[0-9]+)">
-    Alias "/usr/local/apache/errors/%{env:MATCH_NUMBER}.html"
-</LocationMatch>
    - - -
    top

    AliasMatch Directive

    @@ -295,7 +259,7 @@ AliasMatch "^/image/(.*)\.gif$" "/files/gif.images/$1.gif" - @@ -335,17 +299,14 @@ Redirect "/one" "/two" Note that POSTs will be discarded.
    Only complete path segments are matched, so the above example would not match a request for - http://example.com/servicefoo.txt. For more complex matching - using the expression syntax, omit the URL-path - argument as described below. Alternatively, for matching using regular - expressions, see the RedirectMatch directive.

    + http://example.com/servicefoo.txt. For more complex matching + using regular expressions, see the RedirectMatch directive.

    Note

    Redirect directives take precedence over Alias and ScriptAlias directives, irrespective of their ordering in the configuration - file. Redirect directives inside a Location take precedence over - Redirect and Alias directives with an URL-path.

    + file.

    If no status argument is given, the redirect will be "temporary" (HTTP status 302). This indicates to the client @@ -387,25 +348,6 @@ Redirect "/one" "/two" Redirect 303 "/three" "http://example.com/other" -

    If the Redirect directive is used within a - <Location> - or <LocationMatch> - section with the URL-path omitted, then the URL parameter will be - interpreted using expression syntax.
    - This syntax is available in Apache 2.4.13 and later.

    - - 
    <Location "/one">
-    Redirect permanent "http://example.com/two"
-</Location>
-<Location "/three">
-    Redirect 303 "http://example.com/other"
-</Location>
-<LocationMatch "/error/(?<NUMBER>[0-9]+)">
-    Redirect permanent "http://example.com/errors/%{env:MATCH_NUMBER}.html"
-</LocationMatch>
    - - -
    top

    RedirectMatch Directive

    @@ -480,9 +422,9 @@ a different URL
    Description:Sends an external redirect asking the client to fetch a different URL
    Syntax:Redirect [status] [URL-path] +
    Syntax:Redirect [status] URL-path URL
    Context:server config, virtual host, directory, .htaccess
    Override:FileInfo
    - - +
    Description:Maps a URL to a filesystem location and designates the target as a CGI script
    Syntax:ScriptAlias [URL-path] +
    Syntax:ScriptAlias URL-path file-path|directory-path
    Context:server config, virtual host, directory
    Context:server config, virtual host
    Status:Base
    Module:mod_alias
    @@ -538,22 +480,6 @@ target as a CGI script of the CGI scripts if they are not restricted by a Directory section.
    -

    If the ScriptAlias directive is used within - a <Location> - or <LocationMatch> - section with the URL-path omitted, then the URL parameter will be - interpreted using expression syntax.
    - This syntax is available in Apache 2.4.13 and later.

    - - 
    <Location "/cgi-bin">
-    ScriptAlias "/web/cgi-bin/"
-</Location>
-<LocationMatch "/cgi-bin/errors/(?<NUMBER>[0-9]+)">
-    ScriptAlias "/web/cgi-bin/errors/%{env:MATCH_NUMBER}.cgi"
-</LocationMatch>
    - - -

    See also