===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.1,v
retrieving revision 1.432
retrieving revision 1.433
diff -c -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 ****
! .\" $OpenBSD: tmux.1,v 1.432 2015/06/04 11:43:51 nicm Exp $
  .\"
  .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
  .\"
--- 1,4 ----
! .\" $OpenBSD: tmux.1,v 1.433 2015/06/04 14:29:33 nicm Exp $
  .\"
  .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
  .\"
***************
*** 2273,2293 ****
  a server option with
  .Fl s ,
  otherwise a session option.
- .Pp
  If
  .Fl g
! is specified, 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.
  .Pp
  The
  .Fl o
! flag prevents setting an option that is already set.
! .Pp
! The
  .Fl q
  flag suppresses errors about unknown options.
  .Pp
--- 2273,2291 ----
  a server option with
  .Fl s ,
  otherwise a session option.
  If
  .Fl g
! 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 (or with
! .Fl g ,
! restores a global option to the default).
  .Pp
  The
  .Fl o
! flag prevents setting an option that is already set and
  .Fl q
  flag suppresses errors about unknown options.
  .Pp