From: Zbigniew Jędrzejewski-Szmek Date: Thu, 14 Feb 2013 03:46:37 +0000 (-0500) Subject: man: use in various places X-Git-Tag: v198~242 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e670b166a08b7c1031a9e7d7675fa9a29c3e19c9;p=thirdparty%2Fsystemd.git man: use in various places --- diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml index 8c5083cafb5..762d1fc66e6 100644 --- a/man/binfmt.d.xml +++ b/man/binfmt.d.xml @@ -76,7 +76,7 @@ as delimiter in binary format rules. Each configuration file shall be named in the - style of <program>.conf. + style of program.conf. Files in /etc/ override files with the same name in /usr/lib/ and /run/. Files in diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml index ea4f524048c..ce94bef7a7f 100644 --- a/man/modules-load.d.xml +++ b/man/modules-load.d.xml @@ -58,7 +58,7 @@ reads files from the above directories which contain kernel modules to load during boot in a static list. Each configuration file is named in the style of - /etc/modules-load.d/<program>.conf. Note + /etc/modules-load.d/program.conf. Note that it is usually a better idea to rely on the automatic module loading by PCI IDs, USB IDs, DMI IDs or similar triggers encoded in the kernel modules @@ -76,7 +76,7 @@ non-whitespace character is # or ; are ignored. Each configuration file shall be named in the - style of <program>.conf. + style of program.conf. Files in /etc/ override files with the same name in /usr/lib/ and /run/. Files in diff --git a/man/nss-myhostname.xml b/man/nss-myhostname.xml index 46b7471b065..3fc91ee7923 100644 --- a/man/nss-myhostname.xml +++ b/man/nss-myhostname.xml @@ -50,9 +50,7 @@ - - nss-myhostname.la - + nss-myhostname.la diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml index 0093a8fb2d0..d74a91878c6 100644 --- a/man/pam_systemd.xml +++ b/man/pam_systemd.xml @@ -48,9 +48,7 @@ - - pam_systemd.so - + pam_systemd.so diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml index 0ef5545163b..759b8740f57 100644 --- a/man/sysctl.d.xml +++ b/man/sysctl.d.xml @@ -77,7 +77,7 @@ entirely equivalent. Each configuration file shall be named in the - style of <program>.conf. + style of program.conf. Files in /etc/ override files with the same name in /usr/lib/ and /run/. Files in diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 2fa00e80c0c..6a01ffd450a 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -262,13 +262,13 @@ not linked. If host, the journal files are stored on the host file system (beneath - /var/log/journal/<machine-id>) + /var/log/journal/machine-id) and the subdirectory is bind-mounted into the container at the same location. If guest, the journal files are stored on the guest file system (beneath - /var/log/journal/<machine-id>) + /var/log/journal/machine-id) and the subdirectory is symlinked into the host at the same location. If auto (the default), diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml index f428ddfe1af..f0a4293deaf 100644 --- a/man/systemd.automount.xml +++ b/man/systemd.automount.xml @@ -48,7 +48,7 @@ - systemd.automount + automount.automount diff --git a/man/systemd.device.xml b/man/systemd.device.xml index 4c4bb7cee5e..3f6d012c11b 100644 --- a/man/systemd.device.xml +++ b/man/systemd.device.xml @@ -48,7 +48,7 @@ - systemd.device + device.device diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 952bb9595ea..9c31baf7935 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -48,10 +48,10 @@ - systemd.service, - systemd.socket, - systemd.mount, - systemd.swap + service.service, + socket.socket, + mount.mount, + swap.swap diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml index 5ff8feee634..b41ce460b58 100644 --- a/man/systemd.kill.xml +++ b/man/systemd.kill.xml @@ -48,10 +48,10 @@ - systemd.service, - systemd.socket, - systemd.mount, - systemd.swap + service.service, + socket.socket, + mount.mount, + swap.swap diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index 022be4661d1..23e1e6c28ee 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -48,7 +48,7 @@ - systemd.mount + mount.mount diff --git a/man/systemd.path.xml b/man/systemd.path.xml index ccf16df004f..cc2d3661982 100644 --- a/man/systemd.path.xml +++ b/man/systemd.path.xml @@ -48,7 +48,7 @@ - systemd.path + path.path diff --git a/man/systemd.service.xml b/man/systemd.service.xml index d2feb98247b..aecf9c6efa7 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -48,7 +48,7 @@ - systemd.service + service.service diff --git a/man/systemd.snapshot.xml b/man/systemd.snapshot.xml index f7688e99982..08d14c4e012 100644 --- a/man/systemd.snapshot.xml +++ b/man/systemd.snapshot.xml @@ -48,7 +48,7 @@ - systemd.snapshot + snapshot.snapshot diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index f2d4dbe3b73..e5944228891 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -48,7 +48,7 @@ - systemd.socket + socket.socket diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index e547e717222..78b04f58d93 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -48,7 +48,7 @@ - systemd.swap + swap.swap diff --git a/man/systemd.target.xml b/man/systemd.target.xml index efbad15cdf5..fd51cfde3a2 100644 --- a/man/systemd.target.xml +++ b/man/systemd.target.xml @@ -48,7 +48,7 @@ - systemd.target + target.target diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml index 2c2ba582265..2b9d91a60fe 100644 --- a/man/systemd.timer.xml +++ b/man/systemd.timer.xml @@ -48,7 +48,7 @@ - systemd.timer + timer.timer