From dfdebb1b925332352966804303b2516a6506a429 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 13 Feb 2014 14:33:51 -0500 Subject: [PATCH] man: xinclude --help/--version/--no-pager --- Makefile-man.am | 1 + man/bootctl.xml | 19 ++------- man/busctl.xml | 51 ++++++++---------------- man/halt.xml | 6 +-- man/hostnamectl.xml | 21 +++------- man/journalctl.xml | 25 ++---------- man/localectl.xml | 26 ++---------- man/loginctl.xml | 25 ++---------- man/machinectl.xml | 41 +++++-------------- man/runlevel.xml | 6 +-- man/shutdown.xml | 6 +-- man/standard-options.xml | 30 ++++++++++++++ man/systemctl.xml | 27 ++----------- man/systemd-activate.xml | 21 +++------- man/systemd-analyze.xml | 18 ++------- man/systemd-ask-password.xml | 13 ++---- man/systemd-bootchart.xml | 11 ++--- man/systemd-bus-proxyd.xml | 20 ++-------- man/systemd-cat.xml | 19 ++------- man/systemd-cgls.xml | 28 +++---------- man/systemd-cgtop.xml | 20 ++-------- man/systemd-coredumpctl.xml | 29 +++----------- man/systemd-delta.xml | 28 +++---------- man/systemd-detect-virt.xml | 20 ++-------- man/systemd-inhibit.xml | 21 +++------- man/systemd-journal-gatewayd.service.xml | 20 ++-------- man/systemd-machine-id-setup.xml | 19 ++------- man/systemd-notify.xml | 21 +++------- man/systemd-nspawn.xml | 43 ++++++++------------ man/systemd-readahead-replay.service.xml | 21 +++------- man/systemd-run.xml | 21 +++------- man/systemd-socket-proxyd.xml | 21 +++------- man/systemd-suspend.service.xml | 17 ++------ man/systemd-tmpfiles.xml | 21 +++------- man/systemd-tty-ask-password-agent.xml | 20 ++-------- man/systemd-udevd.service.xml | 21 +++++----- man/systemd.xml | 19 +++------ man/telinit.xml | 6 +-- man/timedatectl.xml | 26 ++---------- 39 files changed, 221 insertions(+), 607 deletions(-) create mode 100644 man/standard-options.xml diff --git a/Makefile-man.am b/Makefile-man.am index b11d5aa36..08f856b85 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -1385,6 +1385,7 @@ EXTRA_DIST += \ man/sd_uid_get_state.xml \ man/sd_watchdog_enabled.xml \ man/shutdown.xml \ + man/standard-options.xml \ man/sysctl.d.xml \ man/systemctl.xml \ man/systemd-activate.xml \ diff --git a/man/bootctl.xml b/man/bootctl.xml index 28f1b9203..5f198471b 100644 --- a/man/bootctl.xml +++ b/man/bootctl.xml @@ -19,7 +19,8 @@ along with systemd; If not, see . --> - + bootctl @@ -74,20 +75,8 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - + + The following commands are understood: diff --git a/man/busctl.xml b/man/busctl.xml index f352da1d7..9a2c63c94 100644 --- a/man/busctl.xml +++ b/man/busctl.xml @@ -21,7 +21,8 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see . --> - + busctl @@ -69,40 +70,6 @@ along with systemd; If not, see . The following options are understood: - - - - - Print a short help text and exit. - - - - - - - - Print a short version string and exit. - - - - - - - - Do not pipe output into a pager. - - - - - - - - Do not print the legend, - i.e. the column headers and the - footer. - - - @@ -193,6 +160,20 @@ along with systemd; If not, see . subset matching MATCH. + + + + + + Do not print the legend, + i.e. the column headers and the + footer. + + + + + + diff --git a/man/halt.xml b/man/halt.xml index f54a8648a..d3b686e99 100644 --- a/man/halt.xml +++ b/man/halt.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + halt @@ -80,8 +81,7 @@ - Prints a short help - text and exits. + diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml index 4bc05f52c..d6d000539 100644 --- a/man/hostnamectl.xml +++ b/man/hostnamectl.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + hostnamectl @@ -94,21 +95,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - - @@ -158,6 +144,9 @@ hostnames will be updated. + + + The following commands are understood: diff --git a/man/journalctl.xml b/man/journalctl.xml index 50027b44d..78fc6f616 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -130,28 +130,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - - - - - - Do not pipe output into a - pager. - - @@ -866,6 +844,9 @@ operation. + + + diff --git a/man/localectl.xml b/man/localectl.xml index 09e8d41e7..bef3edb44 100644 --- a/man/localectl.xml +++ b/man/localectl.xml @@ -81,28 +81,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - - - - - - Do not pipe output into a - pager. - - @@ -142,6 +120,10 @@ the console to X11, or X11 to console, respectively. + + + + The following commands are understood: diff --git a/man/loginctl.xml b/man/loginctl.xml index 38f099edc..25eae3159 100644 --- a/man/loginctl.xml +++ b/man/loginctl.xml @@ -72,28 +72,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - - - - - - Do not pipe output into a - pager. - - @@ -200,6 +178,9 @@ SIGTERM. + + + The following commands are understood: diff --git a/man/machinectl.xml b/man/machinectl.xml index 89ab47402..da539ed08 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -72,36 +72,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - - - - - - Do not pipe output into a - pager. - - - - - - Do not print the legend, - i.e. the column headers and the - footer. - - @@ -189,6 +159,17 @@ SIGTERM. + + + + Do not print the legend, + i.e. the column headers and the + footer. + + + + + The following commands are understood: diff --git a/man/runlevel.xml b/man/runlevel.xml index 5efb340df..976753a73 100644 --- a/man/runlevel.xml +++ b/man/runlevel.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + runlevel @@ -78,8 +79,7 @@ - Prints a short help - text and exits. + diff --git a/man/shutdown.xml b/man/shutdown.xml index 27e7e87b6..737258514 100644 --- a/man/shutdown.xml +++ b/man/shutdown.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + shutdown @@ -94,8 +95,7 @@ - Prints a short help - text and exits. + diff --git a/man/standard-options.xml b/man/standard-options.xml new file mode 100644 index 000000000..7ae8a965c --- /dev/null +++ b/man/standard-options.xml @@ -0,0 +1,30 @@ + + + + + + + + + + Print a short help text and exit. + + + + + + + + Print a short version string and exit. + + + + + + + + Do not pipe output into a pager. + + + diff --git a/man/systemctl.xml b/man/systemctl.xml index d6d2c76f2..4bb8b07d6 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -72,22 +72,6 @@ along with systemd; If not, see . The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - - Prints a short version string and exits. - - - @@ -301,14 +285,6 @@ along with systemd; If not, see . - - - - - Do not pipe output into a pager. - - - @@ -515,6 +491,9 @@ along with systemd; If not, see . + + + diff --git a/man/systemd-activate.xml b/man/systemd-activate.xml index 35eec1929..717f5c0c2 100644 --- a/man/systemd-activate.xml +++ b/man/systemd-activate.xml @@ -21,7 +21,8 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see . --> - + systemd-activate @@ -83,21 +84,6 @@ along with systemd; If not, see . Options - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - - @@ -128,6 +114,9 @@ along with systemd; If not, see . environment of systemd-activate itself. + + + diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml index de6c2bee2..7556ef7bc 100644 --- a/man/systemd-analyze.xml +++ b/man/systemd-analyze.xml @@ -182,14 +182,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - @@ -287,13 +279,9 @@ e.g. "50ms". - - - - - Do not pipe output into a pager. - - + + + diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml index db5cb20db..805827efc 100644 --- a/man/systemd-ask-password.xml +++ b/man/systemd-ask-password.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + systemd-ask-password @@ -103,14 +104,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - @@ -160,6 +153,8 @@ output one password per line. + + diff --git a/man/systemd-bootchart.xml b/man/systemd-bootchart.xml index ae432b563..d0adaad98 100644 --- a/man/systemd-bootchart.xml +++ b/man/systemd-bootchart.xml @@ -26,7 +26,9 @@ along with systemd; If not, see . --> - + + systemd-bootchart systemd @@ -144,12 +146,7 @@ - - - - - Prints a short help text and exits. - + diff --git a/man/systemd-bus-proxyd.xml b/man/systemd-bus-proxyd.xml index e6955c3ce..91a6fe368 100644 --- a/man/systemd-bus-proxyd.xml +++ b/man/systemd-bus-proxyd.xml @@ -21,7 +21,8 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see . --> - + systemd-bus-proxyd @@ -86,21 +87,8 @@ along with systemd; If not, see . - - - - - Prints a short version string and exits. - - - - - - - - Prints a short help - text and exits. - + + PLACEHOLDER, if given, must be a string diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml index e61a6ac8f..4098a76bc 100644 --- a/man/systemd-cat.xml +++ b/man/systemd-cat.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + systemd-cat @@ -81,20 +82,8 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - + + diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml index 955e0da37..230957ba2 100644 --- a/man/systemd-cgls.xml +++ b/man/systemd-cgls.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + systemd-cgls @@ -82,28 +83,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - - - - - - Do not pipe output into a - pager. - - @@ -138,6 +117,9 @@ + + + diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml index 38bddf183..73f8e7418 100644 --- a/man/systemd-cgtop.xml +++ b/man/systemd-cgtop.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + systemd-cgtop @@ -99,21 +100,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a version string and - exits. - - @@ -197,6 +183,8 @@ 3. + + diff --git a/man/systemd-coredumpctl.xml b/man/systemd-coredumpctl.xml index 4318a2fd4..092ec56a2 100644 --- a/man/systemd-coredumpctl.xml +++ b/man/systemd-coredumpctl.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + systemd-coredumpctl @@ -70,21 +71,6 @@ The following options are understood: - - - - - Print a short help - text and exit. - - - - - - Print a short version - string and exit. - - @@ -103,14 +89,6 @@ . - - - - Do not pipe output of - list into a - pager. - - @@ -118,6 +96,9 @@ + + + The following commands are understood: diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml index 23fb8d1df..9117773b7 100644 --- a/man/systemd-delta.xml +++ b/man/systemd-delta.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + systemd-delta @@ -107,28 +108,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - - - - - - Do not pipe output into a - pager. - - @@ -197,6 +176,9 @@ to . + + + diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml index 69785ceff..bdf220eb2 100644 --- a/man/systemd-detect-virt.xml +++ b/man/systemd-detect-virt.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + systemd-detect-virt @@ -89,21 +90,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - - @@ -131,6 +117,8 @@ identifier. + + diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml index f915fb8cb..555c5414b 100644 --- a/man/systemd-inhibit.xml +++ b/man/systemd-inhibit.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + systemd-inhibit @@ -83,21 +84,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - - @@ -172,6 +158,9 @@ inhibition locks instead of acquiring one. + + + diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml index f639811e3..01b255201 100644 --- a/man/systemd-journal-gatewayd.service.xml +++ b/man/systemd-journal-gatewayd.service.xml @@ -21,7 +21,8 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see . --> - + systemd-journal-gatewayd.service @@ -81,21 +82,6 @@ along with systemd; If not, see . The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - - @@ -114,6 +100,8 @@ along with systemd; If not, see . with . + + diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml index 7b3aa7e9a..5c34b345d 100644 --- a/man/systemd-machine-id-setup.xml +++ b/man/systemd-machine-id-setup.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + systemd-machine-id-setup @@ -95,20 +96,8 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - + + diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml index e14977d05..69baae0dc 100644 --- a/man/systemd-notify.xml +++ b/man/systemd-notify.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + systemd-notify @@ -86,21 +87,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - - @@ -165,6 +151,9 @@ about the semantics of this option see sd_readahead3. + + + diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 8f09c1b41..0a661c925 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + systemd-nspawn @@ -158,32 +159,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a version string - and exits. - - - - - - - Turns off any status - output by the tool itself. When this - switch is used, the only output - from nspawn will be the console output - of the container OS itself. - - @@ -577,6 +552,20 @@ reported on the host. + + + + + + Turns off any status + output by the tool itself. When this + switch is used, the only output + from nspawn will be the console output + of the container OS itself. + + + + diff --git a/man/systemd-readahead-replay.service.xml b/man/systemd-readahead-replay.service.xml index b075f572d..67b41f5b2 100644 --- a/man/systemd-readahead-replay.service.xml +++ b/man/systemd-readahead-replay.service.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + systemd-readahead-replay.service @@ -115,21 +116,6 @@ the following options: - - - - - Prints a short help text - and exits. - - - - - - Prints a short version - string and exits. - - @@ -157,6 +143,9 @@ for the collect command. + + + diff --git a/man/systemd-run.xml b/man/systemd-run.xml index 4b67b7b5c..87640fc25 100644 --- a/man/systemd-run.xml +++ b/man/systemd-run.xml @@ -21,7 +21,8 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see . --> - + systemd-run @@ -88,21 +89,6 @@ along with systemd; If not, see . The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - - @@ -202,6 +188,9 @@ along with systemd; If not, see . + + + All command-line arguments after the first non-option diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml index 8061466d8..ab80a2b4b 100644 --- a/man/systemd-socket-proxyd.xml +++ b/man/systemd-socket-proxyd.xml @@ -20,7 +20,9 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see . --> - + + systemd-socket-proxyd systemd @@ -83,21 +85,8 @@ Options The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a version - string and exits. - - + + diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml index 4abc27819..690f961a2 100644 --- a/man/systemd-suspend.service.xml +++ b/man/systemd-suspend.service.xml @@ -22,7 +22,8 @@ along with systemd; If not, see . --> - + systemd-suspend.service @@ -125,19 +126,9 @@ following commands: - - - + + - Print a short help - text and exit. - - - - - Print the systemd version - identifier and exit. - diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml index ba47928b0..0b6264033 100644 --- a/man/systemd-tmpfiles.xml +++ b/man/systemd-tmpfiles.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + systemd-tmpfiles @@ -91,21 +92,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - - If this option is @@ -166,6 +152,9 @@ prefix. This option can be specified multiple times. + + + It is possible to combine diff --git a/man/systemd-tty-ask-password-agent.xml b/man/systemd-tty-ask-password-agent.xml index cb5fb43d9..e0df87d21 100644 --- a/man/systemd-tty-ask-password-agent.xml +++ b/man/systemd-tty-ask-password-agent.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + systemd-tty-ask-password-agent @@ -76,21 +77,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - - @@ -141,6 +127,8 @@ calling TTY. + + diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml index cd679a449..f44b7a048 100644 --- a/man/systemd-udevd.service.xml +++ b/man/systemd-udevd.service.xml @@ -3,7 +3,9 @@ - + + systemd-udevd.service systemd @@ -67,18 +69,21 @@ Detach and run in the background. + Print debug messages to standard error. + Limit the number of events executed in parallel. + @@ -89,6 +94,7 @@ modules. + @@ -100,18 +106,13 @@ and all devices will be owned by root. - - - - Print version number. - - + - - Print help text. - + + + diff --git a/man/systemd.xml b/man/systemd.xml index 4abd8902a..331e6c2ff 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + systemd @@ -88,19 +89,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - Prints a systemd version - identifier and exits. - @@ -264,6 +252,9 @@ to . + + + diff --git a/man/telinit.xml b/man/telinit.xml index b20a60a4c..1949c950e 100644 --- a/man/telinit.xml +++ b/man/telinit.xml @@ -21,7 +21,8 @@ along with systemd; If not, see . --> - + telinit @@ -73,8 +74,7 @@ - Prints a short help - text and exits. + diff --git a/man/timedatectl.xml b/man/timedatectl.xml index a82e6468c..7ac19e6be 100644 --- a/man/timedatectl.xml +++ b/man/timedatectl.xml @@ -68,28 +68,6 @@ The following options are understood: - - - - - Prints a short help - text and exits. - - - - - - Prints a short version - string and exits. - - - - - - Do not pipe output into a - pager. - - @@ -131,6 +109,10 @@ synchronized from the system clock. + + + + The following commands are understood: -- 2.30.2