===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.1,v
retrieving revision 1.227
retrieving revision 1.228
diff -c -r1.227 -r1.228
*** src/usr.bin/tmux/tmux.1	2011/05/18 18:06:36	1.227
--- src/usr.bin/tmux/tmux.1	2011/05/18 20:24:29	1.228
***************
*** 1,4 ****
! .\" $OpenBSD: tmux.1,v 1.227 2011/05/18 18:06:36 nicm Exp $
  .\"
  .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
  .\"
--- 1,4 ----
! .\" $OpenBSD: tmux.1,v 1.228 2011/05/18 20:24:29 nicm Exp $
  .\"
  .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
  .\"
***************
*** 1705,1710 ****
--- 1705,1732 ----
  Set the number of buffers; as new buffers are added to the top of the stack,
  old ones are removed from the bottom if necessary to maintain this maximum
  length.
+ .It Xo Ic set-clipboard
+ .Op Ic on | off
+ .Xc
+ Attempt to set the terminal clipboard content using the
+ \ee]52;...\e007
+ .Xr xterm 1
+ escape sequences.
+ This option is on by default if there is an
+ .Em \&Ms
+ entry in the
+ .Xr terminfo 5
+ description for the client terminal.
+ Note that this feature needs to be enabled in
+ .Xr xterm 1
+ by setting the resource:
+ .Bd -literal -offset indent
+ disallowedWindowOps: 20,21,SetXprop
+ .Ed
+ .Pp
+ Or changing this property from the
+ .Xr xterm 1
+ interactive menu when required.
  .It Ic escape-time Ar time
  Set the time in milliseconds for which
  .Nm
***************
*** 2795,2800 ****
--- 2817,2837 ----
  .It Ic server-info
  .D1 (alias: Ic info )
  Show server information and terminal details.
+ .El
+ .Sh TERMINFO EXTENSIONS
+ .Nm
+ understands some extensions to
+ .Xr terminfo 5 :
+ .Bl -tag -width Ds
+ .It Em \&Ms
+ This sequence can be used by
+ .Nm
+ to store the current buffer in the host terminal's selection (clipboard).
+ See the
+ .Em set-clipboard
+ option above and the
+ .Xr xterm 1
+ man page.
  .El
  .Sh FILES
  .Bl -tag -width "/etc/tmux.confXXX" -compact