Index: openvpn/openvpn.8
===================================================================
--- openvpn.orig/openvpn.8	2012-02-23 17:55:50.671749317 +0100
+++ openvpn/openvpn.8	2012-02-23 18:00:56.229264498 +0100
@@ -21,13 +21,13 @@
 .\"  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 .\"
 .\" Manual page for openvpn
-.\
+.\"
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
 .\" IP indented paragraph
 .\" TP hanging label
-.\
+.\"
 .\" .nf -- no formatting
 .\" .fi -- resume formatting
 .\" .ft 3 -- boldface
@@ -3620,7 +3620,7 @@
 This option is only relevant in UDP mode, i.e.
 when either
 .B \-\-proto udp
-is specifed, or no
+is specified, or no
 .B \-\-proto
 option is specified.
 
@@ -4352,7 +4352,7 @@
 .TP
 .B \-\-tls-export-cert directory
 Store the certificates the clients uses upon connection to this
-directory. This will be done before --tls-verify is called.  The
+directory. This will be done before \-\-tls-verify is called.  The
 certificates will use a temporary name and will be deleted when
 the tls-verify script returns.  The file name used for the certificate
 is available via the peer_cert environment variable.
@@ -4362,7 +4362,7 @@
 Field in x509 certificate subject to be used as username (default=CN).
 .B Fieldname
 will be uppercased before matching. When this option is used, the
---tls-remote option will match against the chosen fieldname instead
+\-\-tls-remote option will match against the chosen fieldname instead
 of the CN.
 .\"*********************************************************
 .TP
@@ -4958,26 +4958,26 @@
 documentation of the IPv6-related options. More documentation can be
 found on http://www.greenie.net/ipv6/openvpn.html.
 .TP
-.B --ifconfig-ipv6 ipv6addr/bits ipv6remote
+.B \-\-ifconfig-ipv6 ipv6addr/bits ipv6remote
 configure IPv6 address
 .B ipv6addr/bits
 on the ``tun'' device.  The second parameter is used as route target for
-.B --route-ipv6
+.B \-\-route-ipv6
 if no gateway is specified.
 .TP
-.B --route-ipv6 ipv6addr/bits [gateway] [metric]
+.B \-\-route-ipv6 ipv6addr/bits [gateway] [metric]
 setup IPv6 routing in the system to send the specified IPv6 network
 into OpenVPN's ``tun'' device
 .TP
-.B --server-ipv6 ipv6addr/bits
+.B \-\-server-ipv6 ipv6addr/bits
 convenience-function to enable a number of IPv6 related options at
 once, namely
-.B --ifconfig-ipv6, --ifconfig-ipv6-pool, --tun-ipv6
+.B \-\-ifconfig-ipv6, \-\-ifconfig-ipv6-pool, \-\-tun-ipv6
 and
-.B --push tun-ipv6
-Is only accepted if ``--mode server'' or ``--server'' is set.
+.B \-\-push tun-ipv6
+Is only accepted if ``\-\-mode server'' or ``\-\-server'' is set.
 .TP
-.B --ifconfig-ipv6-pool ipv6addr/bits
+.B \-\-ifconfig-ipv6-pool ipv6addr/bits
 Specify an IPv6 address pool for dynamic assignment to clients.  The
 pool starts at
 .B ipv6addr
@@ -4985,20 +4985,20 @@
 .B /bits
 setting controls the size of the pool.
 .TP
-.B --ifconfig-ipv6-push ipv6addr/bits ipv6remote
+.B \-\-ifconfig-ipv6-push ipv6addr/bits ipv6remote
 for ccd/ per-client static IPv6 interface configuration, see
-.B --client-config-dir
+.B \-\-client-config-dir
 and
-.B --ifconfig-push
+.B \-\-ifconfig-push
 for more details.
 .TP
-.B --iroute-ipv6 ipv6addr/bits
+.B \-\-iroute-ipv6 ipv6addr/bits
 for ccd/ per-client static IPv6 route configuration, see
-.B --iroute
+.B \-\-iroute
 for more details how to setup and use this, and how
-.B --iroute
+.B \-\-iroute
 and
-.B --route
+.B \-\-route
 interact.
 
 .\"*********************************************************
@@ -5417,7 +5417,7 @@
 .TP
 .B peer_cert
 Temporary file name containing the client certificate upon
-connection.  Useful in conjunction with --tls-verify
+connection.  Useful in conjunction with \-\-tls-verify
 .\"*********************************************************
 .TP
 .B script_context