From 9cc2c8b763fb4b9ddda95756a727a438a0d2a012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 14 Jan 2013 22:08:33 -0500 Subject: [PATCH] man: add links to directive index to see-alsos systemd.directives(5) is renamed to systemd.directives(7). Section 7 is "Miscellaneous". --- Makefile.am | 2 +- TODO | 2 -- make-directive-index.py | 2 +- man/bootchart.conf.xml | 3 ++- man/systemd.automount.xml | 3 ++- man/systemd.conf.xml | 3 ++- man/systemd.device.xml | 3 ++- man/systemd.exec.xml | 3 ++- man/systemd.journal-fields.xml | 3 ++- man/systemd.kill.xml | 3 ++- man/systemd.mount.xml | 3 ++- man/systemd.path.xml | 3 ++- man/systemd.service.xml | 3 ++- man/systemd.snapshot.xml | 3 ++- man/systemd.socket.xml | 3 ++- man/systemd.swap.xml | 3 ++- man/systemd.target.xml | 3 ++- man/systemd.time.xml | 3 ++- man/systemd.timer.xml | 3 ++- man/systemd.unit.xml | 3 ++- man/systemd.xml | 3 ++- 21 files changed, 38 insertions(+), 22 deletions(-) diff --git a/Makefile.am b/Makefile.am index f02e9532d99..ed6c307c90d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -693,7 +693,7 @@ man/index.html: make-man-index.py $(XML_FILES) $(AM_V_GEN)$(PYTHON) $^ > $@ MANPAGES += \ - man/systemd.directives.5 + man/systemd.directives.7 EXTRA_DIST += \ man/index.html diff --git a/TODO b/TODO index b4e44612919..7eeca3d4ee7 100644 --- a/TODO +++ b/TODO @@ -23,8 +23,6 @@ Features: nothing. "systemctl enable" does nothing, and gives a bad message about it. Should fix both to print nice actionable messages. -* man: link up systemd.directives better, so that people actually know about it - * fstab: add new mount option x-systemd-after=/foobar/waldo to allow manual dependencies to other mount points https://bugzilla.redhat.com/show_bug.cgi?id=812826 diff --git a/make-directive-index.py b/make-directive-index.py index e94f4c5b30e..48d830e96f0 100755 --- a/make-directive-index.py +++ b/make-directive-index.py @@ -40,7 +40,7 @@ TEMPLATE = '''\ systemd.directives - 5 + 7 diff --git a/man/bootchart.conf.xml b/man/bootchart.conf.xml index f8fcfe01036..d2b09638c14 100644 --- a/man/bootchart.conf.xml +++ b/man/bootchart.conf.xml @@ -151,7 +151,8 @@ See Also - systemd-bootchart1 + systemd-bootchart1, + systemd.directives7 diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml index fe559e1dcb9..75758350607 100644 --- a/man/systemd.automount.xml +++ b/man/systemd.automount.xml @@ -160,7 +160,8 @@ systemd.unit5, systemd.mount5, mount8, - automount8 + automount8, + systemd.directives7 diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml index da3c7f77898..956db2c4d3a 100644 --- a/man/systemd.conf.xml +++ b/man/systemd.conf.xml @@ -290,7 +290,8 @@ See Also - systemd1 + systemd1, + systemd.directives7 diff --git a/man/systemd.device.xml b/man/systemd.device.xml index 141d72e3dcc..4c4bb7cee5e 100644 --- a/man/systemd.device.xml +++ b/man/systemd.device.xml @@ -161,7 +161,8 @@ systemd1, systemctl8, systemd.unit5, - udev7 + udev7, + systemd.directives7 diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 302ac434075..92f59bdfbd9 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -1149,7 +1149,8 @@ systemd.socket5, systemd.swap5, systemd.mount5, - systemd.kill5 + systemd.kill5, + systemd.directives7 diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml index 76a436d650e..13af4fdfc15 100644 --- a/man/systemd.journal-fields.xml +++ b/man/systemd.journal-fields.xml @@ -443,7 +443,8 @@ systemd1, journalctl1, journald.conf5, - sd-journal3 + sd-journal3, + systemd.directives7 diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml index 3fff2f57e64..1bff7b81fa6 100644 --- a/man/systemd.kill.xml +++ b/man/systemd.kill.xml @@ -163,7 +163,8 @@ systemd.socket5, systemd.swap5, systemd.mount5, - systemd.exec5 + systemd.exec5, + systemd.directives7 diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index d1940831a9d..2dc095e47b3 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -290,7 +290,8 @@ systemd.service5, systemd.device5, mount8, - systemd-fstab-generator8 + systemd-fstab-generator8, + systemd.directives7 diff --git a/man/systemd.path.xml b/man/systemd.path.xml index a27a97be772..70a89b7a47a 100644 --- a/man/systemd.path.xml +++ b/man/systemd.path.xml @@ -213,7 +213,8 @@ systemctl8, systemd.unit5, systemd.service5, - inotify7 + inotify7, + systemd.directives7 diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 598e863651d..63e5b16e538 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -922,7 +922,8 @@ systemctl8, systemd.unit5, systemd.exec5, - systemd.kill5 + systemd.kill5, + systemd.directives7 diff --git a/man/systemd.snapshot.xml b/man/systemd.snapshot.xml index b432682a484..f7688e99982 100644 --- a/man/systemd.snapshot.xml +++ b/man/systemd.snapshot.xml @@ -80,7 +80,8 @@ systemd1, systemctl8, - systemd.unit5 + systemd.unit5, + systemd.directives7 diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 4b1fcc8b0cf..88cdaca00ff 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -678,7 +678,8 @@ systemd.unit5, systemd.exec5, systemd.kill5, - systemd.service5 + systemd.service5, + systemd.directives7 diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index a932143d435..dae9d59e7c9 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -206,7 +206,8 @@ systemd.device5, systemd.mount5, swapon8, - systemd-fstab-generator8 + systemd-fstab-generator8, + systemd.directives7 diff --git a/man/systemd.target.xml b/man/systemd.target.xml index d1f4d22674b..efbad15cdf5 100644 --- a/man/systemd.target.xml +++ b/man/systemd.target.xml @@ -101,7 +101,8 @@ systemd1, systemctl8, systemd.unit5, - systemd.special7 + systemd.special7, + systemd.directives7 diff --git a/man/systemd.time.xml b/man/systemd.time.xml index 4f80a306bfa..db5d01b1a28 100644 --- a/man/systemd.time.xml +++ b/man/systemd.time.xml @@ -284,7 +284,8 @@ Wed-Sat,Tue 12-10-15 1:2:3 → Tue-Sat 2012-10-15 01:02:03 systemd1, journalctl1, systemd.timer5, - systemd.unit5 + systemd.unit5, + systemd.directives7 diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml index 5cc543e453e..e08e2002125 100644 --- a/man/systemd.timer.xml +++ b/man/systemd.timer.xml @@ -199,7 +199,8 @@ systemctl8, systemd.unit5, systemd.service5, - systemd.time7 + systemd.time7, + systemd.directives7 diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index bba0f5d29f0..d43f288b81e 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -1123,7 +1123,8 @@ systemd.timer5, systemd.snapshot5, systemd.time7, - capabilities7 + capabilities7, + systemd.directives7 diff --git a/man/systemd.xml b/man/systemd.xml index 55ba0875f0e..962ed56ffcb 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -1265,7 +1265,8 @@ systemd.special5, pkg-config1, kernel-command-line7, - bootup7 + bootup7, + systemd.directives7