summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-03-22 17:11:22 +0100
committerDan McGee <dan@archlinux.org>2008-03-22 17:11:22 +0100
commit2f8fb80ee631ef866c3bd8cb5fab09a7360ca8d2 (patch)
tree9632c8836d26a160af64641d6ec2531646997a23 /doc
parente7a2232934e2658c3c7827d2ce706c1a8f5301b9 (diff)
parent7d451b6e6bc3926589a77e6a2d191e4f158d3980 (diff)
downloadpacman-2f8fb80ee631ef866c3bd8cb5fab09a7360ca8d2.tar.gz
pacman-2f8fb80ee631ef866c3bd8cb5fab09a7360ca8d2.tar.xz
Merge branch 'maint'
Diffstat (limited to 'doc')
-rw-r--r--doc/pacman.conf.5.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt
index 12df824f..3cdd2906 100644
--- a/doc/pacman.conf.5.txt
+++ b/doc/pacman.conf.5.txt
@@ -106,8 +106,9 @@ Options
*NoUpgrade =* file ...::
All files listed with a `NoUpgrade` directive will never be touched during
- a package install/upgrade. Do not include the leading slash when specifying
- files.
+ a package install/upgrade.
+ These files refer to files in the package archive, so do not include the
+ leading slash (the RootDir) when specifying them.
*NoExtract =* file ...::
All files listed with a `NoExtract` directive will never be extracted from
@@ -115,6 +116,8 @@ Options
of a package to be installed. For example, if your httpd root uses an
'index.php', then you would not want the 'index.html' file to be extracted
from the 'apache' package.
+ These files refer to files in the package archive, so do not include the
+ leading slash (the RootDir) when specifying them.
*UseSyslog*::
Log action messages through syslog(). This will insert log entries into