From: Benno Schulenberg <bensberg@telfort.nl>
To: util-linux@vger.kernel.org
Subject: [PATCH 4/8] agetty,setterm: (man) remove the mistakenly added -h and -V short options
Date: Mon, 14 Apr 2025 11:45:30 +0200 [thread overview]
Message-ID: <20250414094534.9504-4-bensberg@telfort.nl> (raw)
In-Reply-To: <20250414094534.9504-1-bensberg@telfort.nl>
Three years ago, commit 2b2d317242 was a little overzealous and replaced
also occurrences of --help and --version that were *not* paired with -h
and -V: `agetty` does not know -V and uses -h for something else, and
`setterm` does not know any short options at all.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
---
term-utils/agetty.8.adoc | 6 +++++-
term-utils/setterm.1.adoc | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/term-utils/agetty.8.adoc b/term-utils/agetty.8.adoc
index d34bd746c..988915865 100644
--- a/term-utils/agetty.8.adoc
+++ b/term-utils/agetty.8.adoc
@@ -180,7 +180,11 @@ Run login with this priority.
*--reload*::
Ask all running *agetty* instances to reload and update their displayed prompts, if the user has not yet commenced logging in. After doing so the command will exit. This feature might be unsupported on systems without Linux *inotify*(7).
-include::man-common/help-version.adoc[]
+*--help*::
+Display help text and exit.
+
+*--version*::
+Display version and exit.
== CONFIG FILE ITEMS
*agetty* reads the _/etc/login.defs_ configuration file (see *login.defs*(5)).
diff --git a/term-utils/setterm.1.adoc b/term-utils/setterm.1.adoc
index 1e6c2f5e1..89e21532e 100644
--- a/term-utils/setterm.1.adoc
+++ b/term-utils/setterm.1.adoc
@@ -160,7 +160,11 @@ Sets the color for underlined characters. Virtual consoles only.
*--underline* **on**|**off**::
Turns underline mode on or off.
-include::man-common/help-version.adoc[]
+*--help*::
+Display help text and exit.
+
+*--version*::
+Display version and exit.
== WARNING
--
2.48.1
next prev parent reply other threads:[~2025-04-14 9:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-14 9:45 [PATCH 1/8] docs: rewrite the description of --bytes, to be clearer Benno Schulenberg
2025-04-14 9:45 ` [PATCH 2/8] docs: improve and harmonize the description of -H / --list-columns Benno Schulenberg
2025-04-14 9:45 ` [PATCH 3/8] docs: fix a few indentation issues Benno Schulenberg
2025-04-14 9:45 ` Benno Schulenberg [this message]
2025-04-14 9:45 ` [PATCH 5/8] losetup,lscpu: (man) add the missing -h/--help and -V/--version options Benno Schulenberg
2025-04-14 9:45 ` [PATCH 6/8] docs: add -h/--help and -V/--version to three man pages that lacked them Benno Schulenberg
2025-04-14 9:45 ` [PATCH 7/8] lastlog2: (man) fix some broken markup, and lowercase option arguments Benno Schulenberg
2025-04-14 9:45 ` [PATCH 8/8] lastlog2: besides -v, recognize also the standard -V for --version Benno Schulenberg
2025-04-16 8:23 ` [PATCH 1/8] docs: rewrite the description of --bytes, to be clearer Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250414094534.9504-4-bensberg@telfort.nl \
--to=bensberg@telfort.nl \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox