===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.1,v
retrieving revision 1.447
retrieving revision 1.448
diff -c -r1.447 -r1.448
*** src/usr.bin/tmux/tmux.1	2015/08/12 08:55:20	1.447
--- src/usr.bin/tmux/tmux.1	2015/08/28 12:31:55	1.448
***************
*** 1,4 ****
! .\" $OpenBSD: tmux.1,v 1.447 2015/08/12 08:55:20 nicm Exp $
  .\"
  .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
  .\"
--- 1,4 ----
! .\" $OpenBSD: tmux.1,v 1.448 2015/08/28 12:31:55 nicm Exp $
  .\"
  .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
  .\"
***************
*** 14,20 ****
  .\" 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: August 12 2015 $
  .Dt TMUX 1
  .Os
  .Sh NAME
--- 14,20 ----
  .\" 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: August 28 2015 $
  .Dt TMUX 1
  .Os
  .Sh NAME
***************
*** 2561,2569 ****
  .Ic lock-session
  command) after
  .Ar number
! seconds of inactivity, or the entire server (all sessions) if the
! .Ic lock-server
! option is set.
  The default is not to lock (set to 0).
  .It Ic lock-command Ar shell-command
  Command to run when locking each client.
--- 2561,2567 ----
  .Ic lock-session
  command) after
  .Ar number
! seconds of inactivity.
  The default is not to lock (set to 0).
  .It Ic lock-command Ar shell-command
  Command to run when locking each client.
***************
*** 2571,2589 ****
  .Xr lock 1
  with
  .Fl np .
- .It Xo Ic lock-server
- .Op Ic on | off
- .Xc
- If this option is
- .Ic on
- (the default),
- instead of each session locking individually as each has been
- idle for
- .Ic lock-after-time ,
- the entire server will lock after
- .Em all
- sessions would have locked.
- This has no effect as a session option; it must be set as a global option.
  .It Ic message-command-style Ar style
  Set status line message command style, where
  .Ar style
--- 2569,2574 ----