===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.1,v
retrieving revision 1.89
retrieving revision 1.90
diff -c -r1.89 -r1.90
*** src/usr.bin/tmux/tmux.1	2009/09/22 12:38:10	1.89
--- src/usr.bin/tmux/tmux.1	2009/09/23 06:18:48	1.90
***************
*** 1,4 ****
! .\" $OpenBSD: tmux.1,v 1.89 2009/09/22 12:38:10 nicm Exp $
  .\"
  .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
  .\"
--- 1,4 ----
! .\" $OpenBSD: tmux.1,v 1.90 2009/09/23 06:18:48 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: September 22 2009 $
  .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: September 23 2009 $
  .Dt TMUX 1
  .Os
  .Sh NAME
***************
*** 23,29 ****
  .Sh SYNOPSIS
  .Nm tmux
  .Bk -words
! .Op Fl 28dlqUuv
  .Op Fl f Ar file
  .Op Fl L Ar socket-name
  .Op Fl S Ar socket-path
--- 23,29 ----
  .Sh SYNOPSIS
  .Nm tmux
  .Bk -words
! .Op Fl 28dlquv
  .Op Fl f Ar file
  .Op Fl L Ar socket-name
  .Op Fl S Ar socket-path
***************
*** 154,161 ****
  is specified, the default socket directory is not used and any
  .Fl L
  flag is ignored.
- .It Fl U
- Unlock the server.
  .It Fl u
  .Nm
  attempts to guess if the terminal is likely to support UTF-8 by checking the
--- 154,159 ----
***************
*** 337,344 ****
  set-window-option -t:0 monitor-activity on
  
  new-window ; split-window -d
- 
- bind-key D detach-client \e\; lock-server
  .Ed
  .Sh CLIENTS AND SESSIONS
  The following commands are available:
--- 335,340 ----
***************
*** 1213,1229 ****
  This setting applies only to new windows - existing window histories are not
  resized and retain the limit at the point they were created.
  .It Ic lock-after-time Ar number
! Lock the server after
  .Ar number
  seconds of inactivity.
  The default is off (set to 0).
  This has no effect as a session option; it must be set as a global option using
  .Fl g .
! When passwords are entered incorrectly,
! .Nm
! follows the behaviour of
! .Xr login 1
! and ignores further password attempts for an increasing timeout.
  .It Ic message-attr Ar attributes
  Set status line message attributes, where
  .Ar attributes
--- 1209,1228 ----
  This setting applies only to new windows - existing window histories are not
  resized and retain the limit at the point they were created.
  .It Ic lock-after-time Ar number
! Lock the server (like the
! .Ic lock-server
! command) after
  .Ar number
  seconds of inactivity.
  The default is off (set to 0).
  This has no effect as a session option; it must be set as a global option using
  .Fl g .
! .It Ic lock-command Ar command
! Command to run when locking each client.
! The default is to run
! .Xr lock 1
! with
! .Fl np .
  .It Ic message-attr Ar attributes
  Set status line message attributes, where
  .Ar attributes
***************
*** 1962,1968 ****
  returns success.
  .It Ic lock-server
  .D1 (alias: Ic lock )
! Lock the server until a password is entered.
  .It Ic run-shell Ar command
  .D1 (alias: Ic run )
  Execute
--- 1961,1969 ----
  returns success.
  .It Ic lock-server
  .D1 (alias: Ic lock )
! Lock each client individually by running the command specified by the
! .Ic lock-command
! option.
  .It Ic run-shell Ar command
  .D1 (alias: Ic run )
  Execute
***************
*** 1975,1995 ****
  .It Ic server-info
  .D1 (alias: Ic info )
  Show server information and terminal details.
- .It Xo Ic set-password
- .Op Fl c
- .Ar password
- .Xc
- .D1 (alias: Ic pass )
- Set the server password.
- If the
- .Fl c
- option is given, a pre-encrypted password may be specified.
- By default, the password is blank, thus any entered password will be accepted
- when unlocking the server (see the
- .Ic lock-server
- command).
- To prevent variable expansion when an encrypted password is read from a
- configuration file, enclose it in single quotes (').
  .El
  .Sh FILES
  .Bl -tag -width "/etc/tmux.confXXX" -compact
--- 1976,1981 ----