mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-02-26 09:57:26 +03:00
man: overwrite vs. override
'overwrite' conveys the idea of the old text being destroyed. 'override' does not. It is more similar to 'overrule'.
This commit is contained in:
parent
ba49b4a1a2
commit
7cf55dd070
@ -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
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user