diff options
| -rw-r--r-- | ebuild-writing/eapi/text.xml | 48 | ||||
| -rw-r--r-- | function-reference/query-functions/text.xml | 6 | ||||
| -rw-r--r-- | general-concepts/dependencies/text.xml | 8 | ||||
| -rw-r--r-- | profiles/updates/text.xml | 5 |
4 files changed, 36 insertions, 31 deletions
diff --git a/ebuild-writing/eapi/text.xml b/ebuild-writing/eapi/text.xml index 59e0bf3..a918fd0 100644 --- a/ebuild-writing/eapi/text.xml +++ b/ebuild-writing/eapi/text.xml @@ -89,9 +89,9 @@ src_compile() { <li> <p><b>SLOT dependencies</b></p> <p> - Any valid atom can be constrained to match a specific SLOT. This - is accomplished by appending a colon to the atom, followed by a - SLOT value. + Any valid package dependency specification can be constrained to match + a specific SLOT. This is accomplished by appending a colon to the + specification, followed by a SLOT value. </p> <p> <b>SLOT dependency examples:</b> @@ -166,34 +166,34 @@ doman foo.lang.1 <body> <ul> <li> - <p><b>Blocker Atoms</b></p> + <p><b>Blockers</b></p> <p> <ul> <li> <p><b>New Meaning for Old Syntax</b></p> <p> - Blocker atoms which use the previously existing !atom syntax now - have a slightly different meaning. These blocker atoms indicate - that conflicting packages may be temporarily installed - simultaneously. When temporary simultaneous installation of - conflicting packages occurs, the installation of a newer package - may overwrite any colliding files that belong to an older package - which is explicitly blocked. When such file collisions occur, the - colliding files cease to belong to the older package, and they - remain installed after the older package is eventually - uninstalled. The older package is uninstalled only after any newer - blocking packages have been merged on top of it. + Blockers which use the previously existing <c>!</c> syntax + now have a slightly different meaning. These so-called + <e>weak blocks</e> indicate that conflicting packages may + be temporarily installed simultaneously. When temporary + simultaneous installation of conflicting packages occurs, the + installation of a newer package may overwrite any colliding + files that belong to an older package which is explicitly + blocked. When such file collisions occur, the colliding files + cease to belong to the older package, and they remain installed + after the older package is eventually uninstalled. The older + package is uninstalled only after any newer blocking packages + have been merged on top of it. </p> </li> <li> - <p><b>New !!atom Syntax</b></p> + <p><b>New <c>!!</c> Operator</b></p> <p> - A new !!atom syntax is now supported, for use in special cases for - which temporary simultaneous installation of conflicting packages - should not be allowed. If a given package happens to be blocked by - a mixture of atoms consisting of both the !atom and !!atom - syntaxes, the !!atom syntax takes precedence over the !atom - syntax. + A new <c>!!</c> operator for <e>strong blocks</e> is now + supported, for use in special cases for which temporary + simultaneous installation of conflicting packages should not be + allowed. If both weak and strong blocks match a given package, + the strong block takes precedence. </p> </li> </ul> @@ -731,7 +731,9 @@ REQUIRED_USE="|| ( foo bar baz )" RDEPEND="dev-libs/foo:0/3" </codesample> <p> - Dependency atoms can use <b>slot operators</b> to clarify what should happen if the slot and/or sub-slot of a runtime dependency changes: + Package dependency specifications can use <b>slot operators</b> to + clarify what should happen if the slot and/or sub-slot of a runtime + dependency changes: </p> <ul> <li> diff --git a/function-reference/query-functions/text.xml b/function-reference/query-functions/text.xml index 66e595f..97d2dfb 100644 --- a/function-reference/query-functions/text.xml +++ b/function-reference/query-functions/text.xml @@ -96,8 +96,10 @@ query variables and similar state. <c>best_version pkg</c> </ti> <ti> - Echoes the highest versioned atom of <c>pkg</c> which is currently - installed. + Echoes category, name and version of the highest version of <c>pkg</c> + that is currently installed. + Example: <c>best_version app-editors/emacs:24</c> will output + <c>app-editors/emacs-24.5-r3</c>. </ti> </tr> <tr> diff --git a/general-concepts/dependencies/text.xml b/general-concepts/dependencies/text.xml index df6df43..18fcefd 100644 --- a/general-concepts/dependencies/text.xml +++ b/general-concepts/dependencies/text.xml @@ -109,10 +109,10 @@ DEPEND="dev-lang/ruby </codesample> <p> -Each atom is the full category and name of a package. Atoms are separated by -arbitrary whitespace <d/> convention is to specify one atom per line for -readability purposes. When specifying names, the category part should be treated -as mandatory. +Each <e>package dependency specification</e> is the full category and name of +a package. Dependency specifications are separated by arbitrary whitespace <d/> +convention is to have one specification per line for readability purposes. +When specifying names, the category part should be treated as mandatory. </p> </body> diff --git a/profiles/updates/text.xml b/profiles/updates/text.xml index ae859e4..7136aea 100644 --- a/profiles/updates/text.xml +++ b/profiles/updates/text.xml @@ -36,10 +36,11 @@ the actual changes to the package have to be done manually. </tr> <tr> <ti> - <c>slotmove atom oldslot newslot</c> + <c>slotmove spec oldslot newslot</c> </ti> <ti> - Indicates that the atom specified has changed slots. + Indicates that the package matching dependency specification <c>spec</c> + has changed slots. </ti> </tr> </table> |