summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--man/sd_bus_creds_get_pid.xml2
-rw-r--r--man/sd_id128_randomize.xml2
-rw-r--r--man/systemd-activate.xml2
-rw-r--r--man/systemd-hostnamed.service.xml2
-rw-r--r--man/systemd-run.xml2
-rw-r--r--man/systemd-timedated.service.xml2
-rw-r--r--man/systemd-udevd.service.xml4
-rw-r--r--man/udev.conf.xml2
-rwxr-xr-xtools/make-directive-index.py2
10 files changed, 12 insertions, 12 deletions
diff --git a/NEWS b/NEWS
index 96f0dd79f9..f621752d64 100644
--- a/NEWS
+++ b/NEWS
@@ -51,7 +51,7 @@ CHANGES WITH 217:
* A helper binary and a service have been added which can be
used to resume from hibernation in the initramfs. A
generator will parse the resume= option on the kernel
- command-line to trigger resume.
+ command line to trigger resume.
* A user console daemon systemd-consoled has been
added. Currently, it is a preview, and will so far open a
@@ -1627,7 +1627,7 @@ CHANGES WITH 209:
one of the next releases, at the same time that we will
declare the APIs stable.
- * When the kernel command-line argument "kdbus" is specified,
+ * When the kernel command line argument "kdbus" is specified,
systemd will automatically load the kdbus.ko kernel module. At
this stage of development, it is only useful for testing kdbus
and should not be used in production. Note: if "--enable-kdbus"
diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index 23763bd6ae..22eb6e5462 100644
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -275,7 +275,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
</para>
<para><function>sd_bus_creds_get_cmdline()</function> will retrieve
- an array of command-line arguments (as stored in
+ an array of command line arguments (as stored in
<filename>/proc/<replaceable>pid</replaceable>/cmdline</filename>).
</para>
diff --git a/man/sd_id128_randomize.xml b/man/sd_id128_randomize.xml
index 8c01ce826e..870474c63d 100644
--- a/man/sd_id128_randomize.xml
+++ b/man/sd_id128_randomize.xml
@@ -79,7 +79,7 @@
<para><citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
<option>--new-id</option> option may be used as a
- command-line front-end for
+ command line front-end for
<function>sd_id128_randomize()</function>.</para>
</refsect1>
diff --git a/man/systemd-activate.xml b/man/systemd-activate.xml
index cde4263c3c..f584aeb567 100644
--- a/man/systemd-activate.xml
+++ b/man/systemd-activate.xml
@@ -61,7 +61,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<title>Description</title>
<para><command>systemd-activate</command> can be used to
- launch a socket activated daemon from the command-line for
+ launch a socket activated daemon from the command line for
testing purposes. It can also be used to launch single instances
of the daemon per connection (inetd-style).
</para>
diff --git a/man/systemd-hostnamed.service.xml b/man/systemd-hostnamed.service.xml
index bdd3a51cc9..7952d8a6cb 100644
--- a/man/systemd-hostnamed.service.xml
+++ b/man/systemd-hostnamed.service.xml
@@ -64,7 +64,7 @@
<para>The tool
<citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- is a command-line client to this service.</para>
+ is a command line client to this service.</para>
<para>See the <ulink
url="http://www.freedesktop.org/wiki/Software/systemd/hostnamed">
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index 6ccfd71b28..c92c324105 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -214,7 +214,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<xi:include href="standard-options.xml" xpointer="version" />
</variablelist>
- <para>All command-line arguments after the first non-option
+ <para>All command line arguments after the first non-option
argument become part of the command line of the launched
process. If a command is run as service unit, its first argument
needs to be an absolute binary path.</para>
diff --git a/man/systemd-timedated.service.xml b/man/systemd-timedated.service.xml
index 143d3403fb..aee37db46e 100644
--- a/man/systemd-timedated.service.xml
+++ b/man/systemd-timedated.service.xml
@@ -66,7 +66,7 @@
<para>The tool
<citerefentry><refentrytitle>timedatectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- is a command-line client to this service.</para>
+ is a command line client to this service.</para>
<para>See the <ulink
url="http://www.freedesktop.org/wiki/Software/systemd/timedated">
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index 05a178c53b..c395c57ecb 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -60,8 +60,8 @@
<para>The behavior of the daemon can be configured using
<citerefentry><refentrytitle>udev.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
- its command-line options, environment variables, and on the kernel
- command-line, or changed dynamically with <command>udevadm
+ its command line options, environment variables, and on the kernel
+ command line, or changed dynamically with <command>udevadm
control</command>.
</para>
</refsect1>
diff --git a/man/udev.conf.xml b/man/udev.conf.xml
index 8a3cc8408f..e87d6e97c6 100644
--- a/man/udev.conf.xml
+++ b/man/udev.conf.xml
@@ -79,7 +79,7 @@
<para>
In addition, <filename>systemd-udevd</filename> can be configured
- by command-line options and the kernel command line (see
+ by command line options and the kernel command line (see
<citerefentry><refentrytitle>systemd-udevd</refentrytitle><manvolnum>8</manvolnum></citerefentry>).
</para>
</refsect1>
diff --git a/tools/make-directive-index.py b/tools/make-directive-index.py
index 5c80a7b9e6..17b1325bba 100755
--- a/tools/make-directive-index.py
+++ b/tools/make-directive-index.py
@@ -141,7 +141,7 @@ TEMPLATE = '''\
</refsect1>
<refsect1>
- <title>command-line options</title>
+ <title>command line options</title>
<para>Command-line options accepted by programs in the
systemd suite.</para>