From 7cf55dd0700d2b93f18a1bdc50b3c864d0af2246 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Tue, 15 May 2012 08:16:30 +0200 Subject: [PATCH] man: overwrite vs. override 'overwrite' conveys the idea of the old text being destroyed. 'override' does not. It is more similar to 'overrule'. --- man/binfmt.d.xml | 6 +++--- man/modules-load.d.xml | 6 +++--- man/systemctl.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml index e997bcf2..1cc75da9 100644 --- a/man/binfmt.d.xml +++ b/man/binfmt.d.xml @@ -75,14 +75,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 diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml index 91d230c3..01013e02 100644 --- a/man/modules-load.d.xml +++ b/man/modules-load.d.xml @@ -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 diff --git a/man/systemctl.xml b/man/systemctl.xml index 29481e71..b5ae48cb 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -343,7 +343,7 @@ When used with - enable, override any + enable, overwrite any existing conflicting symlinks. -- 2.39.5