[systemd-devel] [PATCH] s/commandline/command line/g
harald at redhat.com
harald at redhat.com
Wed Nov 5 05:56:03 PST 2014
From: Harald Hoyer <harald at redhat.com>
---
TODO | 2 +-
m4/attributes.m4 | 2 +-
man/systemd-bootchart.xml | 4 ++--
man/systemd-delta.xml | 2 +-
man/systemd-run.xml | 2 +-
man/systemd.link.xml | 2 +-
man/udev.conf.xml | 2 +-
src/core/shutdown.c | 2 +-
src/cryptsetup/cryptsetup-generator.c | 4 ++--
src/fstab-generator/fstab-generator.c | 2 +-
src/journal/coredump.c | 2 +-
src/network/networkd-wait-online-manager.c | 2 +-
src/shared/condition-util.c | 2 +-
src/udev/collect/collect.c | 2 +-
src/udev/net/link-config.c | 2 +-
src/udev/udevd.c | 2 +-
16 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/TODO b/TODO
index b54aa61..8d3ef11 100644
--- a/TODO
+++ b/TODO
@@ -14,7 +14,7 @@ Bugfixes:
Environment=ONE='one' "TWO='two two' too" THREE=
ExecStart=/bin/python3 -c 'import sys;print(sys.argv)' $ONE $TWO $THREE
-* MEMORY return code is overloaded for syntax errors in the commandline.
+* MEMORY return code is overloaded for syntax errors in the command line.
str_split_quoted() should return a real return code, so spawn_child can
report the failure properly.
diff --git a/m4/attributes.m4 b/m4/attributes.m4
index 7bd5ad8..ac3c662 100644
--- a/m4/attributes.m4
+++ b/m4/attributes.m4
@@ -89,7 +89,7 @@ AC_DEFUN([CC_NOUNDEFINED], [
*-freebsd* | *-openbsd*) ;;
*)
dnl First of all check for the --no-undefined variant of GNU ld. This allows
- dnl for a much more readable commandline, so that people can understand what
+ dnl for a much more readable command line, so that people can understand what
dnl it does without going to look for what the heck -z defs does.
for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do
CC_CHECK_LDFLAGS([$possible_flags], [LDFLAGS_NOUNDEFINED="$possible_flags"])
diff --git a/man/systemd-bootchart.xml b/man/systemd-bootchart.xml
index 150ca48..0068e92 100644
--- a/man/systemd-bootchart.xml
+++ b/man/systemd-bootchart.xml
@@ -64,7 +64,7 @@
as an SVG graph. Normally, systemd-bootchart
is invoked by the kernel by passing
<option>init=<filename>/usr/lib/systemd/systemd-bootchart</filename></option>
- on the kernel commandline. systemd-bootchart will then
+ on the kernel command line. systemd-bootchart will then
fork the real init off to resume normal system
startup, while monitoring and logging startup
information in the background.
@@ -125,7 +125,7 @@
<listitem><para>One can execute
<command>systemd-bootchart</command>
as normal application from the
- commandline. In this mode it is highly
+ command line. In this mode it is highly
recommended to pass the
<option>-r</option> flag in order to
not graph the time elapsed since boot
diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
index 9117773..2175f96 100644
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@@ -97,7 +97,7 @@
only configuration files in this subdirectory (across
all configuration paths) will be analyzed. Otherwise,
all configuration files will be analyzed. If the
- commandline argument is not given at all, all
+ command line argument is not given at all, all
configuration files will be analyzed. See below for
some examples.</para>
</refsect1>
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index 0c9d13d..6ccfd71 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -215,7 +215,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
</variablelist>
<para>All command-line arguments after the first non-option
- argument become part of the commandline of the launched
+ 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>
</refsect1>
diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index 6075b39..6c74b42 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -231,7 +231,7 @@
be set. <literal>NamePolicy</literal> may be
disabled by specifying
<literal>net.ifnames=0</literal> on the kernel
- commandline. Each of the policies may fail, and
+ command line. Each of the policies may fail, and
the first successful one is used. The name is
not set directly, but is exported to udev as
the property <literal>ID_NET_NAME</literal>,
diff --git a/man/udev.conf.xml b/man/udev.conf.xml
index 988129f..8a3cc84 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 commandline (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/src/core/shutdown.c b/src/core/shutdown.c
index 20cf526..dd11ae3 100644
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -165,7 +165,7 @@ int main(int argc, char *argv[]) {
goto error;
/* journald will die if not gone yet. The log target defaults
- * to console, but may have been changed by commandline options. */
+ * to console, but may have been changed by command line options. */
log_close_console(); /* force reopen of /dev/console */
log_open();
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 05ceff4..20dca84 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -381,7 +381,7 @@ int main(int argc, char *argv[]) {
}
/*
- If options are specified on the kernel commandline, let them override
+ If options are specified on the kernel command line, let them override
the ones from crypttab.
*/
STRV_FOREACH(i, arg_options) {
@@ -463,7 +463,7 @@ next:
if (arg_options) {
/*
- If options are specified on the kernel commandline, use them.
+ If options are specified on the kernel command line, use them.
*/
char **j;
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index e257c12..94cbc3a 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -425,7 +425,7 @@ static int add_root_mount(void) {
const char *opts;
if (isempty(arg_root_what)) {
- log_debug("Could not find a root= entry on the kernel commandline.");
+ log_debug("Could not find a root= entry on the kernel command line.");
return 0;
}
diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index 88d720f..f423fa2 100644
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -521,7 +521,7 @@ int main(int argc, char* argv[]) {
}
if (get_process_comm(pid, &comm) < 0) {
- log_warning("Failed to get COMM, falling back to the commandline.");
+ log_warning("Failed to get COMM, falling back to the command line.");
comm = strv_join(argv + INFO_COMM + 1, " ");
}
diff --git a/src/network/networkd-wait-online-manager.c b/src/network/networkd-wait-online-manager.c
index 6e3ec69..b32f222 100644
--- a/src/network/networkd-wait-online-manager.c
+++ b/src/network/networkd-wait-online-manager.c
@@ -37,7 +37,7 @@ bool manager_all_configured(Manager *m) {
char **ifname;
bool one_ready = false;
- /* wait for all the links given on the commandline to appear */
+ /* wait for all the links given on the command line to appear */
STRV_FOREACH(ifname, m->interfaces) {
l = hashmap_get(m->links_by_name, *ifname);
if (!l) {
diff --git a/src/shared/condition-util.c b/src/shared/condition-util.c
index ff4a8ec..a0c9888 100644
--- a/src/shared/condition-util.c
+++ b/src/shared/condition-util.c
@@ -115,7 +115,7 @@ bool condition_test_kernel_command_line(Condition *c) {
}
if (!isempty(state))
- log_warning("Trailing garbage and the end of kernel commandline, ignoring.");
+ log_warning("Trailing garbage and the end of kernel command line, ignoring.");
free(word);
free(line);
diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c
index 4ecb6b0..dc849bd 100644
--- a/src/udev/collect/collect.c
+++ b/src/udev/collect/collect.c
@@ -254,7 +254,7 @@ static void reject(char *us)
* kickout
*
* Remove all IDs in the internal list which are not part
- * of the list passed via the commandline.
+ * of the list passed via the command line.
*/
static void kickout(void)
{
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 25e3cc8..428a71d 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -196,7 +196,7 @@ int link_config_load(link_config_ctx *ctx) {
if (!enable_name_policy()) {
ctx->enable_name_policy = false;
- log_info("Network interface NamePolicy= disabled on kernel commandline, ignoring.");
+ log_info("Network interface NamePolicy= disabled on kernel command line, ignoring.");
}
/* update timestamp */
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 2e6c713..618fe82 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -949,7 +949,7 @@ static int systemd_fds(struct udev *udev, int *rctrl, int *rnetlink) {
}
/*
- * read the kernel commandline, in case we need to get into debug mode
+ * read the kernel command line, in case we need to get into debug mode
* udev.log-priority=<level> syslog priority
* udev.children-max=<number of workers> events are fully serialized if set to 1
* udev.exec-delay=<number of seconds> delay execution of every executed program
--
2.1.0
More information about the systemd-devel
mailing list