[gentoo-pms] [PATCH] Explain "depend atom" in the glossary.

[gentoo-pms] [PATCH] Explain "depend atom" in the glossary.

[Ulrich Müller]

[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]

---
 dependencies.tex | 1 +
 glossary.tex     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dependencies.tex b/dependencies.tex
index 58c86f9..a1d4264 100644
--- a/dependencies.tex
+++ b/dependencies.tex
@@ -166,6 +166,7 @@ In an at-most-one-of group, at most one immediate child element must be matched.
 An empty at-most-one-of group counts as being matched.
 
 \subsection{Package Dependency Specifications}
+\label{sec:pkg-dep}
 
 A package dependency can be in one of the following base formats. A package manager must warn or
 error on non-compliant input.
diff --git a/glossary.tex b/glossary.tex
index 100c09a..75b8a66 100644
--- a/glossary.tex
+++ b/glossary.tex
@@ -7,6 +7,7 @@ be immediately obvious.
 \begin{description}
 \item[qualified package name] A package name along with its associated category. For example,
     \t{app-editors/vim} is a qualified package name.
+\item[depend atom] A \i{package dependency specification}, as defined in section~\ref{sec:pkg-dep}.
 \item[new-style virtual] A new-style virtual is a normal package in the \t{virtual} category which
     installs no files and uses its dependency requirements to pull in a `provider'. Historically,
     old-style virtuals required special handling from the package manager; new-style virtuals do
-- 
2.5.2

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: [gentoo-pms] [PATCH] Explain "depend atom" in the glossary.

[Ciaran McCreesh]

[-- Attachment #1: Type: text/plain, Size: 180 bytes --]

On Sun, 13 Sep 2015 10:56:01 +0200
Ulrich Müller <ulm@gentoo.org> wrote:
> +\item[depend atom]

I'd rather we deprecated the name. It's a silly name.

-- 
Ciaran McCreesh

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [gentoo-pms] [PATCH] Explain "depend atom" in the glossary.

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 3248 bytes --]

>>>>> On Sun, 13 Sep 2015, Ciaran McCreesh wrote:

>> +\item[depend atom]

> I'd rather we deprecated the name. It's a silly name.

I just see that this is bug 174322, and two occurances of the term
were missed when fixing it.

Patch is included below.

Ulrich


From 3cce5a76fbfb3af1e7a9fc1e3b7d87d26d6fa552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Sun, 13 Sep 2015 17:19:17 +0200
Subject: [PATCH] Replace "atom" by "package dependency specification"
 throughout.

This fixes remaining occurances of the term "atom" that were missed
in commit 12b07c3d013246c5ee4c6acb23f85ec1e857ac0a, or readded later.

Bug: 174322
---
 eapi-cheatsheet.tex  | 4 ++--
 pkg-mgr-commands.tex | 2 +-
 profiles.tex         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eapi-cheatsheet.tex b/eapi-cheatsheet.tex
index 765d679..75d5146 100644
--- a/eapi-cheatsheet.tex
+++ b/eapi-cheatsheet.tex
@@ -261,8 +261,8 @@ If there is no EAPI explicitly specified, EAPI 0 is assumed.
     not specified in \code{SLOT}, it defaults to the regular slot.
     See \featureref{sub-slot}.
     \item[Slot operator dependencies] One of the following operators
-    can be specified after package atoms, which will affect updates
-    of runtime dependencies:
+    can be used as a suffix in package dependencies, which will affect
+    updates of runtime dependencies:
     \begin{description}
         \item[\code{:*}] Any slot value is acceptable.  The package
         will not break when its dependency is updated.
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index 99b7c0c..1884a5c 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -88,7 +88,7 @@ supporting option \t{-{}-host-root}, this flag as the first argument will cause
 to the host root instead of \t{ROOT}.
 \begin{description}
 \item[has\_version] Takes exactly one package dependency specification as an argument. Returns
-    true if a package matching the atom is installed in \t{ROOT}, and false otherwise.
+    true if a package matching the specification is installed in \t{ROOT}, and false otherwise.
 \item[best\_version] Takes exactly one package dependency specification as an argument. If a
     matching package is installed, prints the category, package name and version of the highest
     matching version; otherwise, prints an empty string. The exit code is unspecified.
diff --git a/profiles.tex b/profiles.tex
index 4b39160..a7a8527 100644
--- a/profiles.tex
+++ b/profiles.tex
@@ -73,7 +73,7 @@ removed from the list. Once again, blank lines and those beginning with a \# are
 \subsection{packages}
 The \t{packages} file is used to define the `system set' for this profile.
 After the above rules for inheritance and comments are applied, its lines must take one of two
-forms: a package dependency specification prefixed by \t{*} denotes that the atom forms part of the
+forms: a package dependency specification prefixed by \t{*} denotes that it forms part of the
 system set. A package dependency specification on its own may also appear for legacy reasons, but
 should be ignored when calculating the system set.
 
-- 
2.5.2

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]