From: Willy Tarreau <w@1wt.eu>
Date: Tue, 13 Oct 2015 12:50:22 +0000 (+0200)
Subject: DOC: mention the "namespace" options for bind and server lines
X-Git-Tag: v1.6.0~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d72f0f3cffb4d97e7a7de7e68d4c2e277cfb4b62;p=thirdparty%2Fhaproxy.git

DOC: mention the "namespace" options for bind and server lines

It was only in the network-namespaces doc, but it needs to be
present in the config doc as well.
---

diff --git a/doc/configuration.txt b/doc/configuration.txt
index c6219d2f16..d2906680b9 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -9794,6 +9794,12 @@ name <name>
   Sets an optional name for these sockets, which will be reported on the stats
   page.
 
+namespace <name>
+  On Linux, it is possible to specify which network namespace a socket will
+  belong to. This directive makes it possible to explicitly bind a listener to
+  a namespace different from the default one. Please refer to your operating
+  system's documentation to find more details about network namespaces.
+
 nice <nice>
   Sets the 'niceness' of connections initiated from the socket. Value must be
   in the range -1024..1024 inclusive, and defaults to zero. Positive values
@@ -10302,6 +10308,12 @@ minconn <minconn>
 
   Supported in default-server: Yes
 
+namespace <name>
+  On Linux, it is possible to specify which network namespace a socket will
+  belong to. This directive makes it possible to explicitly bind a server to
+  a namespace different from the default one. Please refer to your operating
+  system's documentation to find more details about network namespaces.
+
 no-ssl-reuse
   This option disables SSL session reuse when SSL is used to communicate with
   the server. It will force the server to perform a full handshake for every