From 926280cfc7da5aa6d8a4e7dc60f9831176758e7e Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Wed, 1 Oct 2014 01:57:44 -0400 Subject: remove support for .pacorig files Leave user files in place and save new config files with a .pacnew extension. This reduces the complexity of file extraction and respects the principle that pacman shouldn't modify files it didn't create. Signed-off-by: Andrew Gregory --- doc/pacman.8.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'doc/pacman.8.txt') diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 3fef08dc..5c57450b 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -484,8 +484,9 @@ original=X, current=Y, new=Z:: original=NULL, current=Y, new=Z:: The package was not previously installed, and the file already exists on the - file system. Save the current file with a '.pacorig' extension, install the - new file, and warn the user. + file system. Install the new file with a '.pacnew' extension and warn the + user. The user must then manually merge any necessary changes into the + original file. Examples -- cgit v1.2.3-70-g09d2