Browse code

Incorporate the Debian typo fixes where appropriate and make show_opt default message clearer

Debian also incorrectly changes that the default for route parameters can
be specified by using "nil" instead of "default. The confusion is probably
coming from show_opt printing "nil" instead of "default". Change show_opt
to show "default (not set)" instead of "nil"

Original author: Alberto Gonzalez Iniesta <agi@inittab.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1468495519-25102-1-git-send-email-arne@rfc2549.org>
URL: http://www.mail-archive.com/search?l=mid&q=1468495519-25102-1-git-send-email-arne@rfc2549.org

Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit c42fcbfe708f4c97da063642cf8874f0d4d1a645)

Arne Schwabe authored on 2016/07/14 20:25:19
Showing 3 changed files
... ...
@@ -21,13 +21,13 @@
21 21
 .\"  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
22 22
 .\"
23 23
 .\" Manual page for openvpn
24
-.\
24
+.\"
25 25
 .\" SH section heading
26 26
 .\" SS subsection heading
27 27
 .\" LP paragraph
28 28
 .\" IP indented paragraph
29 29
 .\" TP hanging label
30
-.\
30
+.\"
31 31
 .\" .nf -- no formatting
32 32
 .\" .fi -- resume formatting
33 33
 .\" .ft 3 -- boldface
... ...
@@ -4031,7 +4031,7 @@ is 15 seconds.
4031 4031
 This option is only relevant in UDP mode, i.e.
4032 4032
 when either
4033 4033
 .B \-\-proto udp
4034
-is specifed, or no
4034
+is specified, or no
4035 4035
 .B \-\-proto
4036 4036
 option is specified.
4037 4037
 
... ...
@@ -5304,7 +5304,7 @@ virtual DHCP server address.  In
5304 5304
 .B \-\-dev tun
5305 5305
 mode, OpenVPN will cause the DHCP server to masquerade as if it were
5306 5306
 coming from the remote endpoint.  The optional offset parameter is
5307
-an integer which is > -256 and < 256 and which defaults to 0.
5307
+an integer which is > \-256 and < 256 and which defaults to 0.
5308 5308
 If offset is positive, the DHCP server will masquerade as the IP
5309 5309
 address at network address + offset.
5310 5310
 If offset is negative, the DHCP server will masquerade as the IP
... ...
@@ -379,7 +379,7 @@ process_received_occ_msg (struct context *c)
379 379
 	      && c->c2.max_send_size_local > TUN_MTU_MIN
380 380
 	      && (c->c2.max_recv_size_remote < c->c2.max_send_size_local
381 381
 		  || c->c2.max_recv_size_local < c->c2.max_send_size_remote))
382
-	    msg (M_INFO, "NOTE: This connection is unable to accomodate a UDP packet size of %d. Consider using --fragment or --mssfix options as a workaround.",
382
+	    msg (M_INFO, "NOTE: This connection is unable to accommodate a UDP packet size of %d. Consider using --fragment or --mssfix options as a workaround.",
383 383
 		 c->c2.max_send_size_local);
384 384
 	}
385 385
       event_timeout_clear (&c->c2.occ_mtu_load_test_interval);
... ...
@@ -1098,7 +1098,7 @@ static const char *
1098 1098
 show_opt (const char *option)
1099 1099
 {
1100 1100
   if (!option)
1101
-    return "nil";
1101
+    return "default (not set)";
1102 1102
   else
1103 1103
     return option;
1104 1104
 }