summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChantry Xavier <shiningxc@gmail.com>2007-11-19 18:23:04 +0100
committerDan McGee <dan@archlinux.org>2007-11-20 23:31:40 -0600
commit967a78f5e476030c2d13104a7dadc5ce4daf5882 (patch)
tree28627eebe8dcb5921b5f4915253547c0707bcc0b /doc
parentaa942a126bb7c229f7b94e5e0ab8de5241f77580 (diff)
downloadpacman-967a78f5e476030c2d13104a7dadc5ce4daf5882.tar.xz
Update PKGBUILD manpage with versioned conflicts.
As the b96922679e4ed14aa687bf194b766d82a1d10577 commit showed with two pactests (which were renamed to depconflict110/111), versioned conflicts are now possible. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/PKGBUILD.5.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
index 0d3ff3ae..b55071aa 100644
--- a/doc/PKGBUILD.5.txt
+++ b/doc/PKGBUILD.5.txt
@@ -126,7 +126,7 @@ Options and Directives
*conflicts (array)*::
An array of packages that will conflict with this package (i.e. they
cannot both be installed at the same time). This directive follows the
- same format as depends, except you cannot specify versions.
+ same format as depends. Versioned conflicts are also supported.
*provides (array)*::
An array of ``virtual provisions'' that this package provides. This allows