aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-10-23 16:12:14 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-10-23 16:12:14 +0000
commit71a5b310ad9eddbaac35feef45eb6d5e6e582b6c (patch)
tree335ea659a2a614f9764eb6f00f6d65bdff8c9ee2
parent923a9ff65890808686fd6a8aa1802bbad0cee45f (diff)
downloadpaludis-71a5b310ad9eddbaac35feef45eb6d5e6e582b6c.tar.gz
paludis-71a5b310ad9eddbaac35feef45eb6d5e6e582b6c.tar.xz
Various docs updates, from zlin
-rw-r--r--doc/configuration/hooks.html.part2
-rw-r--r--doc/faq/different.html.part4
-rw-r--r--doc/faq/operation.html.part4
-rw-r--r--doc/faq/repositories.html.part5
-rw-r--r--doc/faq/stricter.html.part14
-rw-r--r--doc/overview/features.html.part8
-rw-r--r--doc/overview/gettingstarted.html.part1
7 files changed, 20 insertions, 18 deletions
diff --git a/doc/configuration/hooks.html.part b/doc/configuration/hooks.html.part
index 14cb9c0..142d8ef 100644
--- a/doc/configuration/hooks.html.part
+++ b/doc/configuration/hooks.html.part
@@ -343,7 +343,7 @@ hook_run_install_all_post()
if [[ -d "${ROOT}/var/lib/monkeys" ]] ; then
for m in "${ROOT}"/var/lib/monkeys/* ; do
- ewarn "Found monkey $(basename ${m} )"
+ ewarn "Found monkey $(basename "${m}" )"
done
else
einfo "No monkeys found"
diff --git a/doc/faq/different.html.part b/doc/faq/different.html.part
index cfcec68..89b8aec 100644
--- a/doc/faq/different.html.part
+++ b/doc/faq/different.html.part
@@ -44,7 +44,9 @@ a rather ugly way of handling things. We do have equivalents to most values:</p>
<code>$D</code>.</dd>
<dt>nostrip</dt>
- <dd>Again, it's a function, so use <code>SKIP_FUNCTIONS="strip"</code>.</dd>
+ <dd>You can use <code>--debug-build internal</code> globally. Again, as this
+ is a function, you can also use <code>SKIP_FUNCTIONS="strip"</code> on a per
+ package basis.</dd>
<dt>sandbox</dt>
<dd>Always on.</dd>
diff --git a/doc/faq/operation.html.part b/doc/faq/operation.html.part
index 1629d97..89658d9 100644
--- a/doc/faq/operation.html.part
+++ b/doc/faq/operation.html.part
@@ -9,8 +9,8 @@
<h2 id="updatingdepends">Paludis does not update DEPENDs of already installed packages</h2>
-<p>Paludis ignores DEPENDs of already installed packages by default. If you
-need a different behaviour, use the <code>--dl-installed-deps-pre</code>
+<p>Paludis ignores build time dependencies (DEPENDs) of already installed packages by default.
+If you need a different behaviour, use the <code>--dl-installed-deps-pre</code>
option. You may also want to use the <code>everything</code> set rather than
<code>world</code>.</p>
diff --git a/doc/faq/repositories.html.part b/doc/faq/repositories.html.part
index 9d5ebb7..3c4accb 100644
--- a/doc/faq/repositories.html.part
+++ b/doc/faq/repositories.html.part
@@ -13,8 +13,9 @@
=</code> setting for ebuild format repositories. The special files
immediately under <code>profiles/</code>, such as
<code>profiles/thirdpartymirrors</code>, <code>profiles/use.desc</code>
-and <code>profiles/package.mask</code>, are specific to that particular profile
-and no other; the <code>profiles =</code> key has no effect upon them.</p>
+and <code>profiles/package.mask</code>, are specific to the repository. Not to
+the profiles that are specified below them, and hence the <code>profiles =</code>
+key has no effect upon them. This is where repository masks are defined.</p>
<h2 id="repo_name">Repository names</h2>
diff --git a/doc/faq/stricter.html.part b/doc/faq/stricter.html.part
index 5d2dd79..493437f 100644
--- a/doc/faq/stricter.html.part
+++ b/doc/faq/stricter.html.part
@@ -72,13 +72,13 @@ question will likely lead to breakages.</p>
<h2 id="downgrades">Paludis wants to downgrade Qt or KDE</h2>
<p>Unlike Portage, Paludis enforces the dependencies of installed
-packages, rather than those of the corresponding package in the tree.
-Unfortunately, to work around Portage limitations, the Qt and KDE
-eclasses are set up to depend specifically on those versions that are
-in the tree at the time of installation. The result is that after
-upgrading to a newer version, dependant packages that were installed
-before the new version became available will try to force a downgrade
-back to the old version.</p>
+packages, rather than those of the corresponding package in its
+original repository. Unfortunately, to work around Portage limitations,
+the Qt and KDE eclasses are set up to depend specifically on those
+versions that are in the tree at the time of installation. The result
+is that after upgrading to a newer version, dependant packages that
+were installed before the new version became available will try to
+force a downgrade back to the old version.</p>
<p>To solve this problem, run your Paludis update command with
the <code>--dl-downgrade warning</code> option, and check the
diff --git a/doc/overview/features.html.part b/doc/overview/features.html.part
index febe79c..7d5514c 100644
--- a/doc/overview/features.html.part
+++ b/doc/overview/features.html.part
@@ -36,7 +36,7 @@
failed compiles far more flexibly than offered by Portage.</li>
<li>Ability to see why a package is really being pulled in, rather than relying
- upon the rather crude 'tree' offered by Portage.</li>
+ upon the rather crude '--tree' offered by Portage.</li>
<li>Much improved output: <code>--query</code> makes it easy to get a useful summary
of information about a package, and <code>--pretend</code> can be configured to show
@@ -46,8 +46,8 @@
<li>Secure (un)installation of set*id files, preventing your system from being left
vulnerable after having replaced a vulnerable application.</li>
- <li>Ability to use slot, use, repository and ranged version dependencies when selecting
- a version.</li>
+ <li>Ability to use slot, use, repository and ranged version dependencies in dependency
+ specifications.</li>
<li>Ability to see all packages that need unmasking in one go, rather than one package
at a time.</li>
@@ -63,7 +63,7 @@
<ul>
<li>Full and correct circular dependency resolution.</li>
- <li>Default deep dependency resolution.</li>
+ <li>Deep dependency resolution even when not upgrading everything.</li>
<li>Support for 'experimental' (read: 'still not implemented in Portage') EAPI proposals
(use dependencies, ranged version specs, -scm and -try version specs, src_uri arrows etc).</li>
diff --git a/doc/overview/gettingstarted.html.part b/doc/overview/gettingstarted.html.part
index e4db29b..ee74b3a 100644
--- a/doc/overview/gettingstarted.html.part
+++ b/doc/overview/gettingstarted.html.part
@@ -238,7 +238,6 @@ master_repository = gentoo
location = /var/paludis/repositories/paludis-overlay/
sync = svn://svn.pioto.org/paludis/overlay
names_cache = (as above)
-provides_cache = (as above)
write_cache = (see below)
format = ebuild
</pre>