aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-01-26 16:51:14 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-01-26 16:51:14 +0000
commite3edf0be14525a801d0050eca2c7f22354a78afa (patch)
treeab907ab72a5377a9d14c2cbb603f8bda45ecfade
parent79d96501ffb6b3bcbf2dfd47bc4085170d7ae38f (diff)
downloadpaludis-e3edf0be14525a801d0050eca2c7f22354a78afa.tar.gz
paludis-e3edf0be14525a801d0050eca2c7f22354a78afa.tar.xz
Update repositories configuration docs.
-rw-r--r--configure.ac1
-rw-r--r--doc/configuration/Makefile.am99
-rw-r--r--doc/configuration/exndbam.html.part.in19
-rw-r--r--doc/configuration/index.html.part8
-rw-r--r--doc/configuration/installedunpackaged.html.part.in16
-rw-r--r--doc/configuration/repositories/Makefile.am104
-rw-r--r--doc/configuration/repositories/accounts.html.part15
-rw-r--r--doc/configuration/repositories/e.html.part (renamed from doc/configuration/erepository.html.part.in)31
-rw-r--r--doc/configuration/repositories/exndbam.html.part21
-rw-r--r--doc/configuration/repositories/index.html.part (renamed from doc/configuration/repositories.html.part.in)37
-rw-r--r--doc/configuration/repositories/installed_accounts.html.part21
-rw-r--r--doc/configuration/repositories/installed_unpackaged.html.part15
-rw-r--r--doc/configuration/repositories/toplinks.html.part.in138
-rw-r--r--doc/configuration/repositories/unavailable.html.part (renamed from doc/configuration/unavailable.html.part.in)21
-rw-r--r--doc/configuration/repositories/vdb.html.part (renamed from doc/configuration/vdb.html.part.in)14
-rw-r--r--doc/configuration/toplinks.html.part.in8
-rw-r--r--doc/configuration/unwritten.html.part.in36
-rw-r--r--doc/index.html.part.in8
18 files changed, 399 insertions, 213 deletions
diff --git a/configure.ac b/configure.ac
index 6bf10ba..6b5f416 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1505,6 +1505,7 @@ AC_OUTPUT(
doc/api/ruby/Makefile
doc/clients/Makefile
doc/configuration/Makefile
+ doc/configuration/repositories/Makefile
doc/faq/Makefile
doc/overview/Makefile
hooks/Makefile
diff --git a/doc/configuration/Makefile.am b/doc/configuration/Makefile.am
index 5f85e6c..065bd15 100644
--- a/doc/configuration/Makefile.am
+++ b/doc/configuration/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = .
+SUBDIRS = repositories .
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail \
header.html.part \
@@ -32,21 +32,7 @@ CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail \
sets.html \
sets.html.part \
configfiles.html \
- specs.html \
- repositories.html \
- repositories.html.part \
- erepository.html \
- erepository.html.part \
- installedunpackaged.html \
- installedunpackaged.html.part \
- vdb.html \
- vdb.html.part \
- exndbam.html \
- exndbam.html.part \
- unavailable.html \
- unavailable.html.part \
- unwritten.html \
- unwritten.html.part
+ specs.html
MAINTAINERCLEANFILES = Makefile.in
@@ -68,14 +54,7 @@ EXTRA_DIST = \
paludisenvironmentonly.html.part \
configfiles.html.part \
specs.html.part \
- sets.html.part.in \
- repositories.html.part.in \
- erepository.html.part.in \
- installedunpackaged.html.part.in \
- unavailable.html.part.in \
- unwritten.html.part.in \
- vdb.html.part.in \
- exndbam.html.part.in
+ sets.html.part.in
paludisconfigurationhtmldir = $(htmldir)/configuration
@@ -95,14 +74,7 @@ paludisconfigurationhtml_DATA = \
use.html \
configfiles.html \
specs.html \
- sets.html \
- repositories.html \
- erepository.html \
- installedunpackaged.html \
- unavailable.html \
- unwritten.html \
- vdb.html \
- exndbam.html
+ sets.html
if HAVE_HTMLTIDY
@@ -177,42 +149,6 @@ specpath.html.part : $(srcdir)/specpath.html.part.in $(srcdir)/paludisenvironmen
-e 's,###PALUDISENVIRONMENTONLY###,,g' \
< $(srcdir)/specpath.html.part.in > specpath.html.part
-erepository.html.part : $(srcdir)/erepository.html.part.in $(srcdir)/paludisenvironmentonly.html.part
- sed \
- -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
- -e 's,###PALUDISENVIRONMENTONLY###,,g' \
- < $(srcdir)/erepository.html.part.in > erepository.html.part
-
-unavailable.html.part : $(srcdir)/unavailable.html.part.in $(srcdir)/paludisenvironmentonly.html.part
- sed \
- -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
- -e 's,###PALUDISENVIRONMENTONLY###,,g' \
- < $(srcdir)/unavailable.html.part.in > unavailable.html.part
-
-unwritten.html.part : $(srcdir)/unwritten.html.part.in $(srcdir)/paludisenvironmentonly.html.part
- sed \
- -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
- -e 's,###PALUDISENVIRONMENTONLY###,,g' \
- < $(srcdir)/unwritten.html.part.in > unwritten.html.part
-
-installedunpackaged.html.part : $(srcdir)/installedunpackaged.html.part.in $(srcdir)/paludisenvironmentonly.html.part
- sed \
- -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
- -e 's,###PALUDISENVIRONMENTONLY###,,g' \
- < $(srcdir)/installedunpackaged.html.part.in > installedunpackaged.html.part
-
-vdb.html.part : $(srcdir)/vdb.html.part.in $(srcdir)/paludisenvironmentonly.html.part
- sed \
- -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
- -e 's,###PALUDISENVIRONMENTONLY###,,g' \
- < $(srcdir)/vdb.html.part.in > vdb.html.part
-
-exndbam.html.part : $(srcdir)/exndbam.html.part.in $(srcdir)/paludisenvironmentonly.html.part
- sed \
- -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
- -e 's,###PALUDISENVIRONMENTONLY###,,g' \
- < $(srcdir)/exndbam.html.part.in > exndbam.html.part
-
environment.html.part : $(srcdir)/environment.html.part.in $(srcdir)/paludisenvironmentonly.html.part
sed \
-e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
@@ -225,12 +161,6 @@ keywords.html.part : $(srcdir)/keywords.html.part.in $(srcdir)/paludisenvironmen
-e 's,###PALUDISENVIRONMENTONLY###,,g' \
< $(srcdir)/keywords.html.part.in > keywords.html.part
-repositories.html.part : $(srcdir)/repositories.html.part.in $(srcdir)/paludisenvironmentonly.html.part
- sed \
- -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
- -e 's,###PALUDISENVIRONMENTONLY###,,g' \
- < $(srcdir)/repositories.html.part.in > repositories.html.part
-
packagemask.html.part : $(srcdir)/packagemask.html.part.in $(srcdir)/paludisenvironmentonly.html.part
sed \
-e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
@@ -279,9 +209,6 @@ environment.html : header.html.part environment.html.part footer.html.part
keywords.html : header.html.part keywords.html.part footer.html.part
cat header.html.part keywords.html.part footer.html.part > $@
-repositories.html : header.html.part repositories.html.part footer.html.part
- cat header.html.part repositories.html.part footer.html.part > $@
-
packagemask.html : header.html.part packagemask.html.part footer.html.part
cat header.html.part packagemask.html.part footer.html.part > $@
@@ -303,24 +230,6 @@ use.html : header.html.part use.html.part footer.html.part
specpath.html : header.html.part specpath.html.part footer.html.part
cat header.html.part specpath.html.part footer.html.part > $@
-erepository.html : header.html.part erepository.html.part footer.html.part
- cat header.html.part erepository.html.part footer.html.part > $@
-
-installedunpackaged.html : header.html.part installedunpackaged.html.part footer.html.part
- cat header.html.part installedunpackaged.html.part footer.html.part > $@
-
-unavailable.html : header.html.part unavailable.html.part footer.html.part
- cat header.html.part unavailable.html.part footer.html.part > $@
-
-unwritten.html : header.html.part unwritten.html.part footer.html.part
- cat header.html.part unwritten.html.part footer.html.part > $@
-
-vdb.html : header.html.part vdb.html.part footer.html.part
- cat header.html.part vdb.html.part footer.html.part > $@
-
-exndbam.html : header.html.part exndbam.html.part footer.html.part
- cat header.html.part exndbam.html.part footer.html.part > $@
-
syncers.html : header.html.part syncers.html.part footer.html.part
cat header.html.part syncers.html.part footer.html.part > $@
diff --git a/doc/configuration/exndbam.html.part.in b/doc/configuration/exndbam.html.part.in
deleted file mode 100644
index 181d85f..0000000
--- a/doc/configuration/exndbam.html.part.in
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- vim: set tw=120 ft=html sw=4 sts=4 et : -->
-
-<h1>exndbam Options</h1>
-
-###PALUDISENVIRONMENTONLY###
-
-<p>As well as the general keys supported for all repositories, the following keys have meaning for exndbam format
-repositories:</p>
-
-<dl>
- <dt><code>location</code></dt>
- <dd>The location of the repository. Mandatory.</dd>
-
- <dt><code>builddir</code></dt>
- <dd>The directory to use when 'building' a package for an uninstall (a temporary directory is needed for various
- operations). Optional.</dd>
-</dl>
-
-
diff --git a/doc/configuration/index.html.part b/doc/configuration/index.html.part
index 085a3a9..6914cd1 100644
--- a/doc/configuration/index.html.part
+++ b/doc/configuration/index.html.part
@@ -33,12 +33,6 @@
<li><a href="packagemask.html">package_mask.conf and package_unmask.conf</a>: for masks.</li>
<li><a href="bashrc.html">bashrc</a>: for package build environment options.</li>
<li><a href="sets.html">sets/*.conf</a>: for user defined package sets.</li>
- <li><a href="repositories.html">repositories/*.conf and repository_defaults.conf</a>, in general.</li>
- <li>... and configuration keys for <a href="erepository.html">ebuild and exheres repositories</a>.</li>
- <li>... and configuration keys for <a href="vdb.html">vdb repositories</a>.</li>
- <li>... and configuration keys for <a href="exndbam.html">exndbam repositories</a>.</li>
- <li>... and configuration keys for <a href="installedunpackaged.html">installed unpackaged repositories</a>.</li>
- <li>... and configuration keys for <a href="unavailable.html">unavailable repositories</a>.</li>
- <li>... and configuration keys for <a href="unwritten.html">unwritten repositories</a>.</li>
+ <li><a href="repositories/index.html">repositories/*.conf and repository_defaults.conf</a></li>
</ul>
diff --git a/doc/configuration/installedunpackaged.html.part.in b/doc/configuration/installedunpackaged.html.part.in
deleted file mode 100644
index 2e089ef..0000000
--- a/doc/configuration/installedunpackaged.html.part.in
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- vim: set tw=120 ft=html sw=4 sts=4 et : -->
-
-<h1>installed_unpackaged Options</h1>
-
-###PALUDISENVIRONMENTONLY###
-
-<p>As well as the general keys supported for all repositories, the following
-keys have meaning for installed_unpackaged format repositories:</p>
-
-<dl>
- <dt><code>location</code></dt>
- <dd>The location of the repository. Mandatory.</dd>
-</dl>
-
-
-
diff --git a/doc/configuration/repositories/Makefile.am b/doc/configuration/repositories/Makefile.am
new file mode 100644
index 0000000..7a9eaf4
--- /dev/null
+++ b/doc/configuration/repositories/Makefile.am
@@ -0,0 +1,104 @@
+SUBDIRS = .
+
+CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail \
+ header.html.part \
+ toplinks.html.part \
+ footer.html.part \
+ index.html \
+ accounts.html \
+ e.html \
+ exndbam.html \
+ installed_accounts.html \
+ installed_unpackaged.html \
+ unavailable.html \
+ vdb.html
+
+MAINTAINERCLEANFILES = Makefile.in
+
+EXTRA_DIST = \
+ header.html.part \
+ toplinks.html.part \
+ footer.html.part \
+ index.html.part \
+ accounts.html \
+ e.html \
+ exndbam.html \
+ installed_accounts.html \
+ installed_unpackaged.html \
+ unavailable.html \
+ vdb.html
+
+paludisconfigurationrepositorieshtmldir = $(htmldir)/configuration/repositories/
+
+paludisconfigurationrepositorieshtml_DATA = \
+ index.html \
+ accounts.html \
+ e.html \
+ exndbam.html \
+ installed_accounts.html \
+ installed_unpackaged.html \
+ unavailable.html \
+ vdb.html
+
+if HAVE_HTMLTIDY
+
+TESTS = $(paludisconfigurationhtml_DATA)
+TESTS_ENVIRONMENT = bash $(top_srcdir)/doc/htmltidy.bash
+
+endif
+
+index.html : header.html.part $(srcdir)/index.html.part footer.html.part
+ cat header.html.part $(srcdir)/index.html.part footer.html.part > $@
+
+accounts.html : header.html.part $(srcdir)/accounts.html.part footer.html.part
+ cat header.html.part $(srcdir)/accounts.html.part footer.html.part > $@
+
+e.html : header.html.part $(srcdir)/e.html.part footer.html.part
+ cat header.html.part $(srcdir)/e.html.part footer.html.part > $@
+
+exndbam.html : header.html.part $(srcdir)/exndbam.html.part footer.html.part
+ cat header.html.part $(srcdir)/exndbam.html.part footer.html.part > $@
+
+installed_accounts.html : header.html.part $(srcdir)/installed_accounts.html.part footer.html.part
+ cat header.html.part $(srcdir)/installed_accounts.html.part footer.html.part > $@
+
+installed_unpackaged.html : header.html.part $(srcdir)/installed_unpackaged.html.part footer.html.part
+ cat header.html.part $(srcdir)/installed_unpackaged.html.part footer.html.part > $@
+
+unavailable.html : header.html.part $(srcdir)/unavailable.html.part footer.html.part
+ cat header.html.part $(srcdir)/unavailable.html.part footer.html.part > $@
+
+vdb.html : header.html.part $(srcdir)/vdb.html.part footer.html.part
+ cat header.html.part $(srcdir)/vdb.html.part footer.html.part > $@
+
+header.html.part : $(srcdir)/../../header.html.part.in toplinks.html.part
+ sed \
+ -e 's,###TOPURI###,../../,g' \
+ -e '/###TOPLINKS###/r $(srcdir)/toplinks.html.part' \
+ -e 's,###TOPLINKS###,,g' \
+ < $(srcdir)/../../header.html.part.in > header.html.part
+
+toplinks.html.part : $(srcdir)/toplinks.html.part.in
+ sed \
+ -e 's,###TOPURI###,../../,g' \
+ < $(srcdir)/toplinks.html.part.in > toplinks.html.part
+
+footer.html.part : $(srcdir)/../../footer.html.part.in
+ sed -e 's,###TOPURI###,../../,g' < $(srcdir)/../../footer.html.part.in > footer.html.part
+
+built-sources : $(BUILT_SOURCES)
+ for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
+
+distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
+
+distcheck-deps-subdirs :
+ for s in `echo $(DIST_SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+
+htmldocs : htmldocs-subdirs
+
+htmldocs-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) htmldocs-local || exit 1 ; \
+ else $(MAKE) -C $$s htmldocs || exit 1 ; fi ; done
+
+htmldocs-local : $(paludisconfigurationrepositorieshtml_DATA)
+
diff --git a/doc/configuration/repositories/accounts.html.part b/doc/configuration/repositories/accounts.html.part
new file mode 100644
index 0000000..a8961cf
--- /dev/null
+++ b/doc/configuration/repositories/accounts.html.part
@@ -0,0 +1,15 @@
+<!-- vim: set tw=120 ft=html sw=4 sts=4 et : -->
+
+<h1>accounts Repository Format</h1>
+
+<p>The <code>accounts</code> repository format, along with the <a href="installed_accounts.html">installed_accounts</a>
+format, is used by Exherbo to track user and group accounts. It is not used by Gentoo and derived distributions.</p>
+
+<p>As well as the <a href="index.html">general keys supported for all repositories</a>, the following keys have meaning
+for <code>accounts</code> format repositories:</p>
+
+<dl>
+ <dt><code>name</code></dt>
+ <dd>If set, use this as the repository name instead of <code>accounts</code>.</dd>
+</dl>
+
diff --git a/doc/configuration/erepository.html.part.in b/doc/configuration/repositories/e.html.part
index 959e778..7233277 100644
--- a/doc/configuration/erepository.html.part.in
+++ b/doc/configuration/repositories/e.html.part
@@ -1,22 +1,24 @@
<!-- vim: set tw=120 ft=html sw=4 sts=4 et : -->
-<h1>ebuild and exheres Options</h1>
+<h1>ebuild and exheres Repository Formats</h1>
-###PALUDISENVIRONMENTONLY###
+<p>The <code>ebuild</code> repository format is used on Gentoo and derived distributions for repositories containing
+ebuilds. The <code>exheres</code> repository format is used on Exherbo for repositories containing exheres packages.
+Except where noted, all options described below are common to both formats.</p>
-<p>As well as the general keys supported for all repositories, the following keys have meaning for ebuild
-and exheres format repositories:</p>
+<p>As well as the <a href="index.html">general keys supported for all repositories</a>, the following keys have meaning
+for <code>ebuild</code> and <code>exheres</code> format repositories:</p>
<dl>
<dt><code>location</code></dt>
<dd>The location of the repository. Mandatory.</dd>
<dt><code>master_repository</code></dt>
- <dd>If set to the name of another ebuild- or exheres-format repository, that repository is used as a 'master' for
- any part of this repository that is not defined. Also changes the default importance of this repository from 0 to
- 10. (In Portage terms, this is similar to saying that this repository is an overlay with the master as the main
- repository. However, identically named and versioned packages in this repository do not hide those in the
- master.)</dd>
+ <dd>If set to the name of another ebuild-format repository, that repository is used as a 'master' for any part of
+ this repository that is not defined. Also changes the default importance of this repository from 0 to 10. (In
+ Portage terms, this is similar to saying that this repository is an overlay with the master as the main repository.
+ However, identically named and versioned packages in this repository do not hide those in the master.)
+ <code>Exheres</code> format repositories describe their own masters, so this option does not apply to them.</dd>
<dt><code>profiles</code></dt>
<dd>A space separated list of directories to use as profiles. Later entries override earlier entries. Inherited from
@@ -25,7 +27,8 @@ and exheres format repositories:</p>
<dt><code>eclassdirs</code></dt>
<dd>A space separated list of directories in which to find eclasses. The first directory is used to set
- <code>ECLASSDIR</code>, but eclasses in later directories have priority. Optional.</dd>
+ <code>ECLASSDIR</code>, but eclasses in later directories have priority. Optional, and not used by
+ <code>exheres</code> format repositories.</dd>
<dt><code>distdir</code></dt>
<dd>Where to look for and save downloaded files. Inherited from a master. Optional.</dd>
@@ -63,16 +66,16 @@ and exheres format repositories:</p>
<dd>The EAPI to use when a package does not specify an EAPI, either explicitly or by suffix. Optional, generally set
by the distribution.</dd>
- <dt><code>profile_eapi</code></dt>
- <dd>The EAPI to use for profiles. Optional, generally set by the distribution.</dd>
+ <dt><code>profile_eapi_when_unspecified</code></dt>
+ <dd>The EAPI to use for profiles when unspecified. Optional, generally set by the distribution.</dd>
<dt><code>names_cache</code></dt>
<dd>The directory in which to look for a names cache, and in which to generate a names cache. A names cache will
significantly speed up converting a <code>pkg</code> into a <code>cat/pkg</code>. See <a
- href="../overview/gettingstarted.html">Getting Started</a> for notes. Optional.</dd>
+ href="../../overview/gettingstarted.html">Getting Started</a> for notes. Optional.</dd>
<dt><code>sync</code></dt>
- <dd>How to sync the repository. See <a href="syncers.html">Syncers</a> for supported formats. Optional if the
+ <dd>How to sync the repository. See <a href="../syncers.html">Syncers</a> for supported formats. Optional if the
repository does not need to be synced.</dd>
<dt><code>sync_options</code></dt>
diff --git a/doc/configuration/repositories/exndbam.html.part b/doc/configuration/repositories/exndbam.html.part
new file mode 100644
index 0000000..15a6dae
--- /dev/null
+++ b/doc/configuration/repositories/exndbam.html.part
@@ -0,0 +1,21 @@
+<!-- vim: set tw=120 ft=html sw=4 sts=4 et : -->
+
+<h1>exndbam Repository Format</h1>
+
+<p>The <code>exndbam</code> repository format is used on Exherbo to track packages installed from an exheres. It is not
+used on Gentoo and derived distributions; <a href="vdb.html">VDB</a> serves the equivalent purpose there.</p>
+
+<p>As well as the <a href="index.html">general keys supported for all repositories</a>, the following keys have meaning
+for <code>exndbam</code> format repositories:</p>
+
+<dl>
+ <dt><code>location</code></dt>
+ <dd>The location of the repository. Mandatory.</dd>
+
+ <dt><code>builddir</code></dt>
+ <dd>The directory to use when 'building' a package for an uninstall (a temporary directory is needed for various
+ operations). Optional.</dd>
+</dl>
+
+
+
diff --git a/doc/configuration/repositories.html.part.in b/doc/configuration/repositories/index.html.part
index 7c4a688..7266ef2 100644
--- a/doc/configuration/repositories.html.part.in
+++ b/doc/configuration/repositories/index.html.part
@@ -1,8 +1,8 @@
<!-- vim: set tw=120 ft=html sw=4 sts=4 et : -->
-<h1>Repositories</h1>
+<h1>repositories/ Configuration</h1>
-###PALUDISENVIRONMENTONLY###
+<h2>In General</h2>
<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 (in which case it has a <code>.bash</code>
@@ -18,7 +18,8 @@ prepended to each individual file.</p>
<h2>Predefined Keys</h2>
-<p>The following keys are predefined. They should not be modified.</p>
+<p>The following keys are predefined. They should not be modified, but may be used in configuration files to define
+other keys.</p>
<dl>
<dt><code>root</code></dt>
@@ -44,9 +45,26 @@ prepended to each individual file.</p>
<p>For format-specific keys, see the documentation for that format.</p>
-<h2>Predefined Repositories</h2>
+<h2>Repository Formats</h2>
-<p>If using a distribution that supports old-style virtuals, two repositories are magically defined:</p>
+<h3>For All Distributions</h3>
+
+<ul>
+ <li><a href="unavailable.html">unavailable</a>, for information about ebuilds that are present in an overlay or
+ supplemental repository that is not configured on this system.</li>
+ <li><a href="installedunpackaged.html">installed_unpackaged</a>, for tracking installs of packages installed
+ manually rather than through an ebuild.</li>
+</ul>
+
+<h3>Gentoo and Derived Distributions</h3>
+
+<ul>
+ <li><a href="e.html">ebuild</a> format repositories.</li>
+ <li><a href="vdb.html">VDB</a>, for tracking installed ebuilds.</li>
+</ul>
+
+<p>In addition, the following repositories are magically defined on Gentoo and derived distributions that make use of
+old-style virtuals:</p>
<dl>
<dt><code>virtuals</code></dt>
@@ -58,3 +76,12 @@ prepended to each individual file.</p>
packages).</dd>
</dl>
+<h3>Exherbo</h3>
+
+<ul>
+ <li><a href="e.html">exheres</a> format repositories.</li>
+ <li><a href="exndbam.html">exndbam</a>, for tracking installed packages installed from an exheres.</li>
+ <li><a href="accounts.html">accounts</a> and <a href="installed_accounts.html">installed_accounts</a> format
+ repositories, for tracking user and group accounts.</li>
+</ul>
+
diff --git a/doc/configuration/repositories/installed_accounts.html.part b/doc/configuration/repositories/installed_accounts.html.part
new file mode 100644
index 0000000..75ce0ef
--- /dev/null
+++ b/doc/configuration/repositories/installed_accounts.html.part
@@ -0,0 +1,21 @@
+<!-- vim: set tw=120 ft=html sw=4 sts=4 et : -->
+
+<h1>installed_accounts Repository Format</h1>
+
+<p>The <code>installed_accounts</code> repository format, along with the <a href="accounts.html">accounts</a> format, is
+used by Exherbo to track user and group accounts. It is not used by Gentoo and derived distributions.</p>
+
+<p>As well as the <a href="index.html">general keys supported for all repositories</a>, the following keys have meaning
+for <code>installed_accounts</code> format repositories:</p>
+
+<dl>
+ <dt><code>name</code></dt>
+ <dd>If set, use this as the repository name instead of <code>accounts</code>.</dd>
+
+ <dt><code>handler</code></dt>
+ <dd>The handler to use for creating accounts. Currently only <code>passwd</code> is supported, which uses
+ <code>useradd</code> and <code>groupadd</code>. Mandatory</dd>
+</dl>
+
+
+
diff --git a/doc/configuration/repositories/installed_unpackaged.html.part b/doc/configuration/repositories/installed_unpackaged.html.part
new file mode 100644
index 0000000..2176d9b
--- /dev/null
+++ b/doc/configuration/repositories/installed_unpackaged.html.part
@@ -0,0 +1,15 @@
+<!-- vim: set tw=120 ft=html sw=4 sts=4 et : -->
+
+<h1>installed_unpackaged Repository Format</h1>
+
+<p>The <code>installed_unpackaged</code> repository format is used to keep
+track of packages installed using <code>importare</code>.</p>
+
+<p>As well as the <a href="index.html">general keys supported for all repositories</a>, the following keys have meaning
+for <code>installed_unpackaged</code> format repositories:</p>
+
+<dl>
+ <dt><code>location</code></dt>
+ <dd>The location of the repository. Mandatory.</dd>
+</dl>
+
diff --git a/doc/configuration/repositories/toplinks.html.part.in b/doc/configuration/repositories/toplinks.html.part.in
new file mode 100644
index 0000000..f5f283a
--- /dev/null
+++ b/doc/configuration/repositories/toplinks.html.part.in
@@ -0,0 +1,138 @@
+<!-- vim: set tw=120 ft=html sw=4 sts=4 et : -->
+
+<div class="topnavinner">
+ <table border="0" cellspacing="0" summary="Navigation links">
+ <tr>
+ <td rowspan="7" class="logotab">
+ <a href="###TOPURI###index.html" class="noarrow"><img style="border: 0px; padding-right: 50px;"
+ src="###TOPURI###paludis_270.png" alt="Paludis Logo"
+ /></a>
+ </td>
+
+ <td>
+ <a href="###TOPURI###index.html">Introduction</a>
+ </td>
+
+ <td>
+ &nbsp;
+ </td>
+
+ <td class="currentpage">
+ <a href="###TOPURI###configuration/repositories/accounts.html">accounts</a>
+ </td>
+
+ <td class="currentpage">
+ &nbsp;
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <a href="http://trac.pioto.org/paludis/">Bugs, Requests, Support</a>
+ </td>
+
+ <td>
+ &nbsp;
+ </td>
+
+ <td class="currentpage">
+ <a href="###TOPURI###configuration/repositories/e.html">ebuild and exheres</a>
+ </td>
+
+ <td class="currentpage">
+ &nbsp;
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <a href="###TOPURI###overview/index.html">Overview</a>
+ </td>
+
+ <td>
+ &nbsp;
+ </td>
+
+ <td class="currentpage">
+ <a href="###TOPURI###configuration/repositories/exndbam.html">exndbam</a>
+ </td>
+
+ <td class="currentpage">
+ &nbsp;
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <a href="###TOPURI###faq/index.html">FAQ</a>
+ </td>
+
+ <td>
+ &nbsp;
+ </td>
+
+ <td class="currentpage">
+ <a href="###TOPURI###configuration/repositories/installed_accounts.html">installed_accounts</a>
+ </td>
+
+ <td class="currentpage">
+ &nbsp;
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <a href="###TOPURI###clients/index.html">Clients</a>
+ </td>
+
+ <td>
+ &nbsp;
+ </td>
+
+ <td class="currentpage">
+ <a href="###TOPURI###configuration/repositories/installed_unpackaged.html">installed_unpackaged</a>
+ </td>
+
+ <td class="currentpage">
+ &nbsp;
+ </td>
+ </tr>
+
+ <tr>
+ <td class="currenttab">
+ <a href="###TOPURI###configuration/index.html">Configuration</a>
+ </td>
+
+ <td class="currenttab">
+ <a href="###TOPURI###configuration/repositories/index.html">repositories/</a>
+ </td>
+
+ <td class="currentpage">
+ <a href="###TOPURI###configuration/repositories/unavailable.html">unavailable</a>
+ </td>
+
+ <td class="currentpage">
+ &nbsp;
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <a href="###TOPURI###api/index.html">API</a>
+ </td>
+
+ <td>
+ &nbsp;
+ </td>
+
+ <td class="currentpage">
+ <a href="###TOPURI###configuration/repositories/vdb.html">VDB</a>
+ </td>
+
+ <td class="currentpage">
+ &nbsp;
+ </td>
+ </tr>
+ </table>
+</div>
+
diff --git a/doc/configuration/unavailable.html.part.in b/doc/configuration/repositories/unavailable.html.part
index bdaf9a6..52d697f 100644
--- a/doc/configuration/unavailable.html.part.in
+++ b/doc/configuration/repositories/unavailable.html.part
@@ -1,11 +1,14 @@
<!-- vim: set tw=120 ft=html sw=4 sts=4 et : -->
-<h1>unavailable Options</h1>
+<h1>unavailable Repository Format</h1>
-###PALUDISENVIRONMENTONLY###
+<p>The <code>unavailable</code> repository format can be used to see basic information about packages that are available
+in other repositories that have not been configured on this system. On Gentoo, this is used for seeing repositories
+known to <code>layman</code> and <code>playman.rb</code>. On Exherbo, this is used for seeing all official and
+selected unofficial repositories.</p>
-<p>As well as the general keys supported for all repositories, the following
-keys have meaning for unavailable format repositories:</p>
+<p>As well as the <a href="index.html">general keys supported for all repositories</a>, the following keys have meaning
+for <code>unavailable</code> format repositories:</p>
<dl>
<dt><code>location</code></dt>
@@ -46,3 +49,13 @@ sync = tar+http://git.exherbo.org/exherbo_repositories.tar.bz2
importance = -100
</pre>
+<p>The following lists selected unofficial repositories:</p>
+
+<pre>
+format = unavailable
+name = unavailable-unofficial
+location = /var/db/paludis/repositories/unavailable-unofficial
+sync = tar+http://git.exherbo.org/exherbo_unofficial_repositories.tar.bz2
+importance = -100
+</pre>
+
diff --git a/doc/configuration/vdb.html.part.in b/doc/configuration/repositories/vdb.html.part
index 7a1d4ba..bda17f2 100644
--- a/doc/configuration/vdb.html.part.in
+++ b/doc/configuration/repositories/vdb.html.part
@@ -1,11 +1,12 @@
<!-- vim: set tw=120 ft=html sw=4 sts=4 et : -->
-<h1>vdb Options</h1>
+<h1>vdb Repository Format</h1>
-###PALUDISENVIRONMENTONLY###
+<p>The <code>vdb</code> repository format is used on Gentoo and derived distributions to track packages installed from
+an ebuild. It is not used on Exherbo; <a href="exndbam.html">exndbam</a> serves the equivalent purpose there.</p>
-<p>As well as the general keys supported for all repositories, the following keys have meaning for vdb format
-repositories:</p>
+<p>As well as the <a href="index.html">general keys supported for all repositories</a>, the following keys have meaning
+for <code>vdb</code> format repositories:</p>
<dl>
<dt><code>location</code></dt>
@@ -14,13 +15,13 @@ repositories:</p>
<dt><code>provides_cache</code></dt>
<dd>The directory to use for reading and writing a cache of providers of old-style virtuals. See <a
- href="../overview/gettingstarted.html">Getting Started</a> for notes. Optional, set to <code>/var/empty</code>
+ href="../../overview/gettingstarted.html">Getting Started</a> for notes. Optional, set to <code>/var/empty</code>
to disable.</dd>
<dt><code>names_cache</code></dt>
<dd>The directory in which to look for a names cache, and in which to generate a names cache. A names cache will
significantly speed up converting a <code>pkg</code> into a <code>cat/pkg</code>. See <a
- href="../overview/gettingstarted.html">Getting Started</a> for notes. Optional, set to <code>/var/empty</code>
+ href="../../overview/gettingstarted.html">Getting Started</a> for notes. Optional, set to <code>/var/empty</code>
to disable.</dd>
<dt><code>builddir</code></dt>
@@ -29,3 +30,4 @@ repositories:</p>
</dl>
+
diff --git a/doc/configuration/toplinks.html.part.in b/doc/configuration/toplinks.html.part.in
index d4c4f98..cae0ae4 100644
--- a/doc/configuration/toplinks.html.part.in
+++ b/doc/configuration/toplinks.html.part.in
@@ -40,7 +40,7 @@
</td>
<td class="currentpage">
- <a href="###TOPURI###configuration/repositories.html">repositories/</a>
+ <a href="###TOPURI###configuration/repositories/index.html">repositories/</a>
</td>
</tr>
@@ -58,7 +58,7 @@
</td>
<td class="currentpage">
- <a href="###TOPURI###configuration/erepository.html">ebuild</a>
+ &nbsp;
</td>
</tr>
@@ -76,7 +76,7 @@
</td>
<td class="currentpage">
- <a href="###TOPURI###configuration/vdb.html">vdb</a>
+ &nbsp;
</td>
</tr>
@@ -94,7 +94,7 @@
</td>
<td class="currentpage">
- <a href="###TOPURI###configuration/installedunpackaged.html">installed unpackaged</a>
+ &nbsp;
</td>
</tr>
diff --git a/doc/configuration/unwritten.html.part.in b/doc/configuration/unwritten.html.part.in
deleted file mode 100644
index 9879556..0000000
--- a/doc/configuration/unwritten.html.part.in
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- vim: set tw=120 ft=html sw=4 sts=4 et : -->
-
-<h1>unwritten Options</h1>
-
-###PALUDISENVIRONMENTONLY###
-
-<p>As well as the general keys supported for all repositories, the following
-keys have meaning for unwritten format repositories:</p>
-
-<dl>
- <dt><code>location</code></dt>
- <dd>The location of the repository. Mandatory.</dd>
-
- <dt><code>name</code></dt>
- <dd>The name of the repository. Defaults to <code>unwritten</code>.</dd>
-
- <dt><code>sync</code></dt>
- <dd>How to sync the repository. See <a href="syncers.html">Syncers</a> for supported formats.</dd>
-
- <dt><code>sync_options</code></dt>
- <dd>Any options to be passed to the syncer. Optional.</dd>
-</dl>
-
-<h2>Reference Configurations</h2>
-
-<h3>Exherbo</h3>
-
-<p>The following is the official unwritten list:</p>
-
-<pre>
-format = unwritten
-location = /var/db/paludis/repositories/unwritten
-sync = git://git.exherbo.org/unwritten.git
-importance = -100
-</pre>
-
diff --git a/doc/index.html.part.in b/doc/index.html.part.in
index cb66f16..1661708 100644
--- a/doc/index.html.part.in
+++ b/doc/index.html.part.in
@@ -64,13 +64,7 @@ the exheres repository format.</p>
<li><a href="configuration/packagemask.html">package_mask.conf and package_unmask.conf</a>: for masks.</li>
<li><a href="configuration/bashrc.html">bashrc</a>: for package build environment options.</li>
<li><a href="configuration/sets.html">sets/*.conf</a>: for user defined package sets.</li>
- <li><a href="configuration/repositories.html">repositories/*.conf and repository_defaults.conf</a>, in general.</li>
- <li>... and configuration keys for <a href="configuration/erepository.html">ebuild and exheres repositories</a>.</li>
- <li>... and configuration keys for <a href="configuration/vdb.html">VDB repositories</a>.</li>
- <li>... and configuration keys for <a href="configuration/exndbam.html">Exndbam repositories</a>.</li>
- <li>... and configuration keys for <a href="configuration/installedunpackaged.html">installed unpackaged repositories</a>.</li>
- <li>... and configuration keys for <a href="configuration/unavailable.html">unavailable repositories</a>.</li>
- <li>... and configuration keys for <a href="configuration/unwritten.html">unwritten repositories</a>.</li>
+ <li><a href="repositories/index.html">repositories/*.conf and repository_defaults.conf</a></li>
</ul>
<h2>Client Documentation</h2>