Module Name: src
Committed By: wiz
Date: Sat Aug 13 14:11:16 UTC 2011
Modified Files:
src/usr.bin/window: main.c window.1
Log Message:
Sort options and option descriptions, and sync usage.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/window/main.c
cvs rdiff -u -r1.22 -r1.23 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.16 src/usr.bin/window/main.c:1.17
--- src/usr.bin/window/main.c:1.16 Sat Aug 13 14:02:48 2011
+++ src/usr.bin/window/main.c Sat Aug 13 14:11:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.16 2011/08/13 14:02:48 jakllsch Exp $ */
+/* $NetBSD: main.c,v 1.17 2011/08/13 14:11:16 wiz 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.16 2011/08/13 14:02:48 jakllsch Exp $");
+__RCSID("$NetBSD: main.c,v 1.17 2011/08/13 14:11:16 wiz Exp $");
#endif
#endif /* not lint */
@@ -194,7 +194,7 @@
usage(void)
{
(void) fprintf(stderr,
- "usage: %s [-d] [-f] [-t] [-c command] [-e escape-char]\n",
+ "usage: %s [-dft] [-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.22 src/usr.bin/window/window.1:1.23
--- src/usr.bin/window/window.1:1.22 Sat Aug 13 14:02:48 2011
+++ src/usr.bin/window/window.1 Sat Aug 13 14:11:16 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: window.1,v 1.22 2011/08/13 14:02:48 jakllsch Exp $
+.\" $NetBSD: window.1,v 1.23 2011/08/13 14:11:16 wiz Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -40,9 +40,7 @@
.Nd window environment
.Sh SYNOPSIS
.Nm
-.Op Fl d
-.Op Fl f
-.Op Fl t
+.Op Fl dft
.Op Fl c Ar command
.Op Fl e Ar escape-char
.Sh DESCRIPTION
@@ -61,7 +59,9 @@
.Nm .
Use
.Xr tmux 1
-instead, or install the misc/window package from
+instead, or install the
+.Pa pkgsrc/misc/window
+package from
.Xr pkgsrc 7 .
.Pp
A window is a rectangular portion of the physical terminal
@@ -90,23 +90,16 @@
.Pp
The command-line options are:
.Bl -tag -width Fl
-.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 d
+Ignore
+.Pa .windowrc
+and create the two default
+windows instead.
.It Fl e Ar escape-char
Set the escape character to
.Ar escape-char .
@@ -117,6 +110,13 @@
.Ar X
is any character, meaning
.No control\- Ns Ar X .
+.It Fl f
+Fast.
+Don't perform any startup action.
+.It Fl t
+Turn on terse mode (see
+.Ic terse
+command below).
.El
.Pp
Windows can overlap and are framed as necessary.
