===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.1,v
retrieving revision 1.636
retrieving revision 1.637
diff -c -r1.636 -r1.637
*** src/usr.bin/tmux/tmux.1	2019/04/17 16:34:35	1.636
--- src/usr.bin/tmux/tmux.1	2019/04/18 12:22:07	1.637
***************
*** 1,4 ****
! .\" $OpenBSD: tmux.1,v 1.636 2019/04/17 16:34:35 jmc Exp $
  .\"
  .\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
  .\"
--- 1,4 ----
! .\" $OpenBSD: tmux.1,v 1.637 2019/04/18 12:22:07 nicm Exp $
  .\"
  .\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
  .\"
***************
*** 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: April 17 2019 $
  .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: April 18 2019 $
  .Dt TMUX 1
  .Os
  .Sh NAME
***************
*** 2488,2496 ****
--- 2488,2504 ----
  a server option with
  .Fl s ,
  otherwise a session option.
+ If the option is not a user option,
+ .Fl w
+ and
+ .Fl s
+ are unnecessary -
+ .Nm
+ will infer the type from the option name.
  If
  .Fl g
  is given, the global session or window option is set.
+ .Pp
  .Fl F
  expands formats in the option value.
  The
***************
*** 3384,3389 ****
--- 3392,3406 ----
  .Fl s ,
  otherwise the session options for
  .Ar target session .
+ If
+ .Ar option
+ is given and is not a user option,
+ .Fl w
+ and
+ .Fl s
+ are unnecessary -
+ .Nm
+ will infer the type from the option name.
  Global session or window options are listed if
  .Fl g
  is used.