From: Jim Jagielski Date: Tue, 19 Mar 2019 12:39:36 +0000 (+0000) Subject: docs and manual xforms rebuild X-Git-Tag: 2.4.39~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=972cad0bfa7fe8f5ed2405c68939f4420e0b2d1a;p=thirdparty%2Fapache%2Fhttpd.git docs and manual xforms rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1855820 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map index f2e3e5bc8d4..95c02610f07 100644 --- a/docs/manual/convenience.map +++ b/docs/manual/convenience.map @@ -255,6 +255,7 @@ h2maxworkeridleseconds mod/mod_http2.html#h2maxworkeridleseconds h2maxworkers mod/mod_http2.html#h2maxworkers h2minworkers mod/mod_http2.html#h2minworkers h2moderntlsonly mod/mod_http2.html#h2moderntlsonly +h2padding mod/mod_http2.html#h2padding h2push mod/mod_http2.html#h2push h2pushdiarysize mod/mod_http2.html#h2pushdiarysize h2pushpriority mod/mod_http2.html#h2pushpriority @@ -392,6 +393,7 @@ mdrenewwindow mod/mod_md.html#mdrenewwindow mdrequirehttps mod/mod_md.html#mdrequirehttps mdstoredir mod/mod_md.html#mdstoredir memcacheconnttl mod/mod_socache_memcache.html#memcacheconnttl +mergeslashes mod/core.html#mergeslashes mergetrailers mod/core.html#mergetrailers metadir mod/mod_cern_meta.html#metadir metafiles mod/mod_cern_meta.html#metafiles @@ -476,6 +478,8 @@ redirect mod/mod_alias.html#redirect redirectmatch mod/mod_alias.html#redirectmatch redirectpermanent mod/mod_alias.html#redirectpermanent redirecttemp mod/mod_alias.html#redirecttemp +redisconnpoolttl mod/mod_socache_redis.html#redisconnpoolttl +redistimeout mod/mod_socache_redis.html#redistimeout reflectorheader mod/mod_reflector.html#reflectorheader regexdefaultoptions mod/core.html#regexdefaultoptions registerhttpmethod mod/core.html#registerhttpmethod diff --git a/docs/manual/mod/allmodules.xml b/docs/manual/mod/allmodules.xml index 40206432678..b0e65d9e3ce 100644 --- a/docs/manual/mod/allmodules.xml +++ b/docs/manual/mod/allmodules.xml @@ -111,6 +111,7 @@ mod_socache_dbm.xml mod_socache_dc.xml mod_socache_memcache.xml + mod_socache_redis.xml mod_socache_shmcb.xml mod_speling.xml mod_ssl.xml diff --git a/docs/manual/mod/allmodules.xml.de b/docs/manual/mod/allmodules.xml.de index 4bacc7232e5..5fa1c419549 100644 --- a/docs/manual/mod/allmodules.xml.de +++ b/docs/manual/mod/allmodules.xml.de @@ -111,6 +111,7 @@ mod_socache_dbm.xml mod_socache_dc.xml mod_socache_memcache.xml + mod_socache_redis.xml mod_socache_shmcb.xml mod_speling.xml mod_ssl.xml diff --git a/docs/manual/mod/allmodules.xml.es b/docs/manual/mod/allmodules.xml.es index 9b48078fa1f..fbc7a76d187 100644 --- a/docs/manual/mod/allmodules.xml.es +++ b/docs/manual/mod/allmodules.xml.es @@ -111,6 +111,7 @@ mod_socache_dbm.xml mod_socache_dc.xml mod_socache_memcache.xml + mod_socache_redis.xml mod_socache_shmcb.xml mod_speling.xml mod_ssl.xml diff --git a/docs/manual/mod/allmodules.xml.fr b/docs/manual/mod/allmodules.xml.fr index 0b9744298d6..e6c398d3bcd 100644 --- a/docs/manual/mod/allmodules.xml.fr +++ b/docs/manual/mod/allmodules.xml.fr @@ -111,6 +111,7 @@ mod_socache_dbm.xml.fr mod_socache_dc.xml.fr mod_socache_memcache.xml.fr + mod_socache_redis.xml mod_socache_shmcb.xml.fr mod_speling.xml.fr mod_ssl.xml.fr diff --git a/docs/manual/mod/allmodules.xml.ja b/docs/manual/mod/allmodules.xml.ja index e0f5f8315e2..223e9bd7bfd 100644 --- a/docs/manual/mod/allmodules.xml.ja +++ b/docs/manual/mod/allmodules.xml.ja @@ -111,6 +111,7 @@ mod_socache_dbm.xml mod_socache_dc.xml mod_socache_memcache.xml + mod_socache_redis.xml mod_socache_shmcb.xml mod_speling.xml.ja mod_ssl.xml diff --git a/docs/manual/mod/allmodules.xml.ko b/docs/manual/mod/allmodules.xml.ko index 0805095e78e..224514242a0 100644 --- a/docs/manual/mod/allmodules.xml.ko +++ b/docs/manual/mod/allmodules.xml.ko @@ -111,6 +111,7 @@ mod_socache_dbm.xml mod_socache_dc.xml mod_socache_memcache.xml + mod_socache_redis.xml mod_socache_shmcb.xml mod_speling.xml.ko mod_ssl.xml diff --git a/docs/manual/mod/allmodules.xml.tr b/docs/manual/mod/allmodules.xml.tr index 99fa7dfbe1c..dc392d216fb 100644 --- a/docs/manual/mod/allmodules.xml.tr +++ b/docs/manual/mod/allmodules.xml.tr @@ -111,6 +111,7 @@ mod_socache_dbm.xml mod_socache_dc.xml mod_socache_memcache.xml + mod_socache_redis.xml mod_socache_shmcb.xml mod_speling.xml mod_ssl.xml diff --git a/docs/manual/mod/allmodules.xml.zh-cn b/docs/manual/mod/allmodules.xml.zh-cn index 40206432678..b0e65d9e3ce 100644 --- a/docs/manual/mod/allmodules.xml.zh-cn +++ b/docs/manual/mod/allmodules.xml.zh-cn @@ -111,6 +111,7 @@ mod_socache_dbm.xml mod_socache_dc.xml mod_socache_memcache.xml + mod_socache_redis.xml mod_socache_shmcb.xml mod_speling.xml mod_ssl.xml diff --git a/docs/manual/mod/core.html.de b/docs/manual/mod/core.html.de index 176d96c2ad2..c097448b3ca 100644 --- a/docs/manual/mod/core.html.de +++ b/docs/manual/mod/core.html.de @@ -100,6 +100,7 @@ Servers
  • MaxRangeOverlaps
  • MaxRangeReversals
  • MaxRanges
    • +
  • MergeSlashes
  • MergeTrailers
  • Mutex
  • NameVirtualHost
    • @@ -2547,6 +2548,20 @@ resource noch nicht übersetzt. Bitte schauen Sie in die englische Version.

    top
    +

    MergeSlashes-Direktive

    + + + + + + + + +
    Beschreibung:Controls whether the server merges consecutive slashes in URLs. +
    Syntax:MergeSlashes ON|OFF
    Voreinstellung:MergeSlashes ON
    Kontext:Serverkonfiguration, Virtual Host
    Status:Core
    Modul:core
    Kompatibilität:Added in 2.4.39

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

    +
    top

    MergeTrailers-Direktive

    diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 74644d8240a..1cc985eb650 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -97,6 +97,7 @@ available
  • MaxRangeOverlaps
  • MaxRangeReversals
  • MaxRanges
    • +
  • MergeSlashes
  • MergeTrailers
  • Mutex
  • NameVirtualHost
    • @@ -3482,6 +3483,32 @@ resource server is willing to satisfy. + +
    top
    +

    MergeSlashes Directive

    +
    Beschreibung:Determines whether trailers are merged into headers
    + + + + + + + +
    Description:Controls whether the server merges consecutive slashes in URLs. +
    Syntax:MergeSlashes ON|OFF
    Default:MergeSlashes ON
    Context:server config, virtual host
    Status:Core
    Module:core
    Compatibility:Added in 2.4.39
    +

    By default, the server merges (or collapses) multiple consecutive slash + ('/') characters in the path component of the request URL.

    + +

    When mapping URL's to the filesystem, these multiple slashes are not + significant. However, URL's handled other ways, such as by CGI or proxy, + might prefer to retain the significance of multiple consecutive slashes. + In these cases MergeSlashes can be set to + OFF to retain the multiple consecutive slashes. In these + configurations, regular expressions used in the configuration file that match + the path component of the URL (LocationMatch, + RewriteRule, ...) need to take into account multiple + consecutive slashes.

    +
    top

    MergeTrailers Directive

    diff --git a/docs/manual/mod/core.html.es b/docs/manual/mod/core.html.es index 9a04571f374..3f2bb61f0e9 100644 --- a/docs/manual/mod/core.html.es +++ b/docs/manual/mod/core.html.es @@ -100,6 +100,7 @@
  • MaxRangeOverlaps
  • MaxRangeReversals
  • MaxRanges
    • +
  • MergeSlashes
  • MergeTrailers
  • Mutex
  • NameVirtualHost
    • @@ -2944,6 +2945,20 @@ resource not been translated yet. Please have a look at the English version.

    top
    +

    Directiva MergeSlashes

    + + + + + + + + +
    Descripción:Controls whether the server merges consecutive slashes in URLs. +
    Sintaxis:MergeSlashes ON|OFF
    Valor por defecto:MergeSlashes ON
    Contexto:server config, virtual host
    Estado:Core
    Módulo:core
    Compatibilidad:Added in 2.4.39

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

    +
    top

    Directiva MergeTrailers

    diff --git a/docs/manual/mod/core.html.fr.utf8 b/docs/manual/mod/core.html.fr.utf8 index 118cec844f8..e9009e378d5 100644 --- a/docs/manual/mod/core.html.fr.utf8 +++ b/docs/manual/mod/core.html.fr.utf8 @@ -33,6 +33,8 @@  ja  |  tr 

    +
    Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.
    Descripción:Determines whether trailers are merged into headers
    Description:Fonctionnalités de base du serveur HTTP Apache toujours disponibles
    Statut:Noyau httpd
    @@ -97,6 +99,7 @@ disponibles
  • MaxRangeOverlaps
  • MaxRangeReversals
  • MaxRanges
    • +
  • MergeSlashes
  • MergeTrailers
  • Mutex
  • NameVirtualHost
    • @@ -3718,6 +3721,20 @@ Apache
    top
    +

    Directive MergeSlashes

    + + + + + + + + +
    Description:Controls whether the server merges consecutive slashes in URLs. +
    Syntaxe:MergeSlashes ON|OFF
    Défaut:MergeSlashes ON
    Contexte:configuration globale, serveur virtuel
    Statut:Noyau httpd
    Module:core
    Compatibilité:Added in 2.4.39

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

    +
    top

    Directive MergeTrailers

    まだ翻訳されていません。英語版をご覧ください。

    top
    +

    MergeSlashes ディレクティブ

    +
    Description:Détermine si les données supplémentaires (trailers) sont diff --git a/docs/manual/mod/core.html.ja.utf8 b/docs/manual/mod/core.html.ja.utf8 index 5f8b9dda550..50d5307338c 100644 --- a/docs/manual/mod/core.html.ja.utf8 +++ b/docs/manual/mod/core.html.ja.utf8 @@ -100,6 +100,7 @@
  • MaxRangeOverlaps
  • MaxRangeReversals
  • MaxRanges
    • +
  • MergeSlashes
  • MergeTrailers
  • Mutex
  • NameVirtualHost
    • @@ -2487,6 +2488,20 @@ resource
    + + + + + + + +
    説明:Controls whether the server merges consecutive slashes in URLs. +
    構文:MergeSlashes ON|OFF
    デフォルト:MergeSlashes ON
    コンテキスト:サーバ設定ファイル, バーチャルホスト
    ステータス:Core
    モジュール:core
    互換性:Added in 2.4.39

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

    +
    top

    MergeTrailers ディレクティブ

    diff --git a/docs/manual/mod/core.html.tr.utf8 b/docs/manual/mod/core.html.tr.utf8 index 9d5a92e7750..92a2e662f15 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.
    説明:Determines whether trailers are merged into headers
    Açıklama:Apache HTTP Sunucusunda daima mevcut olan çekirdek özellikler
    Durum:Çekirdek
    @@ -97,6 +98,7 @@
  • MaxRangeOverlaps
  • MaxRangeReversals
  • MaxRanges
    • +
  • MergeSlashes
  • MergeTrailers
  • Mutex
  • NameVirtualHost
    • @@ -3492,6 +3494,19 @@ LogLevel info ssl_module:warn
    top
    +

    MergeSlashes Yönergesi

    + + + + + + + + +
    Açıklama:Controls whether the server merges consecutive slashes in URLs. +
    Sözdizimi:MergeSlashes ON|OFF
    Öntanımlı:MergeSlashes ON
    Bağlam:sunucu geneli, sanal konak
    Durum:Çekirdek
    Modül:core
    Uyumluluk:Added in 2.4.39

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

    +
    top

    MergeTrailers Yönergesi

    diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 4bdb4f31c7b..75b1390dcf2 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 eb10effeec8..1cd01103588 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_log_config.xml.ja b/docs/manual/mod/mod_log_config.xml.ja index 7dcf648cdc1..220e5070407 100644 --- a/docs/manual/mod/mod_log_config.xml.ja +++ b/docs/manual/mod/mod_log_config.xml.ja @@ -1,7 +1,7 @@ - + + + - + + + diff --git a/docs/manual/socache.xml.meta b/docs/manual/socache.xml.meta index 886fb69e839..f90a047ed63 100644 --- a/docs/manual/socache.xml.meta +++ b/docs/manual/socache.xml.meta @@ -8,6 +8,6 @@ en - fr + fr
    Açıklama:Trailer alanlarının başlığa dahil edilip edilmeyeceğini belirler