| 1 |
Author: zmedico |
| 2 |
Date: 2008-09-04 19:35:53 +0000 (Thu, 04 Sep 2008) |
| 3 |
New Revision: 11491 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/doc/package/ebuild/eapi/2.docbook |
| 7 |
Log: |
| 8 |
s/blocking/conflicting/ for consistency |
| 9 |
|
| 10 |
Modified: main/trunk/doc/package/ebuild/eapi/2.docbook |
| 11 |
=================================================================== |
| 12 |
--- main/trunk/doc/package/ebuild/eapi/2.docbook 2008-09-04 19:22:59 UTC (rev 11490) |
| 13 |
+++ main/trunk/doc/package/ebuild/eapi/2.docbook 2008-09-04 19:35:53 UTC (rev 11491) |
| 14 |
@@ -330,7 +330,7 @@ |
| 15 |
<title>New !!atom Syntax</title> |
| 16 |
<para> |
| 17 |
A new !!atom syntax is now supported, for use in special cases for which |
| 18 |
- temporary simultaneous installation of blocking packages should not be |
| 19 |
+ temporary simultaneous installation of conflicting packages should not be |
| 20 |
allowed. If a given package happens to be blocked my a mixture of atoms |
| 21 |
consisting of both the !atom and !!atom syntaxes, the !!atom syntax takes |
| 22 |
precedence over the !atom syntax. |
Archives