Here's a diff for the manpage to go with the diff for the code.
I've also included a convenience diff against the processed manpages,
mans.diff, for an easier view of what I've changed.
--
Micah J. Cowan
http://micah.cowan.name/
--- /tmp/old 2010-02-13 21:00:37.921671553 -0800
+++ /tmp/new 2010-02-13 21:00:32.893671411 -0800
@@ -288,17 +288,12 @@
WINDOWS AND PANES
A tmux window may be in one of several modes. The default permits direct
- access to the terminal attached to the window. The others are:
-
- output mode
- This is entered when a command which produces output, such as
- list-keys, is executed from a key binding.
-
- copy mode
- This permits a section of a window or its history to be copied to
- a paste buffer for later insertion into another window. This
- mode is entered with the copy-mode command, bound to â[â by
- default.
+ access to the terminal attached to the window. The other is copy mode,
+ which permits a section of a window or its history to be copied to a
+ paste buffer for later insertion into another window. This mode is
+ entered with the copy-mode command, bound to â[â by default. It is also
+ entered when a command that produces output, such as list-keys, is exeâ
+ cuted from a key binding.
The keys available depend on whether emacs or vi mode is selected (see
the mode-keys option). The following keys are supported as appropriate
@@ -353,15 +348,14 @@
These key bindings are defined in a set of named tables: vi-edit and
emacs-edit for keys used when line editing at the command prompt;
vi-choice and emacs-choice for keys used when choosing from lists (such
- as produced by the choose-window command) or in output mode; and vi-copy
- and emacs-copy used in copy mode. The tables may be viewed with the
- list-keys command and keys modified or removed with bind-key and
- unbind-key.
+ as produced by the choose-window command); and vi-copy and emacs-copy
+ used in copy mode. The tables may be viewed with the list-keys command
+ and keys modified or removed with bind-key and unbind-key.
The paste buffer key pastes the first line from the top paste buffer on
the stack.
- The mode commands are as follows:
+ The synopsis for the copy-mode command is:
copy-mode [-u] [-t target-pane]
Enter copy mode. The -u option scrolls one page up.
@@ -1106,8 +1100,8 @@
synchronize-panes [on | off]
Duplicate input to any pane to all other panes in the
- same window, except for panes that are not in output
- mode.
+ same window (only for panes that are not in any special
+ mode).
alternate-screen [on | off]
This option configures whether programs running inside
@@ -1341,8 +1335,8 @@
(alias: run)
Execute command in the background without creating a window.
After the command finishes, any output to stdout is displayed in
- output mode. If command doesn't return success, the exit status
- is also displayed.
+ copy mode. If command doesn't return success, the exit status is
+ also displayed.
server-info
(alias: info)
Index: tmux.1
===================================================================
--- tmux.1.orig
+++ tmux.1
@@ -517,22 +517,18 @@
.Nm
window may be in one of several modes.
The default permits direct access to the terminal attached to the window.
-The others are:
-.Bl -tag -width Ds
-.It Em output mode
-This is entered when a command which produces output, such as
-.Ic list-keys ,
-is executed from a key binding.
-.It Em copy mode
-This permits a section of a window or its history to be copied to a
+The other is copy mode, which permits a section of a window or its
+history to be copied to a
.Em paste buffer
for later insertion into another window.
This mode is entered with the
.Ic copy-mode
command, bound to
.Ql \&[
-by default.
-.El
+by default. It is also entered when a command that produces output,
+such as
+.Ic list-keys ,
+is executed from a key binding.
.Pp
The keys available depend on whether emacs or vi mode is selected
(see the
@@ -603,7 +599,7 @@
.Em emacs-choice
for keys used when choosing from lists (such as produced by the
.Ic choose-window
-command) or in output mode; and
+command); and
.Em vi-copy
and
.Em emacs-copy
@@ -618,7 +614,9 @@
The paste buffer key pastes the first line from the top paste buffer on the
stack.
.Pp
-The mode commands are as follows:
+The synopsis for the
+.Ic copy-mode
+command is:
.Bl -tag -width Ds
.It Xo Ic copy-mode
.Op Fl u
@@ -1896,8 +1894,8 @@
.It Xo Ic synchronize-panes
.Op Ic on | off
.Xc
-Duplicate input to any pane to all other panes in the same window, except
-for panes that are not in output mode.
+Duplicate input to any pane to all other panes in the same window (only
+for panes that are not in any special mode).
.Pp
.It Xo Ic alternate-screen
.Op Ic on | off
@@ -2299,7 +2297,7 @@
Execute
.Ar command
in the background without creating a window.
-After the command finishes, any output to stdout is displayed in output mode.
+After the command finishes, any output to stdout is displayed in copy mode.
If
.Ar command
doesn't return success, the exit status is also displayed.
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
tmux-users mailing list
tmux-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-users
