From 7cc2917b415440f377fd8a7d10e5c34e3d54d6dd Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Sun, 22 Jan 2012 23:30:02 +0000 Subject: [PATCH] update xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234644 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/core.html.de | 19 + docs/manual/mod/core.html.en | 75 +- docs/manual/mod/core.html.es | 19 + docs/manual/mod/core.html.fr | 23 +- docs/manual/mod/core.html.ja.utf8 | 19 + docs/manual/mod/core.html.tr.utf8 | 18 + docs/manual/mod/core.xml.de | 2 +- docs/manual/mod/core.xml.es | 2 +- docs/manual/mod/core.xml.fr | 2 +- docs/manual/mod/core.xml.ja | 2 +- docs/manual/mod/core.xml.tr | 2 +- docs/manual/mod/directives.html.de | 1 + docs/manual/mod/directives.html.en | 1 + docs/manual/mod/directives.html.es | 1 + docs/manual/mod/directives.html.ja.utf8 | 1 + docs/manual/mod/directives.html.ko.euc-kr | 1 + docs/manual/mod/directives.html.tr.utf8 | 1 + docs/manual/mod/directives.html.zh-cn | 1 + docs/manual/mod/quickreference.html.de | 794 ++++++++--------- docs/manual/mod/quickreference.html.en | 796 +++++++++--------- docs/manual/mod/quickreference.html.es | 794 ++++++++--------- docs/manual/mod/quickreference.html.ja.utf8 | 776 ++++++++--------- docs/manual/mod/quickreference.html.ko.euc-kr | 792 ++++++++--------- docs/manual/mod/quickreference.html.tr.utf8 | 796 +++++++++--------- docs/manual/mod/quickreference.html.zh-cn | 796 +++++++++--------- 25 files changed, 2927 insertions(+), 2807 deletions(-) diff --git a/docs/manual/mod/core.html.de b/docs/manual/mod/core.html.de index 91737ca940..8621780d1f 100644 --- a/docs/manual/mod/core.html.de +++ b/docs/manual/mod/core.html.de @@ -70,6 +70,7 @@ Servers
  • <IfDefine>
  • <IfModule>
  • Include
    • +
  • IncludeOptional
  • KeepAlive
  • KeepAliveTimeout
  • <Limit>
    • @@ -1670,6 +1671,24 @@ Server-Konfigurationsdatei ein
    top
    +

    IncludeOptional-Direktive

    + + + + + + + +
    Beschreibung:Includes other configuration files from within +the server configuration files
    Syntax:IncludeOptional file-path|directory-path|wildcard
    Kontext:Serverkonfiguration, Virtual Host, Verzeichnis
    Status:Core
    Modul:core
    Kompatibilität:Available in 2.3.6 and later

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

    Siehe auch

    + +
    +
    top

    KeepAlive-Direktive

    diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 78b4ff1e40..43d2eedd1b 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -67,6 +67,7 @@ available
  • <IfDefine>
  • <IfModule>
  • Include
    • +
  • IncludeOptional
  • KeepAlive
  • KeepAliveTimeout
  • <Limit>
    • @@ -2006,7 +2007,7 @@ later.
    Beschreibung:Aktiviert persistente HTTP-Verbindungen
    - + @@ -2027,27 +2028,14 @@ wildcard matching available in 2.3.6 and later wildcard syntax shown below, to include files that match a particular pattern, such as *.conf, for example.

    -

    When a wildcard is specified for a file component of - the path, and no file matches the wildcard, the - Include - directive will be silently ignored. When a wildcard is - specified for a directory component of the path, and - no directory matches the wildcard, the - Include directive will - fail with an error saying the directory cannot be found. -

    - -

    For further control over the behavior of the server when no files or - directories match, prefix the path with the modifiers optional - or strict. If optional is specified, any wildcard - file or directory that does not match will be silently ignored. If - strict is specified, any wildcard file or directory that does - not match at least one file will cause server startup to fail.

    - -

    When a directory or file component of the path is - specified exactly, and that directory or file does not exist, - Include directive will fail with an - error saying the file or directory cannot be found.

    +

    The Include directive will + fail with an error if a wildcard is specified for a + filename or directory component of the patch, but no file or directory + matches the wildcard. The same is true if a wildcard is specified for a + directory component of the path, and a mathing directory does not contain + the filename specified in the path. The + IncludeOptional directive can be + used instead, if non-matching wildcards should be ignored.

    The file path specified may be an absolute path, or may be relative to the ServerRoot directory.

    @@ -2067,32 +2055,49 @@ wildcard matching available in 2.3.6 and later

    Wildcards may be included in the directory or file portion of the - path. In the following example, the server will fail to load if no - directories match conf/vhosts/*, but will load successfully if no - files match *.conf.

    + path. This example will fail if there is no subdirectory in conf/vhosts + or if a subdirectory of conf/vhosts does not contain at least one *.conf + file:

    - Include conf/vhosts/*/vhost.conf
    Include conf/vhosts/*/*.conf

    -

    In this example, the server will fail to load if either - conf/vhosts/* matches no directories, or if *.conf matches no files:

    +

    Alternatively, the following command will just be ignored in case of + missing files or directories:

    - Include strict conf/vhosts/*/*.conf + IncludeOptional conf/vhosts/*/*.conf

    -

    In this example, the server load successfully if either conf/vhosts/* - matches no directories, or if *.conf matches no files:

    - -

    - Include optional conf/vhosts/*/*.conf -

    +

    See also

    + + +
    top
    +

    IncludeOptional Directive

    +
    Description:Includes other configuration files from within the server configuration files
    Syntax:Include [optional|strict] file-path|directory-path|wildcard
    Syntax:Include file-path|directory-path|wildcard
    Context:server config, virtual host, directory
    Status:Core
    Module:core
    + + + + + + +
    Description:Includes other configuration files from within +the server configuration files
    Syntax:IncludeOptional file-path|directory-path|wildcard
    Context:server config, virtual host, directory
    Status:Core
    Module:core
    Compatibility:Available in 2.3.6 and later
    +

    This directive allows inclusion of other configuration files + from within the server configuration files. It works identically to the + Include directive, with the + exception that if wildcards do not match any file or directory, the + IncludeOptional directive will be + silently ignored instead of causing an error.

    See also

    diff --git a/docs/manual/mod/core.html.es b/docs/manual/mod/core.html.es index 9ace061bdb..15b8f7d4b3 100644 --- a/docs/manual/mod/core.html.es +++ b/docs/manual/mod/core.html.es @@ -70,6 +70,7 @@
  • <IfDefine>
  • <IfModule>
  • Include
    • +
  • IncludeOptional
  • KeepAlive
  • KeepAliveTimeout
  • <Limit>
    • @@ -1925,6 +1926,24 @@ wildcard matching available in 2.3.6 and later
    top
    +

    IncludeOptional Directiva

    + + + + + + + +
    Descripción:Includes other configuration files from within +the server configuration files
    Sintaxis:IncludeOptional file-path|directory-path|wildcard
    Contexto:server config, virtual host, directory
    Estado:Core
    Módulo:core
    Compatibilidad:Available in 2.3.6 and later

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

    Consulte también

    + +
    +
    top

    KeepAlive Directiva

    diff --git a/docs/manual/mod/core.html.fr b/docs/manual/mod/core.html.fr index baf6dfabc3..cb424b1764 100644 --- a/docs/manual/mod/core.html.fr +++ b/docs/manual/mod/core.html.fr @@ -69,6 +69,7 @@ disponibles
  • <IfDefine>
  • <IfModule>
  • Include
    • +
  • IncludeOptional
  • KeepAlive
  • KeepAliveTimeout
  • <Limit>
    • @@ -2238,6 +2239,24 @@ version 2.3.6
    top
    +

    IncludeOptional Directive

    +
    Descripción:Enables HTTP persistent connections
    + + + + + + +
    Description:Includes other configuration files from within +the server configuration files
    Syntaxe:IncludeOptional file-path|directory-path|wildcard
    Contexte:configuration du serveur, serveur virtuel, répertoire
    Statut:Core
    Module:core
    Compatibilité:Available in 2.3.6 and later

    La documentation de cette directive + n'a pas encore t traduite. Veuillez vous reporter la version + en langue anglaise.

    Voir aussi

    + +
    +
    top

    KeepAlive Directive

    @@ -3456,8 +3475,8 @@ verrou pour tous les mutex ou seulement les mutex sp sysvsem.

    - Mutex default sysvsem
    - Mutex mpm-accept fcntl:/var/httpd/locks + Mutex sysvsem default
    + Mutex fcntl:/var/httpd/locks mpm-accept

    diff --git a/docs/manual/mod/core.html.ja.utf8 b/docs/manual/mod/core.html.ja.utf8 index 23cc882943..85fd0b1a8e 100644 --- a/docs/manual/mod/core.html.ja.utf8 +++ b/docs/manual/mod/core.html.ja.utf8 @@ -70,6 +70,7 @@
  • <IfDefine>
  • <IfModule>
  • Include
    • +
  • IncludeOptional
  • KeepAlive
  • KeepAliveTimeout
  • <Limit>
    • @@ -1633,6 +1634,24 @@ request
    top
    +

    IncludeOptional ディレクティブ

    +
    Description:Active les connexions HTTP persistantes
    + + + + + + +
    説明:Includes other configuration files from within +the server configuration files
    構文:IncludeOptional file-path|directory-path|wildcard
    コンテキスト:サーバ設定ファイル, バーチャルホスト, ディレクトリ
    ステータス:Core
    モジュール:core
    互換性:Available in 2.3.6 and later

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

    参照

    + +
    +
    top

    KeepAlive ディレクティブ

    diff --git a/docs/manual/mod/core.html.tr.utf8 b/docs/manual/mod/core.html.tr.utf8 index c92e754de1..a689cea90b 100644 --- a/docs/manual/mod/core.html.tr.utf8 +++ b/docs/manual/mod/core.html.tr.utf8 @@ -68,6 +68,7 @@
  • <IfDefine>
  • <IfModule>
  • Include
    • +
  • IncludeOptional
  • KeepAlive
  • KeepAliveTimeout
  • <Limit>
    • @@ -1670,6 +1671,23 @@ yönergeleri sarmalar.
    top
    +

    IncludeOptional Yönergesi

    +
    説明:HTTP の持続的な接続を有効にする
    + + + + + + +
    Açıklama:Includes other configuration files from within +the server configuration files
    Sözdizimi:IncludeOptional file-path|directory-path|wildcard
    Bağlam:sunucu geneli, sanal konak, dizin
    Durum:Çekirdek
    Modül:core
    Uyumluluk:Available in 2.3.6 and later

    Bu yönergenin belgesi henüz Türkçeye çevrilmedi. + Lütfen İngilizce sürümüne bakınız.

    Ayrıca bakınız:

    + +
    +
    top

    KeepAlive Yönergesi

    diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 7fc3afcebd..9dfd78171a 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index e87bfab4ac..42d45161d5 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + +
    Açıklama:HTTP kalıcı bağlantılarını etkin kılar