diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/binfmt.d.xml | 6 | ||||
| -rw-r--r-- | man/modules-load.d.xml | 6 | ||||
| -rw-r--r-- | man/systemctl.xml | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml index e997bcf21c..1cc75da9ac 100644 --- a/man/binfmt.d.xml +++ b/man/binfmt.d.xml @@ -75,14 +75,14 @@ <para>Each configuration file is named in the style of <filename><program>.conf</filename>. - Files in <filename>/etc/</filename> overwrite + Files in <filename>/etc/</filename> override files with the same name in <filename>/usr/lib/</filename>. - Files in <filename>/run</filename> overwrite files with + Files in <filename>/run</filename> override files with the same name in <filename>/etc/</filename> and <filename>/usr/lib/</filename>. Packages should install their configuration files in <filename>/usr/lib/</filename>, files in <filename>/etc/</filename> 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 diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml index 91d230c35a..01013e0222 100644 --- a/man/modules-load.d.xml +++ b/man/modules-load.d.xml @@ -76,14 +76,14 @@ <para>Each configuration file is named in the style of <filename><program>.conf</filename>. - Files in <filename>/etc/</filename> overwrite + Files in <filename>/etc/</filename> override files with the same name in <filename>/usr/lib/</filename>. - Files in <filename>/run</filename> overwrite files with + Files in <filename>/run</filename> override files with the same name in <filename>/etc/</filename> and <filename>/usr/lib/</filename>. Packages should install their configuration files in <filename>/usr/lib/</filename>, files in <filename>/etc/</filename> 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 diff --git a/man/systemctl.xml b/man/systemctl.xml index 29481e7182..b5ae48cb44 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -343,7 +343,7 @@ <term><option>-f</option></term> <listitem><para>When used with - <command>enable</command>, override any + <command>enable</command>, overwrite any existing conflicting symlinks.</para></listitem> |