diff options
| author | Dan McGee <dan@archlinux.org> | 2012-09-18 15:36:10 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-09-18 15:36:10 +0200 |
| commit | 369c5aa7ddabb81c335bb5b0dbd425c42f892459 (patch) | |
| tree | 494074de2ae73c77ee51a6a84331953234cb73ae /doc | |
| parent | 37de9df7c048dc20522ccacaebf7e898ff20b96e (diff) | |
| parent | c4ab50584fc70f9cbf94fdb1153e2eb08c4052df (diff) | |
| download | pacman-369c5aa7ddabb81c335bb5b0dbd425c42f892459.tar.gz pacman-369c5aa7ddabb81c335bb5b0dbd425c42f892459.tar.xz | |
Merge branch 'maint'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/makepkg.conf.5.txt | 4 | ||||
| -rw-r--r-- | doc/pacman.8.txt | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index de2b4b42..3dbaea1e 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -25,6 +25,10 @@ build environment. NOTE: This does not guarantee that all package Makefiles will use your exported variables. Some of them are non-standard. +The system-wide configuration file is found in {sysconfdir}/makepkg.conf. +Individual options can be overridden (or added to) on a per user basis in +~/.makepkg.conf. + The default file is fairly well commented, so it may be easiest to simply follow directions given there for customization. diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 0ad81882..24c22431 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -401,9 +401,6 @@ system upgrade and install/upgrade the foo package in the same operation. will force a refresh of all package lists even if they appear to be up to date. -*\--needed*:: - Do not reinstall the targets that are already up to date. - Handling Config Files[[HCF]] ---------------------------- |