uuidd: put an option and its description in a single message

Also, improve the markup and the wording in the man page.

CC: Michael Trapp <michael.trapp@sap.com>
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

diff --git a/misc-utils/uuidd.8.adoc b/misc-utils/uuidd.8.adoc
index f8001f986f0ed84261acfd7ee0444f4051965b8c..f15d7b631ede3c293fc1d229c2c62b3080e64a6c 100644 (file)
--- a/misc-utils/uuidd.8.adoc
+++ b/misc-utils/uuidd.8.adoc
@@ -24,12 +24,20 @@ The *uuidd* daemon is used by the UUID library to generate universally unique id
 
 == OPTIONS
 
-*-C*, *--cont-clock*[**=**_time_]::
-Activate continuous clock handling for time based UUIDs. *uuidd* could use all possible clock values, beginning with the daemon's start time. The optional argument can be used to set a value for the max_clock_offset. This guarantees, that a clock value of a UUID will always be within the range of the max_clock_offset.
+*-C*, *--cont-clock*[**=**_number_[*hd*]]::
+Activate continuous clock handling for time-based UUIDs. *uuidd* could
+use all possible clock values, beginning with the daemon's start time.
+The optional argument can be used to set a value for 'max_clock_offset'.
+This guarantees that a clock value of a UUID will always be within the
+range of 'max_clock_offset'.
 +
-The option *-C* or *--cont-clock* enables the feature with a default max_clock_offset of 2 hours.
+The option *-C* or *--cont-clock* (without an argument) enables the
+feature with a default 'max_clock_offset' of 2 hours.
 +
-The option *-C<NUM>[hd]* or *--cont-clock=<NUM>[hd]* enables the feature with a max_clock_offset of NUM seconds. In case of an appended h or d, the NUM value is read in hours or days. The minimum value is 60 seconds, the maximum value is 365 days.
+The option **-C**_number_ or **--cont-clock=**_number_ enables the
+feature with a 'max_clock_offset' of _number_ seconds.
+In case of an appended *h* or *d*, _number_ is understood in hours or days.
+The minimum value is 60 seconds, the maximum value is 365 days.
 
 *-d*, *--debug*::
 Run *uuidd* in debugging mode. This prevents *uuidd* from running as a daemon.

diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 961c3a5fad0ed76e469cb56b3cb81ea4dcdaa836..74e950307d754a44085e1e7505ff737f4c112784 100644 (file)
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -108,8 +108,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -P, --no-pid            do not create pid file\n"), out);
        fputs(_(" -F, --no-fork           do not daemonize using double-fork\n"), out);
        fputs(_(" -S, --socket-activation do not create listening socket\n"), out);
-       fputs(_(" -C, --cont-clock[=<NUM>[hd]]\n"), out);
-       fputs(_("                         activate continuous clock handling\n"), out);
+       fputs(_(" -C, --cont-clock[=<number>[hd]]\n"
+               "                         activate continuous clock handling\n"), out);
        fputs(_(" -d, --debug             run in debugging mode\n"), out);
        fputs(_(" -q, --quiet             turn on quiet mode\n"), out);
        fputs(USAGE_SEPARATOR, out);