Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2016-01-26 19:58:34 +1000
committerAllan McRae <allan@archlinux.org>2016-01-27 12:40:13 +1000
commitc781a85387b960bea5342e811cc086f536d2d8d8 (patch)
treedff3dc27cd7e6258cfd1ecf1b79f72826c81a6fd
parenta5a908021946683a344173eced59c66af3b2124f (diff)
pacman.conf.5: document system hook directory
Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--doc/Makefile.am3
-rw-r--r--doc/pacman.conf.5.txt3
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 90d90f33..5d7c9754 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -121,7 +121,8 @@ ASCIIDOC_OPTS = \
-a pacman_date="`date +%Y-%m-%d`" \
-a pkgdatadir=$(pkgdatadir) \
-a localstatedir=$(localstatedir) \
- -a sysconfdir=$(sysconfdir)
+ -a sysconfdir=$(sysconfdir) \
+ -a datarootdir=$(datarootdir)
A2X_OPTS = \
--no-xmllint \
diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt
index b78d1fe6..022585cf 100644
--- a/doc/pacman.conf.5.txt
+++ b/doc/pacman.conf.5.txt
@@ -71,7 +71,8 @@ Options
path, the root path is not automatically prepended.
*HookDir =* path/to/hook/dir::
- Add directories to search for alpm hooks. A typical default is
+ Add directories to search for alpm hooks in addition to the system hook
+ directory (+{datarootdir}/libalpm/hooks/+). A typical default is
+{sysconfdir}/pacman.d/hooks+. Multiple directories can be specified with
hooks in later directories taking precedence over hooks in earlier
directories. *NOTE*: this is an absolute path, the root path is not