Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2014-10-01 01:57:44 -0400
committerAllan McRae <allan@archlinux.org>2015-01-21 14:27:47 +1000
commit926280cfc7da5aa6d8a4e7dc60f9831176758e7e (patch)
tree4465c6d1d69d744af94fc4b80ad2da2b2db4ce16 /doc
parenta82a5cf3f71e38c54a5ac1b5eaf3c83374d0e515 (diff)
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 <andrew.gregory.8@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/pacman.8.txt5
1 files changed, 3 insertions, 2 deletions
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