X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsysctl.d.xml;h=69e96ee9e580aaf963602aa2fccd84beb56323f6;hp=a4a495ee32b4a473efa30f5d7ccdd3a9e07a7f61;hb=a65f06bb27688a6738f2f94b7f055f4c66768d63;hpb=9393a8774c1acd60deea40007061b9ffc783bf7e diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml index a4a495ee3..69e96ee9e 100644 --- a/man/sysctl.d.xml +++ b/man/sysctl.d.xml @@ -54,21 +54,21 @@ Description - At boot, - systemd-binfmt.service8 - reads configuration files from the above directories - to configure - sysctl8 - kernel parameters. + At boot, + systemd-sysctl.service8 + reads configuration files from the above directories + to configure + sysctl8 + kernel parameters. - Configuration Format + Configuration Format - The configuration files contain a list of - variable assignments, separated by newlines. Empty - lines and lines whose first non-whitespace character - is # or ; are ignored. + The configuration files contain a list of + variable assignments, separated by newlines. Empty + lines and lines whose first non-whitespace character + is # or ; are ignored. Note that both / and . are accepted as label separators within sysctl variable @@ -77,11 +77,11 @@ entirely equivalent. Each configuration file shall be named in the - style of <program>.conf. + style of program.conf. Files in /etc/ override files with the same name in /usr/lib/ and /run/. Files in - /run override files with the same + /run/ override files with the same name in /usr/lib/. Packages should install their configuration files in /usr/lib/. Files in @@ -92,15 +92,15 @@ alphabetical order, regardless in which of the directories they reside, to guarantee that a specific configuration file takes precedence over another file - with an alphabetically earlier name, if both files + with an alphabetically later name, if both files contain the same variable setting. If the administrator wants to disable a - configuration file supplied by the vendor the + configuration file supplied by the vendor, the recommended way is to place a symlink to /dev/null in /etc/sysctl.d/ bearing the - same file name. + same filename.