aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-04-20 02:57:32 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-04-20 02:57:32 +0000
commit787598105c45d7b271443f2c4e22a8830eb47368 (patch)
tree54528fc972d611e43dd42eeedfbeff8fd88c7190
parent906511bf81d11dc3a76c63737c59fdd9451defa8 (diff)
downloadpaludis-787598105c45d7b271443f2c4e22a8830eb47368.tar.gz
paludis-787598105c45d7b271443f2c4e22a8830eb47368.tar.xz
Docs tweak. Fixes: ticket:507
-rw-r--r--doc/configuration/keywords.html.part.in3
-rw-r--r--doc/configuration/licenses.html.part.in3
-rw-r--r--doc/configuration/mirrors.html.part.in5
-rw-r--r--doc/configuration/packagemask.html.part.in3
-rw-r--r--doc/configuration/repositories.html.part.in3
-rw-r--r--doc/configuration/sets.html.part.in3
-rw-r--r--doc/configuration/use.html.part.in2
7 files changed, 14 insertions, 8 deletions
diff --git a/doc/configuration/keywords.html.part.in b/doc/configuration/keywords.html.part.in
index cf4a7bc..3e16158 100644
--- a/doc/configuration/keywords.html.part.in
+++ b/doc/configuration/keywords.html.part.in
@@ -5,7 +5,8 @@
###PALUDISENVIRONMENTONLY###
<p>The <code>keywords.conf</code> file controls which keywords are and are not accepted. It is a standard configuration
-file which may be a bash file and which may use the <code>keywords.conf.d/</code> directory.</p>
+file which may be a bash file (<code>keywords.bash</code>) and which may use the <code>keywords.conf.d/</code>
+directory.</p>
<p>Each line in the file consists of a specification followed by one or more accepted keywords. A specification may be
any of:</p>
diff --git a/doc/configuration/licenses.html.part.in b/doc/configuration/licenses.html.part.in
index b161fc7..700ce32 100644
--- a/doc/configuration/licenses.html.part.in
+++ b/doc/configuration/licenses.html.part.in
@@ -10,7 +10,8 @@
</div>
<p>The <code>license.conf</code> file controls which licenses are and are not accepted. It is a standard configuration
-file which may be a bash file and which may use the <code>licenses.conf.d/</code> directory.</p>
+file which may be a bash file (<code>license.bash</code>) and which may use the <code>licenses.conf.d/</code>
+directory.</p>
<p>Each line in the file consists of a specification followed by one or more license symbols. A specification may be
any of:</p>
diff --git a/doc/configuration/mirrors.html.part.in b/doc/configuration/mirrors.html.part.in
index 274d235..0024488 100644
--- a/doc/configuration/mirrors.html.part.in
+++ b/doc/configuration/mirrors.html.part.in
@@ -4,8 +4,9 @@
###PALUDISENVIRONMENTONLY###
-<p>The <code>mirrors.conf</code> file controls where Paludis looks when downloading files. It is a standard configuration
-file which may be a bash file and which may use the <code>mirrors.conf.d/</code> directory.</p>
+<p>The <code>mirrors.conf</code> file controls where Paludis looks when downloading files. It is a standard
+configuration file which may be a bash file (<code>mirrors.bash</code>) and which may use the
+<code>mirrors.conf.d/</code> directory.</p>
<p>Each line consists of a mirror name followed by one or more URLs. The special mirror name <code>*</code> can be used
to indicate a mirror that should be tried for all URLs (even those that are marked as 'not for mirroring'). Ebuild
diff --git a/doc/configuration/packagemask.html.part.in b/doc/configuration/packagemask.html.part.in
index 387e7c4..fe0965d 100644
--- a/doc/configuration/packagemask.html.part.in
+++ b/doc/configuration/packagemask.html.part.in
@@ -6,7 +6,8 @@
<p>The <code>package_mask.conf</code> file allows a package to be explicitly masked. The
<code>package_unmask.conf</code> file allows repository and profile masked packages to be unmasked. Both are standard
-configuration files which may be bash files and which may use a <code>.conf.d/</code> directory.</p>
+configuration files which may be bash files (<code>package_mask.bash</code> etc) and which may use a
+<code>.conf.d/</code> directory.</p>
<p>Each line in the file consists of a specification.</p>
diff --git a/doc/configuration/repositories.html.part.in b/doc/configuration/repositories.html.part.in
index c694dd9..8498ff8 100644
--- a/doc/configuration/repositories.html.part.in
+++ b/doc/configuration/repositories.html.part.in
@@ -5,7 +5,8 @@
###PALUDISENVIRONMENTONLY###
<p>Each file in <code>repositories/</code> named <code>*.conf</code> defines a repository. A repository configuration
-file is a standard key=value config file, and it may be in bash format. The <code>repository_defaults.conf</code> file
+file is a standard key=value config file, and it may be in bash format (in which case it has a <code>.bash</code>
+extension rather than <code>.conf</code). The <code>repository_defaults.conf</code> file
(which does <em>not</em> live in the <code>repositories</code> subdirectory), if it exists, is treated as if it were
prepended to each individual file.</p>
diff --git a/doc/configuration/sets.html.part.in b/doc/configuration/sets.html.part.in
index f3b4d50..8e9774f 100644
--- a/doc/configuration/sets.html.part.in
+++ b/doc/configuration/sets.html.part.in
@@ -35,7 +35,8 @@
###PALUDISENVIRONMENTONLY###
<p>When using the Paludis environment, the user can create their own sets. A set named <code>foo</code> is defined in
-the file <code>sets/foo.conf</code>, which is a standard configuration file and which may be a bash file.</p>
+the file <code>sets/foo.conf</code>, which is a standard configuration file, or in the file <code>sets/foo.bash</code>,
+which is a dynamic standard configuration file.</p>
<div class="note">
<p>Overriding built-in sets in this manner is not recommended. Strange things will happen.</p>
diff --git a/doc/configuration/use.html.part.in b/doc/configuration/use.html.part.in
index 3e7e907..ddcc2f8 100644
--- a/doc/configuration/use.html.part.in
+++ b/doc/configuration/use.html.part.in
@@ -5,7 +5,7 @@
###PALUDISENVIRONMENTONLY###
<p>The <code>use.conf</code> file controls which use flags are and are not enabled. It is a standard configuration
-file which may be a bash file and which may use the <code>use.conf.d/</code> directory.</p>
+file which may be a bash file (<code>use.bash</code>) and which may use the <code>use.conf.d/</code> directory.</p>
<p>Each line in the file consists of a specification followed by one or more use flags and labels. A specification may be
any of:</p>