===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.1,v
retrieving revision 1.293
retrieving revision 1.294
diff -c -r1.293 -r1.294
*** src/usr.bin/tmux/tmux.1	2012/05/17 21:21:31	1.293
--- src/usr.bin/tmux/tmux.1	2012/05/22 11:35:37	1.294
***************
*** 1,4 ****
! .\" $OpenBSD: tmux.1,v 1.293 2012/05/17 21:21:31 nicm Exp $
  .\"
  .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
  .\"
--- 1,4 ----
! .\" $OpenBSD: tmux.1,v 1.294 2012/05/22 11:35:37 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: May 17 2012 $
  .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: May 22 2012 $
  .Dt TMUX 1
  .Os
  .Sh NAME
***************
*** 1033,1038 ****
--- 1033,1039 ----
  The default is to capture only the visible contents of the pane.
  .It Xo
  .Ic choose-client
+ .Op Fl F Ar format
  .Op Fl t Ar target-window
  .Op Ar template
  .Xc
***************
*** 1048,1057 ****
--- 1049,1064 ----
  If
  .Ar template
  is not given, "detach-client -t '%%'" is used.
+ For the meaning of the
+ .Fl F
+ flag, see the
+ .Sx FORMATS
+ section.
  This command works only from inside
  .Nm .
  .It Xo
  .Ic choose-session
+ .Op Fl F Ar format
  .Op Fl t Ar target-window
  .Op Ar template
  .Xc
***************
*** 1065,1074 ****
--- 1072,1087 ----
  If
  .Ar template
  is not given, "switch-client -t '%%'" is used.
+ For the meaning of the
+ .Fl F
+ flag, see the
+ .Sx FORMATS
+ section.
  This command works only from inside
  .Nm .
  .It Xo
  .Ic choose-window
+ .Op Fl F Ar format
  .Op Fl t Ar target-window
  .Op Ar template
  .Xc
***************
*** 1082,1087 ****
--- 1095,1105 ----
  If
  .Ar template
  is not given, "select-window -t '%%'" is used.
+ For the meaning of the
+ .Fl F
+ flag, see the
+ .Sx FORMATS
+ section.
  This command works only from inside
  .Nm .
  .It Ic display-panes Op Fl t Ar target-client
***************
*** 1101,1106 ****
--- 1119,1125 ----
  keys.
  .It Xo Ic find-window
  .Op Fl CNT
+ .Op Fl F Ar format
  .Op Fl t Ar target-window
  .Ar match-string
  .Xc
***************
*** 1121,1126 ****
--- 1140,1150 ----
  .Fl CNT .
  If only one window is matched, it'll be automatically selected,
  otherwise a choice list is shown.
+ For the meaning of the
+ .Fl F
+ flag, see the
+ .Sx FORMATS
+ section.
  This command only works from inside
  .Nm .
  .It Xo Ic join-pane
***************
*** 2761,2773 ****
  is used.
  .El
  .Sh FORMATS
! The
! .Ic list-clients ,
! .Ic list-sessions ,
! .Ic list-windows
! and
! .Ic list-panes
! commands accept the
  .Fl F
  flag with a
  .Ar format
--- 2785,2791 ----
  is used.
  .El
  .Sh FORMATS
! Certain commands accept the
  .Fl F
  flag with a
  .Ar format
***************
*** 2800,2805 ****
--- 2818,2825 ----
  The following variables are available, where appropriate:
  .Bl -column "session_created_string" "Replaced with" -offset indent
  .It Sy "Variable name" Ta Sy "Replaced with"
+ .It Li "buffer_sample" Ta "First 50 characters from the specified buffer"
+ .It Li "buffer_size" Ta "Size of the specified buffer in bytes"
  .It Li "client_activity" Ta "Integer time client last had activity"
  .It Li "client_activity_string" Ta "String time client last had activity"
  .It Li "client_created" Ta "Integer time client created"
***************
*** 2834,2844 ****
--- 2854,2866 ----
  .It Li "session_width" Ta "Width of session"
  .It Li "session_windows" Ta "Number of windows in session"
  .It Li "window_active" Ta "1 if window active"
+ .It Li "window_find_matches" Ta "Matched data from the find-window command if available"
  .It Li "window_flags" Ta "Window flags"
  .It Li "window_height" Ta "Height of window"
  .It Li "window_index" Ta "Index of window"
  .It Li "window_layout" Ta "Window layout description"
  .It Li "window_name" Ta "Name of window"
+ .It Li "window_panes" Ta "Number of panes in window"
  .It Li "window_width" Ta "Width of window"
  .El
  .Sh NAMES AND TITLES
***************
*** 3145,3150 ****
--- 3167,3173 ----
  .Bl -tag -width Ds
  .It Xo
  .Ic choose-buffer
+ .Op Fl F Ar format
  .Op Fl t Ar target-window
  .Op Ar template
  .Xc
***************
*** 3158,3163 ****
--- 3181,3191 ----
  If
  .Ar template
  is not given, "paste-buffer -b '%%'" is used.
+ For the meaning of the
+ .Fl F
+ flag, see the
+ .Sx FORMATS
+ section.
  This command works only from inside
  .Nm .
  .It Ic clear-history Op Fl t Ar target-pane
***************
*** 3168,3176 ****
  Delete the buffer at
  .Ar buffer-index ,
  or the top buffer if not specified.
! .It Ic list-buffers
  .D1 (alias: Ic lsb )
  List the global buffers.
  .It Xo Ic load-buffer
  .Op Fl b Ar buffer-index
  .Ar path
--- 3196,3211 ----
  Delete the buffer at
  .Ar buffer-index ,
  or the top buffer if not specified.
! .It Xo Ic list-buffers
! .Op Fl F Ar format
! .Xc
  .D1 (alias: Ic lsb )
  List the global buffers.
+ For the meaning of the
+ .Fl F
+ flag, see the
+ .Sx FORMATS
+ section.
  .It Xo Ic load-buffer
  .Op Fl b Ar buffer-index
  .Ar path