From 3ae7e2a9cb06f5ddd67b1a9d8a57f8f662028422 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 23 Jun 2013 22:36:17 +0200
Subject: Sync OpenVPN to master

---
 openvpn/doc/openvpn.8 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'openvpn/doc')

diff --git a/openvpn/doc/openvpn.8 b/openvpn/doc/openvpn.8
index 15dd3206..42c7bf6e 100644
--- a/openvpn/doc/openvpn.8
+++ b/openvpn/doc/openvpn.8
@@ -5378,7 +5378,11 @@ if no gateway is specified.
 .TP
 .B --route-ipv6 ipv6addr/bits [gateway] [metric]
 setup IPv6 routing in the system to send the specified IPv6 network
-into OpenVPN's ``tun'' device
+into OpenVPN's ``tun''.  The gateway parameter is only used for
+IPv6 routes across ``tap'' devices, and if missing, the ``ipv6remote''
+field from
+.B --ifconfig-ipv6
+is used.
 .TP
 .B --server-ipv6 ipv6addr/bits
 convenience-function to enable a number of IPv6 related options at
-- 
cgit v1.2.3