From b303ddd027a71998beb0fb05c6dffba1a1e62c2a Mon Sep 17 00:00:00 2001
From: jmc <jmc@openbsd.org>
Date: Thu, 10 Nov 2022 22:58:39 +0000
Subject: [PATCH] - sort options; from josiah frentsos ok nicm

- add -N to SYNOPSIS

- sort usage()
---
 usr.bin/tmux/tmux.1 | 26 +++++++++++++-------------
 usr.bin/tmux/tmux.c |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index 75093016613..0129869d43e 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.905 2022/11/03 08:33:57 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.906 2022/11/10 22:58:39 jmc Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
 .\"
@@ -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 3 2022 $
+.Dd $Mdocdate: November 10 2022 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -23,7 +23,7 @@
 .Sh SYNOPSIS
 .Nm tmux
 .Bk -words
-.Op Fl 2CDluvV
+.Op Fl 2CDlNuVv
 .Op Fl c Ar shell-command
 .Op Fl f Ar file
 .Op Fl L Ar socket-name
@@ -203,6 +203,12 @@ If
 is specified, the default socket directory is not used and any
 .Fl L
 flag is ignored.
+.It Fl T Ar features
+Set terminal features for the client.
+This is a comma-separated list of features.
+See the
+.Ic terminal-features
+option.
 .It Fl u
 Write UTF-8 output to the terminal even if the first environment
 variable of
@@ -214,12 +220,10 @@ that is set does not contain
 .Qq UTF-8
 or
 .Qq UTF8 .
-.It Fl T Ar features
-Set terminal features for the client.
-This is a comma-separated list of features.
-See the
-.Ic terminal-features
-option.
+.It Fl V
+Report the
+.Nm
+version.
 .It Fl v
 Request verbose logging.
 Log messages will be saved into
@@ -244,10 +248,6 @@ signal may be sent to the
 server process to toggle logging between on (as if
 .Fl v
 was given) and off.
-.It Fl V
-Report the
-.Nm
-version.
 .It Ar command Op Ar flags
 This specifies one of a set of commands used to control
 .Nm ,
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index 59107786ff2..47d159f3901 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.209 2021/08/23 11:04:21 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.210 2022/11/10 22:58:39 jmc Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -57,7 +57,7 @@ static __dead void
 usage(void)
 {
 	fprintf(stderr,
-	    "usage: %s [-2CDlNuvV] [-c shell-command] [-f file] [-L socket-name]\n"
+	    "usage: %s [-2CDlNuVv] [-c shell-command] [-f file] [-L socket-name]\n"
 	    "            [-S socket-path] [-T features] [command [flags]]\n",
 	    getprogname());
 	exit(1);
-- 
2.20.1