Module Name: src
Committed By: jakllsch
Date: Sat Aug 13 14:02:48 UTC 2011
Modified Files:
src/usr.bin/window: main.c window.1
Log Message:
Sort (and synchronize) option list and `SYNOPSIS' section in
manpage, as well as the program's `usage'-line; also some other
minor changes.
>From Snader_LB.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/window/main.c
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/window/window.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/window/main.c
diff -u src/usr.bin/window/main.c:1.15 src/usr.bin/window/main.c:1.16
--- src/usr.bin/window/main.c:1.15 Tue Apr 14 08:50:06 2009
+++ src/usr.bin/window/main.c Sat Aug 13 14:02:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.15 2009/04/14 08:50:06 lukem Exp $ */
+/* $NetBSD: main.c,v 1.16 2011/08/13 14:02:48 jakllsch Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: main.c,v 1.15 2009/04/14 08:50:06 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.16 2011/08/13 14:02:48 jakllsch Exp $");
#endif
#endif /* not lint */
@@ -194,7 +194,7 @@
usage(void)
{
(void) fprintf(stderr,
- "usage: %s [-e escape-char] [-c command] [-t] [-f] [-d]\n",
+ "usage: %s [-d] [-f] [-t] [-c command] [-e escape-char]\n",
getprogname());
exit(1);
}
Index: src/usr.bin/window/window.1
diff -u src/usr.bin/window/window.1:1.21 src/usr.bin/window/window.1:1.22
--- src/usr.bin/window/window.1:1.21 Thu Mar 10 13:23:41 2011
+++ src/usr.bin/window/window.1 Sat Aug 13 14:02:48 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: window.1,v 1.21 2011/03/10 13:23:41 jmmv Exp $
+.\" $NetBSD: window.1,v 1.22 2011/08/13 14:02:48 jakllsch Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" @(#)window.1 8.2 (Berkeley) 12/30/93
.\"
-.Dd March 10, 2011
+.Dd August 13, 2011
.Dt WINDOW 1
.Os
.Sh NAME
@@ -40,11 +40,11 @@
.Nd window environment
.Sh SYNOPSIS
.Nm
-.Op Fl t
-.Op Fl f
.Op Fl d
-.Op Fl e Ar escape-char
+.Op Fl f
+.Op Fl t
.Op Fl c Ar command
+.Op Fl e Ar escape-char
.Sh DESCRIPTION
.Nm
implements a window environment on
@@ -61,9 +61,7 @@
.Nm .
Use
.Xr tmux 1
-instead or install the
-.Sq misc/window
-package from
+instead, or install the misc/window package from
.Xr pkgsrc 7 .
.Pp
A window is a rectangular portion of the physical terminal
@@ -90,20 +88,25 @@
If it does not exist, two equal sized windows spanning
the terminal screen are created by default.
.Pp
-The command line options are
+The command-line options are:
.Bl -tag -width Fl
-.It Fl t
-Turn on terse mode (see
-.Ic terse
-command below).
-.It Fl f
-Fast.
-Don't perform any startup action.
.It Fl d
Ignore
.Pa .windowrc
and create the two default
windows instead.
+.It Fl f
+Fast.
+Don't perform any startup action.
+.It Fl t
+Turn on terse mode (see
+.Ic terse
+command below).
+.It Fl c Ar command
+Execute the string
+.Ar command
+as a long command (see below)
+before doing anything else.
.It Fl e Ar escape-char
Set the escape character to
.Ar escape-char .
@@ -114,11 +117,6 @@
.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.
.El
.Pp
Windows can overlap and are framed as necessary.
