diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index 00640cb290..3046ca88ee 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -200,7 +200,7 @@
Tells the service manager to extend the startup, runtime or shutdown service timeout
corresponding the current state. The value specified is a time in microseconds during which the service must
send a new message. A service timeout will occur if the message isn't received, but only if the runtime of the
- current state is beyond the original maximium times of TimeoutStartSec=, RuntimeMaxSec=,
+ current state is beyond the original maximum times of TimeoutStartSec=, RuntimeMaxSec=,
and TimeoutStopSec=.
See systemd.service5
for effects on the service timeouts.
diff --git a/man/systemctl.xml b/man/systemctl.xml
index d991e979f1..5ebe1832bc 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1341,7 +1341,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
indirect
- The unit file itself is not enabled, but it has a non-empty Also= setting in the [Install] unit file section, listing other unit files that might be enabled, or it has an alias under a different name through a symlink that is not specified in Also=. For template unit file, an instance different than the one specified in DefaultInstance= is enabled.
+ The unit file itself is not enabled, but it has a non-empty Also= setting in the [Install] unit file section, listing other unit files that might be enabled, or it has an alias under a different name through a symlink that is not specified in Also=. For template unit file, an instance different than the one specified in DefaultInstance= is enabled.
0
diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml
index 48deb0220e..75302e07e9 100644
--- a/man/systemd.automount.xml
+++ b/man/systemd.automount.xml
@@ -35,9 +35,9 @@
this unit type. See
systemd.unit5
for the common options of all unit configuration files. The common
- configuration items are configured in the generic [Unit] and
- [Install] sections. The automount specific configuration options
- are configured in the [Automount] section.
+ configuration items are configured in the generic [Unit] and
+ [Install] sections. The automount specific configuration options
+ are configured in the [Automount] section.
Automount units must be named after the automount directories they control. Example: the automount point
/home/lennart must be configured in a unit file
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 178dc188a5..a72a33240d 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -34,9 +34,9 @@
this unit type. See
systemd.unit5
for the common options of all unit configuration files. The common
- configuration items are configured in the generic [Unit] and
- [Install] sections. The mount specific configuration options are
- configured in the [Mount] section.
+ configuration items are configured in the generic [Unit] and
+ [Install] sections. The mount specific configuration options are
+ configured in the [Mount] section.
Additional options are listed in
systemd.exec5,
diff --git a/man/systemd.path.xml b/man/systemd.path.xml
index de284d877e..39cca8cf51 100644
--- a/man/systemd.path.xml
+++ b/man/systemd.path.xml
@@ -34,9 +34,9 @@
this unit type. See
systemd.unit5
for the common options of all unit configuration files. The common
- configuration items are configured in the generic [Unit] and
- [Install] sections. The path specific configuration options are
- configured in the [Path] section.
+ configuration items are configured in the generic [Unit] and
+ [Install] sections. The path specific configuration options are
+ configured in the [Path] section.
For each path file, a matching unit file must exist,
describing the unit to activate when the path changes. By default,
diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml
index 5019bf9976..7157dfa32d 100644
--- a/man/systemd.slice.xml
+++ b/man/systemd.slice.xml
@@ -55,9 +55,9 @@
systemd.unit5
for the common options of all unit configuration
files. The common configuration items are configured
- in the generic [Unit] and [Install] sections. The
+ in the generic [Unit] and [Install] sections. The
slice specific configuration options are configured in
- the [Slice] section. Currently, only generic resource control settings
+ the [Slice] section. Currently, only generic resource control settings
as described in
systemd.resource-control5 are allowed.
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 84faf89c2e..60ea63f742 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -35,9 +35,9 @@
this unit type. See
systemd.unit5
for the common options of all unit configuration files. The common
- configuration items are configured in the generic [Unit] and
- [Install] sections. The socket specific configuration options are
- configured in the [Socket] section.
+ configuration items are configured in the generic [Unit] and
+ [Install] sections. The socket specific configuration options are
+ configured in the [Socket] section.
Additional options are listed in
systemd.exec5,
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index d2a9123b0b..23547bb273 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -37,9 +37,9 @@
this unit type. See
systemd.unit5
for the common options of all unit configuration files. The common
- configuration items are configured in the generic [Unit] and
- [Install] sections. The swap specific configuration options are
- configured in the [Swap] section.
+ configuration items are configured in the generic [Unit] and
+ [Install] sections. The swap specific configuration options are
+ configured in the [Swap] section.
Additional options are listed in
systemd.exec5,
diff --git a/man/systemd.target.xml b/man/systemd.target.xml
index a706a4588a..3052b17786 100644
--- a/man/systemd.target.xml
+++ b/man/systemd.target.xml
@@ -34,8 +34,8 @@
This unit type has no specific options. See
systemd.unit5
for the common options of all unit configuration files. The common
- configuration items are configured in the generic [Unit] and
- [Install] sections. A separate [Target] section does not exist,
+ configuration items are configured in the generic [Unit] and
+ [Install] sections. A separate [Target] section does not exist,
since no target-specific options may be configured.
Target units do not offer any additional functionality on
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 13b9ed35d2..340286d912 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -35,9 +35,9 @@
this unit type. See
systemd.unit5
for the common options of all unit configuration files. The common
- configuration items are configured in the generic [Unit] and
- [Install] sections. The timer specific configuration options are
- configured in the [Timer] section.
+ configuration items are configured in the generic [Unit] and
+ [Install] sections. The timer specific configuration options are
+ configured in the [Timer] section.
For each timer file, a matching unit file must exist,
describing the unit to activate when the timer elapses. By
diff --git a/src/core/service.c b/src/core/service.c
index 190d84e56a..4b50d8d029 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -603,7 +603,7 @@ static int service_verify(Service *s) {
log_unit_warning(UNIT(s), "Service has USBFunctionStrings= setting, but no USBFunctionDescriptors=. Ignoring.");
if (s->runtime_max_usec != USEC_INFINITY && s->type == SERVICE_ONESHOT)
- log_unit_warning(UNIT(s), "MaxRuntimeSec= has no effect in combination with Type=oneshot. Ignoring.");
+ log_unit_warning(UNIT(s), "RuntimeMaxSec= has no effect in combination with Type=oneshot. Ignoring.");
return 0;
}
diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
index a26895e695..cd070329f4 100644
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_systemd.c
@@ -271,7 +271,7 @@ static int append_session_memory_max(pam_handle_t *handle, sd_bus_message *m, co
return r;
}
} else
- pam_syslog(handle, LOG_WARNING, "Failed to parse systemd.limit: %s, ignoring.", limit);
+ pam_syslog(handle, LOG_WARNING, "Failed to parse systemd.memory_max: %s, ignoring.", limit);
}
}
@@ -294,7 +294,7 @@ static int append_session_tasks_max(pam_handle_t *handle, sd_bus_message *m, con
return r;
}
} else
- pam_syslog(handle, LOG_WARNING, "Failed to parse systemd.limit: %s, ignoring.", limit);
+ pam_syslog(handle, LOG_WARNING, "Failed to parse systemd.tasks_max: %s, ignoring.", limit);
return 0;
}