diff -Nru openvpn-2.1~rc7/debian/changelog openvpn-2.1~rc7/debian/changelog
--- openvpn-2.1~rc7/debian/changelog	2008-05-21 20:06:07.000000000 +0100
+++ openvpn-2.1~rc7/debian/changelog	2008-05-21 19:11:17.000000000 +0100
@@ -1,3 +1,10 @@
+openvpn (2.1~rc7-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Format: 3.0 (quilt) test
+
+ -- Adam D. Barratt <adam@adam-barratt.org.uk>  Wed, 21 May 2008 19:11:09 +0100
+
 openvpn (2.1~rc7-1) unstable; urgency=low
 
   * New upstream release (Closes: #464181)
diff -Nru openvpn-2.1~rc7/debian/control openvpn-2.1~rc7/debian/control
--- openvpn-2.1~rc7/debian/control	2008-05-21 20:06:07.000000000 +0100
+++ openvpn-2.1~rc7/debian/control	2008-05-21 19:11:27.000000000 +0100
@@ -1,3 +1,4 @@
+Format: 3.0 (quilt)
 Source: openvpn
 Section: net
 Priority: optional
diff -Nru openvpn-2.1~rc7/debian/patches/debian-changes-2.1~rc7-1.1.diff openvpn-2.1~rc7/debian/patches/debian-changes-2.1~rc7-1.1.diff
--- openvpn-2.1~rc7/debian/patches/debian-changes-2.1~rc7-1.1.diff	1970-01-01 01:00:00.000000000 +0100
+++ openvpn-2.1~rc7/debian/patches/debian-changes-2.1~rc7-1.1.diff	2008-05-21 19:12:22.000000000 +0100
@@ -0,0 +1,4606 @@
+--- openvpn-2.1~rc7.orig/openvpn.8
++++ openvpn-2.1~rc7/openvpn.8
+@@ -355,25 +355,25 @@ with a relatively lightweight footprint.
+ .SH OPTIONS
+ OpenVPN allows any option to be placed either on the command line
+ or in a configuration file.  Though all command line options are preceded
+-by a double-leading-dash ("--"), this prefix can be removed when
++by a double-leading-dash ("\-\-"), this prefix can be removed when
+ an option is placed in a configuration file.
+ .\"*********************************************************
+ .TP
+-.B --help
++.B \-\-help
+ Show options.
+ .\"*********************************************************
+ .TP
+-.B --config file
++.B \-\-config file
+ Load additional config options from
+ .B file
+ where each line corresponds to one command line option,
+-but with the leading '--' removed.
++but with the leading '\-\-' removed.
+ 
+ If
+-.B --config file
++.B \-\-config file
+ is the only option to the openvpn command,
+ the
+-.B --config
++.B \-\-config
+ can be removed, and the command can be given as
+ .B openvpn file
+ 
+@@ -450,29 +450,29 @@ secret static.key
+ .\"*********************************************************
+ .SS Tunnel Options:
+ .TP
+-.B --mode m
++.B \-\-mode m
+ Set OpenVPN major mode.  By default, OpenVPN runs in
+ point-to-point mode ("p2p").  OpenVPN 2.0 introduces
+ a new mode ("server") which implements a multi-client
+ server capability.
+ .\"*********************************************************
+ .TP
+-.B --local host
++.B \-\-local host
+ Local host name or IP address for bind.
+ If specified, OpenVPN will bind to this address only.
+ If unspecified, OpenVPN will bind to all interfaces.
+ .\"*********************************************************
+ .TP
+-.B --remote host [port]
++.B \-\-remote host [port]
+ Remote host name or IP address.  On the client, multiple
+-.B --remote
++.B \-\-remote
+ options may be specified for redundancy, each referring
+ to a different OpenVPN server.
+ 
+ The OpenVPN client will try to connect to a server at
+ .B host:port
+ in the order specified by the list of
+-.B --remote
++.B \-\-remote
+ options.
+ 
+ The client will move on to the next host in the list,
+@@ -483,18 +483,18 @@ one server.
+ 
+ Note that since UDP is connectionless, connection failure
+ is defined by the
+-.B --ping
++.B \-\-ping
+ and
+-.B --ping-restart
++.B \-\-ping-restart
+ options.
+ 
+ Note the following corner case:  If you use multiple
+-.B --remote
++.B \-\-remote
+ options, AND you are dropping root privileges on
+ the client with
+-.B --user
++.B \-\-user
+ and/or
+-.B --group,
++.B \-\-group,
+ AND the client is running a non-Windows OS, if the client needs
+ to switch to a different server, and that server pushes
+ back different TUN/TAP or route settings, the client may lack
+@@ -502,7 +502,7 @@ the necessary privileges to close and re
+ This could cause the client to exit with a fatal error.
+ 
+ If
+-.B --remote
++.B \-\-remote
+ is unspecified, OpenVPN will listen
+ for packets from any IP address, but will not act on those packets unless
+ they pass all authentication tests.  This requirement for authentication
+@@ -511,7 +511,7 @@ trusted IP addresses (it is very easy to
+ a UDP packet).
+ 
+ When used in TCP mode, 
+-.B --remote
++.B \-\-remote
+ will act as a filter, rejecting connections from any host which does
+ not match
+ .B host.
+@@ -524,14 +524,14 @@ chosen, providing a sort of basic load-b
+ failover capability.
+ .\"*********************************************************
+ .TP
+-.B --remote-random
++.B \-\-remote-random
+ When multiple
+-.B --remote
++.B \-\-remote
+ address/ports are specified, initially randomize the order of the list
+ as a kind of basic load-balancing measure.
+ .\"*********************************************************
+ .TP
+-.B --proto p
++.B \-\-proto p
+ Use protocol
+ .B p
+ for communicating with remote host.
+@@ -545,17 +545,17 @@ or
+ The default protocol is
+ .B udp
+ when
+-.B --proto
++.B \-\-proto
+ is not specified.
+ 
+ For UDP operation,
+-.B --proto udp
++.B \-\-proto udp
+ should be specified on both peers.
+ 
+ For TCP operation, one peer must use
+-.B --proto tcp-server
++.B \-\-proto tcp-server
+ and the other must use
+-.B --proto tcp-client.
++.B \-\-proto tcp-client.
+ A peer started with
+ .B tcp-server
+ will wait indefinitely for an incoming connection.  A peer
+@@ -563,9 +563,9 @@ started with
+ .B tcp-client
+ will attempt to connect, and if that fails, will sleep for 5
+ seconds (adjustable via the
+-.B --connect-retry
++.B \-\-connect-retry
+ option) and try again infinite or up to N retries (adjustable via the
+-.B --connect-retry-max
++.B \-\-connect-retry-max
+ option).  Both TCP client and server will simulate
+ a SIGUSR1 restart signal if either side resets the connection.
+ 
+@@ -585,9 +585,9 @@ application-level UDP protocols, or tunn
+ possess a built-in reliability layer.
+ .\"*********************************************************
+ .TP
+-.B --connect-retry n
++.B \-\-connect-retry n
+ For
+-.B --proto tcp-client,
++.B \-\-proto tcp-client,
+ take
+ .B n
+ as the
+@@ -595,16 +595,16 @@ number of seconds to wait
+ between connection retries (default=5).
+ .\"*********************************************************
+ .TP
+-.B --connect-retry-max n
++.B \-\-connect-retry-max n
+ For
+-.B --proto tcp-client,
++.B \-\-proto tcp-client,
+ take
+ .B n
+ as the
+ number of retries of connection attempt (default=infinite).
+ .\"*********************************************************
+ .TP
+-.B --auto-proxy
++.B \-\-auto-proxy
+ Try to sense HTTP or SOCKS proxy settings automatically.
+ If no settings are present, a direct connection will be attempted.
+ If both HTTP and SOCKS settings are present, HTTP will be preferred.
+@@ -616,7 +616,7 @@ InternetQueryOption API.
+ This option exists in OpenVPN 2.1 or higher.
+ .\"*********************************************************
+ .TP
+-.B --http-proxy server port [authfile|'auto'] [auth-method]
++.B \-\-http-proxy server port [authfile|'auto'] [auth-method]
+ Connect to remote host through an HTTP proxy at address
+ .B server
+ and port
+@@ -638,32 +638,32 @@ username/password credentials, if requir
+ exists on OpenVPN 2.1 or higher.
+ .\"*********************************************************
+ .TP
+-.B --http-proxy-retry
++.B \-\-http-proxy-retry
+ Retry indefinitely on HTTP proxy errors.  If an HTTP proxy error
+ occurs, simulate a SIGUSR1 reset.
+ .\"*********************************************************
+ .TP
+-.B --http-proxy-timeout n
++.B \-\-http-proxy-timeout n
+ Set proxy timeout to
+ .B n
+ seconds, default=5.
+ .\"*********************************************************
+ .TP
+-.B --http-proxy-option type [parm]
++.B \-\-http-proxy-option type [parm]
+ Set extended HTTP proxy options.
+ Repeat to set multiple options.
+ 
+-.B VERSION version --
++.B VERSION version \-\-
+ Set HTTP version number to
+ .B version
+ (default=1.0).
+ 
+-.B AGENT user-agent --
++.B AGENT user-agent \-\-
+ Set HTTP "User-Agent" string to
+ .B user-agent.
+ .\"*********************************************************
+ .TP
+-.B --socks-proxy server [port]
++.B \-\-socks-proxy server [port]
+ Connect to remote host through a Socks5 proxy at address
+ .B server
+ and port
+@@ -671,14 +671,14 @@ and port
+ (default=1080).
+ .\"*********************************************************
+ .TP
+-.B --socks-proxy-retry
++.B \-\-socks-proxy-retry
+ Retry indefinitely on Socks proxy errors.  If a Socks proxy error
+ occurs, simulate a SIGUSR1 reset.
+ .\"*********************************************************
+ .TP
+-.B --resolv-retry n
++.B \-\-resolv-retry n
+ If hostname resolve fails for
+-.B --remote,
++.B \-\-remote,
+ retry resolve for
+ .B n
+ seconds before failing.
+@@ -688,18 +688,18 @@ Set
+ to "infinite" to retry indefinitely.
+ 
+ By default,
+-.B --resolv-retry infinite
++.B \-\-resolv-retry infinite
+ is enabled.  You can disable by setting n=0.
+ .\"*********************************************************
+ .TP
+-.B --float
++.B \-\-float
+ Allow remote peer to change its IP address and/or port number, such as due to
+ DHCP (this is the default if
+-.B --remote
++.B \-\-remote
+ is not used).
+-.B --float
++.B \-\-float
+ when specified with
+-.B --remote
++.B \-\-remote
+ allows an OpenVPN session to initially connect to a peer
+ at a known address, however if packets arrive from a new
+ address and pass all authentication tests, the new address
+@@ -708,14 +708,14 @@ you are connecting to a peer which holds
+ such as a dial-in user or DHCP client.
+ 
+ Essentially,
+-.B --float
++.B \-\-float
+ tells OpenVPN to accept authenticated packets
+ from any address, not only the address which was specified in the
+-.B --remote
++.B \-\-remote
+ option.
+ .\"*********************************************************
+ .TP
+-.B --ipchange cmd
++.B \-\-ipchange cmd
+ Execute shell command
+ .B cmd
+ when our remote ip-address is initially authenticated or
+@@ -726,11 +726,11 @@ Execute as:
+ .B cmd ip_address port_number
+ 
+ Don't use
+-.B --ipchange
++.B \-\-ipchange
+ in
+-.B --mode server
++.B \-\-mode server
+ mode.  Use a
+-.B --client-connect
++.B \-\-client-connect
+ script instead.
+ 
+ See the "Environmental Variables" section below for
+@@ -765,41 +765,41 @@ reestablish a connection with its most r
+ peer on its new IP address.
+ .\"*********************************************************
+ .TP
+-.B --port port
++.B \-\-port port
+ TCP/UDP port number for both local and remote.  The current
+ default of 1194 represents the official IANA port number
+ assignment for OpenVPN and has been used since version 2.0-beta17.
+ Previous versions used port 5000 as the default.
+ .\"*********************************************************
+ .TP
+-.B --lport port
++.B \-\-lport port
+ TCP/UDP port number for bind.
+ .\"*********************************************************
+ .TP
+-.B --rport port
++.B \-\-rport port
+ TCP/UDP port number for remote.
+ .\"*********************************************************
+ .TP
+-.B --bind
++.B \-\-bind
+ Bind to local address and port. This is the default unless any of 
+-.B --proto tcp-client
++.B \-\-proto tcp-client
+ ,
+-.B --http-proxy
++.B \-\-http-proxy
+ or
+-.B --socks-proxy
++.B \-\-socks-proxy
+ are used.
+ .\"*********************************************************
+ .TP
+-.B --nobind
++.B \-\-nobind
+ Do not bind to local address and port.  The IP stack will allocate
+ a dynamic port for returning packets.  Since the value of the dynamic port
+ could not be known in advance by a peer, this option is only suitable for
+ peers which will be initiating connections by using the
+-.B --remote
++.B \-\-remote
+ option.
+ .\"*********************************************************
+ .TP
+-.B --dev tunX | tapX | null
++.B \-\-dev tunX | tapX | null
+ TUN/TAP virtual network device (
+ .B X
+ can be omitted for a dynamic device.)
+@@ -817,7 +817,7 @@ devices encapsulate IPv4 or IPv6 while
+ devices encapsulate Ethernet 802.3.
+ .\"*********************************************************
+ .TP
+-.B --dev-type device-type
++.B \-\-dev-type device-type
+ Which device type are we using?
+ .B device-type
+ should be
+@@ -825,60 +825,60 @@ should be
+ or
+ .B tap.
+ Use this option only if the TUN/TAP device used with
+-.B --dev
++.B \-\-dev
+ does not begin with
+ .B tun
+ or
+ .B tap.
+ .\"*********************************************************
+ .TP
+-.B --topology mode
++.B \-\-topology mode
+ Configure virtual addressing topology when running in
+-.B --dev tun
++.B \-\-dev tun
+ mode.  This directive has no meaning in
+-.B --dev tap
++.B \-\-dev tap
+ mode, which always uses a
+ .B subnet
+ topology.
+ 
+ If you set this directive on the server, the
+-.B --server
++.B \-\-server
+ and
+-.B --server-bridge
++.B \-\-server-bridge
+ directives will automatically push your chosen topology setting to clients
+ as well.  This directive can also be manually pushed to clients.  Like the
+-.B --dev
++.B \-\-dev
+ directive, this directive must always be compatible between client and server.
+ 
+ .B mode
+ can be one of:
+ 
+-.B net30 --
++.B net30 \-\-
+ Use a point-to-point topology, by allocating one /30 subnet per client.
+ This is designed to allow point-to-point semantics when some
+ or all of the connecting clients might be Windows systems.  This is the
+ default on OpenVPN 2.0.
+ 
+-.B p2p --
++.B p2p \-\-
+ Use a point-to-point topology where the remote endpoint of the client's
+ tun interface always points to the local endpoint of the server's tun interface.
+ This mode allocates a single IP address per connecting client.
+ Only use
+ when none of the connecting clients are Windows systems.  This mode
+ is functionally equivalent to the
+-.B --ifconfig-pool-linear
++.B \-\-ifconfig-pool-linear
+ directive which is available in OpenVPN 2.0 and is now deprecated.
+ 
+-.B subnet --
++.B subnet \-\-
+ Use a subnet rather than a point-to-point topology by
+ configuring the tun interface with a local IP address and subnet mask,
+ similar to the topology used in
+-.B --dev tap
++.B \-\-dev tap
+ and ethernet bridging mode.
+ This mode allocates a single IP address per connecting client and works on
+ Windows as well.  Only available when server and clients are OpenVPN 2.1 or
+ higher, or OpenVPN 2.0.x which has been manually patched with the
+-.B --topology
++.B \-\-topology
+ directive code.  When used on Windows, requires version 8.2 or higher
+ of the TAP-Win32 driver.  When used on *nix, requires that the tun
+ driver supports an
+@@ -888,26 +888,26 @@ command which sets a subnet instead of a
+ This option exists in OpenVPN 2.1 or higher.
+ .\"*********************************************************
+ .TP
+-.B --tun-ipv6
++.B \-\-tun-ipv6
+ Build a tun link capable of forwarding IPv6 traffic.
+ Should be used in conjunction with
+-.B --dev tun
++.B \-\-dev tun
+ or
+-.B --dev tunX.
++.B \-\-dev tunX.
+ A warning will be displayed
+ if no specific IPv6 TUN support for your OS has been compiled into OpenVPN.
+ .\"*********************************************************
+ .TP
+-.B --dev-node node
++.B \-\-dev-node node
+ Explicitly set the device node rather than using
+ /dev/net/tun, /dev/tun, /dev/tap, etc.  If OpenVPN
+ cannot figure out whether
+ .B node
+ is a TUN or TAP device based on the name, you should
+ also specify
+-.B --dev-type tun
++.B \-\-dev-type tun
+ or
+-.B --dev-type tap.
++.B \-\-dev-type tap.
+ 
+ On Windows systems, select the TAP-Win32 adapter which
+ is named
+@@ -915,24 +915,24 @@ is named
+ in the Network Connections Control Panel or the
+ raw GUID of the adapter enclosed by braces.
+ The
+-.B --show-adapters
++.B \-\-show-adapters
+ option under Windows can also be used
+ to enumerate all available TAP-Win32
+ adapters and will show both the network
+ connections control panel name and the GUID for
+ each TAP-Win32 adapter.
+ .TP
+-.B --lladdr address
++.B \-\-lladdr address
+ Specify the link layer address, more commonly known as the MAC address.
+ Only applied to TAP devices.
+ .\"*********************************************************
+ .TP
+-.B --iproute cmd
++.B \-\-iproute cmd
+ Set alternate command to execute instead of default iproute2 command.
+ May be used in order to execute OpenVPN in unprivileged environment.
+ .\"*********************************************************
+ .TP
+-.B --ifconfig l rn
++.B \-\-ifconfig l rn
+ Set TUN/TAP adapter parameters. 
+ .B l
+ is the IP address of the local VPN endpoint.
+@@ -947,7 +947,7 @@ which is being created or connected to.
+ For TUN devices, which facilitate virtual
+ point-to-point IP connections,
+ the proper usage of
+-.B --ifconfig
++.B \-\-ifconfig
+ is to use two private IP addresses
+ which are not a member of any
+ existing subnet which is in use.
+@@ -961,7 +961,7 @@ you will be pinging across the VPN.
+ For TAP devices, which provide
+ the ability to create virtual
+ ethernet segments,
+-.B --ifconfig
++.B \-\-ifconfig
+ is used to set an IP address and
+ subnet mask just as a physical
+ ethernet adapter would be
+@@ -982,42 +982,42 @@ standard interface to the different
+ ifconfig implementations on different
+ platforms.
+ 
+-.B --ifconfig
++.B \-\-ifconfig
+ parameters which are IP addresses can
+ also be specified as a DNS or /etc/hosts
+ file resolvable name.
+ 
+ For TAP devices,
+-.B --ifconfig
++.B \-\-ifconfig
+ should not be used if the TAP interface will be
+ getting an IP address lease from a DHCP
+ server.
+ .\"*********************************************************
+ .TP
+-.B --ifconfig-noexec
++.B \-\-ifconfig-noexec
+ Don't actually execute ifconfig/netsh commands, instead
+ pass
+-.B --ifconfig
++.B \-\-ifconfig
+ parameters to scripts using environmental variables.
+ .\"*********************************************************
+ .TP
+-.B --ifconfig-nowarn
++.B \-\-ifconfig-nowarn
+ Don't output an options consistency check warning
+ if the
+-.B --ifconfig
++.B \-\-ifconfig
+ option on this side of the
+ connection doesn't match the remote side.  This is useful
+ when you want to retain the overall benefits of the
+ options consistency check (also see
+-.B --disable-occ
++.B \-\-disable-occ
+ option) while only disabling the ifconfig component of
+ the check.
+ 
+ For example,
+ if you have a configuration where the local host uses
+-.B --ifconfig
++.B \-\-ifconfig
+ but the remote host does not, use
+-.B --ifconfig-nowarn
++.B \-\-ifconfig-nowarn
+ on the local host.
+ 
+ This option will also silence warnings about potential
+@@ -1025,7 +1025,7 @@ address conflicts which occasionally ann
+ users by triggering "false positive" warnings.
+ .\"*********************************************************
+ .TP
+-.B --route network/IP [netmask] [gateway] [metric]
++.B \-\-route network/IP [netmask] [gateway] [metric]
+ Add route to routing table after connection is established.
+ Multiple routes can be specified.  Routes will be
+ automatically torn down in reverse order prior to
+@@ -1039,20 +1039,20 @@ while at the same time providing portabl
+ across OpenVPN's platform space.
+ 
+ .B netmask
+-default -- 255.255.255.255
++default \-\- 255.255.255.255
+ 
+ .B gateway
+-default -- taken from
+-.B --route-gateway
++default \-\- taken from
++.B \-\-route-gateway
+ or the second parameter to
+-.B --ifconfig
++.B \-\-ifconfig
+ when
+-.B --dev tun
++.B \-\-dev tun
+ is specified.
+ 
+ .B metric
+-default -- taken from
+-.B --route-metric
++default \-\- taken from
++.B \-\-route-metric
+ otherwise 0.
+ 
+ The default can be specified by leaving an option blank or setting
+@@ -1067,39 +1067,39 @@ also be specified as a DNS or /etc/hosts
+ file resolvable name, or as one of three special keywords:
+ 
+ .B vpn_gateway
+--- The remote VPN endpoint address
++\-\- The remote VPN endpoint address
+ (derived either from
+-.B --route-gateway
++.B \-\-route-gateway
+ or the second parameter to
+-.B --ifconfig
++.B \-\-ifconfig
+ when
+-.B --dev tun
++.B \-\-dev tun
+ is specified).
+ 
+ .B net_gateway
+--- The pre-existing IP default gateway, read from the routing
++\-\- The pre-existing IP default gateway, read from the routing
+ table (not supported on all OSes).
+ 
+ .B remote_host
+--- The
+-.B --remote
++\-\- The
++.B \-\-remote
+ address if OpenVPN is being run in client mode, and is undefined in server mode.
+ .\"*********************************************************
+ .TP
+-.B --route-gateway gw
++.B \-\-route-gateway gw
+ Specify a default gateway
+ .B gw
+ for use with
+-.B --route.
++.B \-\-route.
+ .TP
+-.B --route-metric m
++.B \-\-route-metric m
+ Specify a default metric
+ .B m
+ for use with
+-.B --route.
++.B \-\-route.
+ .\"*********************************************************
+ .TP
+-.B --route-delay [n] [w]
++.B \-\-route-delay [n] [w]
+ Delay
+ .B n
+ seconds (default=0) after connection
+@@ -1107,16 +1107,16 @@ establishment, before adding routes. If
+ .B n
+ is 0, routes will be added immediately upon connection
+ establishment.  If
+-.B --route-delay
++.B \-\-route-delay
+ is omitted, routes will be added immediately after TUN/TAP device
+ open and
+-.B --up
++.B \-\-up
+ script execution, before any
+-.B --user
++.B \-\-user
+ or 
+-.B --group
++.B \-\-group
+ privilege downgrade (or
+-.B --chroot
++.B \-\-chroot
+ execution.)
+ 
+ This option is designed to be useful in scenarios where DHCP is
+@@ -1125,18 +1125,18 @@ tap adapter addresses.  The delay will g
+ time to complete before routes are added.
+ 
+ On Windows,
+-.B --route-delay
++.B \-\-route-delay
+ tries to be more intelligent by waiting
+ .B w
+ seconds (w=30 by default)
+ for the TAP-Win32 adapter to come up before adding routes.
+ .\"*********************************************************
+ .TP
+-.B --route-up cmd
++.B \-\-route-up cmd
+ Execute shell command
+ .B cmd
+ after routes are added, subject to
+-.B --route-delay.
++.B \-\-route-delay.
+ 
+ See the "Environmental Variables" section below for
+ additional parameters passed as environmental variables.
+@@ -1146,17 +1146,17 @@ Note that
+ can be a shell command with multiple arguments.
+ .\"*********************************************************
+ .TP
+-.B --route-noexec
++.B \-\-route-noexec
+ Don't add or remove routes automatically.  Instead pass routes to
+-.B --route-up
++.B \-\-route-up
+ script using environmental variables.
+ .\"*********************************************************
+ .TP
+-.B --route-nopull
++.B \-\-route-nopull
+ When used with
+-.B --client
++.B \-\-client
+ or
+-.B --pull,
++.B \-\-pull,
+ accept options pushed by server EXCEPT for routes.
+ 
+ When used on the client, this option effectively bars the
+@@ -1165,7 +1165,7 @@ however note that this option still allo
+ to set the TCP/IP properties of the client's TUN/TAP interface.
+ .\"*********************************************************
+ .TP
+-.B --redirect-gateway flags...
++.B \-\-redirect-gateway flags...
+ (Experimental) Automatically execute routing commands to cause all outgoing IP traffic
+ to be redirected over the VPN.
+ 
+@@ -1173,7 +1173,7 @@ This option performs three steps:
+ 
+ .B (1)
+ Create a static route for the
+-.B --remote
++.B \-\-remote
+ address which forwards to the pre-existing default gateway.
+ This is done so that
+ .B (3)
+@@ -1184,11 +1184,11 @@ Delete the default gateway route.
+ 
+ .B (3)
+ Set the new default gateway to be the VPN endpoint address (derived either from
+-.B --route-gateway
++.B \-\-route-gateway
+ or the second parameter to
+-.B --ifconfig
++.B \-\-ifconfig
+ when
+-.B --dev tun
++.B \-\-dev tun
+ is specified).
+ 
+ When the tunnel is torn down, all of the above steps are reversed so
+@@ -1196,7 +1196,7 @@ that the original default route is resto
+ 
+ Option flags:
+ 
+-.B local --
++.B local \-\-
+ Add the
+ .B local
+ flag if both OpenVPN servers are directly connected via a common subnet,
+@@ -1206,19 +1206,19 @@ flag will cause step
+ .B 1
+ above to be omitted.
+ 
+-.B def1 --
++.B def1 \-\-
+ Use this flag to override
+ the default gateway by using 0.0.0.0/1 and 128.0.0.0/1
+ rather than 0.0.0.0/0.  This has the benefit of overriding
+ but not wiping out the original default gateway. 
+ 
+-.B bypass-dhcp --
++.B bypass-dhcp \-\-
+ Add a direct route to the DHCP server (if it is non-local) which
+ bypasses the tunnel
+ (Available on Windows clients, may not be available
+ on non-Windows clients).
+ 
+-.B bypass-dns --
++.B bypass-dns \-\-
+ Add a direct route to the DNS server(s) (if they are non-local) which
+ bypasses the tunnel
+ (Available on Windows clients, may not be available
+@@ -1227,13 +1227,13 @@ on non-Windows clients).
+ Using the def1 flag is highly recommended.
+ .\"*********************************************************
+ .TP
+-.B --link-mtu n
++.B \-\-link-mtu n
+ Sets an upper bound on the size of UDP packets which are sent
+ between OpenVPN peers.  It's best not to set this parameter unless
+ you know what you're doing.
+ .\"*********************************************************
+ .TP
+-.B --tun-mtu n
++.B \-\-tun-mtu n
+ Take the TUN device MTU to be
+ .B n
+ and derive the link MTU
+@@ -1249,17 +1249,17 @@ MTU problems often manifest themselves a
+ hang during periods of active usage.
+ 
+ It's best to use the
+-.B --fragment
++.B \-\-fragment
+ and/or
+-.B --mssfix
++.B \-\-mssfix
+ options to deal with MTU sizing issues.
+ .\"*********************************************************
+ .TP
+-.B --tun-mtu-extra n
++.B \-\-tun-mtu-extra n
+ Assume that the TUN/TAP device might return as many as
+ .B n
+ bytes more than the
+-.B --tun-mtu
++.B \-\-tun-mtu
+ size on read.  This parameter defaults to 0, which is sufficient for
+ most TUN devices.  TAP devices may introduce additional overhead in excess
+ of the MTU size, and a setting of 32 is the default when TAP devices are used.
+@@ -1267,34 +1267,34 @@ This parameter only controls internal Op
+ so there is no transmission overhead associated with using a larger value.
+ .\"*********************************************************
+ .TP
+-.B --mtu-disc type
++.B \-\-mtu-disc type
+ Should we do Path MTU discovery on TCP/UDP channel?  Only supported on OSes such
+ as Linux that supports the necessary system call to set.
+ 
+ .B 'no'
+--- Never send DF (Don't Fragment) frames
++\-\- Never send DF (Don't Fragment) frames
+ .br
+ .B 'maybe'
+--- Use per-route hints
++\-\- Use per-route hints
+ .br
+ .B 'yes'
+--- Always DF (Don't Fragment)
++\-\- Always DF (Don't Fragment)
+ .br
+ .\"*********************************************************
+ .TP
+-.B --mtu-test
++.B \-\-mtu-test
+ To empirically measure MTU on connection startup,
+ add the
+-.B --mtu-test
++.B \-\-mtu-test
+ option to your configuration.
+ OpenVPN will send ping packets of various sizes
+ to the remote peer and measure the largest packets
+ which were successfully received.  The
+-.B --mtu-test
++.B \-\-mtu-test
+ process normally takes about 3 minutes to complete.
+ .\"*********************************************************
+ .TP
+-.B --fragment max
++.B \-\-fragment max
+ Enable internal datagram fragmentation so
+ that no UDP datagrams are sent which
+ are larger than
+@@ -1304,24 +1304,24 @@ bytes.
+ The
+ .B max
+ parameter is interpreted in the same way as the
+-.B --link-mtu
++.B \-\-link-mtu
+ parameter, i.e. the UDP packet size after encapsulation
+ overhead has been added in, but not including
+ the UDP header itself.
+ 
+ The
+-.B --fragment
++.B \-\-fragment
+ option only makes sense when you are using the UDP protocol (
+-.B --proto udp
++.B \-\-proto udp
+ ).
+ 
+-.B --fragment
++.B \-\-fragment
+ adds 4 bytes of overhead per datagram.
+ 
+ See the
+-.B --mssfix
++.B \-\-mssfix
+ option below for an important related option to
+-.B --fragment.
++.B \-\-fragment.
+ 
+ It should also be noted that this option is not meant to replace
+ UDP fragmentation at the IP stack level.  It is only meant as a
+@@ -1334,7 +1334,7 @@ internal fragmentation capability may be
+ as tunneling a UDP multicast stream which requires fragmentation.
+ .\"*********************************************************
+ .TP
+-.B --mssfix max
++.B \-\-mssfix max
+ Announce to TCP sessions running over the tunnel that they should limit
+ their send packet sizes such that after OpenVPN has encapsulated them,
+ the resulting UDP packet size that OpenVPN sends to its peer will not
+@@ -1345,33 +1345,33 @@ bytes.
+ The
+ .B max
+ parameter is interpreted in the same way as the
+-.B --link-mtu
++.B \-\-link-mtu
+ parameter, i.e. the UDP packet size after encapsulation
+ overhead has been added in, but not including
+ the UDP header itself.
+ 
+ The
+-.B --mssfix
++.B \-\-mssfix
+ option only makes sense when you are using the UDP protocol
+ for OpenVPN peer-to-peer communication, i.e.
+-.B --proto udp.
++.B \-\-proto udp.
+ 
+-.B --mssfix
++.B \-\-mssfix
+ and
+-.B --fragment
++.B \-\-fragment
+ can be ideally used together, where
+-.B --mssfix
++.B \-\-mssfix
+ will try to keep TCP from needing
+ packet fragmentation in the first place,
+ and if big packets come through anyhow
+ (from protocols other than TCP),
+-.B --fragment
++.B \-\-fragment
+ will internally fragment them.
+ 
+ Both
+-.B --fragment
++.B \-\-fragment
+ and
+-.B --mssfix
++.B \-\-mssfix
+ are designed to work around cases where Path MTU discovery
+ is broken on the network path between OpenVPN peers.
+ 
+@@ -1380,35 +1380,35 @@ connection which successfully starts, bu
+ during active usage.
+ 
+ If
+-.B --fragment
++.B \-\-fragment
+ and
+-.B --mssfix
++.B \-\-mssfix
+ are used together,
+-.B --mssfix
++.B \-\-mssfix
+ will take its default
+ .B max
+ parameter from the
+-.B --fragment max
++.B \-\-fragment max
+ option.
+ 
+ Therefore, one could lower the maximum UDP packet size
+ to 1300 (a good first try for solving MTU-related
+ connection problems) with the following options:
+ 
+-.B --tun-mtu 1500 --fragment 1300 --mssfix
++.B \-\-tun-mtu 1500 \-\-fragment 1300 \-\-mssfix
+ .\"*********************************************************
+ .TP
+-.B --sndbuf size
++.B \-\-sndbuf size
+ Set the TCP/UDP socket send buffer size.
+ Currently defaults to 65536 bytes.
+ .\"*********************************************************
+ .TP
+-.B --rcvbuf size
++.B \-\-rcvbuf size
+ Set the TCP/UDP socket receive buffer size.
+ Currently defaults to 65536 bytes.
+ .\"*********************************************************
+ .TP
+-.B --socket-flags flags...
++.B \-\-socket-flags flags...
+ Apply the given flags to the OpenVPN transport socket.
+ Currently, only
+ .B TCP_NODELAY
+@@ -1425,12 +1425,12 @@ This option is pushable from server to c
+ on both client and server for maximum effect.
+ .\"*********************************************************
+ .TP
+-.B --txqueuelen n
++.B \-\-txqueuelen n
+ (Linux only) Set the TX queue length on the TUN/TAP interface.
+ Currently defaults to 100.
+ .\"*********************************************************
+ .TP
+-.B --shaper n
++.B \-\-shaper n
+ Limit bandwidth of outgoing tunnel data to
+ .B n
+ bytes per second on the TCP/UDP port.
+@@ -1466,7 +1466,7 @@ OpenVPN allows
+ to be between 100 bytes/sec and 100 Mbytes/sec.
+ .\"*********************************************************
+ .TP
+-.B --inactive n [bytes]
++.B \-\-inactive n [bytes]
+ Causes OpenVPN to exit after
+ .B n
+ seconds of inactivity on the TUN/TAP device.  The time length
+@@ -1480,18 +1480,18 @@ produces a combined in/out byte count th
+ .B bytes.
+ .\"*********************************************************
+ .TP
+-.B --ping n
++.B \-\-ping n
+ Ping remote over the TCP/UDP control channel
+ if no packets have been sent for at least
+ .B n
+ seconds (specify
+-.B --ping
++.B \-\-ping
+ on both peers to cause ping packets to be sent in both directions since
+ OpenVPN ping packets are not echoed like IP ping packets).
+ When used in one of OpenVPN's secure modes (where
+-.B --secret, --tls-server,
++.B \-\-secret, \-\-tls-server,
+ or
+-.B --tls-client
++.B \-\-tls-client
+ is specified), the ping packet
+ will be cryptographically secure.
+ 
+@@ -1504,33 +1504,33 @@ pass will not time out.
+ 
+ (2) To provide a basis for the remote to test the existence
+ of its peer using the
+-.B --ping-exit
++.B \-\-ping-exit
+ option.
+ .\"*********************************************************
+ .TP
+-.B --ping-exit n
++.B \-\-ping-exit n
+ Causes OpenVPN to exit after
+ .B n
+ seconds pass without reception of a ping
+ or other packet from remote.
+ This option can be combined with
+-.B --inactive, --ping,
++.B \-\-inactive, \-\-ping,
+ and
+-.B --ping-exit
++.B \-\-ping-exit
+ to create a two-tiered inactivity disconnect.
+ 
+ For example,
+ 
+-.B openvpn [options...] --inactive 3600 --ping 10 --ping-exit 60
++.B openvpn [options...] \-\-inactive 3600 \-\-ping 10 \-\-ping-exit 60
+ 
+ when used on both peers will cause OpenVPN to exit within 60
+ seconds if its peer disconnects, but will exit after one
+ hour if no actual tunnel data is exchanged.
+ .\"*********************************************************
+ .TP
+-.B --ping-restart n
++.B \-\-ping-restart n
+ Similar to
+-.B --ping-exit,
++.B \-\-ping-exit,
+ but trigger a
+ .B SIGUSR1
+ restart after
+@@ -1549,13 +1549,13 @@ as
+ 
+ If the peer cannot be reached, a restart will be triggered, causing
+ the hostname used with
+-.B --remote
++.B \-\-remote
+ to be re-resolved (if
+-.B --resolv-retry
++.B \-\-resolv-retry
+ is also specified).
+ 
+ In server mode,
+-.B --ping-restart, --inactive,
++.B \-\-ping-restart, \-\-inactive,
+ or any other type of internally generated signal will always be
+ applied to
+ individual client instance objects, never to whole server itself.
+@@ -1564,14 +1564,14 @@ which would normally cause a restart, wi
+ of the client instance object instead.
+ 
+ In client mode, the
+-.B --ping-restart
++.B \-\-ping-restart
+ parameter is set to 120 seconds by default.  This default will
+ hold until the client pulls a replacement value from the server, based on
+ the
+-.B --keepalive
++.B \-\-keepalive
+ setting in the server configuration.
+ To disable the 120 second default, set
+-.B --ping-restart 0
++.B \-\-ping-restart 0
+ on the client.
+ 
+ See the signals section below for more information
+@@ -1581,27 +1581,27 @@ on
+ Note that the behavior of
+ .B SIGUSR1
+ can be modified by the
+-.B --persist-tun, --persist-key, --persist-local-ip,
++.B \-\-persist-tun, \-\-persist-key, \-\-persist-local-ip,
+ and
+-.B --persist-remote-ip
++.B \-\-persist-remote-ip
+ options.
+ 
+ Also note that
+-.B --ping-exit
++.B \-\-ping-exit
+ and
+-.B --ping-restart
++.B \-\-ping-restart
+ are mutually exclusive and cannot be used together.
+ .\"*********************************************************
+ .TP
+-.B --keepalive n m
++.B \-\-keepalive n m
+ A helper directive designed to simplify the expression of
+-.B --ping
++.B \-\-ping
+ and
+-.B --ping-restart
++.B \-\-ping-restart
+ in server mode configurations.
+ 
+ For example,
+-.B --keepalive 10 60
++.B \-\-keepalive 10 60
+ expands as follows:
+ 
+ .RS
+@@ -1622,24 +1622,24 @@ expands as follows:
+ .fi
+ .\"*********************************************************
+ .TP
+-.B --ping-timer-rem
++.B \-\-ping-timer-rem
+ Run the
+-.B --ping-exit
++.B \-\-ping-exit
+ /
+-.B --ping-restart
++.B \-\-ping-restart
+ timer only if we have a remote address.  Use this option if you are
+ starting the daemon in listen mode (i.e. without an explicit
+-.B --remote
++.B \-\-remote
+ peer), and you don't want to start clocking timeouts until a remote
+ peer connects.
+ .\"*********************************************************
+ .TP
+-.B --persist-tun
++.B \-\-persist-tun
+ Don't close and reopen TUN/TAP device or run up/down scripts
+ across
+ .B SIGUSR1
+ or
+-.B --ping-restart
++.B \-\-ping-restart
+ restarts.
+ 
+ .B SIGUSR1
+@@ -1649,14 +1649,14 @@ but which offers finer-grained control o
+ reset options.
+ .\"*********************************************************
+ .TP
+-.B --persist-key
++.B \-\-persist-key
+ Don't re-read key files across
+ .B SIGUSR1
+ or
+-.B --ping-restart.
++.B \-\-ping-restart.
+ 
+ This option can be combined with
+-.B --user nobody
++.B \-\-user nobody
+ to allow restarts triggered by the
+ .B SIGUSR1
+ signal.
+@@ -1669,29 +1669,29 @@ This option solves the problem by persis
+ resets, so they don't need to be re-read.
+ .\"*********************************************************
+ .TP
+-.B --persist-local-ip
++.B \-\-persist-local-ip
+ Preserve initially resolved local IP address and port number
+ across
+ .B SIGUSR1
+ or
+-.B --ping-restart
++.B \-\-ping-restart
+ restarts.
+ .\"*********************************************************
+ .TP
+-.B --persist-remote-ip
++.B \-\-persist-remote-ip
+ Preserve most recently authenticated remote IP address and port number
+ across
+ .B SIGUSR1
+ or
+-.B --ping-restart
++.B \-\-ping-restart
+ restarts.
+ .\"*********************************************************
+ .TP
+-.B --mlock
++.B \-\-mlock
+ Disable paging by calling the POSIX mlockall function.
+ Requires that OpenVPN be initially run as root (though
+ OpenVPN can subsequently downgrade its UID using the
+-.B --user
++.B \-\-user
+ option).
+ 
+ Using this option ensures that key material and tunnel
+@@ -1703,33 +1703,33 @@ would not be able to scan the system swa
+ recover previously used
+ ephemeral keys, which are used for a period of time
+ governed by the
+-.B --reneg
++.B \-\-reneg
+ options (see below), then are discarded.
+ 
+ The downside
+ of using
+-.B --mlock
++.B \-\-mlock
+ is that it will reduce the amount of physical
+ memory available to other applications.
+ .\"*********************************************************
+ .TP
+-.B --up cmd
++.B \-\-up cmd
+ Shell command to run after successful TUN/TAP device open
+ (pre
+-.B --user
++.B \-\-user
+ UID change).  The up script is useful for specifying route
+ commands which route IP traffic destined for
+ private subnets which exist at the other
+ end of the VPN connection into the tunnel.
+ 
+ For
+-.B --dev tun
++.B \-\-dev tun
+ execute as:
+ 
+ .B cmd tun_dev tun_mtu link_mtu ifconfig_local_ip ifconfig_remote_ip [ init | restart ]
+ 
+ For
+-.B --dev tap
++.B \-\-dev tap
+ execute as:
+ 
+ .B cmd tap_dev tap_mtu link_mtu ifconfig_local_ip ifconfig_netmask [ init | restart ]
+@@ -1754,62 +1754,62 @@ In this context, the last command line p
+ will be
+ .I init.
+ If the
+-.B --up-restart
++.B \-\-up-restart
+ option is also used, the up script will be called for restarts as
+ well.  A restart is considered to be a partial reinitialization
+ of OpenVPN where the TUN/TAP instance is preserved (the
+-.B --persist-tun
++.B \-\-persist-tun
+ option will enable such preservation).  A restart
+ can be generated by a SIGUSR1 signal, a
+-.B --ping-restart
++.B \-\-ping-restart
+ timeout, or a connection reset when the TCP protocol is enabled
+ with the
+-.B --proto
++.B \-\-proto
+ option.  If a restart occurs, and
+-.B --up-restart
++.B \-\-up-restart
+ has been specified, the up script will be called with
+ .I restart
+ as the last parameter.
+ 
+ The following standalone example shows how the
+-.B --up
++.B \-\-up
+ script can be called in both an initialization and restart context.
+ (NOTE: for security reasons, don't run the following example unless UDP port
+ 9999 is blocked by your firewall.  Also, the example will run indefinitely,
+ so you should abort with control-c).
+ 
+-.B openvpn --dev tun --port 9999 --verb 4 --ping-restart 10 --up 'echo up' --down 'echo down' --persist-tun --up-restart
++.B openvpn \-\-dev tun \-\-port 9999 \-\-verb 4 \-\-ping-restart 10 \-\-up 'echo up' \-\-down 'echo down' \-\-persist-tun \-\-up-restart
+ 
+ Note that OpenVPN also provides the
+-.B --ifconfig
++.B \-\-ifconfig
+ option to automatically ifconfig the TUN device,
+ eliminating the need to define an
+-.B --up
++.B \-\-up
+ script, unless you also want to configure routes
+ in the
+-.B --up
++.B \-\-up
+ script.
+ 
+ If
+-.B --ifconfig
++.B \-\-ifconfig
+ is also specified, OpenVPN will pass the ifconfig local
+ and remote endpoints on the command line to the
+-.B --up
++.B \-\-up
+ script so that they can be used to configure routes such as:
+ 
+ .B route add -net 10.0.0.0 netmask 255.255.255.0 gw $5
+ .\"*********************************************************
+ .TP
+-.B --up-delay
++.B \-\-up-delay
+ Delay TUN/TAP open and possible
+-.B --up
++.B \-\-up
+ script execution
+ until after TCP/UDP connection establishment with peer.
+ 
+ In
+-.B --proto udp
++.B \-\-proto udp
+ mode, this option normally requires the use of
+-.B --ping
++.B \-\-ping
+ to allow connection initiation to be sensed in the absence
+ of tunnel data, since UDP is a "connectionless" protocol.
+ 
+@@ -1818,50 +1818,50 @@ transitioning to "connected" until conne
+ i.e. the receipt of the first authenticated packet from the peer.
+ .\"*********************************************************
+ .TP
+-.B --down cmd
++.B \-\-down cmd
+ Shell command to run after TUN/TAP device close
+ (post
+-.B --user
++.B \-\-user
+ UID change and/or
+-.B --chroot
++.B \-\-chroot
+ ).  Called with the same parameters and environmental
+ variables as the
+-.B --up
++.B \-\-up
+ option above.
+ 
+ Note that if you reduce privileges by using
+-.B --user
++.B \-\-user
+ and/or
+-.B --group,
++.B \-\-group,
+ your
+-.B --down
++.B \-\-down
+ script will also run at reduced privilege.
+ .\"*********************************************************
+ .TP
+-.B --down-pre
++.B \-\-down-pre
+ Call
+-.B --down
++.B \-\-down
+ cmd/script before, rather than after, TUN/TAP close.
+ .\"*********************************************************
+ .TP
+-.B --up-restart
++.B \-\-up-restart
+ Enable the
+-.B --up
++.B \-\-up
+ and
+-.B --down
++.B \-\-down
+ scripts to be called for restarts as well as initial program start.
+ This option is described more fully above in the
+-.B --up
++.B \-\-up
+ option documentation.
+ .\"*********************************************************
+ .TP
+-.B --setenv name value
++.B \-\-setenv name value
+ Set a custom environmental variable
+ .B name=value
+ to pass to script.
+ .\"*********************************************************
+ .TP
+-.B --setenv-safe name value
++.B \-\-setenv-safe name value
+ Set a custom environmental variable
+ .B OPENVPN_name=value
+ to pass to script.
+@@ -1872,19 +1872,19 @@ is a safety precaution to prevent a LD_P
+ from a malicious or compromised server.
+ .\"*********************************************************
+ .TP
+-.B --disable-occ
++.B \-\-disable-occ
+ Don't output a warning message if option inconsistencies are detected between
+ peers.  An example of an option inconsistency would be where one peer uses
+-.B --dev tun
++.B \-\-dev tun
+ while the other peer uses
+-.B --dev tap.
++.B \-\-dev tap.
+ 
+ Use of this option is discouraged, but is provided as
+ a temporary fix in situations where a recent version of OpenVPN must
+ connect to an old version.
+ .\"*********************************************************
+ .TP
+-.B --user user
++.B \-\-user user
+ Change the user ID of the OpenVPN process to
+ .B user
+ after initialization, dropping privileges in the process.
+@@ -1906,7 +1906,7 @@ you want to reset an OpenVPN daemon with
+ signal
+ (for example in response
+ to a DHCP reset), you should make use of one or more of the
+-.B --persist
++.B \-\-persist
+ options to ensure that OpenVPN doesn't need to execute any privileged
+ operations in order to restart (such as re-reading key files
+ or running
+@@ -1914,16 +1914,16 @@ or running
+ on the TUN device).
+ .\"*********************************************************
+ .TP
+-.B --group group
++.B \-\-group group
+ Similar to the
+-.B --user
++.B \-\-user
+ option,
+ this option changes the group ID of the OpenVPN process to
+ .B group
+ after initialization.
+ .\"*********************************************************
+ .TP
+-.B --cd dir
++.B \-\-cd dir
+ Change directory to
+ .B dir
+ prior to reading any files such as
+@@ -1935,16 +1935,16 @@ to the current directory such as "." or 
+ 
+ This option is useful when you are running
+ OpenVPN in 
+-.B --daemon
++.B \-\-daemon
+ mode, and you want to consolidate all of
+ your OpenVPN control files in one location.
+ .\"*********************************************************
+ .TP
+-.B --chroot dir
++.B \-\-chroot dir
+ Chroot to
+ .B dir
+ after initialization.  
+-.B --chroot
++.B \-\-chroot
+ essentially redefines
+ .B dir
+ as being the top
+@@ -1963,7 +1963,7 @@ complications can result when scripts or
+ are executed after the chroot operation.
+ .\"*********************************************************
+ .TP
+-.B --daemon [progname]
++.B \-\-daemon [progname]
+ Become a daemon after all initialization functions are completed.
+ This option will cause all message and error output to
+ be sent to the syslog file (such as /var/log/messages),
+@@ -1972,10 +1972,10 @@ ifconfig commands,
+ which will go to /dev/null unless otherwise redirected.
+ The syslog redirection occurs immediately at the point
+ that
+-.B --daemon
++.B \-\-daemon
+ is parsed on the command line even though
+ the daemonization point occurs later.  If one of the
+-.B --log
++.B \-\-log
+ options is present, it will supercede syslog
+ redirection.
+ 
+@@ -1991,7 +1991,7 @@ When unspecified,
+ defaults to "openvpn".
+ 
+ When OpenVPN is run with the
+-.B --daemon
++.B \-\-daemon
+ option, it will try to delay daemonization until the majority of initialization
+ functions which are capable of generating fatal errors are complete.  This means
+ that initialization scripts can test the return status of the
+@@ -2001,20 +2001,20 @@ has correctly initialized and entered th
+ In OpenVPN, the vast majority of errors which occur after initialization are non-fatal.
+ .\"*********************************************************
+ .TP
+-.B --syslog [progname]
++.B \-\-syslog [progname]
+ Direct log output to system logger, but do not become a daemon.
+ See
+-.B --daemon
++.B \-\-daemon
+ directive above for description of
+ .B progname
+ parameter.
+ .\"*********************************************************
+ .TP
+-.B --passtos
++.B \-\-passtos
+ Set the TOS field of the tunnel packet to what the payload's TOS is.
+ .\"*********************************************************
+ .TP
+-.B --inetd [wait|nowait] [progname]
++.B \-\-inetd [wait|nowait] [progname]
+ Use this option when OpenVPN is being run from the inetd or
+ .BR xinetd(8)
+ server.
+@@ -2025,7 +2025,7 @@ option must match what is specified in t
+ config file.  The
+ .B nowait
+ mode can only be used with
+-.B --proto tcp-server.
++.B \-\-proto tcp-server.
+ The default is
+ .B wait.
+ The
+@@ -2037,16 +2037,16 @@ see the OpenVPN FAQ:
+ .I http://openvpn.net/faq.html#oneport
+ 
+ This option precludes the use of
+-.B --daemon, --local,
++.B \-\-daemon, \-\-local,
+ or
+-.B --remote.
++.B \-\-remote.
+ Note that this option causes message and error output to be handled in the same
+ way as the
+-.B --daemon
++.B \-\-daemon
+ option.  The optional
+ .B progname
+ parameter is also handled exactly as in
+-.B --daemon.
++.B \-\-daemon.
+ 
+ Also note that in
+ .B wait
+@@ -2056,7 +2056,7 @@ on using OpenVPN with xinetd:
+ .I http://openvpn.net/1xhowto.html
+ .\"*********************************************************
+ .TP
+-.B --log file
++.B \-\-log file
+ Output logging messages to
+ .B file,
+ including output to stdout/stderr which
+@@ -2067,44 +2067,44 @@ already exists it will be truncated.
+ This option takes effect
+ immediately when it is parsed in the command line
+ and will supercede syslog output if
+-.B --daemon
++.B \-\-daemon
+ or
+-.B --inetd
++.B \-\-inetd
+ is also specified.
+ This option is persistent over the entire course of
+ an OpenVPN instantiation and will not be reset by SIGHUP,
+ SIGUSR1, or
+-.B --ping-restart.
++.B \-\-ping-restart.
+ 
+ Note that on Windows, when OpenVPN is started as a service,
+ logging occurs by default without the need to specify
+ this option.
+ .\"*********************************************************
+ .TP
+-.B --log-append file
++.B \-\-log-append file
+ Append logging messages to
+ .B file.
+ If
+ .B file
+ does not exist, it will be created.
+ This option behaves exactly like
+-.B --log
++.B \-\-log
+ except that it appends to rather
+ than truncating the log file.
+ .\"*********************************************************
+ .TP
+-.B --suppress-timestamps
++.B \-\-suppress-timestamps
+ Avoid writing timestamps to log messages, even when they
+ otherwise would be prepended. In particular, this applies to
+ log messages sent to stdout.
+ .\"*********************************************************
+ .TP
+-.B --writepid file
++.B \-\-writepid file
+ Write OpenVPN's main process ID to
+ .B file.
+ .\"*********************************************************
+ .TP
+-.B --nice n
++.B \-\-nice n
+ Change process priority after initialization
+ (
+ .B n
+@@ -2113,14 +2113,14 @@ greater than 0 is lower priority,
+ less than zero is higher priority).
+ .\"*********************************************************
+ .\".TP
+-.\".B --nice-work n
++.\".B \-\-nice-work n
+ .\"Change priority of background TLS work thread.  The TLS thread
+ .\"feature is enabled when OpenVPN is built
+ .\"with pthread support, and you are running OpenVPN
+ .\"in TLS mode (i.e. with
+-.\".B --tls-client
++.\".B \-\-tls-client
+ .\"or
+-.\".B --tls-server
++.\".B \-\-tls-server
+ .\"specified).
+ .\"
+ .\"Using a TLS thread offloads the CPU-intensive process of SSL/TLS-based
+@@ -2130,12 +2130,12 @@ less than zero is higher priority).
+ .\"The parameter
+ .\".B n
+ .\"is interpreted exactly as with the
+-.\".B --nice
++.\".B \-\-nice
+ .\"option above, but in relation to the work thread rather
+ .\"than the main thread.
+ .\"*********************************************************
+ .TP
+-.B --fast-io
++.B \-\-fast-io
+ (Experimental) Optimize TUN/TAP/UDP I/O writes by avoiding
+ a call to poll/epoll/select prior to the write operation.  The purpose
+ of such a call would normally be to block until the device
+@@ -2146,13 +2146,13 @@ by avoiding the poll/epoll/select call, 
+ by 5% to 10%.
+ 
+ This option can only be used on non-Windows systems, when
+-.B --proto udp
++.B \-\-proto udp
+ is specified, and when
+-.B --shaper
++.B \-\-shaper
+ is NOT specified.
+ .\"*********************************************************
+ .TP
+-.B --echo [parms...]
++.B \-\-echo [parms...]
+ Echo
+ .B parms
+ to log output.
+@@ -2161,7 +2161,7 @@ Designed to be used to send messages to 
+ which is receiving the OpenVPN log output.
+ .\"*********************************************************
+ .TP
+-.B --remap-usr1 signal
++.B \-\-remap-usr1 signal
+ Control whether internally or externally
+ generated SIGUSR1 signals are remapped to
+ SIGHUP (restart without persisting state) or
+@@ -2172,20 +2172,20 @@ can be set to "SIGHUP" or "SIGTERM".  By
+ occurs.
+ .\"*********************************************************
+ .TP
+-.B --verb n
++.B \-\-verb n
+ Set output verbosity to
+ .B n
+ (default=1).  Each level shows all info from the previous levels.
+ Level 3 is recommended if you want a good summary
+ of what's happening without being swamped by output.
+ 
+-.B 0 --
++.B 0 \-\-
+ No output except fatal errors.
+ .br
+-.B 1 to 4 --
++.B 1 to 4 \-\-
+ Normal usage range.
+ .br
+-.B 5 --
++.B 5 \-\-
+ Output
+ .B R
+ and
+@@ -2193,12 +2193,12 @@ and
+ characters to the console for each packet read and write, uppercase is
+ used for TCP/UDP packets and lowercase is used for TUN/TAP packets.
+ .br
+-.B 6 to 11 --
++.B 6 to 11 \-\-
+ Debug info range (see errlevel.h for additional
+ information on debug levels).
+ .\"*********************************************************
+ .TP
+-.B --status file [n]
++.B \-\-status file [n]
+ Write operational status to
+ .B file
+ every
+@@ -2210,21 +2210,21 @@ Status can also be written to the syslog
+ signal.
+ .\"*********************************************************
+ .TP
+-.B --status-version [n]
++.B \-\-status-version [n]
+ Choose the status file format version number.  Currently
+ .B n
+ can be 1 or 2 and defaults to 1.
+ .\"*********************************************************
+ .TP
+-.B --mute n
++.B \-\-mute n
+ Log at most
+ .B n
+ consecutive messages in the same category.  This is useful to
+ limit repetitive logging of similar message types.
+ .\"*********************************************************
+ .TP
+-.B --comp-lzo [mode]
+-Use fast LZO compression -- may add up to 1 byte per
++.B \-\-comp-lzo [mode]
++Use fast LZO compression \-\- may add up to 1 byte per
+ packet for incompressible data.
+ .B mode
+ may be "yes", "no", or "adaptive" (default).
+@@ -2234,16 +2234,16 @@ compression on or off for individual cli
+ 
+ First, make sure the client-side config file enables selective
+ compression by having at least one
+-.B --comp-lzo
++.B \-\-comp-lzo
+ directive, such as
+-.B --comp-lzo no.
++.B \-\-comp-lzo no.
+ This will turn off compression by default,
+ but allow a future directive push from the server to
+ dynamically change the
+ on/off/adaptive setting.
+ 
+ Next in a
+-.B --client-config-dir
++.B \-\-client-config-dir
+ file, specify the compression setting for the client,
+ for example:
+ 
+@@ -2264,12 +2264,12 @@ setting for the server
+ side of the link, the second sets the client side.
+ .\"*********************************************************
+ .TP
+-.B --comp-noadapt
++.B \-\-comp-noadapt
+ When used in conjunction with
+-.B --comp-lzo,
++.B \-\-comp-lzo,
+ this option will disable OpenVPN's adaptive compression algorithm.
+ Normally, adaptive compression is enabled with
+-.B --comp-lzo.
++.B \-\-comp-lzo.
+ 
+ Adaptive compression tries to optimize the case where you have
+ compression enabled, but you are sending predominantly uncompressible
+@@ -2281,7 +2281,7 @@ the compression efficiency will be very 
+ compression for a period of time until the next re-sample test.
+ .\"*********************************************************
+ .TP
+-.B --management IP port [pw-file]
++.B \-\-management IP port [pw-file]
+ Enable a TCP server on
+ .B IP:port
+ to handle daemon management functions.
+@@ -2318,24 +2318,24 @@ be set to 127.0.0.1
+ server to local clients. 
+ .\"*********************************************************
+ .TP
+-.B --management-query-passwords
++.B \-\-management-query-passwords
+ Query management channel for private key password and
+-.B --auth-user-pass
++.B \-\-auth-user-pass
+ username/password.  Only query the management channel
+ for inputs which ordinarily would have been queried from the
+ console.
+ .\"*********************************************************
+ .TP
+-.B --management-forget-disconnect
++.B \-\-management-forget-disconnect
+ Make OpenVPN forget passwords when management session
+ disconnects.
+ 
+ This directive does not affect the
+-.B --http-proxy
++.B \-\-http-proxy
+ username/password.  It is always cached.
+ .\"*********************************************************
+ .TP
+-.B --management-hold
++.B \-\-management-hold
+ Start OpenVPN in a hibernating state, until a client
+ of the management interface explicitly starts it
+ with the
+@@ -2343,20 +2343,20 @@ with the
+ command.
+ .\"*********************************************************
+ .TP
+-.B --management-signal
++.B \-\-management-signal
+ Send SIGUSR1 signal to OpenVPN if management session disconnects.
+ This is useful when you wish to disconnect an OpenVPN session on
+ user logoff.
+ .\"*********************************************************
+ .TP
+-.B --management-log-cache n
++.B \-\-management-log-cache n
+ Cache the most recent
+ .B n
+ lines of log file history for usage
+ by the management channel.
+ .\"*********************************************************
+ .TP
+-.B --plugin module-pathname [init-string]
++.B \-\-plugin module-pathname [init-string]
+ Load plug-in module from the file
+ .B module-pathname,
+ passing
+@@ -2392,7 +2392,7 @@ the connection to be authenticated.
+ .SS Server Mode
+ Starting with OpenVPN 2.0, a multi-client TCP/UDP server mode
+ is supported, and can be enabled with the
+-.B --mode server
++.B \-\-mode server
+ option.  In server mode, OpenVPN will listen on a single
+ port for incoming client connections.  All client
+ connections will be routed through a single tun or tap
+@@ -2402,7 +2402,7 @@ on sufficiently fast hardware.  SSL/TLS 
+ be used in this mode.
+ .\"*********************************************************
+ .TP
+-.B --server network netmask
++.B \-\-server network netmask
+ A helper directive designed to simplify the configuration
+ of OpenVPN's server mode.  This directive will set up an
+ OpenVPN server which will allocate addresses to clients
+@@ -2412,7 +2412,7 @@ for use as the server-side endpoint of t
+ TUN/TAP interface.
+ 
+ For example,
+-.B --server 10.8.0.0 255.255.255.0
++.B \-\-server 10.8.0.0 255.255.255.0
+ expands as follows:
+ 
+ .RS
+@@ -2442,16 +2442,16 @@ expands as follows:
+ .fi
+ 
+ Don't use
+-.B --server
++.B \-\-server
+ if you are ethernet bridging.  Use
+-.B --server-bridge
++.B \-\-server-bridge
+ instead.
+ .\"*********************************************************
+ .TP
+-.B --server-bridge gateway netmask pool-start-IP pool-end-IP
++.B \-\-server-bridge gateway netmask pool-start-IP pool-end-IP
+ 
+ A helper directive similar to
+-.B --server
++.B \-\-server
+ which is designed to simplify the configuration
+ of OpenVPN's server mode in ethernet bridging configurations.
+ 
+@@ -2471,7 +2471,7 @@ IP/netmask on the bridge interface.  The
+ and
+ .B netmask
+ parameters to
+-.B --server-bridge
++.B \-\-server-bridge
+ can be set to either the IP/netmask of the
+ bridge interface, or the IP/netmask of the
+ default gateway/router on the bridged
+@@ -2505,13 +2505,13 @@ push "route-gateway 10.8.0.4"
+ .fi
+ .\"*********************************************************
+ .TP
+-.B --push "option"
++.B \-\-push "option"
+ Push a config file option back to the client for remote
+ execution.  Note that
+ .B
+ option
+ must be enclosed in double quotes ("").  The client must specify
+-.B --pull
++.B \-\-pull
+ in its config file.  The set of options which can be
+ pushed is limited by both feasibility and security.
+ Some options such as those which would execute scripts
+@@ -2522,44 +2522,44 @@ cannot be pushed because the client need
+ them before the connection to the server can be initiated.
+ 
+ This is a partial list of options which can currently be pushed:
+-.B --route, --route-gateway, --route-delay, --redirect-gateway,
+-.B --ip-win32, --dhcp-option,
+-.B --inactive, --ping, --ping-exit, --ping-restart,
+-.B --setenv,
+-.B --persist-key, --persist-tun, --echo,
+-.B --comp-lzo,
+-.B --socket-flags,
+-.B --sndbuf, --rcvbuf
++.B \-\-route, \-\-route-gateway, \-\-route-delay, \-\-redirect-gateway,
++.B \-\-ip-win32, \-\-dhcp-option,
++.B \-\-inactive, \-\-ping, \-\-ping-exit, \-\-ping-restart,
++.B \-\-setenv,
++.B \-\-persist-key, \-\-persist-tun, \-\-echo,
++.B \-\-comp-lzo,
++.B \-\-socket-flags,
++.B \-\-sndbuf, \-\-rcvbuf
+ .\"*********************************************************
+ .TP
+-.B --push-reset
++.B \-\-push-reset
+ Don't inherit the global push list for a specific client instance.
+ Specify this option in a client-specific context such
+ as with a
+-.B --client-config-dir
++.B \-\-client-config-dir
+ configuration file.  This option will ignore
+-.B --push
++.B \-\-push
+ options at the global config file level.
+ .\"*********************************************************
+ .TP
+-.B --disable
++.B \-\-disable
+ Disable a particular client (based on the common name)
+ from connecting.  Don't use this option to disable a client
+ due to key or password compromise.  Use a CRL (certificate
+ revocation list) instead (see the
+-.B --crl-verify
++.B \-\-crl-verify
+ option).
+ 
+ This option must be associated with a specific client instance,
+ which means that it must be specified either in a client
+ instance config file using
+-.B --client-config-dir
++.B \-\-client-config-dir
+ or dynamically generated using a
+-.B --client-connect
++.B \-\-client-connect
+ script.
+ .\"*********************************************************
+ .TP
+-.B --ifconfig-pool start-IP end-IP [netmask]
++.B \-\-ifconfig-pool start-IP end-IP [netmask]
+ Set aside a pool of subnets to be
+ dynamically allocated to connecting clients, similar
+ to a DHCP server.  For tun-style
+@@ -2572,7 +2572,7 @@ parameter will also be pushed to clients
+ 
+ .\"*********************************************************
+ .TP
+-.B --ifconfig-pool-persist file [seconds]
++.B \-\-ifconfig-pool-persist file [seconds]
+ Persist/unpersist ifconfig-pool
+ data to
+ .B file,
+@@ -2587,7 +2587,7 @@ IP address assigned to them from the ifc
+ Maintaining a long-term
+ association is good for clients because it allows them
+ to effectively use the
+-.B --persist-tun
++.B \-\-persist-tun
+ option.
+ 
+ .B file
+@@ -2608,32 +2608,32 @@ suggestions only, based on past associat
+ a common name and IP address.  They do not guarantee that the given common
+ name will always receive the given IP address.  If you want guaranteed
+ assignment, use
+-.B --ifconfig-push
++.B \-\-ifconfig-push
+ .\"*********************************************************
+ .TP
+-.B --ifconfig-pool-linear
++.B \-\-ifconfig-pool-linear
+ Modifies the
+-.B --ifconfig-pool
++.B \-\-ifconfig-pool
+ directive to
+ allocate individual TUN interface addresses for
+ clients rather than /30 subnets.  NOTE:  This option
+ is incompatible with Windows clients.
+ 
+ This option is deprecated, and should be replaced with
+-.B --topology p2p
++.B \-\-topology p2p
+ which is functionally equivalent.
+ .\"*********************************************************
+ .TP
+-.B --ifconfig-push local remote-netmask
++.B \-\-ifconfig-push local remote-netmask
+ Push virtual IP endpoints for client tunnel,
+-overriding the --ifconfig-pool dynamic allocation.
++overriding the \-\-ifconfig-pool dynamic allocation.
+ 
+ The parameters
+ .B local
+ and
+ .B remote-netmask
+ are set according to the
+-.B --ifconfig
++.B \-\-ifconfig
+ directive which you want to execute on the client machine to
+ configure the remote end of the tunnel.  Note that the parameters
+ .B local
+@@ -2646,13 +2646,13 @@ on the server at the time of client conn
+ This option must be associated with a specific client instance,
+ which means that it must be specified either in a client
+ instance config file using
+-.B --client-config-dir
++.B \-\-client-config-dir
+ or dynamically generated using a
+-.B --client-connect
++.B \-\-client-connect
+ script.
+ 
+ Remember also to include a
+-.B --route
++.B \-\-route
+ directive in the main OpenVPN config file which encloses
+ .B local,
+ so that the kernel will know to route it
+@@ -2662,23 +2662,23 @@ OpenVPN's internal client IP address sel
+ follows:
+ 
+ .B 1
+--- Use
+-.B --client-connect script
++\-\- Use
++.B \-\-client-connect script
+ generated file for static IP (first choice).
+ .br
+ .B 2
+--- Use 
+-.B --client-config-dir
++\-\- Use 
++.B \-\-client-config-dir
+ file for static IP (next choice).
+ .br
+ .B 3
+--- Use
+-.B --ifconfig-pool
++\-\- Use
++.B \-\-ifconfig-pool
+ allocation for dynamic IP (last choice).
+ .br
+ .\"*********************************************************
+ .TP
+-.B --iroute network [netmask]
++.B \-\-iroute network [netmask]
+ Generate an internal route to a specific
+ client. The
+ .B netmask
+@@ -2689,36 +2689,36 @@ the server to a particular client, regar
+ of where the client is connecting from.  Remember
+ that you must also add the route to the system
+ routing table as well (such as by using the
+-.B --route
++.B \-\-route
+ directive).  The reason why two routes are needed
+ is that the
+-.B --route
++.B \-\-route
+ directive routes the packet from the kernel
+ to OpenVPN.  Once in OpenVPN, the
+-.B --iroute
++.B \-\-iroute
+ directive routes to the specific client.
+ 
+ This option must be specified either in a client
+ instance config file using
+-.B --client-config-dir
++.B \-\-client-config-dir
+ or dynamically generated using a
+-.B --client-connect
++.B \-\-client-connect
+ script.
+ 
+ The
+-.B --iroute
++.B \-\-iroute
+ directive also has an important interaction with
+-.B --push
++.B \-\-push
+ "route ...".
+-.B --iroute
++.B \-\-iroute
+ essentially defines a subnet which is owned by a
+ particular client (we will call this client A).
+ If you would like other clients to be able to reach A's
+ subnet, you can use
+-.B --push
++.B \-\-push
+ "route ..."
+ together with
+-.B --client-to-client
++.B \-\-client-to-client
+ to effect this.  In order for all clients to see
+ A's subnet, OpenVPN must push this route to all clients
+ EXCEPT for A, since the subnet is already owned by A.
+@@ -2727,11 +2727,11 @@ not pushing a route to a client
+ if it matches one of the client's iroutes.
+ .\"*********************************************************
+ .TP
+-.B --client-to-client
++.B \-\-client-to-client
+ Because the OpenVPN server mode handles multiple clients
+ through a single tun or tap interface, it is effectively
+ a router.  The
+-.B --client-to-client
++.B \-\-client-to-client
+ flag tells OpenVPN to internally route client-to-client
+ traffic rather than pushing all client-originating traffic
+ to the TUN/TAP interface.
+@@ -2743,13 +2743,13 @@ if you want to firewall tunnel traffic u
+ custom, per-client rules.
+ .\"*********************************************************
+ .TP
+-.B --duplicate-cn
++.B \-\-duplicate-cn
+ Allow multiple clients with the same common name to concurrently connect.
+ In the absence of this option, OpenVPN will disconnect a client instance
+ upon connection of a new client having the same common name.
+ .\"*********************************************************
+ .TP
+-.B --client-connect script
++.B \-\-client-connect script
+ Run
+ .B script
+ on client connection.  The script is passed the common name
+@@ -2765,7 +2765,7 @@ to be applied on the server when the cli
+ it should write it to the file named by $1.
+ 
+ See the
+-.B --client-config-dir
++.B \-\-client-config-dir
+ option below for options which
+ can be legally used in a dynamically generated config file.
+ 
+@@ -2777,18 +2777,18 @@ returns a non-zero error status, it will
+ to be disconnected.
+ .\"*********************************************************
+ .TP
+-.B --client-disconnect
++.B \-\-client-disconnect
+ Like
+-.B --client-connect
++.B \-\-client-connect
+ but called on client instance shutdown.  Will not be called
+ unless the
+-.B --client-connect
++.B \-\-client-connect
+ script and plugins (if defined)
+ were previously called on this instance with
+ successful (0) status returns.
+ 
+ The exception to this rule is if the
+-.B --client-disconnect
++.B \-\-client-disconnect
+ script or plugins are cascaded, and at least one client-connect
+ function succeeded, then ALL of the client-disconnect functions for
+ scripts and plugins will be called on client instance object deletion,
+@@ -2797,7 +2797,7 @@ an error status.
+ .B 
+ .\"*********************************************************
+ .TP
+-.B --client-config-dir dir
++.B \-\-client-config-dir dir
+ Specify a directory
+ .B dir
+ for custom client config files.  After
+@@ -2811,9 +2811,9 @@ will instead try to open and parse a def
+ 
+ This file can specify a fixed IP address for a given
+ client using
+-.B --ifconfig-push,
++.B \-\-ifconfig-push,
+ as well as fixed subnets owned by the client using
+-.B --iroute.
++.B \-\-iroute.
+ 
+ One of the useful properties of this option is that it
+ allows client configuration files to be conveniently
+@@ -2822,28 +2822,28 @@ without needing to restart the server.
+ 
+ The following
+ options are legal in a client-specific context:
+-.B --push, --push-reset, --iroute, --ifconfig-push,
++.B \-\-push, \-\-push-reset, \-\-iroute, \-\-ifconfig-push,
+ and
+-.B --config.
++.B \-\-config.
+ .\"*********************************************************
+ .TP
+-.B --ccd-exclusive
++.B \-\-ccd-exclusive
+ Require, as a
+ condition of authentication, that a connecting client has a
+-.B --client-config-dir
++.B \-\-client-config-dir
+ file.
+ .\"*********************************************************
+ .TP
+-.B --tmp-dir dir
++.B \-\-tmp-dir dir
+ Specify a directory
+ .B dir
+ for temporary files.  This directory will be used by
+-.B --client-connect
++.B \-\-client-connect
+ scripts to dynamically generate client-specific
+ configuration files.
+ .\"*********************************************************
+ .TP
+-.B --hash-size r v
++.B \-\-hash-size r v
+ Set the size of the real address hash table to
+ .B r
+ and the virtual address table to
+@@ -2851,13 +2851,13 @@ and the virtual address table to
+ By default, both tables are sized at 256 buckets.
+ .\"*********************************************************
+ .TP
+-.B --bcast-buffers n
++.B \-\-bcast-buffers n
+ Allocate
+ .B n
+ buffers for broadcast datagrams (default=256).
+ .\"*********************************************************
+ .TP
+-.B --tcp-queue-limit n
++.B \-\-tcp-queue-limit n
+ Maximum number of queued TCP output packets (default=64).
+ 
+ When OpenVPN is tunneling data from a TUN/TAP device to a
+@@ -2869,13 +2869,13 @@ OpenVPN will start to drop outgoing pack
+ at this client.
+ .\"*********************************************************
+ .TP
+-.B --max-clients n
++.B \-\-max-clients n
+ Limit server to a maximum of
+ .B n
+ concurrent clients.
+ .\"*********************************************************
+ .TP
+-.B --max-routes-per-client n
++.B \-\-max-routes-per-client n
+ Allow a maximum of
+ .B n
+ internal routes per client (default=256).
+@@ -2885,9 +2885,9 @@ server with packets appearing to come fr
+ forcing the server to deplete
+ virtual memory as its internal routing table expands.
+ This directive can be used in a
+-.B --client-config-dir
++.B \-\-client-config-dir
+ file or auto-generated by a
+-.B --client-connect
++.B \-\-client-connect
+ script to override the global value for a particular client.
+ 
+ Note that this
+@@ -2895,7 +2895,7 @@ directive affects OpenVPN's internal rou
+ kernel routing table.
+ .\"*********************************************************
+ .TP
+-.B --connect-freq n sec
++.B \-\-connect-freq n sec
+ Allow a maximum of
+ .B n
+ new connections per
+@@ -2909,12 +2909,12 @@ DoS scenario, legitimate connections mig
+ 
+ For the best protection against DoS attacks in server mode,
+ use
+-.B --proto udp
++.B \-\-proto udp
+ and
+-.B --tls-auth.
++.B \-\-tls-auth.
+ .\"*********************************************************
+ .TP
+-.B --learn-address cmd
++.B \-\-learn-address cmd
+ Run script or shell command
+ .B cmd
+ to validate client virtual addresses or routes.
+@@ -2922,19 +2922,19 @@ to validate client virtual addresses or 
+ .B cmd
+ will be executed with 3 parameters:
+ 
+-.B [1] operation --
++.B [1] operation \-\-
+ "add", "update", or "delete" based on whether or not
+ the address is being added to, modified, or deleted from
+ OpenVPN's internal routing table.
+ .br
+-.B [2] address --
++.B [2] address \-\-
+ The address being learned or unlearned.  This can be
+ an IPv4 address such as "198.162.10.14", an IPv4 subnet
+ such as "198.162.10.0/24", or an ethernet MAC address (when
+-.B --dev tap
++.B \-\-dev tap
+ is being used) such as "00:FF:01:02:03:04".
+ .br
+-.B [3] common name --
++.B [3] common name \-\-
+ The common name on the certificate associated with the
+ client linked to this address.  Only present for "add"
+ or "update" operations, not "delete".
+@@ -2954,7 +2954,7 @@ policies with regard to the client's hig
+ rather than the low level client virtual addresses.
+ .\"*********************************************************
+ .TP
+-.B --auth-user-pass-verify script method
++.B \-\-auth-user-pass-verify script method
+ Require the client to provide a username/password (possibly
+ in addition to a client certificate) for authentication.
+ 
+@@ -2985,10 +2985,10 @@ will be passed as an argument to
+ and the file will be automatically deleted by OpenVPN after
+ the script returns.  The location of the temporary file is
+ controlled by the
+-.B --tmp-dir
++.B \-\-tmp-dir
+ option, and will default to the current directory if unspecified.
+ For security, consider setting 
+-.B --tmp-dir
++.B \-\-tmp-dir
+ to a volatile storage medium such as
+ .B /dev/shm
+ (if available) to prevent the username/password file from touching the hard drive.
+@@ -3020,35 +3020,35 @@ For a sample script that performs PAM au
+ in the OpenVPN source distribution.
+ .\"*********************************************************
+ .TP
+-.B --client-cert-not-required
++.B \-\-client-cert-not-required
+ Don't require client certificate, client will authenticate
+ using username/password only.  Be aware that using this directive
+ is less secure than requiring certificates from all clients.
+ 
+ If you use this directive, the
+ entire responsibility of authentication will rest on your
+-.B --auth-user-pass-verify
++.B \-\-auth-user-pass-verify
+ script, so keep in mind that bugs in your script
+ could potentially compromise the security of your VPN.
+ 
+ If you don't use this directive, but you also specify an
+-.B --auth-user-pass-verify
++.B \-\-auth-user-pass-verify
+ script, then OpenVPN will perform double authentication.  The
+ client certificate verification AND the
+-.B --auth-user-pass-verify
++.B \-\-auth-user-pass-verify
+ script will need to succeed in order for a client to be
+ authenticated and accepted onto the VPN.
+ .\"*********************************************************
+ .TP
+-.B --username-as-common-name
++.B \-\-username-as-common-name
+ For
+-.B --auth-user-pass-verify
++.B \-\-auth-user-pass-verify
+ authentication, use
+ the authenticated username as the common name,
+ rather than the common name from the client cert.
+ .\"*********************************************************
+ .TP
+-.B --port-share host port
++.B \-\-port-share host port
+ When run in TCP server mode, share the OpenVPN port with
+ another application, such as an HTTPS server.  If OpenVPN
+ senses a connection to its port which is using a non-OpenVPN
+@@ -3063,13 +3063,13 @@ Not implemented on Windows.
+ .SS Client Mode
+ Use client mode when connecting to an OpenVPN server
+ which has
+-.B --server, --server-bridge,
++.B \-\-server, \-\-server-bridge,
+ or
+-.B --mode server
++.B \-\-mode server
+ in it's configuration.
+ .\"*********************************************************
+ .TP
+-.B --client
++.B \-\-client
+ A helper directive designed to simplify the configuration
+ of OpenVPN's client mode.  This directive is equivalent to:
+ 
+@@ -3085,33 +3085,33 @@ of OpenVPN's client mode.  This directiv
+ .fi
+ .\"*********************************************************
+ .TP
+-.B --pull
++.B \-\-pull
+ This option must be used on a client which is connecting
+ to a multi-client server.  It indicates to OpenVPN that it
+ should accept options pushed by the server, provided they
+ are part of the legal set of pushable options (note that the
+-.B --pull
++.B \-\-pull
+ option is implied by
+-.B --client
++.B \-\-client
+ ).
+ 
+ In particular,
+-.B --pull
++.B \-\-pull
+ allows the server to push routes to the client, so you should
+ not use
+-.B --pull
++.B \-\-pull
+ or
+-.B --client
++.B \-\-client
+ in situations where you don't trust the server to have control
+ over the client's routing table.
+ .\"*********************************************************
+ .TP
+-.B --auth-user-pass [up]
++.B \-\-auth-user-pass [up]
+ Authenticate with server using username/password.
+ .B up
+ is a file containing username/password on 2 lines (Note: OpenVPN
+ will only read passwords from a file if it has been built
+-with the --enable-password-save configure option, or on Windows
++with the \-\-enable-password-save configure option, or on Windows
+ by defining ENABLE_PASSWORD_SAVE in config-win32.h).
+ 
+ If
+@@ -3120,12 +3120,12 @@ is omitted, username/password will be pr
+ console.
+ 
+ The server configuration must specify an
+-.B --auth-user-pass-verify
++.B \-\-auth-user-pass-verify
+ script to verify the username/password provided by
+ the client.
+ .\"*********************************************************
+ .TP
+-.B --auth-retry type
++.B \-\-auth-retry type
+ Controls how OpenVPN responds to username/password verification
+ errors such as the client-side response to an AUTH_FAILED message from the server
+ or verification failure of the private key password.
+@@ -3136,33 +3136,33 @@ of error.
+ 
+ An AUTH_FAILED message is generated by the server if the client
+ fails
+-.B --auth-user-pass
++.B \-\-auth-user-pass
+ authentication, or if the server-side
+-.B --client-connect
++.B \-\-client-connect
+ script returns an error status when the client
+ tries to connect.
+ 
+ .B type
+ can be one of:
+ 
+-.B none --
++.B none \-\-
+ Client will exit with a fatal error (this is the default).
+ .br
+-.B nointeract --
++.B nointeract \-\-
+ Client will retry the connection without requerying for an
+-.B --auth-user-pass
++.B \-\-auth-user-pass
+ username/password.  Use this option for unattended clients.
+ .br
+-.B interact --
++.B interact \-\-
+ Client will requery for an
+-.B --auth-user-pass
++.B \-\-auth-user-pass
+ username/password and/or private key password before attempting a reconnection.
+ 
+ Note that while this option cannot be pushed, it can be controlled
+ from the management interface.
+ .\"*********************************************************
+ .TP
+-.B --explicit-exit-notify [n]
++.B \-\-explicit-exit-notify [n]
+ In UDP client mode or point-to-point mode, send server/peer an exit notification
+ if tunnel is restarted or OpenVPN process is exited.  In client mode, on
+ exit/restart, this
+@@ -3177,12 +3177,12 @@ These options are meaningful for both St
+ (must be compatible between peers).
+ .\"*********************************************************
+ .TP
+-.B --secret file [direction]
++.B \-\-secret file [direction]
+ Enable Static Key encryption mode (non-TLS).
+ Use pre-shared secret
+ .B file
+ which was generated with
+-.B --genkey.
++.B \-\-genkey.
+ 
+ The optional
+ .B direction
+@@ -3213,7 +3213,7 @@ supports the
+ .B direction
+ parameter, will also support 2048 bit key file generation
+ using the
+-.B --genkey
++.B \-\-genkey
+ option.
+ 
+ Static key encryption mode has certain advantages,
+@@ -3243,7 +3243,7 @@ would see nothing
+ but random-looking data.
+ .\"*********************************************************
+ .TP
+-.B --auth alg
++.B \-\-auth alg
+ Authenticate packets with HMAC using message
+ digest algorithm
+ .B alg.
+@@ -3258,7 +3258,7 @@ OpenVPN's usage of HMAC is to first encr
+ 
+ In static-key encryption mode, the HMAC key
+ is included in the key file generated by
+-.B --genkey.
++.B \-\-genkey.
+ In TLS mode, the HMAC key is dynamically generated and shared
+ between peers via the TLS control channel.  If OpenVPN receives a packet with
+ a bad HMAC it will drop the packet.
+@@ -3271,7 +3271,7 @@ For more information on HMAC see
+ .I http://www.cs.ucsd.edu/users/mihir/papers/hmac.html
+ .\"*********************************************************
+ .TP
+-.B --cipher alg
++.B \-\-cipher alg
+ Encrypt packets with cipher algorithm
+ .B alg.
+ The default is
+@@ -3286,7 +3286,7 @@ For more information on blowfish, see
+ 
+ To see other ciphers that are available with
+ OpenVPN, use the
+-.B --show-ciphers
++.B \-\-show-ciphers
+ option.
+ 
+ OpenVPN supports the CBC, CFB, and OFB cipher modes.
+@@ -3296,10 +3296,10 @@ Set
+ to disable encryption.
+ .\"*********************************************************
+ .TP
+-.B --keysize n
++.B \-\-keysize n
+ Size of cipher key in bits (optional).
+ If unspecified, defaults to cipher-specific default.  The
+-.B --show-ciphers
++.B \-\-show-ciphers
+ option (see below) shows all available OpenSSL ciphers,
+ their default key sizes, and whether the key size can
+ be changed.  Use care in changing a cipher's default
+@@ -3309,19 +3309,19 @@ larger key may offer no real guarantee o
+ security, or may even reduce security.
+ .\"*********************************************************
+ .TP
+-.B --engine [engine-name]
++.B \-\-engine [engine-name]
+ Enable OpenSSL hardware-based crypto engine functionality.
+ 
+ If
+ .B engine-name
+ is specified,
+ use a specific crypto engine.  Use the
+-.B --show-engines
++.B \-\-show-engines
+ standalone option to list the crypto engines which are
+ supported by OpenSSL.
+ .\"*********************************************************
+ .TP
+-.B --no-replay
++.B \-\-no-replay
+ Disable OpenVPN's protection against replay attacks.
+ Don't use this option unless you are prepared to make
+ a tradeoff of greater efficiency in exchange for less
+@@ -3365,7 +3365,7 @@ algorithm used
+ by IPSec.
+ .\"*********************************************************
+ .TP
+-.B --replay-window n [t]
++.B \-\-replay-window n [t]
+ Use a replay protection sliding-window of size
+ .B n
+ and a time window of
+@@ -3380,9 +3380,9 @@ is 15 seconds.
+ 
+ This option is only relevant in UDP mode, i.e.
+ when either
+-.B --proto udp
++.B \-\-proto udp
+ is specifed, or no
+-.B --proto
++.B \-\-proto
+ option is specified.
+ 
+ When OpenVPN tunnels IP packets over UDP, there is the possibility that
+@@ -3394,7 +3394,7 @@ the TCP/IP protocol stack, provided they
+ 
+ .B (a)
+ The packet cannot be a replay (unless
+-.B --no-replay
++.B \-\-no-replay
+ is specified, which disables replay protection altogether).
+ 
+ .B (b)
+@@ -3416,7 +3416,7 @@ a larger value for
+ Satellite links in particular often require this.
+ 
+ If you run OpenVPN at
+-.B --verb 4,
++.B \-\-verb 4,
+ you will see the message "Replay-window backtrack occurred [x]"
+ every time the maximum sequence number backtrack seen thus far
+ increases.  This can be used to calibrate
+@@ -3452,7 +3452,7 @@ parameters of what is to be expected fro
+ is easily fixed by simply using TCP as the VPN transport layer.
+ .\"*********************************************************
+ .TP
+-.B --mute-replay-warnings
++.B \-\-mute-replay-warnings
+ Silence the output of replay warnings, which are a common
+ false alarm on WiFi networks.  This option preserves
+ the security of the replay protection code without
+@@ -3460,7 +3460,7 @@ the verbosity associated with warnings a
+ packets.
+ .\"*********************************************************
+ .TP
+-.B --replay-persist file
++.B \-\-replay-persist file
+ Persist replay-protection state across sessions using
+ .B file
+ to save and reload the state.
+@@ -3468,7 +3468,7 @@ to save and reload the state.
+ This option will strengthen protection against replay attacks,
+ especially when you are using OpenVPN in a dynamic context (such
+ as with
+-.B --inetd)
++.B \-\-inetd)
+ when OpenVPN sessions are frequently started and stopped. 
+ 
+ This option will keep a disk copy of the current replay protection
+@@ -3479,12 +3479,12 @@ which were already received by the prior
+ 
+ This option only makes sense when replay protection is enabled
+ (the default) and you are using either
+-.B --secret
++.B \-\-secret
+ (shared-secret key mode) or TLS mode with
+-.B --tls-auth.
++.B \-\-tls-auth.
+ .\"*********************************************************
+ .TP
+-.B --no-iv
++.B \-\-no-iv
+ Disable OpenVPN's use of IV (cipher initialization vector).
+ Don't use this option unless you are prepared to make
+ a tradeoff of greater efficiency in exchange for less
+@@ -3505,24 +3505,24 @@ space-saving optimization that uses the 
+ datagram replay protection as the IV.
+ .\"*********************************************************
+ .TP
+-.B --test-crypto
++.B \-\-test-crypto
+ Do a self-test of OpenVPN's crypto options by encrypting and
+ decrypting test packets using the data channel encryption options
+ specified above.  This option does not require a peer to function,
+ and therefore can be specified without
+-.B --dev
++.B \-\-dev
+ or
+-.B --remote.
++.B \-\-remote.
+ 
+ The typical usage of
+-.B --test-crypto
++.B \-\-test-crypto
+ would be something like this:
+ 
+-.B openvpn --test-crypto --secret key
++.B openvpn \-\-test-crypto \-\-secret key
+ 
+ or
+ 
+-.B openvpn --test-crypto --secret key --verb 9
++.B openvpn \-\-test-crypto \-\-secret key \-\-verb 9
+ 
+ This option is very useful to test OpenVPN after it has been ported to
+ a new platform, or to isolate problems in the compiler, OpenSSL
+@@ -3546,17 +3546,17 @@ including certificate-based authenticati
+ 
+ To use TLS mode, each peer that runs OpenVPN should have its own local
+ certificate/key pair (
+-.B --cert
++.B \-\-cert
+ and
+-.B --key
++.B \-\-key
+ ), signed by the root certificate which is specified
+ in
+-.B --ca.
++.B \-\-ca.
+ 
+ When two OpenVPN peers connect, each presents its local certificate to the
+ other.  Each peer will then check that its partner peer presented a
+ certificate which was signed by the master root certificate as specified in
+-.B --ca.
++.B \-\-ca.
+ 
+ If that check on both peers succeeds, then the TLS negotiation
+ will succeed, both OpenVPN
+@@ -3573,18 +3573,18 @@ The easy-rsa package is also rendered in
+ .I http://openvpn.net/easyrsa.html
+ .\"*********************************************************
+ .TP
+-.B --tls-server
++.B \-\-tls-server
+ Enable TLS and assume server role during TLS handshake.  Note that
+ OpenVPN is designed as a peer-to-peer application.  The designation
+ of client or server is only for the purpose of negotiating the TLS
+ control channel.
+ .\"*********************************************************
+ .TP
+-.B --tls-client
++.B \-\-tls-client
+ Enable TLS and assume client role during TLS handshake.
+ .\"*********************************************************
+ .TP
+-.B --ca file
++.B \-\-ca file
+ Certificate authority (CA) file in .pem format, also referred to as the
+ .I root
+ certificate.  This file can have multiple
+@@ -3606,10 +3606,10 @@ production environment, since by virtue 
+ they are distributed with OpenVPN, they are totally insecure.
+ .\"*********************************************************
+ .TP
+-.B --dh file
++.B \-\-dh file
+ File containing Diffie Hellman parameters
+ in .pem format (required for
+-.B --tls-server
++.B \-\-tls-server
+ only). Use
+ 
+ .B openssl dhparam -out dh1024.pem 1024
+@@ -3619,15 +3619,15 @@ included with the OpenVPN distribution. 
+ may be considered public.
+ .\"*********************************************************
+ .TP
+-.B --cert file
+-Local peer's signed certificate in .pem format -- must be signed
++.B \-\-cert file
++Local peer's signed certificate in .pem format \-\- must be signed
+ by a certificate authority whose certificate is in
+-.B --ca file.
++.B \-\-ca file.
+ Each peer in an OpenVPN link running in TLS mode should have its own
+ certificate and private key file.  In addition, each certificate should
+ have been signed by the key of a certificate
+ authority whose public key resides in the
+-.B --ca
++.B \-\-ca
+ certificate authority file.
+ You can easily make your own certificate authority (see above) or pay money
+ to use a commercial service such as thawte.com (in which case you will be
+@@ -3652,7 +3652,7 @@ Note that the
+ command reads the location of the certificate authority key from its
+ configuration file such as
+ .B /usr/share/ssl/openssl.cnf
+--- note also
++\-\- note also
+ that for certificate authority functions, you must set up the files
+ .B index.txt
+ (may be empty) and
+@@ -3663,83 +3663,83 @@ that for certificate authority functions
+ ).
+ .\"*********************************************************
+ .TP
+-.B --key file
++.B \-\-key file
+ Local peer's private key in .pem format.  Use the private key which was generated
+ when you built your peer's certificate (see
+ .B -cert file
+ above).
+ .\"*********************************************************
+ .TP
+-.B --pkcs12 file
++.B \-\-pkcs12 file
+ Specify a PKCS #12 file containing local private key,
+ local certificate, and root CA certificate.
+ This option can be used instead of
+-.B --ca, --cert,
++.B \-\-ca, \-\-cert,
+ and
+-.B --key.
++.B \-\-key.
+ .\"*********************************************************
+ .TP
+-.B --pkcs11-cert-private [0|1]...
++.B \-\-pkcs11-cert-private [0|1]...
+ Set if access to certificate object should be performed after login.
+ Every provider has its own setting.
+ .\"*********************************************************
+ .TP
+-.B --pkcs11-id name
++.B \-\-pkcs11-id name
+ Specify the serialized certificate id to be used. The id can be gotten
+ by the standalone
+-.B --show-pkcs11-ids
++.B \-\-show-pkcs11-ids
+ option.
+ .\"*********************************************************
+ .TP
+-.B --pkcs11-pin-cache seconds
++.B \-\-pkcs11-pin-cache seconds
+ Specify how many seconds the PIN can be cached, the default is until the token is removed.
+ .\"*********************************************************
+ .TP
+-.B --pkcs11-protected-authentication [0|1]...
++.B \-\-pkcs11-protected-authentication [0|1]...
+ Use PKCS#11 protected authentication path, useful for biometric and external
+ keypad devices.
+ Every provider has its own setting.
+ .\"*********************************************************
+ .TP
+-.B --pkcs11-providers provider...
++.B \-\-pkcs11-providers provider...
+ Specify a RSA Security Inc. PKCS #11 Cryptographic Token Interface (Cryptoki) providers
+ to load.
+ This option can be used instead of
+-.B --cert, --key,
++.B \-\-cert, \-\-key,
+ and
+-.B --pkcs12.
++.B \-\-pkcs12.
+ .\"*********************************************************
+ .TP
+-.B --pkcs11-private-mode mode...
++.B \-\-pkcs11-private-mode mode...
+ Specify which method to use in order to perform private key operations.
+ A different mode can be specified for each provider.
+ Mode is encoded as hex number, and can be a mask one of the following:
+ 
+ .B 0
+-(default) -- Try to determind automatically.
++(default) \-\- Try to determind automatically.
+ .br
+ .B 1
+--- Use sign.
++\-\- Use sign.
+ .br
+ .B 2
+--- Use sign recover.
++\-\- Use sign recover.
+ .br
+ .B 4
+--- Use decrypt.
++\-\- Use decrypt.
+ .br
+ .B 8
+--- Use unwrap.
++\-\- Use unwrap.
+ .br
+ .\"*********************************************************
+ .TP
+-.B --cryptoapicert select-string
++.B \-\-cryptoapicert select-string
+ Load the certificate and private key from the
+ Windows Certificate System Store (Windows Only).
+ 
+ Use this option instead of
+-.B --cert
++.B \-\-cert
+ and
+-.B --key.
++.B \-\-key.
+ 
+ This makes
+ it possible to use any smart card, supported by Windows, but also any
+@@ -3765,7 +3765,7 @@ Certificate Store GUI.
+ 
+ .\"*********************************************************
+ .TP
+-.B --key-method m
++.B \-\-key-method m
+ Use data channel key negotiation method
+ .B m.
+ The key method must match on both sides of the connection.
+@@ -3793,16 +3793,16 @@ of keying occur:
+ of the connection producing certificates and verifying the certificate
+ (or other authentication info provided) of
+ the other side.  The
+-.B --key-method
++.B \-\-key-method
+ parameter has no effect on this process.
+ 
+ (2) After the TLS connection is established, the tunnel session keys are
+ separately negotiated over the existing secure TLS channel.  Here,
+-.B --key-method
++.B \-\-key-method
+ determines the derivation of the tunnel session keys.
+ .\"*********************************************************
+ .TP
+-.B --tls-cipher l
++.B \-\-tls-cipher l
+ A list
+ .B l
+ of allowable TLS ciphers delimited by a colon (":").
+@@ -3812,11 +3812,11 @@ version rollback attack where a man-in-t
+ to force two peers to negotiate to the lowest level
+ of security they both support.
+ Use
+-.B --show-tls
++.B \-\-show-tls
+ to see a list of supported TLS ciphers.
+ .\"*********************************************************
+ .TP
+-.B --tls-timeout n
++.B \-\-tls-timeout n
+ Packet retransmit timeout on TLS control channel
+ if no acknowledgment from remote within
+ .B n
+@@ -3833,7 +3833,7 @@ the higher level network protocols runni
+ such as TCP expect this role to be left to them.
+ .\"*********************************************************
+ .TP
+-.B --reneg-bytes n
++.B \-\-reneg-bytes n
+ Renegotiate data channel key after
+ .B n
+ bytes sent or received (disabled by default).
+@@ -3843,13 +3843,13 @@ a number of seconds.  A key renegotiatio
+ if any of these three criteria are met by either peer.
+ .\"*********************************************************
+ .TP
+-.B --reneg-pkts n
++.B \-\-reneg-pkts n
+ Renegotiate data channel key after
+ .B n
+ packets sent and received (disabled by default).
+ .\"*********************************************************
+ .TP
+-.B --reneg-sec n
++.B \-\-reneg-sec n
+ Renegotiate data channel key after
+ .B n
+ seconds (default=3600).
+@@ -3860,16 +3860,16 @@ cause the end user to be challenged to r
+ Also, keep in mind that this option can be used on both the client and server,
+ and whichever uses the lower value will be the one to trigger the renegotiation.
+ A common mistake is to set
+-.B --reneg-sec
++.B \-\-reneg-sec
+ to a higher value on either the client or server, while the other side of the connection
+ is still using the default value of 3600 seconds, meaning that the renegotiation will
+-still occur once per 3600 seconds.  The solution is to increase --reneg-sec on both the
++still occur once per 3600 seconds.  The solution is to increase \-\-reneg-sec on both the
+ client and server, or set it to 0 on one side of the connection (to disable), and to
+ your chosen value on the other side.
+ .\"*********************************************************
+ .TP
+-.B --hand-window n
+-Handshake Window -- the TLS-based key exchange must finalize within
++.B \-\-hand-window n
++Handshake Window \-\- the TLS-based key exchange must finalize within
+ .B n
+ seconds
+ of handshake initiation by any peer (default = 60 seconds).
+@@ -3877,47 +3877,47 @@ If the handshake fails
+ we will attempt to reset our connection with our peer and try again.
+ Even in the event of handshake failure we will still use
+ our expiring key for up to
+-.B --tran-window
++.B \-\-tran-window
+ seconds to maintain continuity of transmission of tunnel
+ data.
+ .\"*********************************************************
+ .TP
+-.B --tran-window n
+-Transition window -- our old key can live this many seconds
++.B \-\-tran-window n
++Transition window \-\- our old key can live this many seconds
+ after a new a key renegotiation begins (default = 3600 seconds).
+ This feature allows for a graceful transition from old to new
+ key, and removes the key renegotiation sequence from the critical
+ path of tunnel data forwarding.
+ .\"*********************************************************
+ .TP
+-.B --single-session
++.B \-\-single-session
+ After initially connecting to a remote peer, disallow any new connections.
+ Using this
+ option means that a remote peer cannot connect, disconnect, and then
+ reconnect.
+ 
+ If the daemon is reset by a signal or
+-.B --ping-restart,
++.B \-\-ping-restart,
+ it will allow one new connection.
+ 
+-.B --single-session
++.B \-\-single-session
+ can be used with
+-.B --ping-exit
++.B \-\-ping-exit
+ or
+-.B --inactive
++.B \-\-inactive
+ to create a single dynamic session that will exit when finished.
+ .\"*********************************************************
+ .TP
+-.B --tls-exit
++.B \-\-tls-exit
+ Exit on TLS negotiation failure.
+ .\"*********************************************************
+ .TP
+-.B --tls-auth file [direction]
++.B \-\-tls-auth file [direction]
+ Add an additional layer of HMAC authentication on top of the TLS
+ control channel to protect against DoS attacks.
+ 
+ In a nutshell,
+-.B --tls-auth
++.B \-\-tls-auth
+ enables a kind of "HMAC firewall" on OpenVPN's TCP/UDP port,
+ where TLS control channel packets
+ bearing an incorrect HMAC signature can be dropped immediately without
+@@ -3928,7 +3928,7 @@ response.
+ 
+ .B (1)
+ An OpenVPN static key file generated by
+-.B --genkey
++.B \-\-genkey
+ (required if
+ .B direction
+ parameter is used).
+@@ -3946,19 +3946,19 @@ OpenVPN will first try format (1), and i
+ a static key file, format (2) will be used.
+ 
+ See the
+-.B --secret
++.B \-\-secret
+ option for more information on the optional
+ .B direction
+ parameter.
+ 
+-.B --tls-auth
++.B \-\-tls-auth
+ is recommended when you are running OpenVPN in a mode where
+ it is listening for packets from any IP address, such as when
+-.B --remote
++.B \-\-remote
+ is not specified, or
+-.B --remote
++.B \-\-remote
+ is specified with
+-.B --float.
++.B \-\-float.
+ 
+ The rationale for
+ this feature is as follows.  TLS requires a multi-packet exchange
+@@ -3985,7 +3985,7 @@ An important rule of thumb in reducing v
+ minimize the amount of resources a potential, but as yet unauthenticated,
+ client is able to consume.
+ 
+-.B --tls-auth
++.B \-\-tls-auth
+ does this by signing every TLS control channel packet with an HMAC signature,
+ including packets which are sent before the TLS level has had a chance
+ to authenticate the peer.
+@@ -3993,20 +3993,20 @@ The result is that packets without
+ the correct signature can be dropped immediately upon reception,
+ before they have a chance to consume additional system resources
+ such as by initiating a TLS handshake.
+-.B --tls-auth
++.B \-\-tls-auth
+ can be strengthened by adding the
+-.B --replay-persist
++.B \-\-replay-persist
+ option which will keep OpenVPN's replay protection state
+ in a file so that it is not lost across restarts.
+ 
+ It should be emphasized that this feature is optional and that the
+ passphrase/key file used with
+-.B --tls-auth
++.B \-\-tls-auth
+ gives a peer nothing more than the power to initiate a TLS
+ handshake.  It is not used to encrypt or authenticate any tunnel data.
+ .\"*********************************************************
+ .TP
+-.B --askpass [file]
++.B \-\-askpass [file]
+ Get certificate password from console or
+ .B file
+ before we daemonize.
+@@ -4015,7 +4015,7 @@ For the extremely
+ security conscious, it is possible to protect your private key with
+ a password.  Of course this means that every time the OpenVPN
+ daemon is started you must be there to type the password.  The
+-.B --askpass
++.B \-\-askpass
+ option allows you to start OpenVPN from the command line.  It will
+ query you for a password before it daemonizes.  To protect a private
+ key with a password you should omit the
+@@ -4032,15 +4032,15 @@ Keep in mind that storing your password 
+ to a certain extent invalidates the extra security provided by
+ using an encrypted key (Note: OpenVPN
+ will only read passwords from a file if it has been built
+-with the --enable-password-save configure option, or on Windows
++with the \-\-enable-password-save configure option, or on Windows
+ by defining ENABLE_PASSWORD_SAVE in config-win32.h).
+ .\"*********************************************************
+ .TP
+-.B --auth-nocache
++.B \-\-auth-nocache
+ Don't cache
+-.B --askpass
++.B \-\-askpass
+ or
+-.B --auth-user-pass
++.B \-\-auth-user-pass
+ username/passwords in virtual memory.
+ 
+ If specified, this directive will cause OpenVPN to immediately
+@@ -4050,19 +4050,19 @@ from stdin, which may be multiple times 
+ OpenVPN session.
+ 
+ This directive does not affect the
+-.B --http-proxy
++.B \-\-http-proxy
+ username/password.  It is always cached.
+ .\"*********************************************************
+ .TP
+-.B --tls-verify cmd
++.B \-\-tls-verify cmd
+ Execute shell command
+ .B cmd
+ to verify the X509 name of a
+ pending TLS connection that has otherwise passed all other
+ tests of certification (except for revocation via
+-.B --crl-verify
++.B \-\-crl-verify
+ directive; the revocation test occurs after the
+-.B --tls-verify
++.B \-\-tls-verify
+ test).
+ 
+ .B cmd
+@@ -4095,7 +4095,7 @@ to
+ to build a command line which will be passed to the script.
+ .\"*********************************************************
+ .TP
+-.B --tls-remote name
++.B \-\-tls-remote name
+ Accept connections only from a host with X509 name
+ or common name equal to
+ .B name.
+@@ -4105,24 +4105,24 @@ of verification.
+ Name can also be a common name prefix, for example if you
+ want a client to only accept connections to "Server-1",
+ "Server-2", etc., you can simply use
+-.B --tls-remote Server
++.B \-\-tls-remote Server
+ 
+ Using a common name prefix is a useful alternative to managing
+ a CRL (Certificate Revocation List) on the client, since it allows the client
+ to refuse all certificates except for those associated
+ with designated servers.
+ 
+-.B --tls-remote
++.B \-\-tls-remote
+ is a useful replacement for the
+-.B --tls-verify
++.B \-\-tls-verify
+ option to verify the remote host, because
+-.B --tls-remote
++.B \-\-tls-remote
+ works in a
+-.B --chroot
++.B \-\-chroot
+ environment too.
+ .\"*********************************************************
+ .TP
+-.B --ns-cert-type client|server
++.B \-\-ns-cert-type client|server
+ Require that peer certificate was signed with an explicit
+ .B nsCertType
+ designation of "client" or "server".
+@@ -4137,19 +4137,19 @@ field set to "server".
+ 
+ If the server certificate's nsCertType field is set
+ to "server", then the clients can verify this with
+-.B --ns-cert-type server.
++.B \-\-ns-cert-type server.
+ 
+ This is an important security precaution to protect against
+ a man-in-the-middle attack where an authorized client
+ attempts to connect to another client by impersonating the server.
+ The attack is easily prevented by having clients verify
+ the server certificate using any one of
+-.B --ns-cert-type, --tls-remote,
++.B \-\-ns-cert-type, \-\-tls-remote,
+ or
+-.B --tls-verify.
++.B \-\-tls-verify.
+ .\"*********************************************************
+ .TP
+-.B --remote-cert-ku v...
++.B \-\-remote-cert-ku v...
+ Require that peer certificate was signed with an explicit
+ .B key usage.
+ 
+@@ -4160,7 +4160,7 @@ The key usage should be encoded in hex, 
+ usage can be specified.
+ .\"*********************************************************
+ .TP
+-.B --remote-cert-eku oid
++.B \-\-remote-cert-eku oid
+ Require that peer certificate was signed with an explicit
+ .B extended key usage.
+ 
+@@ -4171,7 +4171,7 @@ The extended key usage should be encoded
+ OpenSSL symbolic representation.
+ .\"*********************************************************
+ .TP
+-.B --remote-cert-tls client|server
++.B \-\-remote-cert-tls client|server
+ Require that peer certificate was signed with an explicit
+ .B key usage
+ and
+@@ -4182,18 +4182,18 @@ This is a useful security option for cli
+ the host they connect to is a designated server.
+ 
+ The
+-.B --remote-cert-tls client
++.B \-\-remote-cert-tls client
+ option is equivalent to
+ .B
+---remote-cert-ku 80 08 88 --remote-cert-eku "TLS Web Client Authentication"
++\-\-remote-cert-ku 80 08 88 \-\-remote-cert-eku "TLS Web Client Authentication"
+ 
+ The key usage is digitalSignature and/or keyAgreement.
+ 
+ The
+-.B --remote-cert-tls server
++.B \-\-remote-cert-tls server
+ option is equivalent to
+ .B
+---remote-cert-ku a0 88 --remote-cert-eku "TLS Web Server Authentication"
++\-\-remote-cert-ku a0 88 \-\-remote-cert-eku "TLS Web Server Authentication"
+ 
+ The key usage is digitalSignature and ( keyEncipherment or keyAgreement ).
+ 
+@@ -4202,12 +4202,12 @@ a man-in-the-middle attack where an auth
+ attempts to connect to another client by impersonating the server.
+ The attack is easily prevented by having clients verify
+ the server certificate using any one of
+-.B --remote-cert-tls, --tls-remote,
++.B \-\-remote-cert-tls, \-\-tls-remote,
+ or
+-.B --tls-verify.
++.B \-\-tls-verify.
+ .\"*********************************************************
+ .TP
+-.B --crl-verify crl
++.B \-\-crl-verify crl
+ Check peer certificate against the file
+ .B crl
+ in PEM format.
+@@ -4227,28 +4227,28 @@ if the root certificate key itself was c
+ .SS SSL Library information:
+ .\"*********************************************************
+ .TP
+-.B --show-ciphers
++.B \-\-show-ciphers
+ (Standalone)
+ Show all cipher algorithms to use with the
+-.B --cipher
++.B \-\-cipher
+ option.
+ .\"*********************************************************
+ .TP
+-.B --show-digests
++.B \-\-show-digests
+ (Standalone)
+ Show all message digest algorithms to use with the
+-.B --auth
++.B \-\-auth
+ option.
+ .\"*********************************************************
+ .TP
+-.B --show-tls
++.B \-\-show-tls
+ (Standalone)
+ Show all TLS ciphers (TLS used only as a control channel).  The TLS
+ ciphers will be sorted from highest preference (most secure) to
+ lowest.
+ .\"*********************************************************
+ .TP
+-.B --show-engines
++.B \-\-show-engines
+ (Standalone)
+ Show currently available hardware-based crypto acceleration
+ engines supported by the OpenSSL library.
+@@ -4257,18 +4257,18 @@ engines supported by the OpenSSL library
+ Used only for non-TLS static key encryption mode.
+ .\"*********************************************************
+ .TP
+-.B --genkey
++.B \-\-genkey
+ (Standalone)
+ Generate a random key to be used as a shared secret,
+ for use with the
+-.B --secret
++.B \-\-secret
+ option.  This file must be shared with the
+ peer over a pre-existing secure channel such as
+ .BR scp (1)
+ .
+ .\"*********************************************************
+ .TP
+-.B --secret file
++.B \-\-secret file
+ Write key to
+ .B file.
+ .\"*********************************************************
+@@ -4277,7 +4277,7 @@ Available with linux 2.4.7+.  These opti
+ of OpenVPN which can be used to create and delete persistent tunnels.
+ .\"*********************************************************
+ .TP
+-.B --mktun
++.B \-\-mktun
+ (Standalone)
+ Create a persistent tunnel on platforms which support them such
+ as Linux.  Normally TUN/TAP tunnels exist only for
+@@ -4288,9 +4288,9 @@ only when they are deleted or the machin
+ 
+ One of the advantages of persistent tunnels is that they eliminate the
+ need for separate
+-.B --up
++.B \-\-up
+ and
+-.B --down
++.B \-\-down
+ scripts to run the appropriate
+ .BR ifconfig (8)
+ and
+@@ -4302,56 +4302,56 @@ Another advantage is that open connectio
+ will not be reset if the OpenVPN peer restarts.  This can be useful to
+ provide uninterrupted connectivity through the tunnel in the event of a DHCP
+ reset of the peer's public IP address (see the
+-.B --ipchange
++.B \-\-ipchange
+ option above).
+ 
+ One disadvantage of persistent tunnels is that it is harder to automatically
+ configure their MTU value (see
+-.B --link-mtu
++.B \-\-link-mtu
+ and
+-.B --tun-mtu
++.B \-\-tun-mtu
+ above).
+ 
+ On some platforms such as Windows, TAP-Win32 tunnels are persistent by
+ default.
+ .\"*********************************************************
+ .TP
+-.B --rmtun
++.B \-\-rmtun
+ (Standalone)
+ Remove a persistent tunnel.
+ .\"*********************************************************
+ .TP
+-.B --dev tunX | tapX
++.B \-\-dev tunX | tapX
+ TUN/TAP device
+ .\"*********************************************************
+ .TP
+-.B --user user
++.B \-\-user user
+ Optional user to be owner of this tunnel.
+ .\"*********************************************************
+ .TP
+-.B --group group
++.B \-\-group group
+ Optional group to be owner of this tunnel.
+ .\"*********************************************************
+ .SS Windows-Specific Options:
+ .\"*********************************************************
+ .TP
+-.B --ip-win32 method
++.B \-\-ip-win32 method
+ When using
+-.B --ifconfig
++.B \-\-ifconfig
+ on Windows, set the TAP-Win32 adapter
+ IP address and netmask using
+ .B method.
+ Don't use this option unless you are also using
+-.B --ifconfig.
++.B \-\-ifconfig.
+ 
+-.B manual --
++.B manual \-\-
+ Don't set the IP address or netmask automatically.
+ Instead output a message
+ to the console telling the user to configure the
+ adapter manually and indicating the IP/netmask which
+ OpenVPN expects the adapter to be set to.
+ 
+-.B dynamic [offset] [lease-time] --
++.B dynamic [offset] [lease-time] \-\-
+ Automatically set the IP address and netmask by replying to
+ DHCP query messages generated by the kernel.  This mode is
+ probably the "cleanest" solution
+@@ -4361,13 +4361,13 @@ this mode: (1) The TCP/IP properties for
+ adapter must be set to "Obtain an IP address automatically," and
+ (2) OpenVPN needs to claim an IP address in the subnet for use
+ as the virtual DHCP server address.  By default in
+-.B --dev tap
++.B \-\-dev tap
+ mode, OpenVPN will
+ take the normally unused first address in the subnet.  For example,
+ if your subnet is 192.168.4.0 netmask 255.255.255.0, then
+ OpenVPN will take the IP address 192.168.4.0 to use as the
+ virtual DHCP server address.  In
+-.B --dev tun
++.B \-\-dev tun
+ mode, OpenVPN will cause the DHCP server to masquerade as if it were
+ coming from the remote endpoint.  The optional offset parameter is
+ an integer which is > -256 and < 256 and which defaults to 0.
+@@ -4389,13 +4389,13 @@ because it prevents routes involving the
+ being lost when the system goes to sleep.  The default
+ lease time is one year.
+ 
+-.B netsh --
++.B netsh \-\-
+ Automatically set the IP address and netmask using
+ the Windows command-line "netsh"
+ command.  This method appears to work correctly on
+ Windows XP but not Windows 2000.
+ 
+-.B ipapi --
++.B ipapi \-\-
+ Automatically set the IP address and netmask using the
+ Windows IP Helper API.  This approach
+ does not have ideal semantics, though testing has indicated
+@@ -4404,7 +4404,7 @@ it is best to leave the TCP/IP propertie
+ adapter in their default state, i.e. "Obtain an IP address
+ automatically."
+ 
+-.B adaptive --
++.B adaptive \-\-
+ (Default) Try
+ .B dynamic
+ method initially and fail over to
+@@ -4434,55 +4434,55 @@ mode to restore the TAP-Win32 adapter TC
+ to a DHCP configuration.
+ .\"*********************************************************
+ .TP
+-.B --route-method m
++.B \-\-route-method m
+ Which method
+ .B m
+ to use for adding routes on Windows?
+ 
+ .B adaptive
+-(default) -- Try IP helper API first.  If that fails, fall
++(default) \-\- Try IP helper API first.  If that fails, fall
+ back to the route.exe shell command.
+ .br
+ .B ipapi
+--- Use IP helper API.
++\-\- Use IP helper API.
+ .br
+ .B exe
+--- Call the route.exe shell command.
++\-\- Call the route.exe shell command.
+ .\"*********************************************************
+ .TP
+-.B --dhcp-option type [parm]
++.B \-\-dhcp-option type [parm]
+ Set extended TAP-Win32 TCP/IP properties, must
+ be used with
+-.B --ip-win32 dynamic
++.B \-\-ip-win32 dynamic
+ or
+-.B --ip-win32 adaptive.
++.B \-\-ip-win32 adaptive.
+ This option can be used to set additional TCP/IP properties
+ on the TAP-Win32 adapter, and is particularly useful for
+ configuring an OpenVPN client to access a Samba server
+ across the VPN.
+ 
+-.B DOMAIN name --
++.B DOMAIN name \-\-
+ Set Connection-specific DNS Suffix.
+ 
+-.B DNS addr --
++.B DNS addr \-\-
+ Set primary domain name server address.  Repeat
+ this option to set secondary DNS server addresses.
+ 
+-.B WINS addr --
++.B WINS addr \-\-
+ Set primary WINS server address (NetBIOS over TCP/IP Name Server).
+ Repeat this option to set secondary WINS server addresses.
+ 
+-.B NBDD addr --
++.B NBDD addr \-\-
+ Set primary NBDD server address (NetBIOS over TCP/IP Datagram Distribution Server)
+ Repeat this option
+ to set secondary NBDD server addresses.
+ 
+-.B NTP addr --
++.B NTP addr \-\-
+ Set primary NTP server address (Network Time Protocol).
+ Repeat this option
+ to set secondary NTP server addresses.
+ 
+-.B NBT type --
++.B NBT type \-\-
+ Set NetBIOS over TCP/IP Node type.  Possible options:
+ .B 1
+ = b-node (broadcasts),
+@@ -4495,7 +4495,7 @@ then query name server), and
+ .B 8
+ = h-node (query name server, then broadcast).
+ 
+-.B NBS scope-id --
++.B NBS scope-id \-\-
+ Set NetBIOS over TCP/IP Scope. A NetBIOS Scope ID provides an extended
+ naming service for the NetBIOS over TCP/IP (Known as NBT) module. The
+ primary purpose of a NetBIOS scope ID is to isolate NetBIOS traffic on
+@@ -4507,19 +4507,19 @@ computers to use the same computer name,
+ scope IDs. The Scope ID becomes a part of the NetBIOS name, making the name unique.
+ (This description of NetBIOS scopes courtesy of NeonSurge@abyss.com)
+ 
+-.B DISABLE-NBT --
++.B DISABLE-NBT \-\-
+ Disable Netbios-over-TCP/IP.
+ 
+ Note that if
+-.B --dhcp-option
++.B \-\-dhcp-option
+ is pushed via
+-.B --push
++.B \-\-push
+ to a non-windows client, the option will be saved in the client's
+ environment before the up script is called, under
+ the name "foreign_option_{n}".
+ .\"*********************************************************
+ .TP
+-.B --tap-sleep n
++.B \-\-tap-sleep n
+ Cause OpenVPN to sleep for
+ .B n
+ seconds immediately after the TAP-Win32 adapter state
+@@ -4527,21 +4527,21 @@ is set to "connected".
+ 
+ This option is intended to be used to troubleshoot problems
+ with the
+-.B --ifconfig
++.B \-\-ifconfig
+ and
+-.B --ip-win32
++.B \-\-ip-win32
+ options, and is used to give
+ the TAP-Win32 adapter time to come up before
+ Windows IP Helper API operations are applied to it.
+ .\"*********************************************************
+ .TP
+-.B --show-net-up
++.B \-\-show-net-up
+ Output OpenVPN's view of the system routing table and network
+ adapter list to the syslog or log file after the TUN/TAP adapter
+ has been brought up and any routes have been added.
+ .\"*********************************************************
+ .TP
+-.B --dhcp-renew
++.B \-\-dhcp-renew
+ Ask Windows to renew the TAP adapter lease on startup.
+ This option is normally unnecessary, as Windows automatically
+ triggers a DHCP renegotiation on the TAP adapter when it
+@@ -4550,21 +4550,21 @@ Media Status property to "Always Connect
+ flag.
+ .\"*********************************************************
+ .TP
+-.B --dhcp-release
++.B \-\-dhcp-release
+ Ask Windows to release the TAP adapter lease on shutdown.
+ This option has the same caveats as
+-.B --dhcp-renew
++.B \-\-dhcp-renew
+ above.
+ .\"*********************************************************
+ .TP
+-.B --pause-exit
++.B \-\-pause-exit
+ Put up a "press any key to continue" message on the console prior
+ to OpenVPN program exit.  This option is automatically used by the
+ Windows explorer when OpenVPN is run on a configuration
+ file using the right-click explorer menu.
+ .\"*********************************************************
+ .TP
+-.B --service exit-event [0|1]
++.B \-\-service exit-event [0|1]
+ Should be used when OpenVPN is being automatically executed by another
+ program in such
+ a context that no interaction with the user via display or keyboard
+@@ -4587,26 +4587,26 @@ parameter.  In any case, the controlling
+ causing all such OpenVPN processes to exit.
+ 
+ When executing an OpenVPN process using the
+-.B --service
++.B \-\-service
+ directive, OpenVPN will probably not have a console
+ window to output status/error
+ messages, therefore it is useful to use
+-.B --log
++.B \-\-log
+ or
+-.B --log-append
++.B \-\-log-append
+ to write these messages to a file.
+ .\"*********************************************************
+ .TP
+-.B --show-adapters
++.B \-\-show-adapters
+ (Standalone)
+ Show available TAP-Win32 adapters which can be selected using the
+-.B --dev-node
++.B \-\-dev-node
+ option.  On non-Windows systems, the
+ .BR ifconfig (8)
+ command provides similar functionality.
+ .\"*********************************************************
+ .TP
+-.B --allow-nonadmin [TAP-adapter]
++.B \-\-allow-nonadmin [TAP-adapter]
+ (Standalone)
+ Set
+ .B TAP-adapter
+@@ -4621,10 +4621,10 @@ and reloaded.
+ This directive can only be used by an administrator.
+ .\"*********************************************************
+ .TP
+-.B --show-valid-subnets
++.B \-\-show-valid-subnets
+ (Standalone)
+ Show valid subnets for
+-.B --dev tun
++.B \-\-dev tun
+ emulation.  Since the TAP-Win32 driver
+ exports an ethernet interface to Windows, and since TUN devices are
+ point-to-point in nature, it is necessary for the TAP-Win32 driver
+@@ -4634,7 +4634,7 @@ Namely, the point-to-point endpoints use
+ must be the middle two addresses of a /30 subnet (netmask 255.255.255.252).
+ .\"*********************************************************
+ .TP
+-.B --show-net
++.B \-\-show-net
+ (Standalone)
+ Show OpenVPN's view of the system routing table and network
+ adapter list.
+@@ -4642,12 +4642,12 @@ adapter list.
+ .SS PKCS#11 Standalone Options:
+ .\"*********************************************************
+ .TP
+-.B --show-pkcs11-ids provider [cert_private]
++.B \-\-show-pkcs11-ids provider [cert_private]
+ (Standalone)
+ Show PKCS#11 token object list. Specify cert_private as 1
+ if certificates are stored as private objects.
+ 
+-.B --verb
++.B \-\-verb
+ option can be used BEFORE this option to produce debugging information.
+ .\"*********************************************************
+ .SH SCRIPTING AND ENVIRONMENTAL VARIABLES
+@@ -4657,52 +4657,52 @@ of environmental variables for use by us
+ .SS Script Order of Execution
+ .\"*********************************************************
+ .TP
+-.B --up
++.B \-\-up
+ Executed after TCP/UDP socket bind and TUN/TAP open.
+ .\"*********************************************************
+ .TP
+-.B --tls-verify
++.B \-\-tls-verify
+ Executed when we have a still untrusted remote peer.
+ .\"*********************************************************
+ .TP
+-.B --ipchange
++.B \-\-ipchange
+ Executed after connection authentication, or remote IP address change.
+ .\"*********************************************************
+ .TP
+-.B --client-connect
++.B \-\-client-connect
+ Executed in
+-.B --mode server
++.B \-\-mode server
+ mode immediately after client authentication.
+ .\"*********************************************************
+ .TP
+-.B --route-up
++.B \-\-route-up
+ Executed after connection authentication, either
+ immediately after, or some number of seconds after
+ as defined by the
+-.B --route-delay
++.B \-\-route-delay
+ option.
+ .\"*********************************************************
+ .TP
+-.B --client-disconnect
++.B \-\-client-disconnect
+ Executed in
+-.B --mode server
++.B \-\-mode server
+ mode on client instance shutdown.
+ .\"*********************************************************
+ .TP
+-.B --down
++.B \-\-down
+ Executed after TCP/UDP and TUN/TAP close.
+ .\"*********************************************************
+ .TP
+-.B --learn-address
++.B \-\-learn-address
+ Executed in
+-.B --mode server
++.B \-\-mode server
+ mode whenever an IPv4 address/route or MAC address is added to OpenVPN's
+ internal routing table.
+ .\"*********************************************************
+ .TP
+-.B --auth-user-pass-verify
++.B \-\-auth-user-pass-verify
+ Executed in
+-.B --mode server
++.B \-\-mode server
+ mode on new client connections, when the client is
+ still untrusted.
+ .\"*********************************************************
+@@ -4734,17 +4734,17 @@ true.
+ Alphanumeric, underbar ('_'), dash ('-'), dot ('.'), and at                
+ ('@').
+ 
+-.B --auth-user-pass username:
++.B \-\-auth-user-pass username:
+ Same as Common Name, with one exception: starting with OpenVPN 2.0.1,
+ the username is passed to the OPENVPN_PLUGIN_AUTH_USER_PASS_VERIFY plugin in its raw form,
+ without string remapping.
+ 
+-.B --auth-user-pass password:
++.B \-\-auth-user-pass password:
+ Any "printable" character except CR or LF.  
+ Printable is defined to be a character which will cause the C library 
+ isprint() function to return true.
+ 
+-.B --client-config-dir filename as derived from common name or username:
++.B \-\-client-config-dir filename as derived from common name or username:
+ Alphanumeric, underbar ('_'), dash ('-'), and dot ('.') except for "." or 
+ ".." as standalone strings.  As of 2.0.1-rc6, the at ('@') character has
+ been added as well for compatibility with the common name character class.
+@@ -4774,45 +4774,45 @@ which refer to different client instance
+ .B bytes_received
+ Total number of bytes received from client during VPN session.
+ Set prior to execution of the
+-.B --client-disconnect
++.B \-\-client-disconnect
+ script.
+ .\"*********************************************************
+ .TP
+ .B bytes_sent
+ Total number of bytes sent to client during VPN session.
+ Set prior to execution of the
+-.B --client-disconnect
++.B \-\-client-disconnect
+ script.
+ .\"*********************************************************
+ .TP
+ .B common_name
+ The X509 common name of an authenticated client.
+ Set prior to execution of
+-.B --client-connect, --client-disconnect,
++.B \-\-client-connect, \-\-client-disconnect,
+ and
+-.B --auth-user-pass-verify
++.B \-\-auth-user-pass-verify
+ scripts.
+ .\"*********************************************************
+ .TP
+ .B config
+ Name of first
+-.B --config
++.B \-\-config
+ file.
+ Set on program initiation and reset on SIGHUP.
+ .\"*********************************************************
+ .TP
+ .B daemon
+ Set to "1" if the
+-.B --daemon
++.B \-\-daemon
+ directive is specified, or "0" otherwise.
+ Set on program initiation and reset on SIGHUP.
+ .\"*********************************************************
+ .TP
+ .B daemon_log_redirect
+ Set to "1" if the
+-.B --log
++.B \-\-log
+ or
+-.B --log-append
++.B \-\-log-append
+ directives are specified, or "0" otherwise.
+ Set on program initiation and reset on SIGHUP.
+ .\"*********************************************************
+@@ -4821,30 +4821,30 @@ Set on program initiation and reset on S
+ The actual name of the TUN/TAP device, including
+ a unit number if it exists.
+ Set prior to
+-.B --up
++.B \-\-up
+ or
+-.B --down
++.B \-\-down
+ script execution.
+ .\"*********************************************************
+ .TP
+ .B foreign_option_{n}
+ An option pushed via
+-.B --push
++.B \-\-push
+ to a client which does not natively support it,
+ such as
+-.B --dhcp-option
++.B \-\-dhcp-option
+ on a non-Windows system, will be recorded to this
+ environmental variable sequence prior to
+-.B --up
++.B \-\-up
+ script execution.
+ .\"*********************************************************
+ .TP
+ .B ifconfig_broadcast
+ The broadcast address for the virtual
+ ethernet segment which is derived from the
+-.B --ifconfig
++.B \-\-ifconfig
+ option when
+-.B --dev tap
++.B \-\-dev tap
+ is used.
+ Set prior to OpenVPN calling the
+ .I ifconfig
+@@ -4852,13 +4852,13 @@ or
+ .I netsh
+ (windows version of ifconfig) commands which
+ normally occurs prior to
+-.B --up
++.B \-\-up
+ script execution.
+ .\"*********************************************************
+ .TP
+ .B ifconfig_local
+ The local VPN endpoint IP address specified in the
+-.B --ifconfig
++.B \-\-ifconfig
+ option (first parameter).
+ Set prior to OpenVPN calling the
+ .I ifconfig
+@@ -4866,15 +4866,15 @@ or
+ .I netsh
+ (windows version of ifconfig) commands which
+ normally occurs prior to
+-.B --up
++.B \-\-up
+ script execution.
+ .\"*********************************************************
+ .TP
+ .B ifconfig_remote
+ The remote VPN endpoint IP address specified in the
+-.B --ifconfig
++.B \-\-ifconfig
+ option (second parameter) when
+-.B --dev tun
++.B \-\-dev tun
+ is used.
+ Set prior to OpenVPN calling the
+ .I ifconfig
+@@ -4882,16 +4882,16 @@ or
+ .I netsh
+ (windows version of ifconfig) commands which
+ normally occurs prior to
+-.B --up
++.B \-\-up
+ script execution.
+ .\"*********************************************************
+ .TP
+ .B ifconfig_netmask
+ The subnet mask of the virtual ethernet segment
+ that is specified as the second parameter to
+-.B --ifconfig
++.B \-\-ifconfig
+ when
+-.B --dev tap
++.B \-\-dev tap
+ is being used.
+ Set prior to OpenVPN calling the
+ .I ifconfig
+@@ -4899,61 +4899,61 @@ or
+ .I netsh
+ (windows version of ifconfig) commands which
+ normally occurs prior to
+-.B --up
++.B \-\-up
+ script execution.
+ .\"*********************************************************
+ .TP
+ .B ifconfig_pool_local_ip
+ The local
+ virtual IP address for the TUN/TAP tunnel taken from an
+-.B --ifconfig-push
++.B \-\-ifconfig-push
+ directive if specified, or otherwise from
+ the ifconfig pool (controlled by the
+-.B --ifconfig-pool
++.B \-\-ifconfig-pool
+ config file directive).
+ Only set for
+-.B --dev tun
++.B \-\-dev tun
+ tunnels.
+ This option is set on the server prior to execution
+ of the
+-.B --client-connect
++.B \-\-client-connect
+ and
+-.B --client-disconnect
++.B \-\-client-disconnect
+ scripts.
+ .\"*********************************************************
+ .TP
+ .B ifconfig_pool_netmask
+ The
+ virtual IP netmask for the TUN/TAP tunnel taken from an
+-.B --ifconfig-push
++.B \-\-ifconfig-push
+ directive if specified, or otherwise from
+ the ifconfig pool (controlled by the
+-.B --ifconfig-pool
++.B \-\-ifconfig-pool
+ config file directive).
+ Only set for
+-.B --dev tap
++.B \-\-dev tap
+ tunnels.
+ This option is set on the server prior to execution
+ of the
+-.B --client-connect
++.B \-\-client-connect
+ and
+-.B --client-disconnect
++.B \-\-client-disconnect
+ scripts.
+ .\"*********************************************************
+ .TP
+ .B ifconfig_pool_remote_ip
+ The remote
+ virtual IP address for the TUN/TAP tunnel taken from an
+-.B --ifconfig-push
++.B \-\-ifconfig-push
+ directive if specified, or otherwise from
+ the ifconfig pool (controlled by the
+-.B --ifconfig-pool
++.B \-\-ifconfig-pool
+ config file directive).
+ This option is set on the server prior to execution
+ of the
+-.B --client-connect
++.B \-\-client-connect
+ and
+-.B --client-disconnect
++.B \-\-client-disconnect
+ scripts.
+ .\"*********************************************************
+ .TP
+@@ -4961,31 +4961,31 @@ scripts.
+ The maximum packet size (not including the IP header)
+ of tunnel data in UDP tunnel transport mode.
+ Set prior to
+-.B --up
++.B \-\-up
+ or
+-.B --down
++.B \-\-down
+ script execution.
+ .\"*********************************************************
+ .TP
+ .B local
+ The
+-.B --local
++.B \-\-local
+ parameter.
+ Set on program initiation and reset on SIGHUP.
+ .\"*********************************************************
+ .TP
+ .B local_port
+ The local port number, specified by
+-.B --port
++.B \-\-port
+ or
+-.B --lport.
++.B \-\-lport.
+ Set on program initiation and reset on SIGHUP.
+ .\"*********************************************************
+ .TP
+ .B password
+ The password provided by a connecting client.
+ Set prior to
+-.B --auth-user-pass-verify
++.B \-\-auth-user-pass-verify
+ script execution only when the
+ .B via-env
+ modifier is specified, and deleted from the environment
+@@ -4994,23 +4994,23 @@ after the script returns.
+ .TP
+ .B proto
+ The
+-.B --proto
++.B \-\-proto
+ parameter.
+ Set on program initiation and reset on SIGHUP.
+ .\"*********************************************************
+ .TP
+ .B remote_{n}
+ The
+-.B --remote
++.B \-\-remote
+ parameter.
+ Set on program initiation and reset on SIGHUP.
+ .\"*********************************************************
+ .TP
+ .B remote_port_{n}
+ The remote port number, specified by
+-.B --port
++.B \-\-port
+ or
+-.B --rport.
++.B \-\-rport.
+ Set on program initiation and reset on SIGHUP.
+ .\"*********************************************************
+ .TP
+@@ -5018,29 +5018,29 @@ Set on program initiation and reset on S
+ The pre-existing default IP gateway in the system routing
+ table.
+ Set prior to
+-.B --up
++.B \-\-up
+ script execution.
+ .\"*********************************************************
+ .TP
+ .B route_vpn_gateway
+ The default gateway used by
+-.B --route
++.B \-\-route
+ options, as specified in either the
+-.B --route-gateway
++.B \-\-route-gateway
+ option or the second parameter to
+-.B --ifconfig
++.B \-\-ifconfig
+ when
+-.B --dev tun
++.B \-\-dev tun
+ is specified.
+ Set prior to
+-.B --up
++.B \-\-up
+ script execution.
+ .\"*********************************************************
+ .TP
+ .B route_{parm}_{n}
+ A set of variables which define each route to be added, and
+ are set prior to
+-.B --up
++.B \-\-up
+ script execution.
+ 
+ .B parm
+@@ -5059,7 +5059,7 @@ or configuration file.
+ Set to "init" or "restart" prior to up/down script execution.
+ For more information, see
+ documentation for
+-.B --up.
++.B \-\-up.
+ .\"*********************************************************
+ .TP
+ .B script_type
+@@ -5075,15 +5075,15 @@ Set prior to execution of any script.
+ The reason for exit or restart.  Can be one of
+ .B sigusr1, sighup, sigterm, sigint, inactive
+ (controlled by
+-.B --inactive
++.B \-\-inactive
+ option),
+ .B ping-exit
+ (controlled by
+-.B --ping-exit
++.B \-\-ping-exit
+ option),
+ .B ping-restart
+ (controlled by
+-.B --ping-restart
++.B \-\-ping-restart
+ option),
+ .B connection-reset
+ (triggered on TCP connection reset),
+@@ -5097,7 +5097,7 @@ or
+ Client connection timestamp, formatted as a human-readable
+ time string.
+ Set prior to execution of the
+-.B --client-connect
++.B \-\-client-connect
+ script.
+ .\"*********************************************************
+ .TP
+@@ -5105,7 +5105,7 @@ script.
+ The duration (in seconds) of the client session which is now
+ disconnecting.
+ Set prior to execution of the
+-.B --client-disconnect
++.B \-\-client-disconnect
+ script.
+ .\"*********************************************************
+ .TP
+@@ -5113,7 +5113,7 @@ script.
+ Client connection timestamp, formatted as a unix integer
+ date/time value.
+ Set prior to execution of the
+-.B --client-connect
++.B \-\-client-connect
+ script.
+ .\"*********************************************************
+ .TP
+@@ -5123,7 +5123,7 @@ where
+ .B n
+ is the verification level.  Only set for TLS connections.  Set prior
+ to execution of
+-.B --tls-verify
++.B \-\-tls-verify
+ script.
+ .\"*********************************************************
+ .TP
+@@ -5133,34 +5133,34 @@ where
+ .B n
+ is the verification level.  Only set for TLS connections.  Set prior
+ to execution of
+-.B --tls-verify
++.B \-\-tls-verify
+ script.
+ .\"*********************************************************
+ .TP
+ .B tun_mtu
+ The MTU of the TUN/TAP device.
+ Set prior to
+-.B --up
++.B \-\-up
+ or
+-.B --down
++.B \-\-down
+ script execution.
+ .\"*********************************************************
+ .TP
+ .B trusted_ip
+ Actual IP address of connecting client or peer which has been authenticated.
+ Set prior to execution of
+-.B --ipchange, --client-connect,
++.B \-\-ipchange, \-\-client-connect,
+ and
+-.B --client-disconnect
++.B \-\-client-disconnect
+ scripts.
+ .\"*********************************************************
+ .TP
+ .B trusted_port
+ Actual port number of connecting client or peer which has been authenticated.
+ Set prior to execution of
+-.B --ipchange, --client-connect,
++.B \-\-ipchange, \-\-client-connect,
+ and
+-.B --client-disconnect
++.B \-\-client-disconnect
+ scripts.
+ .\"*********************************************************
+ .TP
+@@ -5169,12 +5169,12 @@ Actual IP address of connecting client o
+ yet.  Sometimes used to
+ .B nmap
+ the connecting host in a
+-.B --tls-verify
++.B \-\-tls-verify
+ script to ensure it is firewalled properly.
+ Set prior to execution of
+-.B --tls-verify
++.B \-\-tls-verify
+ and
+-.B --auth-user-pass-verify
++.B \-\-auth-user-pass-verify
+ scripts.
+ .\"*********************************************************
+ .TP
+@@ -5182,16 +5182,16 @@ scripts.
+ Actual port number of connecting client or peer which has not been authenticated
+ yet.
+ Set prior to execution of
+-.B --tls-verify
++.B \-\-tls-verify
+ and
+-.B --auth-user-pass-verify
++.B \-\-auth-user-pass-verify
+ scripts.
+ .\"*********************************************************
+ .TP
+ .B username
+ The username provided by a connecting client.
+ Set prior to
+-.B --auth-user-pass-verify
++.B \-\-auth-user-pass-verify
+ script execution only when the
+ .B via-env
+ modifier is specified.
+@@ -5211,30 +5211,30 @@ Like 
+ except don't re-read configuration file, and possibly don't close and reopen TUN/TAP
+ device, re-read key files, preserve local IP address/port, or preserve most recently authenticated
+ remote IP address/port based on
+-.B --persist-tun, --persist-key, --persist-local-ip,
++.B \-\-persist-tun, \-\-persist-key, \-\-persist-local-ip,
+ and
+-.B --persist-remote-ip
++.B \-\-persist-remote-ip
+ options respectively (see above).
+ 
+ This signal may also be internally generated by a timeout condition, governed
+ by the
+-.B --ping-restart
++.B \-\-ping-restart
+ option.
+ 
+ This signal, when combined with
+-.B --persist-remote-ip,
++.B \-\-persist-remote-ip,
+ may be
+ sent when the underlying parameters of the host's network interface change
+ such as when the host is a DHCP client and is assigned a new IP address.
+ See
+-.B --ipchange
++.B \-\-ipchange
+ above for more information.
+ .\"*********************************************************
+ .TP
+ .B SIGUSR2
+ Causes OpenVPN to display its current statistics (to the syslog
+ file if
+-.B --daemon
++.B \-\-daemon
+ is used, or stdout otherwise).
+ .\"*********************************************************
+ .TP
+@@ -5289,7 +5289,7 @@ If firewalls exist between
+ the two machines, they should be set to forward UDP port 1194
+ in both directions.  If you do not have control over the firewalls
+ between the two machines, you may still be able to use OpenVPN by adding
+-.B --ping 15
++.B \-\-ping 15
+ to each of the
+ .B openvpn
+ commands used below in the examples (this will cause each peer to send out
+@@ -5358,11 +5358,11 @@ you will get a weird feedback loop.
+ .LP
+ On may:
+ .IP
+-.B openvpn --remote june.kg --dev tun1 --ifconfig 10.4.0.1 10.4.0.2 --verb 9
++.B openvpn \-\-remote june.kg \-\-dev tun1 \-\-ifconfig 10.4.0.1 10.4.0.2 \-\-verb 9
+ .LP
+ On june:
+ .IP
+-.B openvpn --remote may.kg --dev tun1 --ifconfig 10.4.0.2 10.4.0.1 --verb 9
++.B openvpn \-\-remote may.kg \-\-dev tun1 \-\-ifconfig 10.4.0.2 10.4.0.1 \-\-verb 9
+ .LP
+ Now verify the tunnel is working by pinging across the tunnel.
+ .LP
+@@ -5375,17 +5375,17 @@ On june:
+ .B ping 10.4.0.1
+ .LP
+ The
+-.B --verb 9
++.B \-\-verb 9
+ option will produce verbose output, similar to the
+ .BR tcpdump (8)
+ program.  Omit the
+-.B --verb 9
++.B \-\-verb 9
+ option to have OpenVPN run quietly.
+ .\"*********************************************************
+ .SS Example 2: A tunnel with static-key security (i.e. using a pre-shared secret)
+ First build a static key on may.
+ .IP
+-.B openvpn --genkey --secret key
++.B openvpn \-\-genkey \-\-secret key
+ .LP
+ This command will build a random key file called
+ .B key
+@@ -5399,11 +5399,11 @@ program.
+ .LP
+ On may:
+ .IP
+-.B openvpn --remote june.kg --dev tun1 --ifconfig 10.4.0.1 10.4.0.2 --verb 5 --secret key
++.B openvpn \-\-remote june.kg \-\-dev tun1 \-\-ifconfig 10.4.0.1 10.4.0.2 \-\-verb 5 \-\-secret key
+ .LP
+ On june:
+ .IP
+-.B openvpn --remote may.kg --dev tun1 --ifconfig 10.4.0.2 10.4.0.1 --verb 5 --secret key
++.B openvpn \-\-remote may.kg \-\-dev tun1 \-\-ifconfig 10.4.0.2 10.4.0.1 \-\-verb 5 \-\-secret key
+ .LP
+ Now verify the tunnel is working by pinging across the tunnel.
+ .LP
+@@ -5425,10 +5425,10 @@ as the TLS server.
+ 
+ First, build a separate certificate/key pair
+ for both may and june (see above where
+-.B --cert
++.B \-\-cert
+ is discussed for more info).  Then construct
+ Diffie Hellman parameters (see above where
+-.B --dh
++.B \-\-dh
+ is discussed for more info).  You can also use the
+ included test files client.crt, client.key,
+ server.crt, server.key and ca.crt.
+@@ -5441,11 +5441,11 @@ parameters you can use the included file
+ .LP
+ On may:
+ .IP
+-.B openvpn --remote june.kg --dev tun1 --ifconfig 10.4.0.1 10.4.0.2 --tls-client --ca ca.crt --cert client.crt --key client.key --reneg-sec 60 --verb 5
++.B openvpn \-\-remote june.kg \-\-dev tun1 \-\-ifconfig 10.4.0.1 10.4.0.2 \-\-tls-client \-\-ca ca.crt \-\-cert client.crt \-\-key client.key \-\-reneg-sec 60 \-\-verb 5
+ .LP
+ On june:
+ .IP
+-.B openvpn --remote may.kg --dev tun1 --ifconfig 10.4.0.2 10.4.0.1 --tls-server --dh dh1024.pem --ca ca.crt --cert server.crt --key server.key --reneg-sec 60 --verb 5
++.B openvpn \-\-remote may.kg \-\-dev tun1 \-\-ifconfig 10.4.0.2 10.4.0.1 \-\-tls-server \-\-dh dh1024.pem \-\-ca ca.crt \-\-cert server.crt \-\-key server.key \-\-reneg-sec 60 \-\-verb 5
+ .LP
+ Now verify the tunnel is working by pinging across the tunnel.
+ .LP
+@@ -5458,16 +5458,16 @@ On june:
+ .B ping 10.4.0.1
+ .LP
+ Notice the
+-.B --reneg-sec 60
++.B \-\-reneg-sec 60
+ option we used above.  That tells OpenVPN to renegotiate
+ the data channel keys every minute.
+ Since we used
+-.B --verb 5
++.B \-\-verb 5
+ above, you will see status information on each new key negotiation.
+ 
+ For production operations, a key renegotiation interval of 60 seconds
+ is probably too frequent.  Omit the
+-.B --reneg-sec 60
++.B \-\-reneg-sec 60
+ option to use OpenVPN's default key renegotiation interval of one hour.
+ .\"*********************************************************
+ .SS Routing:
+@@ -5503,7 +5503,7 @@ over the secure tunnel (or vice versa).
+ 
+ In a production environment, you could put the route command(s)
+ in a shell script and execute with the
+-.B --up
++.B \-\-up
+ option.
+ .\"*********************************************************
+ .SH FIREWALLS
+@@ -5511,7 +5511,7 @@ OpenVPN's usage of a single UDP port mak
+ You should add an entry to your firewall rules to allow incoming OpenVPN
+ packets.  On Linux 2.4+:
+ .IP
+-.B iptables -A INPUT -p udp -s 1.2.3.4 --dport 1194 -j ACCEPT
++.B iptables -A INPUT -p udp -s 1.2.3.4 \-\-dport 1194 -j ACCEPT
+ .LP
+ This will allow incoming packets on UDP port 1194 (OpenVPN's default UDP port)
+ from an OpenVPN peer at 1.2.3.4.
+@@ -5522,7 +5522,7 @@ address can be considered optional, sinc
+ is a much more secure method of verifying the authenticity of
+ a packet source.  In that case:
+ .IP
+-.B iptables -A INPUT -p udp --dport 1194 -j ACCEPT
++.B iptables -A INPUT -p udp \-\-dport 1194 -j ACCEPT
+ .LP
+ would be adequate and would not render the host inflexible with
+ respect to its peer having a dynamic IP address.
+@@ -5531,7 +5531,7 @@ OpenVPN also works well on stateful fire
+ not need to add any static rules to the firewall list if you are
+ using a stateful firewall that knows how to track UDP connections.
+ If you specify
+-.B --ping n,
++.B \-\-ping n,
+ OpenVPN will be guaranteed
+ to send a packet to its peer at least once every
+ .B n
+--- openvpn-2.1~rc7.orig/socket.c
++++ openvpn-2.1~rc7/socket.c
+@@ -1255,6 +1255,10 @@ link_socket_init_phase1 (struct link_soc
+       resolve_bind_local (sock);
+       resolve_remote (sock, 1, NULL, NULL);
+     }
++
++  /* set socket file descriptor to not pass across execs, so that
++     scripts don't have access to it */
++  set_cloexec (sock->sd);
+ }
+ 
+ /* finalize socket initialization */
+@@ -1461,10 +1465,6 @@ link_socket_init_phase2 (struct link_soc
+   /* set socket to non-blocking mode */
+   set_nonblock (sock->sd);
+ 
+-  /* set socket file descriptor to not pass across execs, so that
+-     scripts don't have access to it */
+-  set_cloexec (sock->sd);
+-
+ #ifdef ENABLE_SOCKS
+   if (socket_defined (sock->ctrl_sd))
+     set_cloexec (sock->ctrl_sd);
+--- openvpn-2.1~rc7.orig/sample-config-files/tls-home.conf
++++ openvpn-2.1~rc7/sample-config-files/tls-home.conf
+@@ -51,7 +51,7 @@ key home.key
+ # "nobody" after initialization
+ # for extra security.
+ ; user nobody
+-; group nobody
++; group nogroup
+ 
+ # If you built OpenVPN with
+ # LZO compression, uncomment
+--- openvpn-2.1~rc7.orig/sample-config-files/static-office.conf
++++ openvpn-2.1~rc7/sample-config-files/static-office.conf
+@@ -37,7 +37,7 @@ secret static.key
+ # "nobody" after initialization
+ # for extra security.
+ ; user nobody
+-; group nobody
++; group nogroup
+ 
+ # If you built OpenVPN with
+ # LZO compression, uncomment
+--- openvpn-2.1~rc7.orig/sample-config-files/server.conf
++++ openvpn-2.1~rc7/sample-config-files/server.conf
+@@ -252,7 +252,7 @@ comp-lzo
+ # You can uncomment this out on
+ # non-Windows systems.
+ ;user nobody
+-;group nobody
++;group nogroup
+ 
+ # The persist options will try to avoid
+ # accessing certain resources on restart
+--- openvpn-2.1~rc7.orig/sample-config-files/client.conf
++++ openvpn-2.1~rc7/sample-config-files/client.conf
+@@ -59,7 +59,7 @@ nobind
+ 
+ # Downgrade privileges after initialization (non-Windows only)
+ ;user nobody
+-;group nobody
++;group nogroup
+ 
+ # Try to preserve some state across restarts.
+ persist-key
+--- openvpn-2.1~rc7.orig/sample-config-files/static-home.conf
++++ openvpn-2.1~rc7/sample-config-files/static-home.conf
+@@ -40,7 +40,7 @@ secret static.key
+ # "nobody" after initialization
+ # for extra security.
+ ; user nobody
+-; group nobody
++; group nogroup
+ 
+ # If you built OpenVPN with
+ # LZO compression, uncomment
+--- openvpn-2.1~rc7.orig/sample-config-files/tls-office.conf
++++ openvpn-2.1~rc7/sample-config-files/tls-office.conf
+@@ -51,7 +51,7 @@ key office.key
+ # "nobody" after initialization
+ # for extra security.
+ ; user nobody
+-; group nobody
++; group nogroup
+ 
+ # If you built OpenVPN with
+ # LZO compression, uncomment
+--- openvpn-2.1~rc7.orig/plugin/auth-pam/auth-pam.c
++++ openvpn-2.1~rc7/plugin/auth-pam/auth-pam.c
+@@ -658,7 +658,7 @@ pam_server (int fd, const char *service,
+   struct user_pass up;
+   int command;
+ #if DLOPEN_PAM
+-  static const char pam_so[] = "libpam.so";
++  static const char pam_so[] = "libpam.so.0";
+ #endif
+ 
+   /*
diff -Nru openvpn-2.1~rc7/debian/patches/series openvpn-2.1~rc7/debian/patches/series
--- openvpn-2.1~rc7/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ openvpn-2.1~rc7/debian/patches/series	2008-05-21 19:12:22.000000000 +0100
@@ -0,0 +1 @@
+debian-changes-2.1~rc7-1.1.diff
diff -Nru openvpn-2.1~rc7/openvpn.8 openvpn-2.1~rc7/openvpn.8
--- openvpn-2.1~rc7/openvpn.8	2008-05-21 20:06:07.000000000 +0100
+++ openvpn-2.1~rc7/openvpn.8	2008-01-23 21:08:41.000000000 +0000
@@ -355,25 +355,25 @@
 .SH OPTIONS
 OpenVPN allows any option to be placed either on the command line
 or in a configuration file.  Though all command line options are preceded
-by a double-leading-dash ("\-\-"), this prefix can be removed when
+by a double-leading-dash ("--"), this prefix can be removed when
 an option is placed in a configuration file.
 .\"*********************************************************
 .TP
-.B \-\-help
+.B --help
 Show options.
 .\"*********************************************************
 .TP
-.B \-\-config file
+.B --config file
 Load additional config options from
 .B file
 where each line corresponds to one command line option,
-but with the leading '\-\-' removed.
+but with the leading '--' removed.
 
 If
-.B \-\-config file
+.B --config file
 is the only option to the openvpn command,
 the
-.B \-\-config
+.B --config
 can be removed, and the command can be given as
 .B openvpn file
 
@@ -450,29 +450,29 @@
 .\"*********************************************************
 .SS Tunnel Options:
 .TP
-.B \-\-mode m
+.B --mode m
 Set OpenVPN major mode.  By default, OpenVPN runs in
 point-to-point mode ("p2p").  OpenVPN 2.0 introduces
 a new mode ("server") which implements a multi-client
 server capability.
 .\"*********************************************************
 .TP
-.B \-\-local host
+.B --local host
 Local host name or IP address for bind.
 If specified, OpenVPN will bind to this address only.
 If unspecified, OpenVPN will bind to all interfaces.
 .\"*********************************************************
 .TP
-.B \-\-remote host [port]
+.B --remote host [port]
 Remote host name or IP address.  On the client, multiple
-.B \-\-remote
+.B --remote
 options may be specified for redundancy, each referring
 to a different OpenVPN server.
 
 The OpenVPN client will try to connect to a server at
 .B host:port
 in the order specified by the list of
-.B \-\-remote
+.B --remote
 options.
 
 The client will move on to the next host in the list,
@@ -483,18 +483,18 @@
 
 Note that since UDP is connectionless, connection failure
 is defined by the
-.B \-\-ping
+.B --ping
 and
-.B \-\-ping-restart
+.B --ping-restart
 options.
 
 Note the following corner case:  If you use multiple
-.B \-\-remote
+.B --remote
 options, AND you are dropping root privileges on
 the client with
-.B \-\-user
+.B --user
 and/or
-.B \-\-group,
+.B --group,
 AND the client is running a non-Windows OS, if the client needs
 to switch to a different server, and that server pushes
 back different TUN/TAP or route settings, the client may lack
@@ -502,7 +502,7 @@
 This could cause the client to exit with a fatal error.
 
 If
-.B \-\-remote
+.B --remote
 is unspecified, OpenVPN will listen
 for packets from any IP address, but will not act on those packets unless
 they pass all authentication tests.  This requirement for authentication
@@ -511,7 +511,7 @@
 a UDP packet).
 
 When used in TCP mode, 
-.B \-\-remote
+.B --remote
 will act as a filter, rejecting connections from any host which does
 not match
 .B host.
@@ -524,14 +524,14 @@
 failover capability.
 .\"*********************************************************
 .TP
-.B \-\-remote-random
+.B --remote-random
 When multiple
-.B \-\-remote
+.B --remote
 address/ports are specified, initially randomize the order of the list
 as a kind of basic load-balancing measure.
 .\"*********************************************************
 .TP
-.B \-\-proto p
+.B --proto p
 Use protocol
 .B p
 for communicating with remote host.
@@ -545,17 +545,17 @@
 The default protocol is
 .B udp
 when
-.B \-\-proto
+.B --proto
 is not specified.
 
 For UDP operation,
-.B \-\-proto udp
+.B --proto udp
 should be specified on both peers.
 
 For TCP operation, one peer must use
-.B \-\-proto tcp-server
+.B --proto tcp-server
 and the other must use
-.B \-\-proto tcp-client.
+.B --proto tcp-client.
 A peer started with
 .B tcp-server
 will wait indefinitely for an incoming connection.  A peer
@@ -563,9 +563,9 @@
 .B tcp-client
 will attempt to connect, and if that fails, will sleep for 5
 seconds (adjustable via the
-.B \-\-connect-retry
+.B --connect-retry
 option) and try again infinite or up to N retries (adjustable via the
-.B \-\-connect-retry-max
+.B --connect-retry-max
 option).  Both TCP client and server will simulate
 a SIGUSR1 restart signal if either side resets the connection.
 
@@ -585,9 +585,9 @@
 possess a built-in reliability layer.
 .\"*********************************************************
 .TP
-.B \-\-connect-retry n
+.B --connect-retry n
 For
-.B \-\-proto tcp-client,
+.B --proto tcp-client,
 take
 .B n
 as the
@@ -595,16 +595,16 @@
 between connection retries (default=5).
 .\"*********************************************************
 .TP
-.B \-\-connect-retry-max n
+.B --connect-retry-max n
 For
-.B \-\-proto tcp-client,
+.B --proto tcp-client,
 take
 .B n
 as the
 number of retries of connection attempt (default=infinite).
 .\"*********************************************************
 .TP
-.B \-\-auto-proxy
+.B --auto-proxy
 Try to sense HTTP or SOCKS proxy settings automatically.
 If no settings are present, a direct connection will be attempted.
 If both HTTP and SOCKS settings are present, HTTP will be preferred.
@@ -616,7 +616,7 @@
 This option exists in OpenVPN 2.1 or higher.
 .\"*********************************************************
 .TP
-.B \-\-http-proxy server port [authfile|'auto'] [auth-method]
+.B --http-proxy server port [authfile|'auto'] [auth-method]
 Connect to remote host through an HTTP proxy at address
 .B server
 and port
@@ -638,32 +638,32 @@
 exists on OpenVPN 2.1 or higher.
 .\"*********************************************************
 .TP
-.B \-\-http-proxy-retry
+.B --http-proxy-retry
 Retry indefinitely on HTTP proxy errors.  If an HTTP proxy error
 occurs, simulate a SIGUSR1 reset.
 .\"*********************************************************
 .TP
-.B \-\-http-proxy-timeout n
+.B --http-proxy-timeout n
 Set proxy timeout to
 .B n
 seconds, default=5.
 .\"*********************************************************
 .TP
-.B \-\-http-proxy-option type [parm]
+.B --http-proxy-option type [parm]
 Set extended HTTP proxy options.
 Repeat to set multiple options.
 
-.B VERSION version \-\-
+.B VERSION version --
 Set HTTP version number to
 .B version
 (default=1.0).
 
-.B AGENT user-agent \-\-
+.B AGENT user-agent --
 Set HTTP "User-Agent" string to
 .B user-agent.
 .\"*********************************************************
 .TP
-.B \-\-socks-proxy server [port]
+.B --socks-proxy server [port]
 Connect to remote host through a Socks5 proxy at address
 .B server
 and port
@@ -671,14 +671,14 @@
 (default=1080).
 .\"*********************************************************
 .TP
-.B \-\-socks-proxy-retry
+.B --socks-proxy-retry
 Retry indefinitely on Socks proxy errors.  If a Socks proxy error
 occurs, simulate a SIGUSR1 reset.
 .\"*********************************************************
 .TP
-.B \-\-resolv-retry n
+.B --resolv-retry n
 If hostname resolve fails for
-.B \-\-remote,
+.B --remote,
 retry resolve for
 .B n
 seconds before failing.
@@ -688,18 +688,18 @@
 to "infinite" to retry indefinitely.
 
 By default,
-.B \-\-resolv-retry infinite
+.B --resolv-retry infinite
 is enabled.  You can disable by setting n=0.
 .\"*********************************************************
 .TP
-.B \-\-float
+.B --float
 Allow remote peer to change its IP address and/or port number, such as due to
 DHCP (this is the default if
-.B \-\-remote
+.B --remote
 is not used).
-.B \-\-float
+.B --float
 when specified with
-.B \-\-remote
+.B --remote
 allows an OpenVPN session to initially connect to a peer
 at a known address, however if packets arrive from a new
 address and pass all authentication tests, the new address
@@ -708,14 +708,14 @@
 such as a dial-in user or DHCP client.
 
 Essentially,
-.B \-\-float
+.B --float
 tells OpenVPN to accept authenticated packets
 from any address, not only the address which was specified in the
-.B \-\-remote
+.B --remote
 option.
 .\"*********************************************************
 .TP
-.B \-\-ipchange cmd
+.B --ipchange cmd
 Execute shell command
 .B cmd
 when our remote ip-address is initially authenticated or
@@ -726,11 +726,11 @@
 .B cmd ip_address port_number
 
 Don't use
-.B \-\-ipchange
+.B --ipchange
 in
-.B \-\-mode server
+.B --mode server
 mode.  Use a
-.B \-\-client-connect
+.B --client-connect
 script instead.
 
 See the "Environmental Variables" section below for
@@ -765,41 +765,41 @@
 peer on its new IP address.
 .\"*********************************************************
 .TP
-.B \-\-port port
+.B --port port
 TCP/UDP port number for both local and remote.  The current
 default of 1194 represents the official IANA port number
 assignment for OpenVPN and has been used since version 2.0-beta17.
 Previous versions used port 5000 as the default.
 .\"*********************************************************
 .TP
-.B \-\-lport port
+.B --lport port
 TCP/UDP port number for bind.
 .\"*********************************************************
 .TP
-.B \-\-rport port
+.B --rport port
 TCP/UDP port number for remote.
 .\"*********************************************************
 .TP
-.B \-\-bind
+.B --bind
 Bind to local address and port. This is the default unless any of 
-.B \-\-proto tcp-client
+.B --proto tcp-client
 ,
-.B \-\-http-proxy
+.B --http-proxy
 or
-.B \-\-socks-proxy
+.B --socks-proxy
 are used.
 .\"*********************************************************
 .TP
-.B \-\-nobind
+.B --nobind
 Do not bind to local address and port.  The IP stack will allocate
 a dynamic port for returning packets.  Since the value of the dynamic port
 could not be known in advance by a peer, this option is only suitable for
 peers which will be initiating connections by using the
-.B \-\-remote
+.B --remote
 option.
 .\"*********************************************************
 .TP
-.B \-\-dev tunX | tapX | null
+.B --dev tunX | tapX | null
 TUN/TAP virtual network device (
 .B X
 can be omitted for a dynamic device.)
@@ -817,7 +817,7 @@
 devices encapsulate Ethernet 802.3.
 .\"*********************************************************
 .TP
-.B \-\-dev-type device-type
+.B --dev-type device-type
 Which device type are we using?
 .B device-type
 should be
@@ -825,60 +825,60 @@
 or
 .B tap.
 Use this option only if the TUN/TAP device used with
-.B \-\-dev
+.B --dev
 does not begin with
 .B tun
 or
 .B tap.
 .\"*********************************************************
 .TP
-.B \-\-topology mode
+.B --topology mode
 Configure virtual addressing topology when running in
-.B \-\-dev tun
+.B --dev tun
 mode.  This directive has no meaning in
-.B \-\-dev tap
+.B --dev tap
 mode, which always uses a
 .B subnet
 topology.
 
 If you set this directive on the server, the
-.B \-\-server
+.B --server
 and
-.B \-\-server-bridge
+.B --server-bridge
 directives will automatically push your chosen topology setting to clients
 as well.  This directive can also be manually pushed to clients.  Like the
-.B \-\-dev
+.B --dev
 directive, this directive must always be compatible between client and server.
 
 .B mode
 can be one of:
 
-.B net30 \-\-
+.B net30 --
 Use a point-to-point topology, by allocating one /30 subnet per client.
 This is designed to allow point-to-point semantics when some
 or all of the connecting clients might be Windows systems.  This is the
 default on OpenVPN 2.0.
 
-.B p2p \-\-
+.B p2p --
 Use a point-to-point topology where the remote endpoint of the client's
 tun interface always points to the local endpoint of the server's tun interface.
 This mode allocates a single IP address per connecting client.
 Only use
 when none of the connecting clients are Windows systems.  This mode
 is functionally equivalent to the
-.B \-\-ifconfig-pool-linear
+.B --ifconfig-pool-linear
 directive which is available in OpenVPN 2.0 and is now deprecated.
 
-.B subnet \-\-
+.B subnet --
 Use a subnet rather than a point-to-point topology by
 configuring the tun interface with a local IP address and subnet mask,
 similar to the topology used in
-.B \-\-dev tap
+.B --dev tap
 and ethernet bridging mode.
 This mode allocates a single IP address per connecting client and works on
 Windows as well.  Only available when server and clients are OpenVPN 2.1 or
 higher, or OpenVPN 2.0.x which has been manually patched with the
-.B \-\-topology
+.B --topology
 directive code.  When used on Windows, requires version 8.2 or higher
 of the TAP-Win32 driver.  When used on *nix, requires that the tun
 driver supports an
@@ -888,26 +888,26 @@
 This option exists in OpenVPN 2.1 or higher.
 .\"*********************************************************
 .TP
-.B \-\-tun-ipv6
+.B --tun-ipv6
 Build a tun link capable of forwarding IPv6 traffic.
 Should be used in conjunction with
-.B \-\-dev tun
+.B --dev tun
 or
-.B \-\-dev tunX.
+.B --dev tunX.
 A warning will be displayed
 if no specific IPv6 TUN support for your OS has been compiled into OpenVPN.
 .\"*********************************************************
 .TP
-.B \-\-dev-node node
+.B --dev-node node
 Explicitly set the device node rather than using
 /dev/net/tun, /dev/tun, /dev/tap, etc.  If OpenVPN
 cannot figure out whether
 .B node
 is a TUN or TAP device based on the name, you should
 also specify
-.B \-\-dev-type tun
+.B --dev-type tun
 or
-.B \-\-dev-type tap.
+.B --dev-type tap.
 
 On Windows systems, select the TAP-Win32 adapter which
 is named
@@ -915,24 +915,24 @@
 in the Network Connections Control Panel or the
 raw GUID of the adapter enclosed by braces.
 The
-.B \-\-show-adapters
+.B --show-adapters
 option under Windows can also be used
 to enumerate all available TAP-Win32
 adapters and will show both the network
 connections control panel name and the GUID for
 each TAP-Win32 adapter.
 .TP
-.B \-\-lladdr address
+.B --lladdr address
 Specify the link layer address, more commonly known as the MAC address.
 Only applied to TAP devices.
 .\"*********************************************************
 .TP
-.B \-\-iproute cmd
+.B --iproute cmd
 Set alternate command to execute instead of default iproute2 command.
 May be used in order to execute OpenVPN in unprivileged environment.
 .\"*********************************************************
 .TP
-.B \-\-ifconfig l rn
+.B --ifconfig l rn
 Set TUN/TAP adapter parameters. 
 .B l
 is the IP address of the local VPN endpoint.
@@ -947,7 +947,7 @@
 For TUN devices, which facilitate virtual
 point-to-point IP connections,
 the proper usage of
-.B \-\-ifconfig
+.B --ifconfig
 is to use two private IP addresses
 which are not a member of any
 existing subnet which is in use.
@@ -961,7 +961,7 @@
 For TAP devices, which provide
 the ability to create virtual
 ethernet segments,
-.B \-\-ifconfig
+.B --ifconfig
 is used to set an IP address and
 subnet mask just as a physical
 ethernet adapter would be
@@ -982,42 +982,42 @@
 ifconfig implementations on different
 platforms.
 
-.B \-\-ifconfig
+.B --ifconfig
 parameters which are IP addresses can
 also be specified as a DNS or /etc/hosts
 file resolvable name.
 
 For TAP devices,
-.B \-\-ifconfig
+.B --ifconfig
 should not be used if the TAP interface will be
 getting an IP address lease from a DHCP
 server.
 .\"*********************************************************
 .TP
-.B \-\-ifconfig-noexec
+.B --ifconfig-noexec
 Don't actually execute ifconfig/netsh commands, instead
 pass
-.B \-\-ifconfig
+.B --ifconfig
 parameters to scripts using environmental variables.
 .\"*********************************************************
 .TP
-.B \-\-ifconfig-nowarn
+.B --ifconfig-nowarn
 Don't output an options consistency check warning
 if the
-.B \-\-ifconfig
+.B --ifconfig
 option on this side of the
 connection doesn't match the remote side.  This is useful
 when you want to retain the overall benefits of the
 options consistency check (also see
-.B \-\-disable-occ
+.B --disable-occ
 option) while only disabling the ifconfig component of
 the check.
 
 For example,
 if you have a configuration where the local host uses
-.B \-\-ifconfig
+.B --ifconfig
 but the remote host does not, use
-.B \-\-ifconfig-nowarn
+.B --ifconfig-nowarn
 on the local host.
 
 This option will also silence warnings about potential
@@ -1025,7 +1025,7 @@
 users by triggering "false positive" warnings.
 .\"*********************************************************
 .TP
-.B \-\-route network/IP [netmask] [gateway] [metric]
+.B --route network/IP [netmask] [gateway] [metric]
 Add route to routing table after connection is established.
 Multiple routes can be specified.  Routes will be
 automatically torn down in reverse order prior to
@@ -1039,20 +1039,20 @@
 across OpenVPN's platform space.
 
 .B netmask
-default \-\- 255.255.255.255
+default -- 255.255.255.255
 
 .B gateway
-default \-\- taken from
-.B \-\-route-gateway
+default -- taken from
+.B --route-gateway
 or the second parameter to
-.B \-\-ifconfig
+.B --ifconfig
 when
-.B \-\-dev tun
+.B --dev tun
 is specified.
 
 .B metric
-default \-\- taken from
-.B \-\-route-metric
+default -- taken from
+.B --route-metric
 otherwise 0.
 
 The default can be specified by leaving an option blank or setting
@@ -1067,39 +1067,39 @@
 file resolvable name, or as one of three special keywords:
 
 .B vpn_gateway
-\-\- The remote VPN endpoint address
+-- The remote VPN endpoint address
 (derived either from
-.B \-\-route-gateway
+.B --route-gateway
 or the second parameter to
-.B \-\-ifconfig
+.B --ifconfig
 when
-.B \-\-dev tun
+.B --dev tun
 is specified).
 
 .B net_gateway
-\-\- The pre-existing IP default gateway, read from the routing
+-- The pre-existing IP default gateway, read from the routing
 table (not supported on all OSes).
 
 .B remote_host
-\-\- The
-.B \-\-remote
+-- The
+.B --remote
 address if OpenVPN is being run in client mode, and is undefined in server mode.
 .\"*********************************************************
 .TP
-.B \-\-route-gateway gw
+.B --route-gateway gw
 Specify a default gateway
 .B gw
 for use with
-.B \-\-route.
+.B --route.
 .TP
-.B \-\-route-metric m
+.B --route-metric m
 Specify a default metric
 .B m
 for use with
-.B \-\-route.
+.B --route.
 .\"*********************************************************
 .TP
-.B \-\-route-delay [n] [w]
+.B --route-delay [n] [w]
 Delay
 .B n
 seconds (default=0) after connection
@@ -1107,16 +1107,16 @@
 .B n
 is 0, routes will be added immediately upon connection
 establishment.  If
-.B \-\-route-delay
+.B --route-delay
 is omitted, routes will be added immediately after TUN/TAP device
 open and
-.B \-\-up
+.B --up
 script execution, before any
-.B \-\-user
+.B --user
 or 
-.B \-\-group
+.B --group
 privilege downgrade (or
-.B \-\-chroot
+.B --chroot
 execution.)
 
 This option is designed to be useful in scenarios where DHCP is
@@ -1125,18 +1125,18 @@
 time to complete before routes are added.
 
 On Windows,
-.B \-\-route-delay
+.B --route-delay
 tries to be more intelligent by waiting
 .B w
 seconds (w=30 by default)
 for the TAP-Win32 adapter to come up before adding routes.
 .\"*********************************************************
 .TP
-.B \-\-route-up cmd
+.B --route-up cmd
 Execute shell command
 .B cmd
 after routes are added, subject to
-.B \-\-route-delay.
+.B --route-delay.
 
 See the "Environmental Variables" section below for
 additional parameters passed as environmental variables.
@@ -1146,17 +1146,17 @@
 can be a shell command with multiple arguments.
 .\"*********************************************************
 .TP
-.B \-\-route-noexec
+.B --route-noexec
 Don't add or remove routes automatically.  Instead pass routes to
-.B \-\-route-up
+.B --route-up
 script using environmental variables.
 .\"*********************************************************
 .TP
-.B \-\-route-nopull
+.B --route-nopull
 When used with
-.B \-\-client
+.B --client
 or
-.B \-\-pull,
+.B --pull,
 accept options pushed by server EXCEPT for routes.
 
 When used on the client, this option effectively bars the
@@ -1165,7 +1165,7 @@
 to set the TCP/IP properties of the client's TUN/TAP interface.
 .\"*********************************************************
 .TP
-.B \-\-redirect-gateway flags...
+.B --redirect-gateway flags...
 (Experimental) Automatically execute routing commands to cause all outgoing IP traffic
 to be redirected over the VPN.
 
@@ -1173,7 +1173,7 @@
 
 .B (1)
 Create a static route for the
-.B \-\-remote
+.B --remote
 address which forwards to the pre-existing default gateway.
 This is done so that
 .B (3)
@@ -1184,11 +1184,11 @@
 
 .B (3)
 Set the new default gateway to be the VPN endpoint address (derived either from
-.B \-\-route-gateway
+.B --route-gateway
 or the second parameter to
-.B \-\-ifconfig
+.B --ifconfig
 when
-.B \-\-dev tun
+.B --dev tun
 is specified).
 
 When the tunnel is torn down, all of the above steps are reversed so
@@ -1196,7 +1196,7 @@
 
 Option flags:
 
-.B local \-\-
+.B local --
 Add the
 .B local
 flag if both OpenVPN servers are directly connected via a common subnet,
@@ -1206,19 +1206,19 @@
 .B 1
 above to be omitted.
 
-.B def1 \-\-
+.B def1 --
 Use this flag to override
 the default gateway by using 0.0.0.0/1 and 128.0.0.0/1
 rather than 0.0.0.0/0.  This has the benefit of overriding
 but not wiping out the original default gateway. 
 
-.B bypass-dhcp \-\-
+.B bypass-dhcp --
 Add a direct route to the DHCP server (if it is non-local) which
 bypasses the tunnel
 (Available on Windows clients, may not be available
 on non-Windows clients).
 
-.B bypass-dns \-\-
+.B bypass-dns --
 Add a direct route to the DNS server(s) (if they are non-local) which
 bypasses the tunnel
 (Available on Windows clients, may not be available
@@ -1227,13 +1227,13 @@
 Using the def1 flag is highly recommended.
 .\"*********************************************************
 .TP
-.B \-\-link-mtu n
+.B --link-mtu n
 Sets an upper bound on the size of UDP packets which are sent
 between OpenVPN peers.  It's best not to set this parameter unless
 you know what you're doing.
 .\"*********************************************************
 .TP
-.B \-\-tun-mtu n
+.B --tun-mtu n
 Take the TUN device MTU to be
 .B n
 and derive the link MTU
@@ -1249,17 +1249,17 @@
 hang during periods of active usage.
 
 It's best to use the
-.B \-\-fragment
+.B --fragment
 and/or
-.B \-\-mssfix
+.B --mssfix
 options to deal with MTU sizing issues.
 .\"*********************************************************
 .TP
-.B \-\-tun-mtu-extra n
+.B --tun-mtu-extra n
 Assume that the TUN/TAP device might return as many as
 .B n
 bytes more than the
-.B \-\-tun-mtu
+.B --tun-mtu
 size on read.  This parameter defaults to 0, which is sufficient for
 most TUN devices.  TAP devices may introduce additional overhead in excess
 of the MTU size, and a setting of 32 is the default when TAP devices are used.
@@ -1267,34 +1267,34 @@
 so there is no transmission overhead associated with using a larger value.
 .\"*********************************************************
 .TP
-.B \-\-mtu-disc type
+.B --mtu-disc type
 Should we do Path MTU discovery on TCP/UDP channel?  Only supported on OSes such
 as Linux that supports the necessary system call to set.
 
 .B 'no'
-\-\- Never send DF (Don't Fragment) frames
+-- Never send DF (Don't Fragment) frames
 .br
 .B 'maybe'
-\-\- Use per-route hints
+-- Use per-route hints
 .br
 .B 'yes'
-\-\- Always DF (Don't Fragment)
+-- Always DF (Don't Fragment)
 .br
 .\"*********************************************************
 .TP
-.B \-\-mtu-test
+.B --mtu-test
 To empirically measure MTU on connection startup,
 add the
-.B \-\-mtu-test
+.B --mtu-test
 option to your configuration.
 OpenVPN will send ping packets of various sizes
 to the remote peer and measure the largest packets
 which were successfully received.  The
-.B \-\-mtu-test
+.B --mtu-test
 process normally takes about 3 minutes to complete.
 .\"*********************************************************
 .TP
-.B \-\-fragment max
+.B --fragment max
 Enable internal datagram fragmentation so
 that no UDP datagrams are sent which
 are larger than
@@ -1304,24 +1304,24 @@
 The
 .B max
 parameter is interpreted in the same way as the
-.B \-\-link-mtu
+.B --link-mtu
 parameter, i.e. the UDP packet size after encapsulation
 overhead has been added in, but not including
 the UDP header itself.
 
 The
-.B \-\-fragment
+.B --fragment
 option only makes sense when you are using the UDP protocol (
-.B \-\-proto udp
+.B --proto udp
 ).
 
-.B \-\-fragment
+.B --fragment
 adds 4 bytes of overhead per datagram.
 
 See the
-.B \-\-mssfix
+.B --mssfix
 option below for an important related option to
-.B \-\-fragment.
+.B --fragment.
 
 It should also be noted that this option is not meant to replace
 UDP fragmentation at the IP stack level.  It is only meant as a
@@ -1334,7 +1334,7 @@
 as tunneling a UDP multicast stream which requires fragmentation.
 .\"*********************************************************
 .TP
-.B \-\-mssfix max
+.B --mssfix max
 Announce to TCP sessions running over the tunnel that they should limit
 their send packet sizes such that after OpenVPN has encapsulated them,
 the resulting UDP packet size that OpenVPN sends to its peer will not
@@ -1345,33 +1345,33 @@
 The
 .B max
 parameter is interpreted in the same way as the
-.B \-\-link-mtu
+.B --link-mtu
 parameter, i.e. the UDP packet size after encapsulation
 overhead has been added in, but not including
 the UDP header itself.
 
 The
-.B \-\-mssfix
+.B --mssfix
 option only makes sense when you are using the UDP protocol
 for OpenVPN peer-to-peer communication, i.e.
-.B \-\-proto udp.
+.B --proto udp.
 
-.B \-\-mssfix
+.B --mssfix
 and
-.B \-\-fragment
+.B --fragment
 can be ideally used together, where
-.B \-\-mssfix
+.B --mssfix
 will try to keep TCP from needing
 packet fragmentation in the first place,
 and if big packets come through anyhow
 (from protocols other than TCP),
-.B \-\-fragment
+.B --fragment
 will internally fragment them.
 
 Both
-.B \-\-fragment
+.B --fragment
 and
-.B \-\-mssfix
+.B --mssfix
 are designed to work around cases where Path MTU discovery
 is broken on the network path between OpenVPN peers.
 
@@ -1380,35 +1380,35 @@
 during active usage.
 
 If
-.B \-\-fragment
+.B --fragment
 and
-.B \-\-mssfix
+.B --mssfix
 are used together,
-.B \-\-mssfix
+.B --mssfix
 will take its default
 .B max
 parameter from the
-.B \-\-fragment max
+.B --fragment max
 option.
 
 Therefore, one could lower the maximum UDP packet size
 to 1300 (a good first try for solving MTU-related
 connection problems) with the following options:
 
-.B \-\-tun-mtu 1500 \-\-fragment 1300 \-\-mssfix
+.B --tun-mtu 1500 --fragment 1300 --mssfix
 .\"*********************************************************
 .TP
-.B \-\-sndbuf size
+.B --sndbuf size
 Set the TCP/UDP socket send buffer size.
 Currently defaults to 65536 bytes.
 .\"*********************************************************
 .TP
-.B \-\-rcvbuf size
+.B --rcvbuf size
 Set the TCP/UDP socket receive buffer size.
 Currently defaults to 65536 bytes.
 .\"*********************************************************
 .TP
-.B \-\-socket-flags flags...
+.B --socket-flags flags...
 Apply the given flags to the OpenVPN transport socket.
 Currently, only
 .B TCP_NODELAY
@@ -1425,12 +1425,12 @@
 on both client and server for maximum effect.
 .\"*********************************************************
 .TP
-.B \-\-txqueuelen n
+.B --txqueuelen n
 (Linux only) Set the TX queue length on the TUN/TAP interface.
 Currently defaults to 100.
 .\"*********************************************************
 .TP
-.B \-\-shaper n
+.B --shaper n
 Limit bandwidth of outgoing tunnel data to
 .B n
 bytes per second on the TCP/UDP port.
@@ -1466,7 +1466,7 @@
 to be between 100 bytes/sec and 100 Mbytes/sec.
 .\"*********************************************************
 .TP
-.B \-\-inactive n [bytes]
+.B --inactive n [bytes]
 Causes OpenVPN to exit after
 .B n
 seconds of inactivity on the TUN/TAP device.  The time length
@@ -1480,18 +1480,18 @@
 .B bytes.
 .\"*********************************************************
 .TP
-.B \-\-ping n
+.B --ping n
 Ping remote over the TCP/UDP control channel
 if no packets have been sent for at least
 .B n
 seconds (specify
-.B \-\-ping
+.B --ping
 on both peers to cause ping packets to be sent in both directions since
 OpenVPN ping packets are not echoed like IP ping packets).
 When used in one of OpenVPN's secure modes (where
-.B \-\-secret, \-\-tls-server,
+.B --secret, --tls-server,
 or
-.B \-\-tls-client
+.B --tls-client
 is specified), the ping packet
 will be cryptographically secure.
 
@@ -1504,33 +1504,33 @@
 
 (2) To provide a basis for the remote to test the existence
 of its peer using the
-.B \-\-ping-exit
+.B --ping-exit
 option.
 .\"*********************************************************
 .TP
-.B \-\-ping-exit n
+.B --ping-exit n
 Causes OpenVPN to exit after
 .B n
 seconds pass without reception of a ping
 or other packet from remote.
 This option can be combined with
-.B \-\-inactive, \-\-ping,
+.B --inactive, --ping,
 and
-.B \-\-ping-exit
+.B --ping-exit
 to create a two-tiered inactivity disconnect.
 
 For example,
 
-.B openvpn [options...] \-\-inactive 3600 \-\-ping 10 \-\-ping-exit 60
+.B openvpn [options...] --inactive 3600 --ping 10 --ping-exit 60
 
 when used on both peers will cause OpenVPN to exit within 60
 seconds if its peer disconnects, but will exit after one
 hour if no actual tunnel data is exchanged.
 .\"*********************************************************
 .TP
-.B \-\-ping-restart n
+.B --ping-restart n
 Similar to
-.B \-\-ping-exit,
+.B --ping-exit,
 but trigger a
 .B SIGUSR1
 restart after
@@ -1549,13 +1549,13 @@
 
 If the peer cannot be reached, a restart will be triggered, causing
 the hostname used with
-.B \-\-remote
+.B --remote
 to be re-resolved (if
-.B \-\-resolv-retry
+.B --resolv-retry
 is also specified).
 
 In server mode,
-.B \-\-ping-restart, \-\-inactive,
+.B --ping-restart, --inactive,
 or any other type of internally generated signal will always be
 applied to
 individual client instance objects, never to whole server itself.
@@ -1564,14 +1564,14 @@
 of the client instance object instead.
 
 In client mode, the
-.B \-\-ping-restart
+.B --ping-restart
 parameter is set to 120 seconds by default.  This default will
 hold until the client pulls a replacement value from the server, based on
 the
-.B \-\-keepalive
+.B --keepalive
 setting in the server configuration.
 To disable the 120 second default, set
-.B \-\-ping-restart 0
+.B --ping-restart 0
 on the client.
 
 See the signals section below for more information
@@ -1581,27 +1581,27 @@
 Note that the behavior of
 .B SIGUSR1
 can be modified by the
-.B \-\-persist-tun, \-\-persist-key, \-\-persist-local-ip,
+.B --persist-tun, --persist-key, --persist-local-ip,
 and
-.B \-\-persist-remote-ip
+.B --persist-remote-ip
 options.
 
 Also note that
-.B \-\-ping-exit
+.B --ping-exit
 and
-.B \-\-ping-restart
+.B --ping-restart
 are mutually exclusive and cannot be used together.
 .\"*********************************************************
 .TP
-.B \-\-keepalive n m
+.B --keepalive n m
 A helper directive designed to simplify the expression of
-.B \-\-ping
+.B --ping
 and
-.B \-\-ping-restart
+.B --ping-restart
 in server mode configurations.
 
 For example,
-.B \-\-keepalive 10 60
+.B --keepalive 10 60
 expands as follows:
 
 .RS
@@ -1622,24 +1622,24 @@
 .fi
 .\"*********************************************************
 .TP
-.B \-\-ping-timer-rem
+.B --ping-timer-rem
 Run the
-.B \-\-ping-exit
+.B --ping-exit
 /
-.B \-\-ping-restart
+.B --ping-restart
 timer only if we have a remote address.  Use this option if you are
 starting the daemon in listen mode (i.e. without an explicit
-.B \-\-remote
+.B --remote
 peer), and you don't want to start clocking timeouts until a remote
 peer connects.
 .\"*********************************************************
 .TP
-.B \-\-persist-tun
+.B --persist-tun
 Don't close and reopen TUN/TAP device or run up/down scripts
 across
 .B SIGUSR1
 or
-.B \-\-ping-restart
+.B --ping-restart
 restarts.
 
 .B SIGUSR1
@@ -1649,14 +1649,14 @@
 reset options.
 .\"*********************************************************
 .TP
-.B \-\-persist-key
+.B --persist-key
 Don't re-read key files across
 .B SIGUSR1
 or
-.B \-\-ping-restart.
+.B --ping-restart.
 
 This option can be combined with
-.B \-\-user nobody
+.B --user nobody
 to allow restarts triggered by the
 .B SIGUSR1
 signal.
@@ -1669,29 +1669,29 @@
 resets, so they don't need to be re-read.
 .\"*********************************************************
 .TP
-.B \-\-persist-local-ip
+.B --persist-local-ip
 Preserve initially resolved local IP address and port number
 across
 .B SIGUSR1
 or
-.B \-\-ping-restart
+.B --ping-restart
 restarts.
 .\"*********************************************************
 .TP
-.B \-\-persist-remote-ip
+.B --persist-remote-ip
 Preserve most recently authenticated remote IP address and port number
 across
 .B SIGUSR1
 or
-.B \-\-ping-restart
+.B --ping-restart
 restarts.
 .\"*********************************************************
 .TP
-.B \-\-mlock
+.B --mlock
 Disable paging by calling the POSIX mlockall function.
 Requires that OpenVPN be initially run as root (though
 OpenVPN can subsequently downgrade its UID using the
-.B \-\-user
+.B --user
 option).
 
 Using this option ensures that key material and tunnel
@@ -1703,33 +1703,33 @@
 recover previously used
 ephemeral keys, which are used for a period of time
 governed by the
-.B \-\-reneg
+.B --reneg
 options (see below), then are discarded.
 
 The downside
 of using
-.B \-\-mlock
+.B --mlock
 is that it will reduce the amount of physical
 memory available to other applications.
 .\"*********************************************************
 .TP
-.B \-\-up cmd
+.B --up cmd
 Shell command to run after successful TUN/TAP device open
 (pre
-.B \-\-user
+.B --user
 UID change).  The up script is useful for specifying route
 commands which route IP traffic destined for
 private subnets which exist at the other
 end of the VPN connection into the tunnel.
 
 For
-.B \-\-dev tun
+.B --dev tun
 execute as:
 
 .B cmd tun_dev tun_mtu link_mtu ifconfig_local_ip ifconfig_remote_ip [ init | restart ]
 
 For
-.B \-\-dev tap
+.B --dev tap
 execute as:
 
 .B cmd tap_dev tap_mtu link_mtu ifconfig_local_ip ifconfig_netmask [ init | restart ]
@@ -1754,62 +1754,62 @@
 will be
 .I init.
 If the
-.B \-\-up-restart
+.B --up-restart
 option is also used, the up script will be called for restarts as
 well.  A restart is considered to be a partial reinitialization
 of OpenVPN where the TUN/TAP instance is preserved (the
-.B \-\-persist-tun
+.B --persist-tun
 option will enable such preservation).  A restart
 can be generated by a SIGUSR1 signal, a
-.B \-\-ping-restart
+.B --ping-restart
 timeout, or a connection reset when the TCP protocol is enabled
 with the
-.B \-\-proto
+.B --proto
 option.  If a restart occurs, and
-.B \-\-up-restart
+.B --up-restart
 has been specified, the up script will be called with
 .I restart
 as the last parameter.
 
 The following standalone example shows how the
-.B \-\-up
+.B --up
 script can be called in both an initialization and restart context.
 (NOTE: for security reasons, don't run the following example unless UDP port
 9999 is blocked by your firewall.  Also, the example will run indefinitely,
 so you should abort with control-c).
 
-.B openvpn \-\-dev tun \-\-port 9999 \-\-verb 4 \-\-ping-restart 10 \-\-up 'echo up' \-\-down 'echo down' \-\-persist-tun \-\-up-restart
+.B openvpn --dev tun --port 9999 --verb 4 --ping-restart 10 --up 'echo up' --down 'echo down' --persist-tun --up-restart
 
 Note that OpenVPN also provides the
-.B \-\-ifconfig
+.B --ifconfig
 option to automatically ifconfig the TUN device,
 eliminating the need to define an
-.B \-\-up
+.B --up
 script, unless you also want to configure routes
 in the
-.B \-\-up
+.B --up
 script.
 
 If
-.B \-\-ifconfig
+.B --ifconfig
 is also specified, OpenVPN will pass the ifconfig local
 and remote endpoints on the command line to the
-.B \-\-up
+.B --up
 script so that they can be used to configure routes such as:
 
 .B route add -net 10.0.0.0 netmask 255.255.255.0 gw $5
 .\"*********************************************************
 .TP
-.B \-\-up-delay
+.B --up-delay
 Delay TUN/TAP open and possible
-.B \-\-up
+.B --up
 script execution
 until after TCP/UDP connection establishment with peer.
 
 In
-.B \-\-proto udp
+.B --proto udp
 mode, this option normally requires the use of
-.B \-\-ping
+.B --ping
 to allow connection initiation to be sensed in the absence
 of tunnel data, since UDP is a "connectionless" protocol.
 
@@ -1818,50 +1818,50 @@
 i.e. the receipt of the first authenticated packet from the peer.
 .\"*********************************************************
 .TP
-.B \-\-down cmd
+.B --down cmd
 Shell command to run after TUN/TAP device close
 (post
-.B \-\-user
+.B --user
 UID change and/or
-.B \-\-chroot
+.B --chroot
 ).  Called with the same parameters and environmental
 variables as the
-.B \-\-up
+.B --up
 option above.
 
 Note that if you reduce privileges by using
-.B \-\-user
+.B --user
 and/or
-.B \-\-group,
+.B --group,
 your
-.B \-\-down
+.B --down
 script will also run at reduced privilege.
 .\"*********************************************************
 .TP
-.B \-\-down-pre
+.B --down-pre
 Call
-.B \-\-down
+.B --down
 cmd/script before, rather than after, TUN/TAP close.
 .\"*********************************************************
 .TP
-.B \-\-up-restart
+.B --up-restart
 Enable the
-.B \-\-up
+.B --up
 and
-.B \-\-down
+.B --down
 scripts to be called for restarts as well as initial program start.
 This option is described more fully above in the
-.B \-\-up
+.B --up
 option documentation.
 .\"*********************************************************
 .TP
-.B \-\-setenv name value
+.B --setenv name value
 Set a custom environmental variable
 .B name=value
 to pass to script.
 .\"*********************************************************
 .TP
-.B \-\-setenv-safe name value
+.B --setenv-safe name value
 Set a custom environmental variable
 .B OPENVPN_name=value
 to pass to script.
@@ -1872,19 +1872,19 @@
 from a malicious or compromised server.
 .\"*********************************************************
 .TP
-.B \-\-disable-occ
+.B --disable-occ
 Don't output a warning message if option inconsistencies are detected between
 peers.  An example of an option inconsistency would be where one peer uses
-.B \-\-dev tun
+.B --dev tun
 while the other peer uses
-.B \-\-dev tap.
+.B --dev tap.
 
 Use of this option is discouraged, but is provided as
 a temporary fix in situations where a recent version of OpenVPN must
 connect to an old version.
 .\"*********************************************************
 .TP
-.B \-\-user user
+.B --user user
 Change the user ID of the OpenVPN process to
 .B user
 after initialization, dropping privileges in the process.
@@ -1906,7 +1906,7 @@
 signal
 (for example in response
 to a DHCP reset), you should make use of one or more of the
-.B \-\-persist
+.B --persist
 options to ensure that OpenVPN doesn't need to execute any privileged
 operations in order to restart (such as re-reading key files
 or running
@@ -1914,16 +1914,16 @@
 on the TUN device).
 .\"*********************************************************
 .TP
-.B \-\-group group
+.B --group group
 Similar to the
-.B \-\-user
+.B --user
 option,
 this option changes the group ID of the OpenVPN process to
 .B group
 after initialization.
 .\"*********************************************************
 .TP
-.B \-\-cd dir
+.B --cd dir
 Change directory to
 .B dir
 prior to reading any files such as
@@ -1935,16 +1935,16 @@
 
 This option is useful when you are running
 OpenVPN in 
-.B \-\-daemon
+.B --daemon
 mode, and you want to consolidate all of
 your OpenVPN control files in one location.
 .\"*********************************************************
 .TP
-.B \-\-chroot dir
+.B --chroot dir
 Chroot to
 .B dir
 after initialization.  
-.B \-\-chroot
+.B --chroot
 essentially redefines
 .B dir
 as being the top
@@ -1963,7 +1963,7 @@
 are executed after the chroot operation.
 .\"*********************************************************
 .TP
-.B \-\-daemon [progname]
+.B --daemon [progname]
 Become a daemon after all initialization functions are completed.
 This option will cause all message and error output to
 be sent to the syslog file (such as /var/log/messages),
@@ -1972,10 +1972,10 @@
 which will go to /dev/null unless otherwise redirected.
 The syslog redirection occurs immediately at the point
 that
-.B \-\-daemon
+.B --daemon
 is parsed on the command line even though
 the daemonization point occurs later.  If one of the
-.B \-\-log
+.B --log
 options is present, it will supercede syslog
 redirection.
 
@@ -1991,7 +1991,7 @@
 defaults to "openvpn".
 
 When OpenVPN is run with the
-.B \-\-daemon
+.B --daemon
 option, it will try to delay daemonization until the majority of initialization
 functions which are capable of generating fatal errors are complete.  This means
 that initialization scripts can test the return status of the
@@ -2001,20 +2001,20 @@
 In OpenVPN, the vast majority of errors which occur after initialization are non-fatal.
 .\"*********************************************************
 .TP
-.B \-\-syslog [progname]
+.B --syslog [progname]
 Direct log output to system logger, but do not become a daemon.
 See
-.B \-\-daemon
+.B --daemon
 directive above for description of
 .B progname
 parameter.
 .\"*********************************************************
 .TP
-.B \-\-passtos
+.B --passtos
 Set the TOS field of the tunnel packet to what the payload's TOS is.
 .\"*********************************************************
 .TP
-.B \-\-inetd [wait|nowait] [progname]
+.B --inetd [wait|nowait] [progname]
 Use this option when OpenVPN is being run from the inetd or
 .BR xinetd(8)
 server.
@@ -2025,7 +2025,7 @@
 config file.  The
 .B nowait
 mode can only be used with
-.B \-\-proto tcp-server.
+.B --proto tcp-server.
 The default is
 .B wait.
 The
@@ -2037,16 +2037,16 @@
 .I http://openvpn.net/faq.html#oneport
 
 This option precludes the use of
-.B \-\-daemon, \-\-local,
+.B --daemon, --local,
 or
-.B \-\-remote.
+.B --remote.
 Note that this option causes message and error output to be handled in the same
 way as the
-.B \-\-daemon
+.B --daemon
 option.  The optional
 .B progname
 parameter is also handled exactly as in
-.B \-\-daemon.
+.B --daemon.
 
 Also note that in
 .B wait
@@ -2056,7 +2056,7 @@
 .I http://openvpn.net/1xhowto.html
 .\"*********************************************************
 .TP
-.B \-\-log file
+.B --log file
 Output logging messages to
 .B file,
 including output to stdout/stderr which
@@ -2067,44 +2067,44 @@
 This option takes effect
 immediately when it is parsed in the command line
 and will supercede syslog output if
-.B \-\-daemon
+.B --daemon
 or
-.B \-\-inetd
+.B --inetd
 is also specified.
 This option is persistent over the entire course of
 an OpenVPN instantiation and will not be reset by SIGHUP,
 SIGUSR1, or
-.B \-\-ping-restart.
+.B --ping-restart.
 
 Note that on Windows, when OpenVPN is started as a service,
 logging occurs by default without the need to specify
 this option.
 .\"*********************************************************
 .TP
-.B \-\-log-append file
+.B --log-append file
 Append logging messages to
 .B file.
 If
 .B file
 does not exist, it will be created.
 This option behaves exactly like
-.B \-\-log
+.B --log
 except that it appends to rather
 than truncating the log file.
 .\"*********************************************************
 .TP
-.B \-\-suppress-timestamps
+.B --suppress-timestamps
 Avoid writing timestamps to log messages, even when they
 otherwise would be prepended. In particular, this applies to
 log messages sent to stdout.
 .\"*********************************************************
 .TP
-.B \-\-writepid file
+.B --writepid file
 Write OpenVPN's main process ID to
 .B file.
 .\"*********************************************************
 .TP
-.B \-\-nice n
+.B --nice n
 Change process priority after initialization
 (
 .B n
@@ -2113,14 +2113,14 @@
 less than zero is higher priority).
 .\"*********************************************************
 .\".TP
-.\".B \-\-nice-work n
+.\".B --nice-work n
 .\"Change priority of background TLS work thread.  The TLS thread
 .\"feature is enabled when OpenVPN is built
 .\"with pthread support, and you are running OpenVPN
 .\"in TLS mode (i.e. with
-.\".B \-\-tls-client
+.\".B --tls-client
 .\"or
-.\".B \-\-tls-server
+.\".B --tls-server
 .\"specified).
 .\"
 .\"Using a TLS thread offloads the CPU-intensive process of SSL/TLS-based
@@ -2130,12 +2130,12 @@
 .\"The parameter
 .\".B n
 .\"is interpreted exactly as with the
-.\".B \-\-nice
+.\".B --nice
 .\"option above, but in relation to the work thread rather
 .\"than the main thread.
 .\"*********************************************************
 .TP
-.B \-\-fast-io
+.B --fast-io
 (Experimental) Optimize TUN/TAP/UDP I/O writes by avoiding
 a call to poll/epoll/select prior to the write operation.  The purpose
 of such a call would normally be to block until the device
@@ -2146,13 +2146,13 @@
 by 5% to 10%.
 
 This option can only be used on non-Windows systems, when
-.B \-\-proto udp
+.B --proto udp
 is specified, and when
-.B \-\-shaper
+.B --shaper
 is NOT specified.
 .\"*********************************************************
 .TP
-.B \-\-echo [parms...]
+.B --echo [parms...]
 Echo
 .B parms
 to log output.
@@ -2161,7 +2161,7 @@
 which is receiving the OpenVPN log output.
 .\"*********************************************************
 .TP
-.B \-\-remap-usr1 signal
+.B --remap-usr1 signal
 Control whether internally or externally
 generated SIGUSR1 signals are remapped to
 SIGHUP (restart without persisting state) or
@@ -2172,20 +2172,20 @@
 occurs.
 .\"*********************************************************
 .TP
-.B \-\-verb n
+.B --verb n
 Set output verbosity to
 .B n
 (default=1).  Each level shows all info from the previous levels.
 Level 3 is recommended if you want a good summary
 of what's happening without being swamped by output.
 
-.B 0 \-\-
+.B 0 --
 No output except fatal errors.
 .br
-.B 1 to 4 \-\-
+.B 1 to 4 --
 Normal usage range.
 .br
-.B 5 \-\-
+.B 5 --
 Output
 .B R
 and
@@ -2193,12 +2193,12 @@
 characters to the console for each packet read and write, uppercase is
 used for TCP/UDP packets and lowercase is used for TUN/TAP packets.
 .br
-.B 6 to 11 \-\-
+.B 6 to 11 --
 Debug info range (see errlevel.h for additional
 information on debug levels).
 .\"*********************************************************
 .TP
-.B \-\-status file [n]
+.B --status file [n]
 Write operational status to
 .B file
 every
@@ -2210,21 +2210,21 @@
 signal.
 .\"*********************************************************
 .TP
-.B \-\-status-version [n]
+.B --status-version [n]
 Choose the status file format version number.  Currently
 .B n
 can be 1 or 2 and defaults to 1.
 .\"*********************************************************
 .TP
-.B \-\-mute n
+.B --mute n
 Log at most
 .B n
 consecutive messages in the same category.  This is useful to
 limit repetitive logging of similar message types.
 .\"*********************************************************
 .TP
-.B \-\-comp-lzo [mode]
-Use fast LZO compression \-\- may add up to 1 byte per
+.B --comp-lzo [mode]
+Use fast LZO compression -- may add up to 1 byte per
 packet for incompressible data.
 .B mode
 may be "yes", "no", or "adaptive" (default).
@@ -2234,16 +2234,16 @@
 
 First, make sure the client-side config file enables selective
 compression by having at least one
-.B \-\-comp-lzo
+.B --comp-lzo
 directive, such as
-.B \-\-comp-lzo no.
+.B --comp-lzo no.
 This will turn off compression by default,
 but allow a future directive push from the server to
 dynamically change the
 on/off/adaptive setting.
 
 Next in a
-.B \-\-client-config-dir
+.B --client-config-dir
 file, specify the compression setting for the client,
 for example:
 
@@ -2264,12 +2264,12 @@
 side of the link, the second sets the client side.
 .\"*********************************************************
 .TP
-.B \-\-comp-noadapt
+.B --comp-noadapt
 When used in conjunction with
-.B \-\-comp-lzo,
+.B --comp-lzo,
 this option will disable OpenVPN's adaptive compression algorithm.
 Normally, adaptive compression is enabled with
-.B \-\-comp-lzo.
+.B --comp-lzo.
 
 Adaptive compression tries to optimize the case where you have
 compression enabled, but you are sending predominantly uncompressible
@@ -2281,7 +2281,7 @@
 compression for a period of time until the next re-sample test.
 .\"*********************************************************
 .TP
-.B \-\-management IP port [pw-file]
+.B --management IP port [pw-file]
 Enable a TCP server on
 .B IP:port
 to handle daemon management functions.
@@ -2318,24 +2318,24 @@
 server to local clients. 
 .\"*********************************************************
 .TP
-.B \-\-management-query-passwords
+.B --management-query-passwords
 Query management channel for private key password and
-.B \-\-auth-user-pass
+.B --auth-user-pass
 username/password.  Only query the management channel
 for inputs which ordinarily would have been queried from the
 console.
 .\"*********************************************************
 .TP
-.B \-\-management-forget-disconnect
+.B --management-forget-disconnect
 Make OpenVPN forget passwords when management session
 disconnects.
 
 This directive does not affect the
-.B \-\-http-proxy
+.B --http-proxy
 username/password.  It is always cached.
 .\"*********************************************************
 .TP
-.B \-\-management-hold
+.B --management-hold
 Start OpenVPN in a hibernating state, until a client
 of the management interface explicitly starts it
 with the
@@ -2343,20 +2343,20 @@
 command.
 .\"*********************************************************
 .TP
-.B \-\-management-signal
+.B --management-signal
 Send SIGUSR1 signal to OpenVPN if management session disconnects.
 This is useful when you wish to disconnect an OpenVPN session on
 user logoff.
 .\"*********************************************************
 .TP
-.B \-\-management-log-cache n
+.B --management-log-cache n
 Cache the most recent
 .B n
 lines of log file history for usage
 by the management channel.
 .\"*********************************************************
 .TP
-.B \-\-plugin module-pathname [init-string]
+.B --plugin module-pathname [init-string]
 Load plug-in module from the file
 .B module-pathname,
 passing
@@ -2392,7 +2392,7 @@
 .SS Server Mode
 Starting with OpenVPN 2.0, a multi-client TCP/UDP server mode
 is supported, and can be enabled with the
-.B \-\-mode server
+.B --mode server
 option.  In server mode, OpenVPN will listen on a single
 port for incoming client connections.  All client
 connections will be routed through a single tun or tap
@@ -2402,7 +2402,7 @@
 be used in this mode.
 .\"*********************************************************
 .TP
-.B \-\-server network netmask
+.B --server network netmask
 A helper directive designed to simplify the configuration
 of OpenVPN's server mode.  This directive will set up an
 OpenVPN server which will allocate addresses to clients
@@ -2412,7 +2412,7 @@
 TUN/TAP interface.
 
 For example,
-.B \-\-server 10.8.0.0 255.255.255.0
+.B --server 10.8.0.0 255.255.255.0
 expands as follows:
 
 .RS
@@ -2442,16 +2442,16 @@
 .fi
 
 Don't use
-.B \-\-server
+.B --server
 if you are ethernet bridging.  Use
-.B \-\-server-bridge
+.B --server-bridge
 instead.
 .\"*********************************************************
 .TP
-.B \-\-server-bridge gateway netmask pool-start-IP pool-end-IP
+.B --server-bridge gateway netmask pool-start-IP pool-end-IP
 
 A helper directive similar to
-.B \-\-server
+.B --server
 which is designed to simplify the configuration
 of OpenVPN's server mode in ethernet bridging configurations.
 
@@ -2471,7 +2471,7 @@
 and
 .B netmask
 parameters to
-.B \-\-server-bridge
+.B --server-bridge
 can be set to either the IP/netmask of the
 bridge interface, or the IP/netmask of the
 default gateway/router on the bridged
@@ -2505,13 +2505,13 @@
 .fi
 .\"*********************************************************
 .TP
-.B \-\-push "option"
+.B --push "option"
 Push a config file option back to the client for remote
 execution.  Note that
 .B
 option
 must be enclosed in double quotes ("").  The client must specify
-.B \-\-pull
+.B --pull
 in its config file.  The set of options which can be
 pushed is limited by both feasibility and security.
 Some options such as those which would execute scripts
@@ -2522,44 +2522,44 @@
 them before the connection to the server can be initiated.
 
 This is a partial list of options which can currently be pushed:
-.B \-\-route, \-\-route-gateway, \-\-route-delay, \-\-redirect-gateway,
-.B \-\-ip-win32, \-\-dhcp-option,
-.B \-\-inactive, \-\-ping, \-\-ping-exit, \-\-ping-restart,
-.B \-\-setenv,
-.B \-\-persist-key, \-\-persist-tun, \-\-echo,
-.B \-\-comp-lzo,
-.B \-\-socket-flags,
-.B \-\-sndbuf, \-\-rcvbuf
+.B --route, --route-gateway, --route-delay, --redirect-gateway,
+.B --ip-win32, --dhcp-option,
+.B --inactive, --ping, --ping-exit, --ping-restart,
+.B --setenv,
+.B --persist-key, --persist-tun, --echo,
+.B --comp-lzo,
+.B --socket-flags,
+.B --sndbuf, --rcvbuf
 .\"*********************************************************
 .TP
-.B \-\-push-reset
+.B --push-reset
 Don't inherit the global push list for a specific client instance.
 Specify this option in a client-specific context such
 as with a
-.B \-\-client-config-dir
+.B --client-config-dir
 configuration file.  This option will ignore
-.B \-\-push
+.B --push
 options at the global config file level.
 .\"*********************************************************
 .TP
-.B \-\-disable
+.B --disable
 Disable a particular client (based on the common name)
 from connecting.  Don't use this option to disable a client
 due to key or password compromise.  Use a CRL (certificate
 revocation list) instead (see the
-.B \-\-crl-verify
+.B --crl-verify
 option).
 
 This option must be associated with a specific client instance,
 which means that it must be specified either in a client
 instance config file using
-.B \-\-client-config-dir
+.B --client-config-dir
 or dynamically generated using a
-.B \-\-client-connect
+.B --client-connect
 script.
 .\"*********************************************************
 .TP
-.B \-\-ifconfig-pool start-IP end-IP [netmask]
+.B --ifconfig-pool start-IP end-IP [netmask]
 Set aside a pool of subnets to be
 dynamically allocated to connecting clients, similar
 to a DHCP server.  For tun-style
@@ -2572,7 +2572,7 @@
 
 .\"*********************************************************
 .TP
-.B \-\-ifconfig-pool-persist file [seconds]
+.B --ifconfig-pool-persist file [seconds]
 Persist/unpersist ifconfig-pool
 data to
 .B file,
@@ -2587,7 +2587,7 @@
 Maintaining a long-term
 association is good for clients because it allows them
 to effectively use the
-.B \-\-persist-tun
+.B --persist-tun
 option.
 
 .B file
@@ -2608,32 +2608,32 @@
 a common name and IP address.  They do not guarantee that the given common
 name will always receive the given IP address.  If you want guaranteed
 assignment, use
-.B \-\-ifconfig-push
+.B --ifconfig-push
 .\"*********************************************************
 .TP
-.B \-\-ifconfig-pool-linear
+.B --ifconfig-pool-linear
 Modifies the
-.B \-\-ifconfig-pool
+.B --ifconfig-pool
 directive to
 allocate individual TUN interface addresses for
 clients rather than /30 subnets.  NOTE:  This option
 is incompatible with Windows clients.
 
 This option is deprecated, and should be replaced with
-.B \-\-topology p2p
+.B --topology p2p
 which is functionally equivalent.
 .\"*********************************************************
 .TP
-.B \-\-ifconfig-push local remote-netmask
+.B --ifconfig-push local remote-netmask
 Push virtual IP endpoints for client tunnel,
-overriding the \-\-ifconfig-pool dynamic allocation.
+overriding the --ifconfig-pool dynamic allocation.
 
 The parameters
 .B local
 and
 .B remote-netmask
 are set according to the
-.B \-\-ifconfig
+.B --ifconfig
 directive which you want to execute on the client machine to
 configure the remote end of the tunnel.  Note that the parameters
 .B local
@@ -2646,13 +2646,13 @@
 This option must be associated with a specific client instance,
 which means that it must be specified either in a client
 instance config file using
-.B \-\-client-config-dir
+.B --client-config-dir
 or dynamically generated using a
-.B \-\-client-connect
+.B --client-connect
 script.
 
 Remember also to include a
-.B \-\-route
+.B --route
 directive in the main OpenVPN config file which encloses
 .B local,
 so that the kernel will know to route it
@@ -2662,23 +2662,23 @@
 follows:
 
 .B 1
-\-\- Use
-.B \-\-client-connect script
+-- Use
+.B --client-connect script
 generated file for static IP (first choice).
 .br
 .B 2
-\-\- Use 
-.B \-\-client-config-dir
+-- Use 
+.B --client-config-dir
 file for static IP (next choice).
 .br
 .B 3
-\-\- Use
-.B \-\-ifconfig-pool
+-- Use
+.B --ifconfig-pool
 allocation for dynamic IP (last choice).
 .br
 .\"*********************************************************
 .TP
-.B \-\-iroute network [netmask]
+.B --iroute network [netmask]
 Generate an internal route to a specific
 client. The
 .B netmask
@@ -2689,36 +2689,36 @@
 of where the client is connecting from.  Remember
 that you must also add the route to the system
 routing table as well (such as by using the
-.B \-\-route
+.B --route
 directive).  The reason why two routes are needed
 is that the
-.B \-\-route
+.B --route
 directive routes the packet from the kernel
 to OpenVPN.  Once in OpenVPN, the
-.B \-\-iroute
+.B --iroute
 directive routes to the specific client.
 
 This option must be specified either in a client
 instance config file using
-.B \-\-client-config-dir
+.B --client-config-dir
 or dynamically generated using a
-.B \-\-client-connect
+.B --client-connect
 script.
 
 The
-.B \-\-iroute
+.B --iroute
 directive also has an important interaction with
-.B \-\-push
+.B --push
 "route ...".
-.B \-\-iroute
+.B --iroute
 essentially defines a subnet which is owned by a
 particular client (we will call this client A).
 If you would like other clients to be able to reach A's
 subnet, you can use
-.B \-\-push
+.B --push
 "route ..."
 together with
-.B \-\-client-to-client
+.B --client-to-client
 to effect this.  In order for all clients to see
 A's subnet, OpenVPN must push this route to all clients
 EXCEPT for A, since the subnet is already owned by A.
@@ -2727,11 +2727,11 @@
 if it matches one of the client's iroutes.
 .\"*********************************************************
 .TP
-.B \-\-client-to-client
+.B --client-to-client
 Because the OpenVPN server mode handles multiple clients
 through a single tun or tap interface, it is effectively
 a router.  The
-.B \-\-client-to-client
+.B --client-to-client
 flag tells OpenVPN to internally route client-to-client
 traffic rather than pushing all client-originating traffic
 to the TUN/TAP interface.
@@ -2743,13 +2743,13 @@
 custom, per-client rules.
 .\"*********************************************************
 .TP
-.B \-\-duplicate-cn
+.B --duplicate-cn
 Allow multiple clients with the same common name to concurrently connect.
 In the absence of this option, OpenVPN will disconnect a client instance
 upon connection of a new client having the same common name.
 .\"*********************************************************
 .TP
-.B \-\-client-connect script
+.B --client-connect script
 Run
 .B script
 on client connection.  The script is passed the common name
@@ -2765,7 +2765,7 @@
 it should write it to the file named by $1.
 
 See the
-.B \-\-client-config-dir
+.B --client-config-dir
 option below for options which
 can be legally used in a dynamically generated config file.
 
@@ -2777,18 +2777,18 @@
 to be disconnected.
 .\"*********************************************************
 .TP
-.B \-\-client-disconnect
+.B --client-disconnect
 Like
-.B \-\-client-connect
+.B --client-connect
 but called on client instance shutdown.  Will not be called
 unless the
-.B \-\-client-connect
+.B --client-connect
 script and plugins (if defined)
 were previously called on this instance with
 successful (0) status returns.
 
 The exception to this rule is if the
-.B \-\-client-disconnect
+.B --client-disconnect
 script or plugins are cascaded, and at least one client-connect
 function succeeded, then ALL of the client-disconnect functions for
 scripts and plugins will be called on client instance object deletion,
@@ -2797,7 +2797,7 @@
 .B 
 .\"*********************************************************
 .TP
-.B \-\-client-config-dir dir
+.B --client-config-dir dir
 Specify a directory
 .B dir
 for custom client config files.  After
@@ -2811,9 +2811,9 @@
 
 This file can specify a fixed IP address for a given
 client using
-.B \-\-ifconfig-push,
+.B --ifconfig-push,
 as well as fixed subnets owned by the client using
-.B \-\-iroute.
+.B --iroute.
 
 One of the useful properties of this option is that it
 allows client configuration files to be conveniently
@@ -2822,28 +2822,28 @@
 
 The following
 options are legal in a client-specific context:
-.B \-\-push, \-\-push-reset, \-\-iroute, \-\-ifconfig-push,
+.B --push, --push-reset, --iroute, --ifconfig-push,
 and
-.B \-\-config.
+.B --config.
 .\"*********************************************************
 .TP
-.B \-\-ccd-exclusive
+.B --ccd-exclusive
 Require, as a
 condition of authentication, that a connecting client has a
-.B \-\-client-config-dir
+.B --client-config-dir
 file.
 .\"*********************************************************
 .TP
-.B \-\-tmp-dir dir
+.B --tmp-dir dir
 Specify a directory
 .B dir
 for temporary files.  This directory will be used by
-.B \-\-client-connect
+.B --client-connect
 scripts to dynamically generate client-specific
 configuration files.
 .\"*********************************************************
 .TP
-.B \-\-hash-size r v
+.B --hash-size r v
 Set the size of the real address hash table to
 .B r
 and the virtual address table to
@@ -2851,13 +2851,13 @@
 By default, both tables are sized at 256 buckets.
 .\"*********************************************************
 .TP
-.B \-\-bcast-buffers n
+.B --bcast-buffers n
 Allocate
 .B n
 buffers for broadcast datagrams (default=256).
 .\"*********************************************************
 .TP
-.B \-\-tcp-queue-limit n
+.B --tcp-queue-limit n
 Maximum number of queued TCP output packets (default=64).
 
 When OpenVPN is tunneling data from a TUN/TAP device to a
@@ -2869,13 +2869,13 @@
 at this client.
 .\"*********************************************************
 .TP
-.B \-\-max-clients n
+.B --max-clients n
 Limit server to a maximum of
 .B n
 concurrent clients.
 .\"*********************************************************
 .TP
-.B \-\-max-routes-per-client n
+.B --max-routes-per-client n
 Allow a maximum of
 .B n
 internal routes per client (default=256).
@@ -2885,9 +2885,9 @@
 forcing the server to deplete
 virtual memory as its internal routing table expands.
 This directive can be used in a
-.B \-\-client-config-dir
+.B --client-config-dir
 file or auto-generated by a
-.B \-\-client-connect
+.B --client-connect
 script to override the global value for a particular client.
 
 Note that this
@@ -2895,7 +2895,7 @@
 kernel routing table.
 .\"*********************************************************
 .TP
-.B \-\-connect-freq n sec
+.B --connect-freq n sec
 Allow a maximum of
 .B n
 new connections per
@@ -2909,12 +2909,12 @@
 
 For the best protection against DoS attacks in server mode,
 use
-.B \-\-proto udp
+.B --proto udp
 and
-.B \-\-tls-auth.
+.B --tls-auth.
 .\"*********************************************************
 .TP
-.B \-\-learn-address cmd
+.B --learn-address cmd
 Run script or shell command
 .B cmd
 to validate client virtual addresses or routes.
@@ -2922,19 +2922,19 @@
 .B cmd
 will be executed with 3 parameters:
 
-.B [1] operation \-\-
+.B [1] operation --
 "add", "update", or "delete" based on whether or not
 the address is being added to, modified, or deleted from
 OpenVPN's internal routing table.
 .br
-.B [2] address \-\-
+.B [2] address --
 The address being learned or unlearned.  This can be
 an IPv4 address such as "198.162.10.14", an IPv4 subnet
 such as "198.162.10.0/24", or an ethernet MAC address (when
-.B \-\-dev tap
+.B --dev tap
 is being used) such as "00:FF:01:02:03:04".
 .br
-.B [3] common name \-\-
+.B [3] common name --
 The common name on the certificate associated with the
 client linked to this address.  Only present for "add"
 or "update" operations, not "delete".
@@ -2954,7 +2954,7 @@
 rather than the low level client virtual addresses.
 .\"*********************************************************
 .TP
-.B \-\-auth-user-pass-verify script method
+.B --auth-user-pass-verify script method
 Require the client to provide a username/password (possibly
 in addition to a client certificate) for authentication.
 
@@ -2985,10 +2985,10 @@
 and the file will be automatically deleted by OpenVPN after
 the script returns.  The location of the temporary file is
 controlled by the
-.B \-\-tmp-dir
+.B --tmp-dir
 option, and will default to the current directory if unspecified.
 For security, consider setting 
-.B \-\-tmp-dir
+.B --tmp-dir
 to a volatile storage medium such as
 .B /dev/shm
 (if available) to prevent the username/password file from touching the hard drive.
@@ -3020,35 +3020,35 @@
 in the OpenVPN source distribution.
 .\"*********************************************************
 .TP
-.B \-\-client-cert-not-required
+.B --client-cert-not-required
 Don't require client certificate, client will authenticate
 using username/password only.  Be aware that using this directive
 is less secure than requiring certificates from all clients.
 
 If you use this directive, the
 entire responsibility of authentication will rest on your
-.B \-\-auth-user-pass-verify
+.B --auth-user-pass-verify
 script, so keep in mind that bugs in your script
 could potentially compromise the security of your VPN.
 
 If you don't use this directive, but you also specify an
-.B \-\-auth-user-pass-verify
+.B --auth-user-pass-verify
 script, then OpenVPN will perform double authentication.  The
 client certificate verification AND the
-.B \-\-auth-user-pass-verify
+.B --auth-user-pass-verify
 script will need to succeed in order for a client to be
 authenticated and accepted onto the VPN.
 .\"*********************************************************
 .TP
-.B \-\-username-as-common-name
+.B --username-as-common-name
 For
-.B \-\-auth-user-pass-verify
+.B --auth-user-pass-verify
 authentication, use
 the authenticated username as the common name,
 rather than the common name from the client cert.
 .\"*********************************************************
 .TP
-.B \-\-port-share host port
+.B --port-share host port
 When run in TCP server mode, share the OpenVPN port with
 another application, such as an HTTPS server.  If OpenVPN
 senses a connection to its port which is using a non-OpenVPN
@@ -3063,13 +3063,13 @@
 .SS Client Mode
 Use client mode when connecting to an OpenVPN server
 which has
-.B \-\-server, \-\-server-bridge,
+.B --server, --server-bridge,
 or
-.B \-\-mode server
+.B --mode server
 in it's configuration.
 .\"*********************************************************
 .TP
-.B \-\-client
+.B --client
 A helper directive designed to simplify the configuration
 of OpenVPN's client mode.  This directive is equivalent to:
 
@@ -3085,33 +3085,33 @@
 .fi
 .\"*********************************************************
 .TP
-.B \-\-pull
+.B --pull
 This option must be used on a client which is connecting
 to a multi-client server.  It indicates to OpenVPN that it
 should accept options pushed by the server, provided they
 are part of the legal set of pushable options (note that the
-.B \-\-pull
+.B --pull
 option is implied by
-.B \-\-client
+.B --client
 ).
 
 In particular,
-.B \-\-pull
+.B --pull
 allows the server to push routes to the client, so you should
 not use
-.B \-\-pull
+.B --pull
 or
-.B \-\-client
+.B --client
 in situations where you don't trust the server to have control
 over the client's routing table.
 .\"*********************************************************
 .TP
-.B \-\-auth-user-pass [up]
+.B --auth-user-pass [up]
 Authenticate with server using username/password.
 .B up
 is a file containing username/password on 2 lines (Note: OpenVPN
 will only read passwords from a file if it has been built
-with the \-\-enable-password-save configure option, or on Windows
+with the --enable-password-save configure option, or on Windows
 by defining ENABLE_PASSWORD_SAVE in config-win32.h).
 
 If
@@ -3120,12 +3120,12 @@
 console.
 
 The server configuration must specify an
-.B \-\-auth-user-pass-verify
+.B --auth-user-pass-verify
 script to verify the username/password provided by
 the client.
 .\"*********************************************************
 .TP
-.B \-\-auth-retry type
+.B --auth-retry type
 Controls how OpenVPN responds to username/password verification
 errors such as the client-side response to an AUTH_FAILED message from the server
 or verification failure of the private key password.
@@ -3136,33 +3136,33 @@
 
 An AUTH_FAILED message is generated by the server if the client
 fails
-.B \-\-auth-user-pass
+.B --auth-user-pass
 authentication, or if the server-side
-.B \-\-client-connect
+.B --client-connect
 script returns an error status when the client
 tries to connect.
 
 .B type
 can be one of:
 
-.B none \-\-
+.B none --
 Client will exit with a fatal error (this is the default).
 .br
-.B nointeract \-\-
+.B nointeract --
 Client will retry the connection without requerying for an
-.B \-\-auth-user-pass
+.B --auth-user-pass
 username/password.  Use this option for unattended clients.
 .br
-.B interact \-\-
+.B interact --
 Client will requery for an
-.B \-\-auth-user-pass
+.B --auth-user-pass
 username/password and/or private key password before attempting a reconnection.
 
 Note that while this option cannot be pushed, it can be controlled
 from the management interface.
 .\"*********************************************************
 .TP
-.B \-\-explicit-exit-notify [n]
+.B --explicit-exit-notify [n]
 In UDP client mode or point-to-point mode, send server/peer an exit notification
 if tunnel is restarted or OpenVPN process is exited.  In client mode, on
 exit/restart, this
@@ -3177,12 +3177,12 @@
 (must be compatible between peers).
 .\"*********************************************************
 .TP
-.B \-\-secret file [direction]
+.B --secret file [direction]
 Enable Static Key encryption mode (non-TLS).
 Use pre-shared secret
 .B file
 which was generated with
-.B \-\-genkey.
+.B --genkey.
 
 The optional
 .B direction
@@ -3213,7 +3213,7 @@
 .B direction
 parameter, will also support 2048 bit key file generation
 using the
-.B \-\-genkey
+.B --genkey
 option.
 
 Static key encryption mode has certain advantages,
@@ -3243,7 +3243,7 @@
 but random-looking data.
 .\"*********************************************************
 .TP
-.B \-\-auth alg
+.B --auth alg
 Authenticate packets with HMAC using message
 digest algorithm
 .B alg.
@@ -3258,7 +3258,7 @@
 
 In static-key encryption mode, the HMAC key
 is included in the key file generated by
-.B \-\-genkey.
+.B --genkey.
 In TLS mode, the HMAC key is dynamically generated and shared
 between peers via the TLS control channel.  If OpenVPN receives a packet with
 a bad HMAC it will drop the packet.
@@ -3271,7 +3271,7 @@
 .I http://www.cs.ucsd.edu/users/mihir/papers/hmac.html
 .\"*********************************************************
 .TP
-.B \-\-cipher alg
+.B --cipher alg
 Encrypt packets with cipher algorithm
 .B alg.
 The default is
@@ -3286,7 +3286,7 @@
 
 To see other ciphers that are available with
 OpenVPN, use the
-.B \-\-show-ciphers
+.B --show-ciphers
 option.
 
 OpenVPN supports the CBC, CFB, and OFB cipher modes.
@@ -3296,10 +3296,10 @@
 to disable encryption.
 .\"*********************************************************
 .TP
-.B \-\-keysize n
+.B --keysize n
 Size of cipher key in bits (optional).
 If unspecified, defaults to cipher-specific default.  The
-.B \-\-show-ciphers
+.B --show-ciphers
 option (see below) shows all available OpenSSL ciphers,
 their default key sizes, and whether the key size can
 be changed.  Use care in changing a cipher's default
@@ -3309,19 +3309,19 @@
 security, or may even reduce security.
 .\"*********************************************************
 .TP
-.B \-\-engine [engine-name]
+.B --engine [engine-name]
 Enable OpenSSL hardware-based crypto engine functionality.
 
 If
 .B engine-name
 is specified,
 use a specific crypto engine.  Use the
-.B \-\-show-engines
+.B --show-engines
 standalone option to list the crypto engines which are
 supported by OpenSSL.
 .\"*********************************************************
 .TP
-.B \-\-no-replay
+.B --no-replay
 Disable OpenVPN's protection against replay attacks.
 Don't use this option unless you are prepared to make
 a tradeoff of greater efficiency in exchange for less
@@ -3365,7 +3365,7 @@
 by IPSec.
 .\"*********************************************************
 .TP
-.B \-\-replay-window n [t]
+.B --replay-window n [t]
 Use a replay protection sliding-window of size
 .B n
 and a time window of
@@ -3380,9 +3380,9 @@
 
 This option is only relevant in UDP mode, i.e.
 when either
-.B \-\-proto udp
+.B --proto udp
 is specifed, or no
-.B \-\-proto
+.B --proto
 option is specified.
 
 When OpenVPN tunnels IP packets over UDP, there is the possibility that
@@ -3394,7 +3394,7 @@
 
 .B (a)
 The packet cannot be a replay (unless
-.B \-\-no-replay
+.B --no-replay
 is specified, which disables replay protection altogether).
 
 .B (b)
@@ -3416,7 +3416,7 @@
 Satellite links in particular often require this.
 
 If you run OpenVPN at
-.B \-\-verb 4,
+.B --verb 4,
 you will see the message "Replay-window backtrack occurred [x]"
 every time the maximum sequence number backtrack seen thus far
 increases.  This can be used to calibrate
@@ -3452,7 +3452,7 @@
 is easily fixed by simply using TCP as the VPN transport layer.
 .\"*********************************************************
 .TP
-.B \-\-mute-replay-warnings
+.B --mute-replay-warnings
 Silence the output of replay warnings, which are a common
 false alarm on WiFi networks.  This option preserves
 the security of the replay protection code without
@@ -3460,7 +3460,7 @@
 packets.
 .\"*********************************************************
 .TP
-.B \-\-replay-persist file
+.B --replay-persist file
 Persist replay-protection state across sessions using
 .B file
 to save and reload the state.
@@ -3468,7 +3468,7 @@
 This option will strengthen protection against replay attacks,
 especially when you are using OpenVPN in a dynamic context (such
 as with
-.B \-\-inetd)
+.B --inetd)
 when OpenVPN sessions are frequently started and stopped. 
 
 This option will keep a disk copy of the current replay protection
@@ -3479,12 +3479,12 @@
 
 This option only makes sense when replay protection is enabled
 (the default) and you are using either
-.B \-\-secret
+.B --secret
 (shared-secret key mode) or TLS mode with
-.B \-\-tls-auth.
+.B --tls-auth.
 .\"*********************************************************
 .TP
-.B \-\-no-iv
+.B --no-iv
 Disable OpenVPN's use of IV (cipher initialization vector).
 Don't use this option unless you are prepared to make
 a tradeoff of greater efficiency in exchange for less
@@ -3505,24 +3505,24 @@
 datagram replay protection as the IV.
 .\"*********************************************************
 .TP
-.B \-\-test-crypto
+.B --test-crypto
 Do a self-test of OpenVPN's crypto options by encrypting and
 decrypting test packets using the data channel encryption options
 specified above.  This option does not require a peer to function,
 and therefore can be specified without
-.B \-\-dev
+.B --dev
 or
-.B \-\-remote.
+.B --remote.
 
 The typical usage of
-.B \-\-test-crypto
+.B --test-crypto
 would be something like this:
 
-.B openvpn \-\-test-crypto \-\-secret key
+.B openvpn --test-crypto --secret key
 
 or
 
-.B openvpn \-\-test-crypto \-\-secret key \-\-verb 9
+.B openvpn --test-crypto --secret key --verb 9
 
 This option is very useful to test OpenVPN after it has been ported to
 a new platform, or to isolate problems in the compiler, OpenSSL
@@ -3546,17 +3546,17 @@
 
 To use TLS mode, each peer that runs OpenVPN should have its own local
 certificate/key pair (
-.B \-\-cert
+.B --cert
 and
-.B \-\-key
+.B --key
 ), signed by the root certificate which is specified
 in
-.B \-\-ca.
+.B --ca.
 
 When two OpenVPN peers connect, each presents its local certificate to the
 other.  Each peer will then check that its partner peer presented a
 certificate which was signed by the master root certificate as specified in
-.B \-\-ca.
+.B --ca.
 
 If that check on both peers succeeds, then the TLS negotiation
 will succeed, both OpenVPN
@@ -3573,18 +3573,18 @@
 .I http://openvpn.net/easyrsa.html
 .\"*********************************************************
 .TP
-.B \-\-tls-server
+.B --tls-server
 Enable TLS and assume server role during TLS handshake.  Note that
 OpenVPN is designed as a peer-to-peer application.  The designation
 of client or server is only for the purpose of negotiating the TLS
 control channel.
 .\"*********************************************************
 .TP
-.B \-\-tls-client
+.B --tls-client
 Enable TLS and assume client role during TLS handshake.
 .\"*********************************************************
 .TP
-.B \-\-ca file
+.B --ca file
 Certificate authority (CA) file in .pem format, also referred to as the
 .I root
 certificate.  This file can have multiple
@@ -3606,10 +3606,10 @@
 they are distributed with OpenVPN, they are totally insecure.
 .\"*********************************************************
 .TP
-.B \-\-dh file
+.B --dh file
 File containing Diffie Hellman parameters
 in .pem format (required for
-.B \-\-tls-server
+.B --tls-server
 only). Use
 
 .B openssl dhparam -out dh1024.pem 1024
@@ -3619,15 +3619,15 @@
 may be considered public.
 .\"*********************************************************
 .TP
-.B \-\-cert file
-Local peer's signed certificate in .pem format \-\- must be signed
+.B --cert file
+Local peer's signed certificate in .pem format -- must be signed
 by a certificate authority whose certificate is in
-.B \-\-ca file.
+.B --ca file.
 Each peer in an OpenVPN link running in TLS mode should have its own
 certificate and private key file.  In addition, each certificate should
 have been signed by the key of a certificate
 authority whose public key resides in the
-.B \-\-ca
+.B --ca
 certificate authority file.
 You can easily make your own certificate authority (see above) or pay money
 to use a commercial service such as thawte.com (in which case you will be
@@ -3652,7 +3652,7 @@
 command reads the location of the certificate authority key from its
 configuration file such as
 .B /usr/share/ssl/openssl.cnf
-\-\- note also
+-- note also
 that for certificate authority functions, you must set up the files
 .B index.txt
 (may be empty) and
@@ -3663,83 +3663,83 @@
 ).
 .\"*********************************************************
 .TP
-.B \-\-key file
+.B --key file
 Local peer's private key in .pem format.  Use the private key which was generated
 when you built your peer's certificate (see
 .B -cert file
 above).
 .\"*********************************************************
 .TP
-.B \-\-pkcs12 file
+.B --pkcs12 file
 Specify a PKCS #12 file containing local private key,
 local certificate, and root CA certificate.
 This option can be used instead of
-.B \-\-ca, \-\-cert,
+.B --ca, --cert,
 and
-.B \-\-key.
+.B --key.
 .\"*********************************************************
 .TP
-.B \-\-pkcs11-cert-private [0|1]...
+.B --pkcs11-cert-private [0|1]...
 Set if access to certificate object should be performed after login.
 Every provider has its own setting.
 .\"*********************************************************
 .TP
-.B \-\-pkcs11-id name
+.B --pkcs11-id name
 Specify the serialized certificate id to be used. The id can be gotten
 by the standalone
-.B \-\-show-pkcs11-ids
+.B --show-pkcs11-ids
 option.
 .\"*********************************************************
 .TP
-.B \-\-pkcs11-pin-cache seconds
+.B --pkcs11-pin-cache seconds
 Specify how many seconds the PIN can be cached, the default is until the token is removed.
 .\"*********************************************************
 .TP
-.B \-\-pkcs11-protected-authentication [0|1]...
+.B --pkcs11-protected-authentication [0|1]...
 Use PKCS#11 protected authentication path, useful for biometric and external
 keypad devices.
 Every provider has its own setting.
 .\"*********************************************************
 .TP
-.B \-\-pkcs11-providers provider...
+.B --pkcs11-providers provider...
 Specify a RSA Security Inc. PKCS #11 Cryptographic Token Interface (Cryptoki) providers
 to load.
 This option can be used instead of
-.B \-\-cert, \-\-key,
+.B --cert, --key,
 and
-.B \-\-pkcs12.
+.B --pkcs12.
 .\"*********************************************************
 .TP
-.B \-\-pkcs11-private-mode mode...
+.B --pkcs11-private-mode mode...
 Specify which method to use in order to perform private key operations.
 A different mode can be specified for each provider.
 Mode is encoded as hex number, and can be a mask one of the following:
 
 .B 0
-(default) \-\- Try to determind automatically.
+(default) -- Try to determind automatically.
 .br
 .B 1
-\-\- Use sign.
+-- Use sign.
 .br
 .B 2
-\-\- Use sign recover.
+-- Use sign recover.
 .br
 .B 4
-\-\- Use decrypt.
+-- Use decrypt.
 .br
 .B 8
-\-\- Use unwrap.
+-- Use unwrap.
 .br
 .\"*********************************************************
 .TP
-.B \-\-cryptoapicert select-string
+.B --cryptoapicert select-string
 Load the certificate and private key from the
 Windows Certificate System Store (Windows Only).
 
 Use this option instead of
-.B \-\-cert
+.B --cert
 and
-.B \-\-key.
+.B --key.
 
 This makes
 it possible to use any smart card, supported by Windows, but also any
@@ -3765,7 +3765,7 @@
 
 .\"*********************************************************
 .TP
-.B \-\-key-method m
+.B --key-method m
 Use data channel key negotiation method
 .B m.
 The key method must match on both sides of the connection.
@@ -3793,16 +3793,16 @@
 of the connection producing certificates and verifying the certificate
 (or other authentication info provided) of
 the other side.  The
-.B \-\-key-method
+.B --key-method
 parameter has no effect on this process.
 
 (2) After the TLS connection is established, the tunnel session keys are
 separately negotiated over the existing secure TLS channel.  Here,
-.B \-\-key-method
+.B --key-method
 determines the derivation of the tunnel session keys.
 .\"*********************************************************
 .TP
-.B \-\-tls-cipher l
+.B --tls-cipher l
 A list
 .B l
 of allowable TLS ciphers delimited by a colon (":").
@@ -3812,11 +3812,11 @@
 to force two peers to negotiate to the lowest level
 of security they both support.
 Use
-.B \-\-show-tls
+.B --show-tls
 to see a list of supported TLS ciphers.
 .\"*********************************************************
 .TP
-.B \-\-tls-timeout n
+.B --tls-timeout n
 Packet retransmit timeout on TLS control channel
 if no acknowledgment from remote within
 .B n
@@ -3833,7 +3833,7 @@
 such as TCP expect this role to be left to them.
 .\"*********************************************************
 .TP
-.B \-\-reneg-bytes n
+.B --reneg-bytes n
 Renegotiate data channel key after
 .B n
 bytes sent or received (disabled by default).
@@ -3843,13 +3843,13 @@
 if any of these three criteria are met by either peer.
 .\"*********************************************************
 .TP
-.B \-\-reneg-pkts n
+.B --reneg-pkts n
 Renegotiate data channel key after
 .B n
 packets sent and received (disabled by default).
 .\"*********************************************************
 .TP
-.B \-\-reneg-sec n
+.B --reneg-sec n
 Renegotiate data channel key after
 .B n
 seconds (default=3600).
@@ -3860,16 +3860,16 @@
 Also, keep in mind that this option can be used on both the client and server,
 and whichever uses the lower value will be the one to trigger the renegotiation.
 A common mistake is to set
-.B \-\-reneg-sec
+.B --reneg-sec
 to a higher value on either the client or server, while the other side of the connection
 is still using the default value of 3600 seconds, meaning that the renegotiation will
-still occur once per 3600 seconds.  The solution is to increase \-\-reneg-sec on both the
+still occur once per 3600 seconds.  The solution is to increase --reneg-sec on both the
 client and server, or set it to 0 on one side of the connection (to disable), and to
 your chosen value on the other side.
 .\"*********************************************************
 .TP
-.B \-\-hand-window n
-Handshake Window \-\- the TLS-based key exchange must finalize within
+.B --hand-window n
+Handshake Window -- the TLS-based key exchange must finalize within
 .B n
 seconds
 of handshake initiation by any peer (default = 60 seconds).
@@ -3877,47 +3877,47 @@
 we will attempt to reset our connection with our peer and try again.
 Even in the event of handshake failure we will still use
 our expiring key for up to
-.B \-\-tran-window
+.B --tran-window
 seconds to maintain continuity of transmission of tunnel
 data.
 .\"*********************************************************
 .TP
-.B \-\-tran-window n
-Transition window \-\- our old key can live this many seconds
+.B --tran-window n
+Transition window -- our old key can live this many seconds
 after a new a key renegotiation begins (default = 3600 seconds).
 This feature allows for a graceful transition from old to new
 key, and removes the key renegotiation sequence from the critical
 path of tunnel data forwarding.
 .\"*********************************************************
 .TP
-.B \-\-single-session
+.B --single-session
 After initially connecting to a remote peer, disallow any new connections.
 Using this
 option means that a remote peer cannot connect, disconnect, and then
 reconnect.
 
 If the daemon is reset by a signal or
-.B \-\-ping-restart,
+.B --ping-restart,
 it will allow one new connection.
 
-.B \-\-single-session
+.B --single-session
 can be used with
-.B \-\-ping-exit
+.B --ping-exit
 or
-.B \-\-inactive
+.B --inactive
 to create a single dynamic session that will exit when finished.
 .\"*********************************************************
 .TP
-.B \-\-tls-exit
+.B --tls-exit
 Exit on TLS negotiation failure.
 .\"*********************************************************
 .TP
-.B \-\-tls-auth file [direction]
+.B --tls-auth file [direction]
 Add an additional layer of HMAC authentication on top of the TLS
 control channel to protect against DoS attacks.
 
 In a nutshell,
-.B \-\-tls-auth
+.B --tls-auth
 enables a kind of "HMAC firewall" on OpenVPN's TCP/UDP port,
 where TLS control channel packets
 bearing an incorrect HMAC signature can be dropped immediately without
@@ -3928,7 +3928,7 @@
 
 .B (1)
 An OpenVPN static key file generated by
-.B \-\-genkey
+.B --genkey
 (required if
 .B direction
 parameter is used).
@@ -3946,19 +3946,19 @@
 a static key file, format (2) will be used.
 
 See the
-.B \-\-secret
+.B --secret
 option for more information on the optional
 .B direction
 parameter.
 
-.B \-\-tls-auth
+.B --tls-auth
 is recommended when you are running OpenVPN in a mode where
 it is listening for packets from any IP address, such as when
-.B \-\-remote
+.B --remote
 is not specified, or
-.B \-\-remote
+.B --remote
 is specified with
-.B \-\-float.
+.B --float.
 
 The rationale for
 this feature is as follows.  TLS requires a multi-packet exchange
@@ -3985,7 +3985,7 @@
 minimize the amount of resources a potential, but as yet unauthenticated,
 client is able to consume.
 
-.B \-\-tls-auth
+.B --tls-auth
 does this by signing every TLS control channel packet with an HMAC signature,
 including packets which are sent before the TLS level has had a chance
 to authenticate the peer.
@@ -3993,20 +3993,20 @@
 the correct signature can be dropped immediately upon reception,
 before they have a chance to consume additional system resources
 such as by initiating a TLS handshake.
-.B \-\-tls-auth
+.B --tls-auth
 can be strengthened by adding the
-.B \-\-replay-persist
+.B --replay-persist
 option which will keep OpenVPN's replay protection state
 in a file so that it is not lost across restarts.
 
 It should be emphasized that this feature is optional and that the
 passphrase/key file used with
-.B \-\-tls-auth
+.B --tls-auth
 gives a peer nothing more than the power to initiate a TLS
 handshake.  It is not used to encrypt or authenticate any tunnel data.
 .\"*********************************************************
 .TP
-.B \-\-askpass [file]
+.B --askpass [file]
 Get certificate password from console or
 .B file
 before we daemonize.
@@ -4015,7 +4015,7 @@
 security conscious, it is possible to protect your private key with
 a password.  Of course this means that every time the OpenVPN
 daemon is started you must be there to type the password.  The
-.B \-\-askpass
+.B --askpass
 option allows you to start OpenVPN from the command line.  It will
 query you for a password before it daemonizes.  To protect a private
 key with a password you should omit the
@@ -4032,15 +4032,15 @@
 to a certain extent invalidates the extra security provided by
 using an encrypted key (Note: OpenVPN
 will only read passwords from a file if it has been built
-with the \-\-enable-password-save configure option, or on Windows
+with the --enable-password-save configure option, or on Windows
 by defining ENABLE_PASSWORD_SAVE in config-win32.h).
 .\"*********************************************************
 .TP
-.B \-\-auth-nocache
+.B --auth-nocache
 Don't cache
-.B \-\-askpass
+.B --askpass
 or
-.B \-\-auth-user-pass
+.B --auth-user-pass
 username/passwords in virtual memory.
 
 If specified, this directive will cause OpenVPN to immediately
@@ -4050,19 +4050,19 @@
 OpenVPN session.
 
 This directive does not affect the
-.B \-\-http-proxy
+.B --http-proxy
 username/password.  It is always cached.
 .\"*********************************************************
 .TP
-.B \-\-tls-verify cmd
+.B --tls-verify cmd
 Execute shell command
 .B cmd
 to verify the X509 name of a
 pending TLS connection that has otherwise passed all other
 tests of certification (except for revocation via
-.B \-\-crl-verify
+.B --crl-verify
 directive; the revocation test occurs after the
-.B \-\-tls-verify
+.B --tls-verify
 test).
 
 .B cmd
@@ -4095,7 +4095,7 @@
 to build a command line which will be passed to the script.
 .\"*********************************************************
 .TP
-.B \-\-tls-remote name
+.B --tls-remote name
 Accept connections only from a host with X509 name
 or common name equal to
 .B name.
@@ -4105,24 +4105,24 @@
 Name can also be a common name prefix, for example if you
 want a client to only accept connections to "Server-1",
 "Server-2", etc., you can simply use
-.B \-\-tls-remote Server
+.B --tls-remote Server
 
 Using a common name prefix is a useful alternative to managing
 a CRL (Certificate Revocation List) on the client, since it allows the client
 to refuse all certificates except for those associated
 with designated servers.
 
-.B \-\-tls-remote
+.B --tls-remote
 is a useful replacement for the
-.B \-\-tls-verify
+.B --tls-verify
 option to verify the remote host, because
-.B \-\-tls-remote
+.B --tls-remote
 works in a
-.B \-\-chroot
+.B --chroot
 environment too.
 .\"*********************************************************
 .TP
-.B \-\-ns-cert-type client|server
+.B --ns-cert-type client|server
 Require that peer certificate was signed with an explicit
 .B nsCertType
 designation of "client" or "server".
@@ -4137,19 +4137,19 @@
 
 If the server certificate's nsCertType field is set
 to "server", then the clients can verify this with
-.B \-\-ns-cert-type server.
+.B --ns-cert-type server.
 
 This is an important security precaution to protect against
 a man-in-the-middle attack where an authorized client
 attempts to connect to another client by impersonating the server.
 The attack is easily prevented by having clients verify
 the server certificate using any one of
-.B \-\-ns-cert-type, \-\-tls-remote,
+.B --ns-cert-type, --tls-remote,
 or
-.B \-\-tls-verify.
+.B --tls-verify.
 .\"*********************************************************
 .TP
-.B \-\-remote-cert-ku v...
+.B --remote-cert-ku v...
 Require that peer certificate was signed with an explicit
 .B key usage.
 
@@ -4160,7 +4160,7 @@
 usage can be specified.
 .\"*********************************************************
 .TP
-.B \-\-remote-cert-eku oid
+.B --remote-cert-eku oid
 Require that peer certificate was signed with an explicit
 .B extended key usage.
 
@@ -4171,7 +4171,7 @@
 OpenSSL symbolic representation.
 .\"*********************************************************
 .TP
-.B \-\-remote-cert-tls client|server
+.B --remote-cert-tls client|server
 Require that peer certificate was signed with an explicit
 .B key usage
 and
@@ -4182,18 +4182,18 @@
 the host they connect to is a designated server.
 
 The
-.B \-\-remote-cert-tls client
+.B --remote-cert-tls client
 option is equivalent to
 .B
-\-\-remote-cert-ku 80 08 88 \-\-remote-cert-eku "TLS Web Client Authentication"
+--remote-cert-ku 80 08 88 --remote-cert-eku "TLS Web Client Authentication"
 
 The key usage is digitalSignature and/or keyAgreement.
 
 The
-.B \-\-remote-cert-tls server
+.B --remote-cert-tls server
 option is equivalent to
 .B
-\-\-remote-cert-ku a0 88 \-\-remote-cert-eku "TLS Web Server Authentication"
+--remote-cert-ku a0 88 --remote-cert-eku "TLS Web Server Authentication"
 
 The key usage is digitalSignature and ( keyEncipherment or keyAgreement ).
 
@@ -4202,12 +4202,12 @@
 attempts to connect to another client by impersonating the server.
 The attack is easily prevented by having clients verify
 the server certificate using any one of
-.B \-\-remote-cert-tls, \-\-tls-remote,
+.B --remote-cert-tls, --tls-remote,
 or
-.B \-\-tls-verify.
+.B --tls-verify.
 .\"*********************************************************
 .TP
-.B \-\-crl-verify crl
+.B --crl-verify crl
 Check peer certificate against the file
 .B crl
 in PEM format.
@@ -4227,28 +4227,28 @@
 .SS SSL Library information:
 .\"*********************************************************
 .TP
-.B \-\-show-ciphers
+.B --show-ciphers
 (Standalone)
 Show all cipher algorithms to use with the
-.B \-\-cipher
+.B --cipher
 option.
 .\"*********************************************************
 .TP
-.B \-\-show-digests
+.B --show-digests
 (Standalone)
 Show all message digest algorithms to use with the
-.B \-\-auth
+.B --auth
 option.
 .\"*********************************************************
 .TP
-.B \-\-show-tls
+.B --show-tls
 (Standalone)
 Show all TLS ciphers (TLS used only as a control channel).  The TLS
 ciphers will be sorted from highest preference (most secure) to
 lowest.
 .\"*********************************************************
 .TP
-.B \-\-show-engines
+.B --show-engines
 (Standalone)
 Show currently available hardware-based crypto acceleration
 engines supported by the OpenSSL library.
@@ -4257,18 +4257,18 @@
 Used only for non-TLS static key encryption mode.
 .\"*********************************************************
 .TP
-.B \-\-genkey
+.B --genkey
 (Standalone)
 Generate a random key to be used as a shared secret,
 for use with the
-.B \-\-secret
+.B --secret
 option.  This file must be shared with the
 peer over a pre-existing secure channel such as
 .BR scp (1)
 .
 .\"*********************************************************
 .TP
-.B \-\-secret file
+.B --secret file
 Write key to
 .B file.
 .\"*********************************************************
@@ -4277,7 +4277,7 @@
 of OpenVPN which can be used to create and delete persistent tunnels.
 .\"*********************************************************
 .TP
-.B \-\-mktun
+.B --mktun
 (Standalone)
 Create a persistent tunnel on platforms which support them such
 as Linux.  Normally TUN/TAP tunnels exist only for
@@ -4288,9 +4288,9 @@
 
 One of the advantages of persistent tunnels is that they eliminate the
 need for separate
-.B \-\-up
+.B --up
 and
-.B \-\-down
+.B --down
 scripts to run the appropriate
 .BR ifconfig (8)
 and
@@ -4302,56 +4302,56 @@
 will not be reset if the OpenVPN peer restarts.  This can be useful to
 provide uninterrupted connectivity through the tunnel in the event of a DHCP
 reset of the peer's public IP address (see the
-.B \-\-ipchange
+.B --ipchange
 option above).
 
 One disadvantage of persistent tunnels is that it is harder to automatically
 configure their MTU value (see
-.B \-\-link-mtu
+.B --link-mtu
 and
-.B \-\-tun-mtu
+.B --tun-mtu
 above).
 
 On some platforms such as Windows, TAP-Win32 tunnels are persistent by
 default.
 .\"*********************************************************
 .TP
-.B \-\-rmtun
+.B --rmtun
 (Standalone)
 Remove a persistent tunnel.
 .\"*********************************************************
 .TP
-.B \-\-dev tunX | tapX
+.B --dev tunX | tapX
 TUN/TAP device
 .\"*********************************************************
 .TP
-.B \-\-user user
+.B --user user
 Optional user to be owner of this tunnel.
 .\"*********************************************************
 .TP
-.B \-\-group group
+.B --group group
 Optional group to be owner of this tunnel.
 .\"*********************************************************
 .SS Windows-Specific Options:
 .\"*********************************************************
 .TP
-.B \-\-ip-win32 method
+.B --ip-win32 method
 When using
-.B \-\-ifconfig
+.B --ifconfig
 on Windows, set the TAP-Win32 adapter
 IP address and netmask using
 .B method.
 Don't use this option unless you are also using
-.B \-\-ifconfig.
+.B --ifconfig.
 
-.B manual \-\-
+.B manual --
 Don't set the IP address or netmask automatically.
 Instead output a message
 to the console telling the user to configure the
 adapter manually and indicating the IP/netmask which
 OpenVPN expects the adapter to be set to.
 
-.B dynamic [offset] [lease-time] \-\-
+.B dynamic [offset] [lease-time] --
 Automatically set the IP address and netmask by replying to
 DHCP query messages generated by the kernel.  This mode is
 probably the "cleanest" solution
@@ -4361,13 +4361,13 @@
 adapter must be set to "Obtain an IP address automatically," and
 (2) OpenVPN needs to claim an IP address in the subnet for use
 as the virtual DHCP server address.  By default in
-.B \-\-dev tap
+.B --dev tap
 mode, OpenVPN will
 take the normally unused first address in the subnet.  For example,
 if your subnet is 192.168.4.0 netmask 255.255.255.0, then
 OpenVPN will take the IP address 192.168.4.0 to use as the
 virtual DHCP server address.  In
-.B \-\-dev tun
+.B --dev tun
 mode, OpenVPN will cause the DHCP server to masquerade as if it were
 coming from the remote endpoint.  The optional offset parameter is
 an integer which is > -256 and < 256 and which defaults to 0.
@@ -4389,13 +4389,13 @@
 being lost when the system goes to sleep.  The default
 lease time is one year.
 
-.B netsh \-\-
+.B netsh --
 Automatically set the IP address and netmask using
 the Windows command-line "netsh"
 command.  This method appears to work correctly on
 Windows XP but not Windows 2000.
 
-.B ipapi \-\-
+.B ipapi --
 Automatically set the IP address and netmask using the
 Windows IP Helper API.  This approach
 does not have ideal semantics, though testing has indicated
@@ -4404,7 +4404,7 @@
 adapter in their default state, i.e. "Obtain an IP address
 automatically."
 
-.B adaptive \-\-
+.B adaptive --
 (Default) Try
 .B dynamic
 method initially and fail over to
@@ -4434,55 +4434,55 @@
 to a DHCP configuration.
 .\"*********************************************************
 .TP
-.B \-\-route-method m
+.B --route-method m
 Which method
 .B m
 to use for adding routes on Windows?
 
 .B adaptive
-(default) \-\- Try IP helper API first.  If that fails, fall
+(default) -- Try IP helper API first.  If that fails, fall
 back to the route.exe shell command.
 .br
 .B ipapi
-\-\- Use IP helper API.
+-- Use IP helper API.
 .br
 .B exe
-\-\- Call the route.exe shell command.
+-- Call the route.exe shell command.
 .\"*********************************************************
 .TP
-.B \-\-dhcp-option type [parm]
+.B --dhcp-option type [parm]
 Set extended TAP-Win32 TCP/IP properties, must
 be used with
-.B \-\-ip-win32 dynamic
+.B --ip-win32 dynamic
 or
-.B \-\-ip-win32 adaptive.
+.B --ip-win32 adaptive.
 This option can be used to set additional TCP/IP properties
 on the TAP-Win32 adapter, and is particularly useful for
 configuring an OpenVPN client to access a Samba server
 across the VPN.
 
-.B DOMAIN name \-\-
+.B DOMAIN name --
 Set Connection-specific DNS Suffix.
 
-.B DNS addr \-\-
+.B DNS addr --
 Set primary domain name server address.  Repeat
 this option to set secondary DNS server addresses.
 
-.B WINS addr \-\-
+.B WINS addr --
 Set primary WINS server address (NetBIOS over TCP/IP Name Server).
 Repeat this option to set secondary WINS server addresses.
 
-.B NBDD addr \-\-
+.B NBDD addr --
 Set primary NBDD server address (NetBIOS over TCP/IP Datagram Distribution Server)
 Repeat this option
 to set secondary NBDD server addresses.
 
-.B NTP addr \-\-
+.B NTP addr --
 Set primary NTP server address (Network Time Protocol).
 Repeat this option
 to set secondary NTP server addresses.
 
-.B NBT type \-\-
+.B NBT type --
 Set NetBIOS over TCP/IP Node type.  Possible options:
 .B 1
 = b-node (broadcasts),
@@ -4495,7 +4495,7 @@
 .B 8
 = h-node (query name server, then broadcast).
 
-.B NBS scope-id \-\-
+.B NBS scope-id --
 Set NetBIOS over TCP/IP Scope. A NetBIOS Scope ID provides an extended
 naming service for the NetBIOS over TCP/IP (Known as NBT) module. The
 primary purpose of a NetBIOS scope ID is to isolate NetBIOS traffic on
@@ -4507,19 +4507,19 @@
 scope IDs. The Scope ID becomes a part of the NetBIOS name, making the name unique.
 (This description of NetBIOS scopes courtesy of NeonSurge@abyss.com)
 
-.B DISABLE-NBT \-\-
+.B DISABLE-NBT --
 Disable Netbios-over-TCP/IP.
 
 Note that if
-.B \-\-dhcp-option
+.B --dhcp-option
 is pushed via
-.B \-\-push
+.B --push
 to a non-windows client, the option will be saved in the client's
 environment before the up script is called, under
 the name "foreign_option_{n}".
 .\"*********************************************************
 .TP
-.B \-\-tap-sleep n
+.B --tap-sleep n
 Cause OpenVPN to sleep for
 .B n
 seconds immediately after the TAP-Win32 adapter state
@@ -4527,21 +4527,21 @@
 
 This option is intended to be used to troubleshoot problems
 with the
-.B \-\-ifconfig
+.B --ifconfig
 and
-.B \-\-ip-win32
+.B --ip-win32
 options, and is used to give
 the TAP-Win32 adapter time to come up before
 Windows IP Helper API operations are applied to it.
 .\"*********************************************************
 .TP
-.B \-\-show-net-up
+.B --show-net-up
 Output OpenVPN's view of the system routing table and network
 adapter list to the syslog or log file after the TUN/TAP adapter
 has been brought up and any routes have been added.
 .\"*********************************************************
 .TP
-.B \-\-dhcp-renew
+.B --dhcp-renew
 Ask Windows to renew the TAP adapter lease on startup.
 This option is normally unnecessary, as Windows automatically
 triggers a DHCP renegotiation on the TAP adapter when it
@@ -4550,21 +4550,21 @@
 flag.
 .\"*********************************************************
 .TP
-.B \-\-dhcp-release
+.B --dhcp-release
 Ask Windows to release the TAP adapter lease on shutdown.
 This option has the same caveats as
-.B \-\-dhcp-renew
+.B --dhcp-renew
 above.
 .\"*********************************************************
 .TP
-.B \-\-pause-exit
+.B --pause-exit
 Put up a "press any key to continue" message on the console prior
 to OpenVPN program exit.  This option is automatically used by the
 Windows explorer when OpenVPN is run on a configuration
 file using the right-click explorer menu.
 .\"*********************************************************
 .TP
-.B \-\-service exit-event [0|1]
+.B --service exit-event [0|1]
 Should be used when OpenVPN is being automatically executed by another
 program in such
 a context that no interaction with the user via display or keyboard
@@ -4587,26 +4587,26 @@
 causing all such OpenVPN processes to exit.
 
 When executing an OpenVPN process using the
-.B \-\-service
+.B --service
 directive, OpenVPN will probably not have a console
 window to output status/error
 messages, therefore it is useful to use
-.B \-\-log
+.B --log
 or
-.B \-\-log-append
+.B --log-append
 to write these messages to a file.
 .\"*********************************************************
 .TP
-.B \-\-show-adapters
+.B --show-adapters
 (Standalone)
 Show available TAP-Win32 adapters which can be selected using the
-.B \-\-dev-node
+.B --dev-node
 option.  On non-Windows systems, the
 .BR ifconfig (8)
 command provides similar functionality.
 .\"*********************************************************
 .TP
-.B \-\-allow-nonadmin [TAP-adapter]
+.B --allow-nonadmin [TAP-adapter]
 (Standalone)
 Set
 .B TAP-adapter
@@ -4621,10 +4621,10 @@
 This directive can only be used by an administrator.
 .\"*********************************************************
 .TP
-.B \-\-show-valid-subnets
+.B --show-valid-subnets
 (Standalone)
 Show valid subnets for
-.B \-\-dev tun
+.B --dev tun
 emulation.  Since the TAP-Win32 driver
 exports an ethernet interface to Windows, and since TUN devices are
 point-to-point in nature, it is necessary for the TAP-Win32 driver
@@ -4634,7 +4634,7 @@
 must be the middle two addresses of a /30 subnet (netmask 255.255.255.252).
 .\"*********************************************************
 .TP
-.B \-\-show-net
+.B --show-net
 (Standalone)
 Show OpenVPN's view of the system routing table and network
 adapter list.
@@ -4642,12 +4642,12 @@
 .SS PKCS#11 Standalone Options:
 .\"*********************************************************
 .TP
-.B \-\-show-pkcs11-ids provider [cert_private]
+.B --show-pkcs11-ids provider [cert_private]
 (Standalone)
 Show PKCS#11 token object list. Specify cert_private as 1
 if certificates are stored as private objects.
 
-.B \-\-verb
+.B --verb
 option can be used BEFORE this option to produce debugging information.
 .\"*********************************************************
 .SH SCRIPTING AND ENVIRONMENTAL VARIABLES
@@ -4657,52 +4657,52 @@
 .SS Script Order of Execution
 .\"*********************************************************
 .TP
-.B \-\-up
+.B --up
 Executed after TCP/UDP socket bind and TUN/TAP open.
 .\"*********************************************************
 .TP
-.B \-\-tls-verify
+.B --tls-verify
 Executed when we have a still untrusted remote peer.
 .\"*********************************************************
 .TP
-.B \-\-ipchange
+.B --ipchange
 Executed after connection authentication, or remote IP address change.
 .\"*********************************************************
 .TP
-.B \-\-client-connect
+.B --client-connect
 Executed in
-.B \-\-mode server
+.B --mode server
 mode immediately after client authentication.
 .\"*********************************************************
 .TP
-.B \-\-route-up
+.B --route-up
 Executed after connection authentication, either
 immediately after, or some number of seconds after
 as defined by the
-.B \-\-route-delay
+.B --route-delay
 option.
 .\"*********************************************************
 .TP
-.B \-\-client-disconnect
+.B --client-disconnect
 Executed in
-.B \-\-mode server
+.B --mode server
 mode on client instance shutdown.
 .\"*********************************************************
 .TP
-.B \-\-down
+.B --down
 Executed after TCP/UDP and TUN/TAP close.
 .\"*********************************************************
 .TP
-.B \-\-learn-address
+.B --learn-address
 Executed in
-.B \-\-mode server
+.B --mode server
 mode whenever an IPv4 address/route or MAC address is added to OpenVPN's
 internal routing table.
 .\"*********************************************************
 .TP
-.B \-\-auth-user-pass-verify
+.B --auth-user-pass-verify
 Executed in
-.B \-\-mode server
+.B --mode server
 mode on new client connections, when the client is
 still untrusted.
 .\"*********************************************************
@@ -4734,17 +4734,17 @@
 Alphanumeric, underbar ('_'), dash ('-'), dot ('.'), and at                
 ('@').
 
-.B \-\-auth-user-pass username:
+.B --auth-user-pass username:
 Same as Common Name, with one exception: starting with OpenVPN 2.0.1,
 the username is passed to the OPENVPN_PLUGIN_AUTH_USER_PASS_VERIFY plugin in its raw form,
 without string remapping.
 
-.B \-\-auth-user-pass password:
+.B --auth-user-pass password:
 Any "printable" character except CR or LF.  
 Printable is defined to be a character which will cause the C library 
 isprint() function to return true.
 
-.B \-\-client-config-dir filename as derived from common name or username:
+.B --client-config-dir filename as derived from common name or username:
 Alphanumeric, underbar ('_'), dash ('-'), and dot ('.') except for "." or 
 ".." as standalone strings.  As of 2.0.1-rc6, the at ('@') character has
 been added as well for compatibility with the common name character class.
@@ -4774,45 +4774,45 @@
 .B bytes_received
 Total number of bytes received from client during VPN session.
 Set prior to execution of the
-.B \-\-client-disconnect
+.B --client-disconnect
 script.
 .\"*********************************************************
 .TP
 .B bytes_sent
 Total number of bytes sent to client during VPN session.
 Set prior to execution of the
-.B \-\-client-disconnect
+.B --client-disconnect
 script.
 .\"*********************************************************
 .TP
 .B common_name
 The X509 common name of an authenticated client.
 Set prior to execution of
-.B \-\-client-connect, \-\-client-disconnect,
+.B --client-connect, --client-disconnect,
 and
-.B \-\-auth-user-pass-verify
+.B --auth-user-pass-verify
 scripts.
 .\"*********************************************************
 .TP
 .B config
 Name of first
-.B \-\-config
+.B --config
 file.
 Set on program initiation and reset on SIGHUP.
 .\"*********************************************************
 .TP
 .B daemon
 Set to "1" if the
-.B \-\-daemon
+.B --daemon
 directive is specified, or "0" otherwise.
 Set on program initiation and reset on SIGHUP.
 .\"*********************************************************
 .TP
 .B daemon_log_redirect
 Set to "1" if the
-.B \-\-log
+.B --log
 or
-.B \-\-log-append
+.B --log-append
 directives are specified, or "0" otherwise.
 Set on program initiation and reset on SIGHUP.
 .\"*********************************************************
@@ -4821,30 +4821,30 @@
 The actual name of the TUN/TAP device, including
 a unit number if it exists.
 Set prior to
-.B \-\-up
+.B --up
 or
-.B \-\-down
+.B --down
 script execution.
 .\"*********************************************************
 .TP
 .B foreign_option_{n}
 An option pushed via
-.B \-\-push
+.B --push
 to a client which does not natively support it,
 such as
-.B \-\-dhcp-option
+.B --dhcp-option
 on a non-Windows system, will be recorded to this
 environmental variable sequence prior to
-.B \-\-up
+.B --up
 script execution.
 .\"*********************************************************
 .TP
 .B ifconfig_broadcast
 The broadcast address for the virtual
 ethernet segment which is derived from the
-.B \-\-ifconfig
+.B --ifconfig
 option when
-.B \-\-dev tap
+.B --dev tap
 is used.
 Set prior to OpenVPN calling the
 .I ifconfig
@@ -4852,13 +4852,13 @@
 .I netsh
 (windows version of ifconfig) commands which
 normally occurs prior to
-.B \-\-up
+.B --up
 script execution.
 .\"*********************************************************
 .TP
 .B ifconfig_local
 The local VPN endpoint IP address specified in the
-.B \-\-ifconfig
+.B --ifconfig
 option (first parameter).
 Set prior to OpenVPN calling the
 .I ifconfig
@@ -4866,15 +4866,15 @@
 .I netsh
 (windows version of ifconfig) commands which
 normally occurs prior to
-.B \-\-up
+.B --up
 script execution.
 .\"*********************************************************
 .TP
 .B ifconfig_remote
 The remote VPN endpoint IP address specified in the
-.B \-\-ifconfig
+.B --ifconfig
 option (second parameter) when
-.B \-\-dev tun
+.B --dev tun
 is used.
 Set prior to OpenVPN calling the
 .I ifconfig
@@ -4882,16 +4882,16 @@
 .I netsh
 (windows version of ifconfig) commands which
 normally occurs prior to
-.B \-\-up
+.B --up
 script execution.
 .\"*********************************************************
 .TP
 .B ifconfig_netmask
 The subnet mask of the virtual ethernet segment
 that is specified as the second parameter to
-.B \-\-ifconfig
+.B --ifconfig
 when
-.B \-\-dev tap
+.B --dev tap
 is being used.
 Set prior to OpenVPN calling the
 .I ifconfig
@@ -4899,61 +4899,61 @@
 .I netsh
 (windows version of ifconfig) commands which
 normally occurs prior to
-.B \-\-up
+.B --up
 script execution.
 .\"*********************************************************
 .TP
 .B ifconfig_pool_local_ip
 The local
 virtual IP address for the TUN/TAP tunnel taken from an
-.B \-\-ifconfig-push
+.B --ifconfig-push
 directive if specified, or otherwise from
 the ifconfig pool (controlled by the
-.B \-\-ifconfig-pool
+.B --ifconfig-pool
 config file directive).
 Only set for
-.B \-\-dev tun
+.B --dev tun
 tunnels.
 This option is set on the server prior to execution
 of the
-.B \-\-client-connect
+.B --client-connect
 and
-.B \-\-client-disconnect
+.B --client-disconnect
 scripts.
 .\"*********************************************************
 .TP
 .B ifconfig_pool_netmask
 The
 virtual IP netmask for the TUN/TAP tunnel taken from an
-.B \-\-ifconfig-push
+.B --ifconfig-push
 directive if specified, or otherwise from
 the ifconfig pool (controlled by the
-.B \-\-ifconfig-pool
+.B --ifconfig-pool
 config file directive).
 Only set for
-.B \-\-dev tap
+.B --dev tap
 tunnels.
 This option is set on the server prior to execution
 of the
-.B \-\-client-connect
+.B --client-connect
 and
-.B \-\-client-disconnect
+.B --client-disconnect
 scripts.
 .\"*********************************************************
 .TP
 .B ifconfig_pool_remote_ip
 The remote
 virtual IP address for the TUN/TAP tunnel taken from an
-.B \-\-ifconfig-push
+.B --ifconfig-push
 directive if specified, or otherwise from
 the ifconfig pool (controlled by the
-.B \-\-ifconfig-pool
+.B --ifconfig-pool
 config file directive).
 This option is set on the server prior to execution
 of the
-.B \-\-client-connect
+.B --client-connect
 and
-.B \-\-client-disconnect
+.B --client-disconnect
 scripts.
 .\"*********************************************************
 .TP
@@ -4961,31 +4961,31 @@
 The maximum packet size (not including the IP header)
 of tunnel data in UDP tunnel transport mode.
 Set prior to
-.B \-\-up
+.B --up
 or
-.B \-\-down
+.B --down
 script execution.
 .\"*********************************************************
 .TP
 .B local
 The
-.B \-\-local
+.B --local
 parameter.
 Set on program initiation and reset on SIGHUP.
 .\"*********************************************************
 .TP
 .B local_port
 The local port number, specified by
-.B \-\-port
+.B --port
 or
-.B \-\-lport.
+.B --lport.
 Set on program initiation and reset on SIGHUP.
 .\"*********************************************************
 .TP
 .B password
 The password provided by a connecting client.
 Set prior to
-.B \-\-auth-user-pass-verify
+.B --auth-user-pass-verify
 script execution only when the
 .B via-env
 modifier is specified, and deleted from the environment
@@ -4994,23 +4994,23 @@
 .TP
 .B proto
 The
-.B \-\-proto
+.B --proto
 parameter.
 Set on program initiation and reset on SIGHUP.
 .\"*********************************************************
 .TP
 .B remote_{n}
 The
-.B \-\-remote
+.B --remote
 parameter.
 Set on program initiation and reset on SIGHUP.
 .\"*********************************************************
 .TP
 .B remote_port_{n}
 The remote port number, specified by
-.B \-\-port
+.B --port
 or
-.B \-\-rport.
+.B --rport.
 Set on program initiation and reset on SIGHUP.
 .\"*********************************************************
 .TP
@@ -5018,29 +5018,29 @@
 The pre-existing default IP gateway in the system routing
 table.
 Set prior to
-.B \-\-up
+.B --up
 script execution.
 .\"*********************************************************
 .TP
 .B route_vpn_gateway
 The default gateway used by
-.B \-\-route
+.B --route
 options, as specified in either the
-.B \-\-route-gateway
+.B --route-gateway
 option or the second parameter to
-.B \-\-ifconfig
+.B --ifconfig
 when
-.B \-\-dev tun
+.B --dev tun
 is specified.
 Set prior to
-.B \-\-up
+.B --up
 script execution.
 .\"*********************************************************
 .TP
 .B route_{parm}_{n}
 A set of variables which define each route to be added, and
 are set prior to
-.B \-\-up
+.B --up
 script execution.
 
 .B parm
@@ -5059,7 +5059,7 @@
 Set to "init" or "restart" prior to up/down script execution.
 For more information, see
 documentation for
-.B \-\-up.
+.B --up.
 .\"*********************************************************
 .TP
 .B script_type
@@ -5075,15 +5075,15 @@
 The reason for exit or restart.  Can be one of
 .B sigusr1, sighup, sigterm, sigint, inactive
 (controlled by
-.B \-\-inactive
+.B --inactive
 option),
 .B ping-exit
 (controlled by
-.B \-\-ping-exit
+.B --ping-exit
 option),
 .B ping-restart
 (controlled by
-.B \-\-ping-restart
+.B --ping-restart
 option),
 .B connection-reset
 (triggered on TCP connection reset),
@@ -5097,7 +5097,7 @@
 Client connection timestamp, formatted as a human-readable
 time string.
 Set prior to execution of the
-.B \-\-client-connect
+.B --client-connect
 script.
 .\"*********************************************************
 .TP
@@ -5105,7 +5105,7 @@
 The duration (in seconds) of the client session which is now
 disconnecting.
 Set prior to execution of the
-.B \-\-client-disconnect
+.B --client-disconnect
 script.
 .\"*********************************************************
 .TP
@@ -5113,7 +5113,7 @@
 Client connection timestamp, formatted as a unix integer
 date/time value.
 Set prior to execution of the
-.B \-\-client-connect
+.B --client-connect
 script.
 .\"*********************************************************
 .TP
@@ -5123,7 +5123,7 @@
 .B n
 is the verification level.  Only set for TLS connections.  Set prior
 to execution of
-.B \-\-tls-verify
+.B --tls-verify
 script.
 .\"*********************************************************
 .TP
@@ -5133,34 +5133,34 @@
 .B n
 is the verification level.  Only set for TLS connections.  Set prior
 to execution of
-.B \-\-tls-verify
+.B --tls-verify
 script.
 .\"*********************************************************
 .TP
 .B tun_mtu
 The MTU of the TUN/TAP device.
 Set prior to
-.B \-\-up
+.B --up
 or
-.B \-\-down
+.B --down
 script execution.
 .\"*********************************************************
 .TP
 .B trusted_ip
 Actual IP address of connecting client or peer which has been authenticated.
 Set prior to execution of
-.B \-\-ipchange, \-\-client-connect,
+.B --ipchange, --client-connect,
 and
-.B \-\-client-disconnect
+.B --client-disconnect
 scripts.
 .\"*********************************************************
 .TP
 .B trusted_port
 Actual port number of connecting client or peer which has been authenticated.
 Set prior to execution of
-.B \-\-ipchange, \-\-client-connect,
+.B --ipchange, --client-connect,
 and
-.B \-\-client-disconnect
+.B --client-disconnect
 scripts.
 .\"*********************************************************
 .TP
@@ -5169,12 +5169,12 @@
 yet.  Sometimes used to
 .B nmap
 the connecting host in a
-.B \-\-tls-verify
+.B --tls-verify
 script to ensure it is firewalled properly.
 Set prior to execution of
-.B \-\-tls-verify
+.B --tls-verify
 and
-.B \-\-auth-user-pass-verify
+.B --auth-user-pass-verify
 scripts.
 .\"*********************************************************
 .TP
@@ -5182,16 +5182,16 @@
 Actual port number of connecting client or peer which has not been authenticated
 yet.
 Set prior to execution of
-.B \-\-tls-verify
+.B --tls-verify
 and
-.B \-\-auth-user-pass-verify
+.B --auth-user-pass-verify
 scripts.
 .\"*********************************************************
 .TP
 .B username
 The username provided by a connecting client.
 Set prior to
-.B \-\-auth-user-pass-verify
+.B --auth-user-pass-verify
 script execution only when the
 .B via-env
 modifier is specified.
@@ -5211,30 +5211,30 @@
 except don't re-read configuration file, and possibly don't close and reopen TUN/TAP
 device, re-read key files, preserve local IP address/port, or preserve most recently authenticated
 remote IP address/port based on
-.B \-\-persist-tun, \-\-persist-key, \-\-persist-local-ip,
+.B --persist-tun, --persist-key, --persist-local-ip,
 and
-.B \-\-persist-remote-ip
+.B --persist-remote-ip
 options respectively (see above).
 
 This signal may also be internally generated by a timeout condition, governed
 by the
-.B \-\-ping-restart
+.B --ping-restart
 option.
 
 This signal, when combined with
-.B \-\-persist-remote-ip,
+.B --persist-remote-ip,
 may be
 sent when the underlying parameters of the host's network interface change
 such as when the host is a DHCP client and is assigned a new IP address.
 See
-.B \-\-ipchange
+.B --ipchange
 above for more information.
 .\"*********************************************************
 .TP
 .B SIGUSR2
 Causes OpenVPN to display its current statistics (to the syslog
 file if
-.B \-\-daemon
+.B --daemon
 is used, or stdout otherwise).
 .\"*********************************************************
 .TP
@@ -5289,7 +5289,7 @@
 the two machines, they should be set to forward UDP port 1194
 in both directions.  If you do not have control over the firewalls
 between the two machines, you may still be able to use OpenVPN by adding
-.B \-\-ping 15
+.B --ping 15
 to each of the
 .B openvpn
 commands used below in the examples (this will cause each peer to send out
@@ -5358,11 +5358,11 @@
 .LP
 On may:
 .IP
-.B openvpn \-\-remote june.kg \-\-dev tun1 \-\-ifconfig 10.4.0.1 10.4.0.2 \-\-verb 9
+.B openvpn --remote june.kg --dev tun1 --ifconfig 10.4.0.1 10.4.0.2 --verb 9
 .LP
 On june:
 .IP
-.B openvpn \-\-remote may.kg \-\-dev tun1 \-\-ifconfig 10.4.0.2 10.4.0.1 \-\-verb 9
+.B openvpn --remote may.kg --dev tun1 --ifconfig 10.4.0.2 10.4.0.1 --verb 9
 .LP
 Now verify the tunnel is working by pinging across the tunnel.
 .LP
@@ -5375,17 +5375,17 @@
 .B ping 10.4.0.1
 .LP
 The
-.B \-\-verb 9
+.B --verb 9
 option will produce verbose output, similar to the
 .BR tcpdump (8)
 program.  Omit the
-.B \-\-verb 9
+.B --verb 9
 option to have OpenVPN run quietly.
 .\"*********************************************************
 .SS Example 2: A tunnel with static-key security (i.e. using a pre-shared secret)
 First build a static key on may.
 .IP
-.B openvpn \-\-genkey \-\-secret key
+.B openvpn --genkey --secret key
 .LP
 This command will build a random key file called
 .B key
@@ -5399,11 +5399,11 @@
 .LP
 On may:
 .IP
-.B openvpn \-\-remote june.kg \-\-dev tun1 \-\-ifconfig 10.4.0.1 10.4.0.2 \-\-verb 5 \-\-secret key
+.B openvpn --remote june.kg --dev tun1 --ifconfig 10.4.0.1 10.4.0.2 --verb 5 --secret key
 .LP
 On june:
 .IP
-.B openvpn \-\-remote may.kg \-\-dev tun1 \-\-ifconfig 10.4.0.2 10.4.0.1 \-\-verb 5 \-\-secret key
+.B openvpn --remote may.kg --dev tun1 --ifconfig 10.4.0.2 10.4.0.1 --verb 5 --secret key
 .LP
 Now verify the tunnel is working by pinging across the tunnel.
 .LP
@@ -5425,10 +5425,10 @@
 
 First, build a separate certificate/key pair
 for both may and june (see above where
-.B \-\-cert
+.B --cert
 is discussed for more info).  Then construct
 Diffie Hellman parameters (see above where
-.B \-\-dh
+.B --dh
 is discussed for more info).  You can also use the
 included test files client.crt, client.key,
 server.crt, server.key and ca.crt.
@@ -5441,11 +5441,11 @@
 .LP
 On may:
 .IP
-.B openvpn \-\-remote june.kg \-\-dev tun1 \-\-ifconfig 10.4.0.1 10.4.0.2 \-\-tls-client \-\-ca ca.crt \-\-cert client.crt \-\-key client.key \-\-reneg-sec 60 \-\-verb 5
+.B openvpn --remote june.kg --dev tun1 --ifconfig 10.4.0.1 10.4.0.2 --tls-client --ca ca.crt --cert client.crt --key client.key --reneg-sec 60 --verb 5
 .LP
 On june:
 .IP
-.B openvpn \-\-remote may.kg \-\-dev tun1 \-\-ifconfig 10.4.0.2 10.4.0.1 \-\-tls-server \-\-dh dh1024.pem \-\-ca ca.crt \-\-cert server.crt \-\-key server.key \-\-reneg-sec 60 \-\-verb 5
+.B openvpn --remote may.kg --dev tun1 --ifconfig 10.4.0.2 10.4.0.1 --tls-server --dh dh1024.pem --ca ca.crt --cert server.crt --key server.key --reneg-sec 60 --verb 5
 .LP
 Now verify the tunnel is working by pinging across the tunnel.
 .LP
@@ -5458,16 +5458,16 @@
 .B ping 10.4.0.1
 .LP
 Notice the
-.B \-\-reneg-sec 60
+.B --reneg-sec 60
 option we used above.  That tells OpenVPN to renegotiate
 the data channel keys every minute.
 Since we used
-.B \-\-verb 5
+.B --verb 5
 above, you will see status information on each new key negotiation.
 
 For production operations, a key renegotiation interval of 60 seconds
 is probably too frequent.  Omit the
-.B \-\-reneg-sec 60
+.B --reneg-sec 60
 option to use OpenVPN's default key renegotiation interval of one hour.
 .\"*********************************************************
 .SS Routing:
@@ -5503,7 +5503,7 @@
 
 In a production environment, you could put the route command(s)
 in a shell script and execute with the
-.B \-\-up
+.B --up
 option.
 .\"*********************************************************
 .SH FIREWALLS
@@ -5511,7 +5511,7 @@
 You should add an entry to your firewall rules to allow incoming OpenVPN
 packets.  On Linux 2.4+:
 .IP
-.B iptables -A INPUT -p udp -s 1.2.3.4 \-\-dport 1194 -j ACCEPT
+.B iptables -A INPUT -p udp -s 1.2.3.4 --dport 1194 -j ACCEPT
 .LP
 This will allow incoming packets on UDP port 1194 (OpenVPN's default UDP port)
 from an OpenVPN peer at 1.2.3.4.
@@ -5522,7 +5522,7 @@
 is a much more secure method of verifying the authenticity of
 a packet source.  In that case:
 .IP
-.B iptables -A INPUT -p udp \-\-dport 1194 -j ACCEPT
+.B iptables -A INPUT -p udp --dport 1194 -j ACCEPT
 .LP
 would be adequate and would not render the host inflexible with
 respect to its peer having a dynamic IP address.
@@ -5531,7 +5531,7 @@
 not need to add any static rules to the firewall list if you are
 using a stateful firewall that knows how to track UDP connections.
 If you specify
-.B \-\-ping n,
+.B --ping n,
 OpenVPN will be guaranteed
 to send a packet to its peer at least once every
 .B n
diff -Nru openvpn-2.1~rc7/plugin/auth-pam/auth-pam.c openvpn-2.1~rc7/plugin/auth-pam/auth-pam.c
--- openvpn-2.1~rc7/plugin/auth-pam/auth-pam.c	2008-05-21 20:06:07.000000000 +0100
+++ openvpn-2.1~rc7/plugin/auth-pam/auth-pam.c	2008-01-23 21:08:37.000000000 +0000
@@ -658,7 +658,7 @@
   struct user_pass up;
   int command;
 #if DLOPEN_PAM
-  static const char pam_so[] = "libpam.so.0";
+  static const char pam_so[] = "libpam.so";
 #endif
 
   /*
diff -Nru openvpn-2.1~rc7/sample-config-files/client.conf openvpn-2.1~rc7/sample-config-files/client.conf
--- openvpn-2.1~rc7/sample-config-files/client.conf	2008-05-21 20:06:07.000000000 +0100
+++ openvpn-2.1~rc7/sample-config-files/client.conf	2008-01-23 21:08:40.000000000 +0000
@@ -59,7 +59,7 @@
 
 # Downgrade privileges after initialization (non-Windows only)
 ;user nobody
-;group nogroup
+;group nobody
 
 # Try to preserve some state across restarts.
 persist-key
diff -Nru openvpn-2.1~rc7/sample-config-files/server.conf openvpn-2.1~rc7/sample-config-files/server.conf
--- openvpn-2.1~rc7/sample-config-files/server.conf	2008-05-21 20:06:07.000000000 +0100
+++ openvpn-2.1~rc7/sample-config-files/server.conf	2008-01-23 21:08:40.000000000 +0000
@@ -252,7 +252,7 @@
 # You can uncomment this out on
 # non-Windows systems.
 ;user nobody
-;group nogroup
+;group nobody
 
 # The persist options will try to avoid
 # accessing certain resources on restart
diff -Nru openvpn-2.1~rc7/sample-config-files/static-home.conf openvpn-2.1~rc7/sample-config-files/static-home.conf
--- openvpn-2.1~rc7/sample-config-files/static-home.conf	2008-05-21 20:06:07.000000000 +0100
+++ openvpn-2.1~rc7/sample-config-files/static-home.conf	2008-01-23 21:08:40.000000000 +0000
@@ -40,7 +40,7 @@
 # "nobody" after initialization
 # for extra security.
 ; user nobody
-; group nogroup
+; group nobody
 
 # If you built OpenVPN with
 # LZO compression, uncomment
diff -Nru openvpn-2.1~rc7/sample-config-files/static-office.conf openvpn-2.1~rc7/sample-config-files/static-office.conf
--- openvpn-2.1~rc7/sample-config-files/static-office.conf	2008-05-21 20:06:07.000000000 +0100
+++ openvpn-2.1~rc7/sample-config-files/static-office.conf	2008-01-23 21:08:40.000000000 +0000
@@ -37,7 +37,7 @@
 # "nobody" after initialization
 # for extra security.
 ; user nobody
-; group nogroup
+; group nobody
 
 # If you built OpenVPN with
 # LZO compression, uncomment
diff -Nru openvpn-2.1~rc7/sample-config-files/tls-home.conf openvpn-2.1~rc7/sample-config-files/tls-home.conf
--- openvpn-2.1~rc7/sample-config-files/tls-home.conf	2008-05-21 20:06:07.000000000 +0100
+++ openvpn-2.1~rc7/sample-config-files/tls-home.conf	2008-01-23 21:08:40.000000000 +0000
@@ -51,7 +51,7 @@
 # "nobody" after initialization
 # for extra security.
 ; user nobody
-; group nogroup
+; group nobody
 
 # If you built OpenVPN with
 # LZO compression, uncomment
diff -Nru openvpn-2.1~rc7/sample-config-files/tls-office.conf openvpn-2.1~rc7/sample-config-files/tls-office.conf
--- openvpn-2.1~rc7/sample-config-files/tls-office.conf	2008-05-21 20:06:07.000000000 +0100
+++ openvpn-2.1~rc7/sample-config-files/tls-office.conf	2008-01-23 21:08:40.000000000 +0000
@@ -51,7 +51,7 @@
 # "nobody" after initialization
 # for extra security.
 ; user nobody
-; group nogroup
+; group nobody
 
 # If you built OpenVPN with
 # LZO compression, uncomment
diff -Nru openvpn-2.1~rc7/socket.c openvpn-2.1~rc7/socket.c
--- openvpn-2.1~rc7/socket.c	2008-05-21 20:06:07.000000000 +0100
+++ openvpn-2.1~rc7/socket.c	2008-01-23 21:08:41.000000000 +0000
@@ -1255,10 +1255,6 @@
       resolve_bind_local (sock);
       resolve_remote (sock, 1, NULL, NULL);
     }
-
-  /* set socket file descriptor to not pass across execs, so that
-     scripts don't have access to it */
-  set_cloexec (sock->sd);
 }
 
 /* finalize socket initialization */
@@ -1465,6 +1461,10 @@
   /* set socket to non-blocking mode */
   set_nonblock (sock->sd);
 
+  /* set socket file descriptor to not pass across execs, so that
+     scripts don't have access to it */
+  set_cloexec (sock->sd);
+
 #ifdef ENABLE_SOCKS
   if (socket_defined (sock->ctrl_sd))
     set_cloexec (sock->ctrl_sd);
