Also, avoid duplication of --help/--version in the man page for `chfn`.
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxx>
---
login-utils/chfn.1.adoc | 6 +++---
login-utils/chsh.1.adoc | 10 +++++-----
man-common/help-version.adoc | 2 +-
schedutils/coresched.1.adoc | 6 +-----
text-utils/col.1.adoc | 2 +-
5 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/login-utils/chfn.1.adoc b/login-utils/chfn.1.adoc
index 35a2e82cf..527c6806c 100644
--- a/login-utils/chfn.1.adoc
+++ b/login-utils/chfn.1.adoc
@@ -50,10 +50,10 @@ Specify your home phone number.
Display help text and exit.
*-V*, *--version*::
-Print version and exit. The short options *-V* have been used since version 2.39; old versions use
-deprecated *-v*.
+Display version and exit. (Short option *-V* is used since version 2.39;
+older versions used the now-deprecated *-v*).
-include::man-common/help-version.adoc[]
+// Do not include::man-common/help-version.adoc[] as --help and --version are already given explicitly above.
== CONFIG FILE ITEMS
diff --git a/login-utils/chsh.1.adoc b/login-utils/chsh.1.adoc
index 940ded5aa..e259b593f 100644
--- a/login-utils/chsh.1.adoc
+++ b/login-utils/chsh.1.adoc
@@ -37,14 +37,14 @@ Specify your login shell.
Print the list of shells listed in _/etc/shells_ and exit.
*-h*, *--help*::
-Display help text and exit. The short options *-h* have been used since version 2.30; old versions use
-deprecated *-u*.
+Display help text and exit. (Short option *-h* is used since version 2.30;
+older versions used the now-deprecated *-u*).
*-V*, *--version*::
-Print version and exit. The short options *-V* have been used since version 2.39; old versions use
-deprecated *-v*.
+Display version and exit. (Short option *-V* is used since version 2.39;
+older versions used the now-deprecated *-v*).
-// Do not include::man-common/help-version.adoc[] as both -h and -V were already explicitly given above in more detail.
+// Do not include::man-common/help-version.adoc[] as both -h and -V are already given explicitly above in more detail.
== VALID SHELLS
diff --git a/man-common/help-version.adoc b/man-common/help-version.adoc
index 7a3c04fb9..8bce5760f 100644
--- a/man-common/help-version.adoc
+++ b/man-common/help-version.adoc
@@ -2,4 +2,4 @@
Display help text and exit.
*-V*, *--version*::
-Print version and exit.
+Display version and exit.
diff --git a/schedutils/coresched.1.adoc b/schedutils/coresched.1.adoc
index 8a9c28846..0d4c211f8 100644
--- a/schedutils/coresched.1.adoc
+++ b/schedutils/coresched.1.adoc
@@ -67,11 +67,7 @@ The type of the PID whose cookie will be modified. This can be one of three valu
*-v*, *--verbose*::
Show extra information when modifying cookies of tasks.
-*-h*, *--help*::
-Display help text and exit.
-
-*-V*, *--version*::
-Print version and exit.
+include::man-common/help-version.adoc[]
== EXAMPLES
Get the core scheduling cookie of the {command} task itself, usually inherited from its parent{colon}::
diff --git a/text-utils/col.1.adoc b/text-utils/col.1.adoc
index 46610f0c5..bc1913a91 100644
--- a/text-utils/col.1.adoc
+++ b/text-utils/col.1.adoc
@@ -81,7 +81,7 @@ Output multiple spaces instead of tabs.
Display help text and exit.
*-V*, *--version*::
-Print version and exit.
+Display version and exit.
== CONFORMING TO
--
2.48.1
