diff options
| author |   nicm <nicm@openbsd.org> | 2010-12-10 21:01:38 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-12-10 21:01:38 +0000 |
| commit | b4d7dbd7cf2b6956b27d60a6e30416579994b944 (patch) | |
| tree | e8058a5e2e73a3890627fc79cc0e45a28dd2ab0d | |
| parent | stating that -f may be used by users is wrong, since that would (diff) | |
| download | wireguard-openbsd-b4d7dbd7cf2b6956b27d60a6e30416579994b944.tar.xz wireguard-openbsd-b4d7dbd7cf2b6956b27d60a6e30416579994b944.zip | |
Rephrase a confusing sentence.
| -rw-r--r-- | usr.bin/tmux/tmux.1 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index 7a6fb873668..01a37f4ffff 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.192 2010/12/06 22:51:02 nicm Exp $ +.\" $OpenBSD: tmux.1,v 1.193 2010/12/10 21:01:38 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: December 6 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 |