Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/doc/pacman.8.txt
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-01-22 10:03:51 -0600
committerDan McGee <dan@archlinux.org>2011-01-22 10:03:51 -0600
commit51175f31c4aac9df6ceeffc7855a0f842c580fdb (patch)
tree4fe5405a24aa967572f407dafbbee9231a25b0dc /doc/pacman.8.txt
parente277e838d798c1463ae5df98dcf637df70e048ec (diff)
parent859bdb5b1d1b9ccb781c95026836283a005a96ce (diff)
Merge branch 'epoch-work'
Diffstat (limited to 'doc/pacman.8.txt')
-rw-r--r--doc/pacman.8.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 2b47a88c..8f91e408 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -80,8 +80,10 @@ to determine which packages need upgrading. This behavior operates as follows:
Numeric:
1 < 1.0 < 1.1 < 1.1.1 < 1.2 < 2.0 < 3.0.0
+
-Additionally, packages can have an 'epoch' value defined that will override any
-version comparison and force an upgrade.
+Additionally, version strings can have an 'epoch' value defined that will
+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`.
*-T, \--deptest*::
Check dependencies; this is useful in scripts such as makepkg to check