From: Franck Bui Date: Wed, 20 Sep 2023 15:40:53 +0000 (+0200) Subject: man/standard-conf: directory paths should end with '/' X-Git-Tag: v255-rc1~220^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cae6ba720a12b4f215f0857dd6b4fb49a81065f3;p=thirdparty%2Fsystemd.git man/standard-conf: directory paths should end with '/' Follow-up for c76f2fb0e59340222ce21f85c17d384c114db9de. --- diff --git a/man/standard-conf.xml b/man/standard-conf.xml index c4f28778642..cc2b8740167 100644 --- a/man/standard-conf.xml +++ b/man/standard-conf.xml @@ -43,10 +43,10 @@ The default configuration is set during compilation, so configuration is only needed when it is necessary to deviate from those defaults. The main configuration file is either in - /usr/lib/systemd or /etc/systemd/ and contains commented out + /usr/lib/systemd/ or /etc/systemd/ and contains commented out entries showing the defaults as a guide to the administrator. Local overrides can be created by creating drop-ins, as described below. The main configuration file can also be edited for this purpose (or a copy - in /etc if it's shipped in /usr) however using drop-ins for + in /etc/ if it's shipped in /usr/) however using drop-ins for local configuration is recommended over modifications to the main configuration file. In addition to the "main" configuration file, drop-in configuration snippets are read from diff --git a/src/core/system.conf.in b/src/core/system.conf.in index fd7e9e46477..05eb6812700 100644 --- a/src/core/system.conf.in +++ b/src/core/system.conf.in @@ -10,7 +10,7 @@ # /etc/ if the original file is shipped in /usr/), or by creating "drop-ins" in # /etc/systemd/system.conf.d/ directory. The latter is generally recommended. # Defaults can be restored by simply deleting the main configuration file and -# all drop-ins located in /etc. +# all drop-ins located in /etc/. # # Use 'systemd-analyze cat-config systemd/system.conf' to display the full config. #