]> err.no Git - systemd/commitdiff
man: overwrite vs. override
authorMichal Schmidt <mschmidt@redhat.com>
Tue, 15 May 2012 06:16:30 +0000 (08:16 +0200)
committerMichal Schmidt <mschmidt@redhat.com>
Tue, 15 May 2012 06:26:29 +0000 (08:26 +0200)
'overwrite' conveys the idea of the old text being destroyed.
'override' does not. It is more similar to 'overrule'.

man/binfmt.d.xml
man/modules-load.d.xml
man/systemctl.xml

index e997bcf21cd709340f3d1f11a36506e30358f2a1..1cc75da9acceb18803253e8ce7eeff785fe679ba 100644 (file)
 
                 <para>Each configuration file is named in the style of
                 <filename>&lt;program&gt;.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
index 91d230c35a9af26e681027d4693ed87957abcfb9..01013e0222e8b95101436afd598373a4a05e43b3 100644 (file)
 
                 <para>Each configuration file is named in the style of
                 <filename>&lt;program&gt;.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
index 29481e718231e808c10687766285f5fe86b3709d..b5ae48cb44021946d7afdaaf3cce1aaa248e9d30 100644 (file)
                                 <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>