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 f854e059dc663c1fcfdd5fc484ea96934f2961a0..a5d8cbae04e741ceb8fcd97f4bd78a4fc9c51975 100644 (file)
--- 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.