X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fmodules-load.d.xml;h=01013e0222e8b95101436afd598373a4a05e43b3;hp=b63366347540725e53c6182f2471896fddfbf6c8;hb=78d54bd42b87818f5d0ef862d247f9db4844fadd;hpb=772f83719e3c2262d948a4c4e70fe9babc4c4610 diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml index b63366347..01013e022 100644 --- a/man/modules-load.d.xml +++ b/man/modules-load.d.xml @@ -7,16 +7,16 @@ Copyright 2011 Lennart Poettering systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. systemd is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see . --> @@ -46,9 +46,9 @@ - /usr/lib/modules-load.d/*.conf /etc/modules-load.d/*.conf /run/modules-load.d/*.conf + /usr/lib/modules-load.d/*.conf @@ -76,14 +76,14 @@ Each configuration file is named in the style of <program>.conf. - Files in /etc/ overwrite + Files in /etc/ override files with the same name in /usr/lib/. - Files in /run overwrite files with + Files in /run override files with the same name in /etc/ and /usr/lib/. Packages should install their configuration files in /usr/lib/, files in /etc/ are reserved for the local - administration, which possibly decides to overwrite the + administration, which possibly decides to override the configurations installed from packages. All files are sorted by filename in alphabetical order, regardless in which of the directories they reside, to ensure that a specific