we should not document each operand in the usage of a command,

it is an usual practice on BSDs and make the synopsis and usage
more robust when operands are added or removed; synchronize the
usage with the synopsis on the manual page; while here, remove
superfluous information from the usage.

ok jmc@

2 files changed, 7 insertions, 12 deletions

diff --git a/usr.sbin/ppp/ppp/main.c b/usr.sbin/ppp/ppp/main.c
index 3b543d5c727..9b56e15e21b 100644
--- a/usr.sbin/ppp/ppp/main.c
+++ b/usr.sbin/ppp/ppp/main.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: main.c,v 1.36 2005/09/21 15:04:28 brad Exp $
+ * $OpenBSD: main.c,v 1.37 2008/11/12 16:01:08 sobrado Exp $
  */
 
 #include <sys/param.h>
@@ -189,12 +189,11 @@ RestartServer(int signo)
 static void
 Usage(void)
 {
-  fprintf(stderr, "usage: ppp [-auto | -foreground | -background | -direct |"
-          " -dedicated | -ddial | -interactive]"
+  fprintf(stderr, "usage: ppp [-mode]"
 #ifndef NOALIAS
           " [-nat]"
 #endif
-          " [-quiet] [-unit N] [system ...]\n");
+          " [-quiet] [-unitN] [system ...]\n");
   exit(EX_START);
 }
 
diff --git a/usr.sbin/ppp/pppctl/pppctl.c b/usr.sbin/ppp/pppctl/pppctl.c
index e8130896a1a..f5512c4f8be 100644
--- a/usr.sbin/ppp/pppctl/pppctl.c
+++ b/usr.sbin/ppp/pppctl/pppctl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pppctl.c,v 1.19 2007/07/26 17:48:41 millert Exp $
+ *	$Id: pppctl.c,v 1.20 2008/11/12 16:01:08 sobrado Exp $
  */
 
 #include <sys/types.h>
@@ -56,13 +56,9 @@ static char Buffer[LINELEN], Command[LINELEN];
 static int
 usage()
 {
-    fprintf(stderr, "usage: pppctl [-v] [-p passwd] [-t n] "
-            "Port|LocalSock [command[;command]...]\n");
-    fprintf(stderr, "              -p passwd specifies your password\n");
-    fprintf(stderr, "              -t n specifies a timeout of n"
-            " seconds when connecting (default 2)\n");
-    fprintf(stderr, "              -v tells pppctl to output all"
-            " conversation\n");
+    fprintf(stderr,
+        "usage: pppctl [-v] [-p passwd] [-t n] [host:]port | LocalSocket\n"
+        "              [command [;command ...]]\n");
     exit(1);
 }