From 0c670beed94f9098f32d265c1571e2855b3f173c Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.funk1@gmail.com>
Date: Thu, 31 Oct 2024 22:43:18 -0700
Subject: [PATCH] stty: adjust --help to match POSIX 2024

* src/stty.c (usage): Mark cols, rows, and size as standardized by
POSIX.
* doc/coreutils.texi (Special): Likewise.
---
 doc/coreutils.texi | 8 ++++----
 src/stty.c         | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 77eed8e7c..60a07b2ef 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -15855,13 +15855,14 @@ Set the output speed to @var{n}.
 @item rows @var{n}
 @opindex rows
 Tell the tty kernel driver that the terminal has @var{n} rows.
-Non-POSIX.
 
 @item cols @var{n}
-@itemx columns @var{n}
 @opindex cols
+Tell the kernel that the terminal has @var{n} columns.
+
+@item columns @var{n}
 @opindex columns
-Tell the kernel that the terminal has @var{n} columns.  Non-POSIX.
+Same as @samp{cols}.  Non-POSIX.
 
 @item drain
 @opindex drain
@@ -15886,7 +15887,6 @@ Print the number of rows and columns that the kernel thinks the
 terminal has.  (Systems that don't support rows and columns in the kernel
 typically use the environment variables @env{LINES} and @env{COLUMNS}
 instead; however, GNU @command{stty} does not know anything about them.)
-Non-POSIX.
 
 @item line @var{n}
 @opindex line
diff --git a/src/stty.c b/src/stty.c
index 95091744a..db993888f 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -632,7 +632,7 @@ Special settings:\n\
 "), stdout);
 #ifdef TIOCGWINSZ
       fputs (_("\
- * cols N        tell the kernel that the terminal has N columns\n\
+   cols N        tell the kernel that the terminal has N columns\n\
  * columns N     same as cols N\n\
 "), stdout);
 #endif
@@ -653,8 +653,8 @@ Special settings:\n\
 "), stdout);
 #ifdef TIOCGWINSZ
       fputs (_("\
- * rows N        tell the kernel that the terminal has N rows\n\
- * size          print the number of rows and columns according to the kernel\n\
+   rows N        tell the kernel that the terminal has N rows\n\
+   size          print the number of rows and columns according to the kernel\n\
 "), stdout);
 #endif
       fputs (_("\
-- 
2.11.4.GIT