summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-01-18 19:33:25 -0600
committerDan McGee <dan@archlinux.org>2008-01-18 19:33:25 -0600
commitf6785dcb89e380f0f3062b4b7aa485e1cd3c5830 (patch)
tree670091dee0aa0a023e477d52d514da6722dfed26 /doc
parent38e981fab3f901e6c932e2f2913790ef0b96c6c2 (diff)
parent8ec9a67aee75b18ddbba8f28fadb85f37c0b69aa (diff)
downloadpacman-f6785dcb89e380f0f3062b4b7aa485e1cd3c5830.tar.xz
Merge branch 'maint'
Diffstat (limited to 'doc')
-rw-r--r--doc/pacman.8.txt20
-rw-r--r--doc/pacman.conf.5.txt9
2 files changed, 18 insertions, 11 deletions
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index c47af65e..f6eb69c3 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -113,6 +113,9 @@ Options
not be used as a way to install software into ``/usr/local'' instead of
``/usr''. This option is used if you want to install a package on a
temporary mounted partition which is "owned" by another system.
+ *NOTE*: If database path or logfile are not specified on either the
+ command line or in linkman:pacman.conf[5], their default location will
+ be inside this root path.
*-v, --verbose*::
Output paths such as as the Root, Conf File, DB Path, Cache Dirs, etc.
@@ -229,14 +232,15 @@ Remove Options[[RO]]
Sync Options[[SO]]
------------------
*-c, \--clean*::
- Remove old packages from the cache as well as unused sync databases to
- free up disk space. When pacman downloads packages, it saves them in a
- cache directory. In addition, databases are saved for every sync DB you
- download from, and are not deleted even if they are removed from the
- configuration file linkman:pacman.conf[5]. Use one '\--clean' switch to
- only remove old packages; use two to remove all packages from the cache.
- In both cases, you will have a yes or no option to remove packages and/or
- unused downloaded databases.
+ Remove packages that are no longer installed from the cache as well as
+ currently unused sync databases to free up disk space. When pacman
+ downloads packages, it saves them in a cache directory. In addition,
+ databases are saved for every sync DB you download from, and are not
+ deleted even if they are removed from the configuration file
+ linkman:pacman.conf[5]. Use one '\--clean' switch to only remove
+ packages that are no longer installed; use two to remove all packages
+ from the cache. In both cases, you will have a yes or no option to
+ remove packages and/or unused downloaded databases.
*-e, \--dependsonly*::
Install all dependencies of a package, but not the specified package
diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt
index 95298633..e8f74540 100644
--- a/doc/pacman.conf.5.txt
+++ b/doc/pacman.conf.5.txt
@@ -47,6 +47,9 @@ Options
Set the default root directory for pacman to install to. This option is
used if you want to install a package on a temporary mounted partition
which is "owned" by another system, or for a chroot install.
+ *NOTE*: If database path or logfile are not specified on either the
+ command line or in linkman:pacman.conf[5], their default location will
+ be inside this root path.
*DBPath =* path/to/db/dir::
Overrides the default location of the toplevel database directory. A
@@ -59,9 +62,9 @@ Options
default is ``/var/cache/pacman/pkg/''. Multiple cache directories can be
specified, and they are tried in the order they are listed in the config
file. If a file is not found in any cache directory, it will be downloaded
- to the first cache directory with write access. *NOTE*: if specified, this
- is an absolute path and the root path is not automatically prepended. This
- behavior changed in pacman 3.1.0.
+ to the first cache directory with write access. *NOTE*: this is an absolute
+ path, the root path is not automatically prepended. This behavior changed
+ in pacman 3.1.0.
*LogFile =* '/path/to/file'::