zap trailing whitespace, and add -o to usage() and help (-h);

2 files changed, 9 insertions, 6 deletions

diff --git a/src/usr.bin/nc/nc.1 b/src/usr.bin/nc/nc.1
index 2dda57af92..15ed5ee1aa 100644
--- a/src/usr.bin/nc/nc.1
+++ b/src/usr.bin/nc/nc.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: nc.1,v 1.77 2016/11/05 15:13:26 beck Exp $
+.\"     $OpenBSD: nc.1,v 1.78 2016/11/05 16:03:09 jmc Exp $
 .\"
 .\" Copyright (c) 1996 David Sacerdote
 .\" All rights reserved.
@@ -191,8 +191,8 @@ Specifies the size of the TCP send buffer.
 .It Fl o Ar staplefile
 Specifies the filename from which to load data to be stapled
 during the TLS handshake.
-The file is expected to contain an OSCP response from an OCSP server in 
-DER format. 
+The file is expected to contain an OSCP response from an OCSP server in
+DER format.
 May only be used with TLS and when a certificate is being used.
 .It Fl P Ar proxy_username
 Specifies a username to present to a proxy server that requires authentication.
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c
index 4a841fb96d..7573314615 100644
--- a/src/usr.bin/nc/netcat.c
+++ b/src/usr.bin/nc/netcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.168 2016/11/05 15:13:26 beck Exp $ */
+/* $OpenBSD: netcat.c,v 1.169 2016/11/05 16:03:09 jmc Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
  * Copyright (c) 2015 Bob Beck.  All rights reserved.
@@ -1640,6 +1640,7 @@ help(void)
         \t-N            Shutdown the network socket after EOF on stdin\n\
         \t-n            Suppress name/port resolutions\n\
         \t-O length     TCP send buffer length\n\
+        \t-o staplefile Staple file\n\
         \t-P proxyuser\tUsername for proxy authentication\n\
         \t-p port\t     Specify local port for remote connects\n\
         \t-R CAfile     CA bundle\n\
@@ -1667,8 +1668,10 @@ usage(int ret)
             "usage: nc [-46cDdFhklNnrStUuvz] [-C certfile] [-e name] "
             "[-H hash] [-I length]\n"
             "\t  [-i interval] [-K keyfile] [-M ttl] [-m minttl] [-O length]\n"
-            "\t  [-P proxy_username] [-p source_port] [-R CAfile] [-s source]\n"
-            "\t  [-T keyword] [-V rtable] [-w timeout] [-X proxy_protocol]\n"
+            "\t  [-o staplefile] [-P proxy_username] [-p source_port] "
+            "[-R CAfile]\n"
+            "\t  [-s source] [-T keyword] [-V rtable] [-w timeout] "
+            "[-X proxy_protocol]\n"
             "\t  [-x proxy_address[:port]] [destination] [port]\n");
         if (ret)
                 exit(1);