===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.1,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -r1.432 -r1.433
--- src/usr.bin/tmux/tmux.1	2015/06/04 11:43:51	1.432
+++ src/usr.bin/tmux/tmux.1	2015/06/04 14:29:33	1.433
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.432 2015/06/04 11:43:51 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.433 2015/06/04 14:29:33 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -2273,21 +2273,19 @@
 a server option with
 .Fl s ,
 otherwise a session option.
-.Pp
 If
 .Fl g
-is specified, the global session or window option is set.
+is given, the global session or window option is set.
 The
 .Fl u
 flag unsets an option, so a session inherits the option from the global
-options.
-It is not possible to unset a global option.
+options (or with
+.Fl g ,
+restores a global option to the default).
 .Pp
 The
 .Fl o
-flag prevents setting an option that is already set.
-.Pp
-The
+flag prevents setting an option that is already set and
 .Fl q
 flag suppresses errors about unknown options.
 .Pp