summaryrefslogtreecommitdiff
path: root/openvpn/doc
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-06-02 15:45:11 +0200
committerArne Schwabe <arne@rfc2549.org>2012-06-02 15:45:11 +0200
commit4ddf2ac169fbb4931b5268962b02cdca33323ccd (patch)
treedae21582837ec7d1cdda84b482377c4e7ee7e929 /openvpn/doc
parent9b069ae8b8c4c458559f400211a0cfbc44c63938 (diff)
bring openvpn in sync with openvpn git master and patches submitted to mailing list
Diffstat (limited to 'openvpn/doc')
-rw-r--r--openvpn/doc/openvpn.83
1 files changed, 2 insertions, 1 deletions
diff --git a/openvpn/doc/openvpn.8 b/openvpn/doc/openvpn.8
index 24b1a2c4..f420d584 100644
--- a/openvpn/doc/openvpn.8
+++ b/openvpn/doc/openvpn.8
@@ -1087,7 +1087,8 @@ When used with
.B \-\-client
or
.B \-\-pull,
-accept options pushed by server EXCEPT for routes.
+accept options pushed by server EXCEPT for routes and dhcp options
+like DNS servers.
When used on the client, this option effectively bars the
server from adding routes to the client's routing table,