aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tmux.110
1 files changed, 5 insertions, 5 deletions
diff --git a/tmux.1 b/tmux.1
index 675e9db9..e97d842d 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.274 2010-12-06 22:52:21 nicm Exp $
+.\" $Id: tmux.1,v 1.275 2010-12-10 21:05:22 nicm Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
.\"
@@ -14,7 +14,7 @@
.\" 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: November 29 2010 $
+.Dd $Mdocdate: December 10 2010 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -2319,9 +2319,9 @@ copies the environment into the
.Em global environment ;
in addition, each session has a
.Em session environment .
-When a window is created, the session and global environments are merged with
-the session environment overriding any variable present in both.
-This is the initial environment passed to the new process.
+When a window is created, the session and global environments are merged.
+If a variable exists in both, the value from the session environment is used.
+The result is the initial environment passed to the new process.
.Pp
The
.Ic update-environment