man pages: use the same verb for --version as for --help, like in usages

Also, avoid duplication of --help/--version in the man page for `chfn`.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

diff --git a/login-utils/chfn.1.adoc b/login-utils/chfn.1.adoc
index 35a2e82cf07233d8f482787312749caa028f3b83..527c6806c6ff5e77b94a5c0669c3d68080b56b39 100644 (file)
--- 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 940ded5aa13da64a99cb18a7a9c5df9842e43692..e259b593f13b247477c9e1eedd7c292243753fee 100644 (file)
--- 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 7a3c04fb9dc6c2b7be8fb6f25796e95b148a5a2b..8bce5760f9b4f7c9e6e9c1373a7c87013500d74b 100644 (file)
--- 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 8a9c28846a64ff4bb6d7b2237f16707bc1ebc453..0d4c211f855a070a664cfbf0a9ce73131a46d496 100644 (file)
--- 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 46610f0c5bc161adc8705b47a2ddf7c87a4e9a50..bc1913a913655203b72764102ef5d2d1f6dbd3af 100644 (file)
--- 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