From: Zbigniew Jędrzejewski-Szmek Date: Mon, 11 Feb 2013 19:42:24 +0000 (-0500) Subject: man: rename systemd.conf to systemd-system.conf X-Git-Tag: v198~270 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5f9cfd4c3877fdc68618faf9ae5efb5948e002b6;p=elogind.git man: rename systemd.conf to systemd-system.conf Alias as systemd-user.conf is also provided. This should help users running systemd in session mode. https://bugzilla.redhat.com/show_bug.cgi?id=690868 --- diff --git a/Makefile-man.am b/Makefile-man.am index ee9a95276..e4eb26ce6 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 30523c537..6ba583b31 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -404,7 +404,7 @@ systemd-journald.service8, journalctl1, systemd.journal-fields7, - systemd.conf5 + systemd-system.conf5 diff --git a/man/logind.conf.xml b/man/logind.conf.xml index d223514e0..96e5936e5 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -329,7 +329,7 @@ systemd1, systemd-logind.service8, loginctl1, - systemd.conf5 + systemd-system.conf5 diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml index 7a34512b2..ad1f0f8c4 100644 --- a/man/systemd-cgtop.xml +++ b/man/systemd-cgtop.xml @@ -78,7 +78,7 @@ blkio and memory to the DefaultControllers= setting in /etc/systemd/system.conf (see - systemd.conf5 + systemd-system.conf5 for details). Alternatively, it is possible to enable resource accounting individually for services, by making use of the ControlGroup= diff --git a/man/systemd.conf.xml b/man/systemd-system.conf.xml similarity index 97% rename from man/systemd.conf.xml rename to man/systemd-system.conf.xml index 8c8fb7d7c..12979d81b 100644 --- a/man/systemd.conf.xml +++ b/man/systemd-system.conf.xml @@ -22,9 +22,9 @@ along with systemd; If not, see . --> - + - systemd.conf + systemd-system.conf systemd @@ -38,13 +38,14 @@ - systemd.conf + systemd-system.conf 5 - systemd.conf - System and service manager configuration file + systemd-system.conf + systemd-user.conf + System and session service manager configuration file diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 53094e587..952bb9595 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -462,7 +462,7 @@ with in - systemd.conf5, + systemd-system.conf5, which defaults to . @@ -481,7 +481,7 @@ setting defaults to the value set with in - systemd.conf5, + systemd-system.conf5, which defaults to . @@ -839,7 +839,7 @@ settings of DefaultControllers= of - systemd.conf5, + systemd-system.conf5, but a unit's ControlGroup= setting for a specific controller diff --git a/man/systemd.xml b/man/systemd.xml index 5380ae8b6..cd38c1637 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -78,7 +78,7 @@ the configuration file system.conf, otherwise user.conf. See - systemd.conf5 + systemd-system.conf5 for more information. @@ -1258,7 +1258,7 @@ See Also - systemd.conf5, + systemd-system.conf5, locale.conf5, systemctl1, journalctl1, diff --git a/src/core/system.conf b/src/core/system.conf index 68076d973..508e0f5fa 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 e02b46bc3..4252451eb 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 0f1ac9294..54988e643 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;