aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-04-29 16:33:45 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-04-29 16:33:45 +0000
commit6b4260d8e76b93572523ac707e2ed9b0d842c0ef (patch)
treef1b4d198fee713860c49eeaf5a73e393571fb2b0
parent77a5e7c20ba9959e3b9cd0cf55aea6c652fcd4c3 (diff)
downloadpaludis-6b4260d8e76b93572523ac707e2ed9b0d842c0ef.tar.gz
paludis-6b4260d8e76b93572523ac707e2ed9b0d842c0ef.tar.xz
Documentation updates.
-rw-r--r--doc/cachefiles.html.skel2
-rw-r--r--doc/configuration.html.skel16
-rw-r--r--doc/faq.html.skel2
-rw-r--r--doc/portagedifferences.html.skel2
-rw-r--r--doc/programmingwithpaludis.html.skel4
-rw-r--r--doc/sets.html.skel12
6 files changed, 19 insertions, 19 deletions
diff --git a/doc/cachefiles.html.skel b/doc/cachefiles.html.skel
index 55f6f29..fb3875a 100644
--- a/doc/cachefiles.html.skel
+++ b/doc/cachefiles.html.skel
@@ -64,7 +64,7 @@ user explicitly enable or disable it.</p>
<p><strong>Warning:</strong> If you enable the names cache, and then go on to sync or otherwise
modify the repository in question manually or with another package manager,
you <b>must</b> run <code>paludis --regenerate-installable-cache</code>
- (for Portage repositories) or <code>paludis
+ (for ebuild repositories) or <code>paludis
--regenerate-installed-cache</code> (for VDB repositories). You should
also run this command after turning on the cache for the first time,
and if Paludis is interrupted during an install, uninstall or sync if
diff --git a/doc/configuration.html.skel b/doc/configuration.html.skel
index 9e31d6a..3075d98 100644
--- a/doc/configuration.html.skel
+++ b/doc/configuration.html.skel
@@ -87,14 +87,14 @@ does, Paludis executes the latter and pretends that its stdout is the content of
<h3>The use.conf File</h3>
<p>User <code>USE</code> preferences are controlled by the <code>use.conf</code>
-file. The basic format of a line is <code>atom use use use ...</code>, where
-<code>atom</code> is a package depend atom, <a href="sets.html">package set</a>
+file. The basic format of a line is <code>spec use use use ...</code>, where
+<code>spec</code> is a package dependency specification, <a href="sets.html">package set</a>
or <code>*</code> for "all packages",
and <code>use use use ...</code> is one or more USE flag names, prefixed by
a minus if they are to be disabled.</p>
<p>For <code>USE_EXPAND</code> variables such as <code>LINGUAS</code> and
-<code>VIDEO_CARDS</code>, <code>atom VARIABLE: value value ...</code> should be
+<code>VIDEO_CARDS</code>, <code>spec VARIABLE: value value ...</code> should be
used. To avoid inheriting values from your profile, include <code>-*</code>.</p>
<pre>
@@ -127,8 +127,8 @@ executed and has its stdout used as if it were appended to the main file.</p>
<p>Which <code>ARCH KEYWORDS</code> to accept is controlled by the
<code>keywords.conf</code> file. The format of a line is
-<code>atom keyword1 keywords2 ...</code>, where <code>atom</code> is a package
-depend atom, <a href="sets.html">set name</a> or <code>*</code> for "all packages" and
+<code>spec keyword1 keywords2 ...</code>, where <code>spec</code> is a package
+dependency specification, <a href="sets.html">set name</a> or <code>*</code> for "all packages" and
<code>keyword1 keyword2 ...</code> is one or more arch keywords. As with Portage,
accepting <code>~arch</code> does <em>not</em>
implicitly accept <code>arch</code>, however, if a package matches multiple lines,
@@ -163,7 +163,7 @@ executed and has its stdout used as if it were appended to the main file.</p>
<h3>The package_mask.conf File</h3>
<p>Packages can be masked through the use of the <code>package_mask.conf</code>
-file. The format of the file is one <code>atom</code> or <a href="sets.html">set name</a>
+file. The format of the file is one <code>spec</code> or <a href="sets.html">set name</a>
per line. For example:</p>
<pre>
@@ -185,7 +185,7 @@ executed and has its stdout used as if it were appended to the main file.</p>
<p>Packages can be unmasked through the use of the
<code>package_unmask.conf</code> file. The format of the file is one
-<code>atom</code> or <a href="sets.html">set name</a> per line. For example:</p>
+<code>spec</code> or <a href="sets.html">set name</a> per line. For example:</p>
<pre>
# I need banshee 0.11.0
@@ -258,7 +258,7 @@ are executed by Paludis and their stdout is used as if it were a normal reposito
<code>.conf</code> file.</p>
<p>Each repository can have a key named <code>importance</code>. This is used when
-two different repositories contain an identical package atom (e.g. foo/bar-1.0).
+two different repositories contain an identically named and versioned package (e.g. foo/bar-1.0).
The repository with the higher importance will always be chosen first. If not
provided, the default is 0.</p>
diff --git a/doc/faq.html.skel b/doc/faq.html.skel
index fa90e63..e42f0e2 100644
--- a/doc/faq.html.skel
+++ b/doc/faq.html.skel
@@ -139,7 +139,7 @@ use <code>--pretend</code> and check the output before proceeding:</p>
is <em>used</em> if any of these conditions are true:</p>
<ul>
- <li>It is matched by any atom in any repository's <code>system</code> or
+ <li>It is matched by any dependency specification in any repository's <code>system</code> or
<code>world</code> set.</li>
<li>It is depended upon by another used package.</li>
</ul>
diff --git a/doc/portagedifferences.html.skel b/doc/portagedifferences.html.skel
index 8d019cb..8ac27c3 100644
--- a/doc/portagedifferences.html.skel
+++ b/doc/portagedifferences.html.skel
@@ -116,7 +116,7 @@
<li>Ability to deliver news items to the end user.</li>
- <li>Ranged dep atom support.</li>
+ <li>Ranged dep specification support.</li>
<li>Extensive and easily extendable QA checks.</li>
diff --git a/doc/programmingwithpaludis.html.skel b/doc/programmingwithpaludis.html.skel
index 47f0f95..76eb2bc 100644
--- a/doc/programmingwithpaludis.html.skel
+++ b/doc/programmingwithpaludis.html.skel
@@ -197,14 +197,14 @@ via the <code>paludis::Environment::package_database()</code> method.</p>
<p>The <code>PackageDatabase</code> contains a number of
<code>paludis::Repository</code> subclass instances. These
can be obtained using the
-paludis<cpde>::PackageDatabase::begin_repositories()</code> and
+paludis<code>::PackageDatabase::begin_repositories()</code> and
<code>paludis::PackageDatabase::end_repositories()</code> pair or the
<code>paludis::PackageDatabase::fetch_repository()</code> method.</p>
<p>The <code>PackageDatabase</code> also provides a number of utility functions.
<code>paludis::PackageDatabase::query()</code>
can be used to fetch a <code>paludis::PackageDatabaseEntryCollection</code> containing packages
-matching a particular <cpde>paludis::PackageDepAtom</code>.
+matching a particular <code>paludis::PackageDepSpec</code>.
<code>paludis::PackageDatabase::fetch_unique_qualified_package_name()</code>
can be used to convert a <code>paludis::PackageNamePart</code> with no
associated <code>paludis::CategoryNamePart</code> into
diff --git a/doc/sets.html.skel b/doc/sets.html.skel
index 53b8d95..c4020b3 100644
--- a/doc/sets.html.skel
+++ b/doc/sets.html.skel
@@ -54,11 +54,11 @@ in which <code>use.conf</code> et al. reside. The format is as follows:</p>
<ul>
<li>Comments lines start with a <code>#</code>. These, and blank lines, are ignored.</li>
<li>Lines consist of a symbol, followed by whitespace, followed by a package dependency
- atom.</li>
- <li>The symbol <code>*</code> should be used to mean "include this package dependency atom in
+ specification.</li>
+ <li>The symbol <code>*</code> should be used to mean "include this package dependency specification in
the set".</li>
- <li>The symbol <code>?</code> should be used to mean "include this package dependency atom in
- the set if and only if the package part of the atom is matched by an installed package". For
+ <li>The symbol <code>?</code> should be used to mean "include this package dependency specification in
+ the set if and only if the package part of the specification is matched by an installed package". For
example, the line <code>? &gt;=app-editors/vim-7</code> means requires <code>vim-7</code> if
and only if <code>app-editors/vim</code> (any version) is already installed.</li>
</ul>
@@ -69,7 +69,7 @@ in which <code>use.conf</code> et al. reside. The format is as follows:</p>
of <code>.conf</code>, and when executed should output what would be valid content for a
<code>.conf</code> set.</p>
-<h3>Portage Repositories Defined Sets</h3>
+<h3>Ebuild Repositories Defined Sets</h3>
<p>Ebuild format repositories can supply their own sets. The <code>system</code> and
<code>security</code> sets are defined programmatically; other sets are defined by a file
@@ -80,7 +80,7 @@ user defined sets above.</p>
<p>Sets can currently be used as targets for <code>paludis --query</code>,
<code>paludis --install</code> and <code>paludis --uninstall</code>.
-They can also be used as the atom column in the
+They can also be used as the specification column in the
<code>use.conf</code>, <code>keywords.conf</code>, <code>licenses.conf</code>,
<code>package_mask.conf</code> and <code>package_unmask.conf</code>.</p>