summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2005-04-02 22:59:42 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2005-04-02 22:59:42 +0000
commit1f16d04d4f7d0bbba59575a40edf154ada19cf47 (patch)
tree871ed8b764ddea584bdbb151966d46ac8a2efcb4
parentc66d13299f60bdc675614282b1732db13f3b0ec3 (diff)
- simplify synopsis
- sort options - sync usage() - simplify a display
-rw-r--r--usr.bin/window/main.c6
-rw-r--r--usr.bin/window/window.135
2 files changed, 19 insertions, 22 deletions
diff --git a/usr.bin/window/main.c b/usr.bin/window/main.c
index 2487f2f1c17..44f6123b488 100644
--- a/usr.bin/window/main.c
+++ b/usr.bin/window/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.9 2003/06/10 22:20:54 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.10 2005/04/02 22:59:41 jmc Exp $ */
/* $NetBSD: main.c,v 1.6 1996/02/08 20:45:01 mycroft Exp $ */
/*
@@ -43,7 +43,7 @@ char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.9 2003/06/10 22:20:54 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.10 2005/04/02 22:59:41 jmc Exp $";
#endif
#endif /* not lint */
@@ -199,7 +199,7 @@ bad:
usage(void)
{
- fprintf(stderr, "Usage: window [-e escape-char] [-c command] [-t] [-f] [-d]\n");
+ fprintf(stderr, "Usage: window [-dft] [-c command] [-e escape-char]\n");
exit(1);
return 0; /* for lint */
}
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index 8880d384291..e3fd939e488 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: window.1,v 1.18 2003/09/04 22:14:43 jmc Exp $
+.\" $OpenBSD: window.1,v 1.19 2005/04/02 22:59:41 jmc Exp $
.\" $NetBSD: window.1,v 1.3 1995/09/28 10:35:05 tls Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
@@ -41,11 +41,9 @@
.Nd window environment
.Sh SYNOPSIS
.Nm window
-.Op Fl t
-.Op Fl f
-.Op Fl d
-.Op Fl e Ar escape-char
+.Op Fl dft
.Op Fl c Ar command
+.Op Fl e Ar escape-char
.Sh DESCRIPTION
.Nm
implements a window environment on
@@ -79,13 +77,11 @@ the terminal screen are created by default.
.Pp
The options are as follows:
.Bl -tag -width Ds
-.It Fl t
-Turn on terse mode (see the
-.Ic terse
-command below).
-.It Fl f
-Fast.
-Don't perform any startup action.
+.It Fl c Ar command
+Execute the string
+.Ar command
+as a long command (see below)
+before doing anything else.
.It Fl d
Ignore
.Pa .windowrc
@@ -101,11 +97,13 @@ where
.Ar X
is any character, meaning
.No control\- Ns Ar X .
-.It Fl c Ar command
-Execute the string
-.Ar command
-as a long command (see below)
-before doing anything else.
+.It Fl f
+Fast.
+Don't perform any startup action.
+.It Fl t
+Turn on terse mode (see the
+.Ic terse
+command below).
.El
.Pp
Windows can overlap and are framed as necessary.
@@ -429,8 +427,7 @@ an expression on the next line, terminate the first line with
.Nm
has a single control structure:
the fully bracketed if statement in the form
-.Pp
-.Bd -literal -offset indent -compact
+.Bd -literal -offset indent
if <expr> then
\t<statement>
\t...