summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile-man.am8
-rw-r--r--man/journald.conf.xml2
-rw-r--r--man/logind.conf.xml2
-rw-r--r--man/systemd-cgtop.xml2
-rw-r--r--man/systemd-system.conf.xml (renamed from man/systemd.conf.xml)11
-rw-r--r--man/systemd.exec.xml6
-rw-r--r--man/systemd.xml4
-rw-r--r--src/core/system.conf2
-rw-r--r--src/core/user.conf2
-rw-r--r--src/shared/env-util.c2
10 files changed, 22 insertions, 19 deletions
diff --git a/Makefile-man.am b/Makefile-man.am
index ee9a952765..e4eb26ce6e 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1,5 +1,5 @@
# Do not edit. Generated by make-man-rules.py.
-# Regenerate with 'make man-list-update'.
+# Regenerate with 'make update-man-list'.
MANPAGES += \
man/bootup.7 \
@@ -67,13 +67,13 @@ MANPAGES += \
man/systemd-suspend.service.8 \
man/systemd-sysctl.service.8 \
man/systemd-system-update-generator.8 \
+ man/systemd-system.conf.5 \
man/systemd-tmpfiles.8 \
man/systemd-tty-ask-password-agent.1 \
man/systemd-udevd.service.8 \
man/systemd-update-utmp-runlevel.service.8 \
man/systemd.1 \
man/systemd.automount.5 \
- man/systemd.conf.5 \
man/systemd.device.5 \
man/systemd.exec.5 \
man/systemd.journal-fields.7 \
@@ -187,7 +187,8 @@ MANPAGES_ALIAS += \
man/systemd-udevd-kernel.socket.8 \
man/systemd-udevd.8 \
man/systemd-update-utmp-shutdown.service.8 \
- man/systemd-update-utmp.8
+ man/systemd-update-utmp.8 \
+ man/systemd-user.conf.5
man/SD_ALERT.3: man/sd-daemon.3
man/SD_CRIT.3: man/sd-daemon.3
man/SD_DEBUG.3: man/sd-daemon.3
@@ -281,6 +282,7 @@ man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8
man/systemd-udevd.8: man/systemd-udevd.service.8
man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8
man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8
+man/systemd-user.conf.5: man/systemd-system.conf.5
if ENABLE_BINFMT
MANPAGES += \
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 30523c5370..6ba583b31d 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -404,7 +404,7 @@
<citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para>
</refsect1>
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index d223514e0e..96e5936e5e 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -329,7 +329,7 @@
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para>
</refsect1>
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
index 7a34512b21..ad1f0f8c4d 100644
--- a/man/systemd-cgtop.xml
+++ b/man/systemd-cgtop.xml
@@ -78,7 +78,7 @@
<literal>blkio</literal> and <literal>memory</literal>
to the <varname>DefaultControllers=</varname> setting
in <filename>/etc/systemd/system.conf</filename> (see
- <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details). Alternatively, it is possible to enable
resource accounting individually for services, by
making use of the <varname>ControlGroup=</varname>
diff --git a/man/systemd.conf.xml b/man/systemd-system.conf.xml
index 8c8fb7d7c0..12979d81b6 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -22,9 +22,9 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="systemd.conf">
+<refentry id="systemd-system.conf">
<refentryinfo>
- <title>systemd.conf</title>
+ <title>systemd-system.conf</title>
<productname>systemd</productname>
<authorgroup>
@@ -38,13 +38,14 @@
</refentryinfo>
<refmeta>
- <refentrytitle>systemd.conf</refentrytitle>
+ <refentrytitle>systemd-system.conf</refentrytitle>
<manvolnum>5</manvolnum>
</refmeta>
<refnamediv>
- <refname>systemd.conf</refname>
- <refpurpose>System and service manager configuration file</refpurpose>
+ <refname>systemd-system.conf</refname>
+ <refname>systemd-user.conf</refname>
+ <refpurpose>System and session service manager configuration file</refpurpose>
</refnamediv>
<refsynopsisdiv>
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 53094e587d..952bb9595e 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -462,7 +462,7 @@
with
<option>DefaultStandardOutput=</option>
in
- <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
which defaults to
<option>journal</option>.</para></listitem>
</varlistentry>
@@ -481,7 +481,7 @@
setting defaults to the value set with
<option>DefaultStandardError=</option>
in
- <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
which defaults to
<option>inherit</option>.</para></listitem>
</varlistentry>
@@ -839,7 +839,7 @@
settings of
<varname>DefaultControllers=</varname>
of
- <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
but a unit's
<varname>ControlGroup=</varname>
setting for a specific controller
diff --git a/man/systemd.xml b/man/systemd.xml
index 5380ae8b67..cd38c16375 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -78,7 +78,7 @@
the configuration file
<filename>system.conf</filename>, otherwise
<filename>user.conf</filename>. See
- <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for more information.</para>
</refsect1>
@@ -1258,7 +1258,7 @@
<refsect1>
<title>See Also</title>
<para>
- <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
diff --git a/src/core/system.conf b/src/core/system.conf
index 68076d9735..508e0f5fa4 100644
--- a/src/core/system.conf
+++ b/src/core/system.conf
@@ -5,7 +5,7 @@
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
-# See systemd.conf(5) for details
+# See systemd-system.conf(5) for details
[Manager]
#LogLevel=info
diff --git a/src/core/user.conf b/src/core/user.conf
index e02b46bc3a..4252451eb7 100644
--- a/src/core/user.conf
+++ b/src/core/user.conf
@@ -5,7 +5,7 @@
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
-# See systemd.conf(5) for details
+# See systemd-user.conf(5) for details
[Manager]
#LogLevel=info
diff --git a/src/shared/env-util.c b/src/shared/env-util.c
index 0f1ac9294b..54988e6437 100644
--- a/src/shared/env-util.c
+++ b/src/shared/env-util.c
@@ -108,7 +108,7 @@ bool env_assignment_is_valid(const char *e) {
/* POSIX says the overall size of the environment block cannot
* be > ARG_MAX, hence the individual variable assignments
- * cannot be either, but let's room for one trailing NUL
+ * cannot be either, but let's leave room for one trailing NUL
* byte. */
if (strlen(e) > ARG_MAX - 1)
return false;
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-10 13:53:07 +0000