Update upstream source from tag 'upstream/2.5_rc3'

Update to upstream version '2.5~rc3'
with Debian dir 654a857be97a3895ea7ff814fea7c3f9f80e8794

3 files changed, 12 insertions, 12 deletions

diff --git a/doc/man-sections/script-options.rst b/doc/man-sections/script-options.rst
index a4df673..03b3dd7 100644
--- a/doc/man-sections/script-options.rst
+++ b/doc/man-sections/script-options.rst
@@ -709,10 +709,10 @@ instances.
     A set of variables which define each IPv6 route to be added, and are
     set prior to **--up** script execution.
 
-    ``parm`` will be one of :code:`network` or :code:`gateway`
-    (:code:`netmask` is contained as :code:`/nnn` in the
-    ``route_ipv6_network_{n}``, unlike IPv4 where it is passed in a
-    separate environment variable).
+    ``parm`` will be one of :code:`network`, :code:`gateway` or
+    :code:`metric`. ``route_ipv6_network_{n}`` contains :code:`netmask`
+    as :code:`/nnn`, unlike IPv4 where it is passed in a separate environment
+    variable.
 
     ``n`` is the OpenVPN route number, starting from 1.
 
diff --git a/doc/openvpn.8 b/doc/openvpn.8
index 5056e03..a504ce9 100644
--- a/doc/openvpn.8
+++ b/doc/openvpn.8
@@ -5694,10 +5694,10 @@ command line or configuration file.
 A set of variables which define each IPv6 route to be added, and are
 set prior to \fB\-\-up\fP script execution.
 .sp
-\fBparm\fP will be one of \fBnetwork\fP or \fBgateway\fP
-(\fBnetmask\fP is contained as \fB/nnn\fP in the
-\fBroute_ipv6_network_{n}\fP, unlike IPv4 where it is passed in a
-separate environment variable).
+\fBparm\fP will be one of \fBnetwork\fP, \fBgateway\fP or
+\fBmetric\fP\&. \fBroute_ipv6_network_{n}\fP contains \fBnetmask\fP
+as \fB/nnn\fP, unlike IPv4 where it is passed in a separate environment
+variable.
 .sp
 \fBn\fP is the OpenVPN route number, starting from 1.
 .sp
diff --git a/doc/openvpn.8.html b/doc/openvpn.8.html
index f5d6f26..b941476 100644
--- a/doc/openvpn.8.html
+++ b/doc/openvpn.8.html
@@ -4974,10 +4974,10 @@ command line or configuration file.</p>
 <dt><code>route_ipv6_{parm}_{n}</code></dt>
 <dd><p class="first">A set of variables which define each IPv6 route to be added, and are
 set prior to <strong>--up</strong> script execution.</p>
-<p><tt class="docutils literal">parm</tt> will be one of <code>network</code> or <code>gateway</code>
-(<code>netmask</code> is contained as <code>/nnn</code> in the
-<tt class="docutils literal">route_ipv6_network_{n}</tt>, unlike IPv4 where it is passed in a
-separate environment variable).</p>
+<p><tt class="docutils literal">parm</tt> will be one of <code>network</code>, <code>gateway</code> or
+<code>metric</code>. <tt class="docutils literal">route_ipv6_network_{n}</tt> contains <code>netmask</code>
+as <code>/nnn</code>, unlike IPv4 where it is passed in a separate environment
+variable.</p>
 <p><tt class="docutils literal">n</tt> is the OpenVPN route number, starting from 1.</p>
 <p class="last">If the network or gateway are resolvable DNS names, their IP address
 translations will be recorded rather than their names as denoted on the