summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-09-04 19:35:53 +0000
committerZac Medico <zmedico@gentoo.org>2008-09-04 19:35:53 +0000
commit49084b557a2331edd156f5a52e36524c0404a2e6 (patch)
tree2b020820e2f887434d9e5effe232e646385f7482
parentdcc68916d38afd81f7de23fb3ba6d701fa21e3fc (diff)
downloadportage-49084b557a2331edd156f5a52e36524c0404a2e6.tar.gz
portage-49084b557a2331edd156f5a52e36524c0404a2e6.tar.bz2
portage-49084b557a2331edd156f5a52e36524c0404a2e6.zip
s/blocking/conflicting/ for consistency
svn path=/main/trunk/; revision=11491
-rw-r--r--doc/package/ebuild/eapi/2.docbook2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/package/ebuild/eapi/2.docbook b/doc/package/ebuild/eapi/2.docbook
index f854e059d..a5d8cbae0 100644
--- a/doc/package/ebuild/eapi/2.docbook
+++ b/doc/package/ebuild/eapi/2.docbook
@@ -330,7 +330,7 @@ src_compile() {
<title>New !!atom Syntax</title>
<para>
A new !!atom syntax is now supported, for use in special cases for which
- temporary simultaneous installation of blocking packages should not be
+ temporary simultaneous installation of conflicting packages should not be
allowed. If a given package happens to be blocked my a mixture of atoms
consisting of both the !atom and !!atom syntaxes, the !!atom syntax takes
precedence over the !atom syntax.