From 49084b557a2331edd156f5a52e36524c0404a2e6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 4 Sep 2008 19:35:53 +0000 Subject: s/blocking/conflicting/ for consistency svn path=/main/trunk/; revision=11491 --- doc/package/ebuild/eapi/2.docbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/package/ebuild/eapi/2.docbook') 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() { New !!atom Syntax 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. -- cgit v1.2.3-1-g7c22