From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 4 Sep 2008 19:35:53 +0000 (-0000)
Subject: s/blocking/conflicting/ for consistency
X-Git-Tag: v2.2_rc9~35
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=49084b557a2331edd156f5a52e36524c0404a2e6;p=portage.git

s/blocking/conflicting/ for consistency

svn path=/main/trunk/; revision=11491
---

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.