aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-05-02 15:20:34 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-05-02 15:20:34 +0000
commit514f909d700f40416ea8f3ff3ac4e223afcabcf0 (patch)
tree2b3ff26555dbdd892db5e4c249e4c4be76309fdc
parentb9fa8b3aaf69a387589da88ea17c97ac838d72bd (diff)
downloadpaludis-514f909d700f40416ea8f3ff3ac4e223afcabcf0.tar.gz
paludis-514f909d700f40416ea8f3ff3ac4e223afcabcf0.tar.xz
Use */* rather than * in docs
-rw-r--r--doc/configuration.html.skel17
-rw-r--r--doc/migration.html.skel12
2 files changed, 14 insertions, 15 deletions
diff --git a/doc/configuration.html.skel b/doc/configuration.html.skel
index 3075d98..e83c763 100644
--- a/doc/configuration.html.skel
+++ b/doc/configuration.html.skel
@@ -88,8 +88,7 @@ does, Paludis executes the latter and pretends that its stdout is the content of
<p>User <code>USE</code> preferences are controlled by the <code>use.conf</code>
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",
+<code>spec</code> is a package dependency specification or <a href="sets.html">package set</a>
and <code>use use use ...</code> is one or more USE flag names, prefixed by
a minus if they are to be disabled.</p>
@@ -99,7 +98,7 @@ used. To avoid inheriting values from your profile, include <code>-*</code>.</p>
<pre>
# By default, apply these to all packages
-* -doc nls -apache2
+*/* -doc nls -apache2
# Turn off nls for vim
app-editors/vim -nls
@@ -111,7 +110,7 @@ app-editors/vim -nls
x11-libs/gtk+:2 tiff
# We like English
-* LINGUAS: -* en_GB en
+*/* LINGUAS: -* en_GB en
</pre>
<p>Note that if a package matches multiple lines, <em>all</em> of these lines will
@@ -128,7 +127,7 @@ 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>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
+dependency specification or <a href="sets.html">set name</a> 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,
@@ -137,14 +136,14 @@ For example:</p>
<pre>
# We want a mostly stable system:
-* x86
+*/* x86
# But some ~arch packages:
app-editors/vim ~x86
app-editors/vim-core ~x86
</pre>
-<p>If <code>*</code> is not used, then every package that is to be installed will require
+<p>If <code>*/*</code> is not used, then every package that is to be installed will require
an entry in <code>keywords.conf</code>. It is also generally assumed within the gentoo
tree that if <code>~ARCH</code> is accepted for a package, then so is
<code>ARCH</code>; not doing so may result in all versions or the latest version of a
@@ -204,13 +203,13 @@ executed and has its stdout used as if it were appended to the main file.</p>
filtering is desired, use:</p>
<pre>
-* *
+*/* *
</pre>
<p>For filtering, the format is similar to the keywords and use files:</p>
<pre>
-* GPL-2 BSD
+*/* GPL-2 BSD
app-editors/vim-core vim
</pre>
diff --git a/doc/migration.html.skel b/doc/migration.html.skel
index 6323004..fb98dda 100644
--- a/doc/migration.html.skel
+++ b/doc/migration.html.skel
@@ -83,7 +83,7 @@ For a quick template:</p>
mkdir -p /etc/paludis/repositories
cat &lt;&lt;"END" &gt; /etc/paludis/keywords.conf
-* x86
+*/* x86
dev-cpp/libebt x86 ~x86
sys-apps/paludis x86 ~x86
dev-util/subversion x86 ~x86
@@ -92,15 +92,15 @@ sys-fs/udev x86 ~x86
END
cat &lt;&lt;"END" &gt; /etc/paludis/use.conf
-* -doc nls -apache2
-* LINGUAS: en
-* INPUT_DEVICES: keyboard mouse
-* VIDEO_CARDS: -* ati
+*/* -doc nls -apache2
+*/* LINGUAS: en
+*/* INPUT_DEVICES: keyboard mouse
+*/* VIDEO_CARDS: -* ati
app-editors/vim -nls
END
cat &lt;&lt;"END" &gt; /etc/paludis/licenses.conf
-* *
+*/* *
END
cat &lt;&lt;"END" &gt; /etc/paludis/mirrors.conf