===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.1,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- src/usr.bin/tmux/tmux.1	2009/12/01 18:42:38	1.128
+++ src/usr.bin/tmux/tmux.1	2009/12/03 17:44:02	1.129
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.128 2009/12/01 18:42:38 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.129 2009/12/03 17:44:02 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -14,7 +14,7 @@
 .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: December 1 2009 $
+.Dd $Mdocdate: December 3 2009 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -1230,8 +1230,8 @@
 Commands which set options are as follows:
 .Bl -tag -width Ds
 .It Xo Ic set-option
-.Op Fl agu
-.Op Fl t Ar target-session
+.Op Fl aguw
+.Op Fl t Ar target-session | Ar target-window
 .Ar option Ar value
 .Xc
 .D1 (alias: Ic set )
@@ -1249,6 +1249,13 @@
 flag unsets an option, so a session inherits the option from the global
 options - it is not possible to unset a global option.
 .Pp
+With
+.Fl w ,
+this command is equivalent to
+.Ic set-window-option 
+with
+.Ar target-window .
+.Pp
 Available session options are:
 .Bl -tag -width Ds
 .It Ic base-index Ar index
@@ -1831,14 +1838,21 @@
 The default is off.
 .El
 .It Xo Ic show-options
-.Op Fl g
-.Op Fl t Ar target-session
+.Op Fl gw
+.Op Fl t Ar target-session | Ar target-window
 .Xc
 .D1 (alias: Ic show )
 Show the session options for
 .Ar target session ,
 or the global session options with
 .Fl g .
+.Pp
+If
+.Fl w
+is used, this command is equivalent to
+.Ic show-window-options 
+with
+.Ar target-window .
 .It Xo Ic show-window-options
 .Op Fl g
 .Op Fl t Ar target-window