===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.1,v
retrieving revision 1.435
retrieving revision 1.436
diff -c -r1.435 -r1.436
*** src/usr.bin/tmux/tmux.1	2015/06/05 08:14:16	1.435
--- src/usr.bin/tmux/tmux.1	2015/06/07 21:39:39	1.436
***************
*** 1,4 ****
! .\" $OpenBSD: tmux.1,v 1.435 2015/06/05 08:14:16 nicm Exp $
  .\"
  .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
  .\"
--- 1,4 ----
! .\" $OpenBSD: tmux.1,v 1.436 2015/06/07 21:39:39 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: June 5 2015 $
  .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: June 7 2015 $
  .Dt TMUX 1
  .Os
  .Sh NAME
***************
*** 670,676 ****
  The following commands are available to manage clients and sessions:
  .Bl -tag -width Ds
  .It Xo Ic attach-session
! .Op Fl dr
  .Op Fl c Ar working-directory
  .Op Fl t Ar target-session
  .Xc
--- 670,676 ----
  The following commands are available to manage clients and sessions:
  .Bl -tag -width Ds
  .It Xo Ic attach-session
! .Op Fl dEr
  .Op Fl c Ar working-directory
  .Op Fl t Ar target-session
  .Xc
***************
*** 709,714 ****
--- 709,720 ----
  .Fl c
  will set the session working directory (used for new windows) to
  .Ar working-directory .
+ .Pp
+ If
+ .Fl E
+ is used,
+ .Ic update-environment
+ option will not be applied.
  .It Xo Ic detach-client
  .Op Fl P
  .Op Fl a
***************
*** 783,789 ****
  Lock all clients attached to
  .Ar target-session .
  .It Xo Ic new-session
! .Op Fl AdDP
  .Op Fl c Ar start-directory
  .Op Fl F Ar format
  .Op Fl n Ar window-name
--- 789,795 ----
  Lock all clients attached to
  .Ar target-session .
  .It Xo Ic new-session
! .Op Fl AdDEP
  .Op Fl c Ar start-directory
  .Op Fl F Ar format
  .Op Fl n Ar window-name
***************
*** 858,863 ****
--- 864,876 ----
  .Ql #{session_name}:
  but a different format may be specified with
  .Fl F .
+ .Pp
+ If
+ .Fl E
+ is used,
+ .Ic update-environment
+ option will not be applied.
+ .Ic update-environment .
  .It Xo Ic refresh-client
  .Op Fl S
  .Op Fl t Ar target-client
***************
*** 912,918 ****
  .Dv SIGTSTP
  (tty stop).
  .It Xo Ic switch-client
! .Op Fl lnpr
  .Op Fl c Ar target-client
  .Op Fl t Ar target-session
  .Op Fl T Ar key-table
--- 925,931 ----
  .Dv SIGTSTP
  (tty stop).
  .It Xo Ic switch-client
! .Op Fl Elnpr
  .Op Fl c Ar target-client
  .Op Fl t Ar target-session
  .Op Fl T Ar key-table
***************
*** 933,938 ****
--- 946,957 ----
  toggles whether a client is read-only (see the
  .Ic attach-session
  command).
+ .Pp
+ If
+ .Fl E
+ is used,
+ .Ic update-environment
+ option will not be applied.
  .Pp
  .Fl T
  sets the client's key table; the next key from the client will be interpreted from