From 812d94bfccb10d8d1294fcbe89e97e17bf118f78 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 20 Sep 2012 13:47:55 +0000 Subject: [PATCH] xforms for BalancerInherit git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1388031 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/directives.html.en | 1 + docs/manual/mod/mod_proxy.html.en | 19 + docs/manual/mod/mod_proxy.xml.fr | 2 +- docs/manual/mod/mod_proxy.xml.ja | 2 +- docs/manual/mod/quickreference.html.en | 1139 ++++++++++++------------ 5 files changed, 592 insertions(+), 571 deletions(-) diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index dd7790678da..ba334a03729 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -148,6 +148,7 @@
  • <AuthzProviderAlias>
  • AuthzSendForbiddenOnFailure
  • BalancerGrowth
    • +
  • BalancerInherit
  • BalancerMember
  • BalancerPersist
  • BrowserMatch
    • diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index ae5d7921851..a9d931f4002 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -86,6 +86,7 @@

    Directives

    +
    top
    +

    BalancerInherit Directive

    + + + + + + + + +
    Description:Inherit Balancers from the main server
    Syntax:BalancerInherit On|Off
    Default:BalancerInherit Off
    Context:server config, virtual host
    Status:Extension
    Module:mod_proxy
    Compatibility:BalancerInherit is only available in Apache HTTP Server 2.5.0 + and later.
    +

    This directive will cause the current server/vhost to "inherit" Balancers + defined in the main server. This can cause issues and inconsistent + behavior if using the Balancer Manager and so is disabled + by default.

    +
    top

    BalancerMember Directive

    diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr index 3bd49518bfd..9a2820c3ea3 100644 --- a/docs/manual/mod/mod_proxy.xml.fr +++ b/docs/manual/mod/mod_proxy.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index 9aca6724efc..ea400cf5b00 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - +