aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2013-03-12 22:49:56 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2013-03-12 22:49:56 +0000
commit9e879b4aabc925fc1fbf02e25c331317a3881d17 (patch)
tree5d69a95e496f1b019d694246cadff30e8108535f
parent99934bf9988ca364d3d75bb185863eed184a2971 (diff)
parent8840f2d629639fe77f4a51eb02c0fa119398f819 (diff)
downloadrtmux-9e879b4aabc925fc1fbf02e25c331317a3881d17.tar.gz
rtmux-9e879b4aabc925fc1fbf02e25c331317a3881d17.tar.bz2
rtmux-9e879b4aabc925fc1fbf02e25c331317a3881d17.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
-rw-r--r--tmux.15
1 files changed, 3 insertions, 2 deletions
diff --git a/tmux.1 b/tmux.1
index a669fe9c..19a9822c 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1624,8 +1624,8 @@ is given in lines or cells (the default is 1).
.Pp
With
.Fl Z ,
-the active pane is toggled between occupying the whole of the window and its
-normal position in the layout.
+the active pane is toggled between zoomed (occupying the whole of the window)
+and unzoomed (its normal position in the layout).
.It Xo Ic respawn-pane
.Op Fl k
.Op Fl t Ar target-pane
@@ -3257,6 +3257,7 @@ The flag is one of the following symbols appended to the window name:
.It Li "!" Ta "A bell has occurred in the window."
.It Li "+" Ta "Window is monitored for content and it has appeared."
.It Li "~" Ta "The window has been silent for the monitor-silence interval."
+.It Li "Z" Ta "The window's active pane is zoomed."
.El
.Pp
The # symbol relates to the