diff options
author | Dan McGee <dan@archlinux.org> | 2012-01-23 19:19:51 +0100 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2012-01-23 19:20:52 +0100 |
commit | e50c4a8837cedf47c2fe1a2c6064b4dc03dc5b03 (patch) | |
tree | df2e33d95d02b17e5d720320c19e267893d68bdf /doc | |
parent | b3612e9cc198f198b3806efa461bf6fc04dd4502 (diff) | |
parent | 825b4ff35aa676b139dc24bc651724b092f2fded (diff) | |
download | pacman-e50c4a8837cedf47c2fe1a2c6064b4dc03dc5b03.tar.gz pacman-e50c4a8837cedf47c2fe1a2c6064b4dc03dc5b03.tar.xz |
Merge branch 'maint'
Conflicts:
lib/libalpm/diskspace.c
src/pacman/util.h
Diffstat (limited to 'doc')
-rw-r--r-- | doc/pacman.8.txt | 2 | ||||
-rw-r--r-- | doc/vercmp.8.txt | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 39551e15..0813b887 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -349,7 +349,7 @@ Sync Options[[SO]] 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 + packages that are no longer installed; use two to remove all files from the cache. In both cases, you will have a yes or no option to remove packages and/or unused downloaded databases. + diff --git a/doc/vercmp.8.txt b/doc/vercmp.8.txt index 4b0490fa..6b94f3e4 100644 --- a/doc/vercmp.8.txt +++ b/doc/vercmp.8.txt @@ -6,7 +6,7 @@ vercmp(8) Name ---- -vercmp - version comparsion utility +vercmp - version comparison utility Synopsis @@ -23,7 +23,7 @@ numbers. It outputs values as follows: * = 0 : if ver1 == ver2 * > 0 : if ver1 > ver2 -Version comparsion operates as follows: +Version comparison operates as follows: Alphanumeric: 1.0a < 1.0b < 1.0beta < 1.0p < 1.0pre < 1.0rc < 1.0 < 1.0.a < 1.0.1 @@ -35,6 +35,11 @@ overrule any version comparison (unless the epoch values are equal). This is specified in an `epoch:version-rel` format. For example, `2:1.0-1` is always greater than `1:3.6-1`. +Keep in mind that the 'pkgrel' is only compared if it is available on both +versions given to this tool. For example, comparing `1.5-1` and `1.5` will +yield 0; comparing `1.5-1` and `1.5-2` will yield < 0 as expected. This is +mainly for supporting versioned dependencies that do not include the 'pkgrel'. + Options ------- |