diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/apt-cache.8.xml | 17 | ||||
| -rw-r--r-- | doc/apt-get.8.xml | 49 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 10 | ||||
| -rw-r--r-- | doc/apt.ent | 64 |
5 files changed, 74 insertions, 68 deletions
diff --git a/debian/changelog b/debian/changelog index 5ddd84117..c5a786919 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ apt (0.7.24) UNRELEASED; urgency=low * apt-pkg/aptconfiguration.cc, doc/apt.conf.5.xml: - add an order subgroup to the compression types to simplify reordering a bit and improve the documentation for this option group. + * doc/apt.ent, all man pages: + - move the description of files to globally usable entities -- David Kalnischkies <kalnischkies@gmail.com> Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 8b76f55b9..26d55a519 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -357,21 +357,8 @@ Reverse Provides: <refsect1><title>Files</title> <variablelist> - <varlistentry><term><filename>/etc/apt/sources.list</filename></term> - <listitem><para>Locations to fetch packages from. - Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem> - </varlistentry> - - <varlistentry><term><filename>&statedir;/lists/</filename></term> - <listitem><para>Storage area for state information for each package resource specified in - &sources-list; - Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem> - </varlistentry> - - <varlistentry><term><filename>&statedir;/lists/partial/</filename></term> - <listitem><para>Storage area for state information in transit. - Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem> - </varlistentry> + &file-sourceslist; + &file-statelists; </variablelist> </refsect1> diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 3a1292198..ec773edeb 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -558,50 +558,11 @@ <refsect1><title>Files</title> <variablelist> - <varlistentry><term><filename>/etc/apt/sources.list</filename></term> - <listitem><para>Locations to fetch packages from. - Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem> - </varlistentry> - - <varlistentry><term><filename>/etc/apt/apt.conf</filename></term> - <listitem><para>APT configuration file. - Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem> - </varlistentry> - - <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term> - <listitem><para>APT configuration file fragments. - Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem> - </varlistentry> - - <varlistentry><term><filename>/etc/apt/preferences</filename></term> - <listitem><para>Version preferences file. - This is where you would specify "pinning", - i.e. a preference to get certain packages - from a separate source - or from a different version of a distribution. - Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem> - </varlistentry> - - <varlistentry><term><filename>&cachedir;/archives/</filename></term> - <listitem><para>Storage area for retrieved package files. - Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem> - </varlistentry> - - <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term> - <listitem><para>Storage area for package files in transit. - Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem> - </varlistentry> - - <varlistentry><term><filename>&statedir;/lists/</filename></term> - <listitem><para>Storage area for state information for each package resource specified in - &sources-list; - Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem> - </varlistentry> - - <varlistentry><term><filename>&statedir;/lists/partial/</filename></term> - <listitem><para> Storage area for state information in transit. - Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem> - </varlistentry> + &file-sourceslist; + &file-aptconf; + &file-preferences; + &file-cachearchives; + &file-statelists; </variablelist> </refsect1> diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 92ac5ec04..81be753f9 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -858,15 +858,7 @@ is commented. <refsect1><title>Files</title> <variablelist> - <varlistentry><term><filename>/etc/apt/apt.conf</filename></term> - <listitem><para>APT configuration file. - Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem> - </varlistentry> - - <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term> - <listitem><para>APT configuration file fragments. - Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem> - </varlistentry> + &file-aptconf; </variablelist> </refsect1> diff --git a/doc/apt.ent b/doc/apt.ent index 43ac2f8e5..9a4c17bcd 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -289,3 +289,67 @@ </para> "> +<!ENTITY file-aptconf " + <varlistentry><term><filename>/etc/apt/apt.conf</filename></term> + <listitem><para>APT configuration file. + Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem> + </varlistentry> + + <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term> + <listitem><para>APT configuration file fragments. + Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem> + </varlistentry> +"> + +<!ENTITY file-cachearchives " + <varlistentry><term><filename>&cachedir;/archives/</filename></term> + <listitem><para>Storage area for retrieved package files. + Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem> + </varlistentry> + + <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term> + <listitem><para>Storage area for package files in transit. + Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem> + </varlistentry> +"> + +<!ENTITY file-preferences " + <varlistentry><term><filename>/etc/apt/preferences</filename></term> + <listitem><para>Version preferences file. + This is where you would specify "pinning", + i.e. a preference to get certain packages + from a separate source + or from a different version of a distribution. + Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem> + </varlistentry> + + <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term> + <listitem><para>File fragments for the version preferences. + Configuration Item: <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem> + </varlistentry> +"> + +<!ENTITY file-sourceslist " + <varlistentry><term><filename>/etc/apt/sources.list</filename></term> + <listitem><para>Locations to fetch packages from. + Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem> + </varlistentry> + + <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term> + <listitem><para>File fragments for locations to fetch packages from. + Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem> + </varlistentry> +"> + +<!ENTITY file-statelists " + <varlistentry><term><filename>&statedir;/lists/</filename></term> + <listitem><para>Storage area for state information for each package resource specified in + &sources-list; + Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem> + </varlistentry> + + <varlistentry><term><filename>&statedir;/lists/partial/</filename></term> + <listitem><para>Storage area for state information in transit. + Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem> + </varlistentry> +"> |