From f0599b9c2ee704f97dbea17262107c55f527bbf0 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 26 Aug 2009 12:21:54 +0200
Subject: =?UTF-8?q?[=20Nicolas=20Fran=C3=A7ois=20]=20*=20doc/*.=3F.xml=20(?=
 =?UTF-8?q?manpages):=20=20=20-=20add=20contrib=20to=20author=20tags=20and?=
 =?UTF-8?q?=20also=20add=20refmiscinfo=20to=20fix=20warnings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/apt.ent | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

(limited to 'doc/apt.ent')

diff --git a/doc/apt.ent b/doc/apt.ent
index 4cfc00069..43ac2f8e5 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -158,7 +158,10 @@
 <!ENTITY apt-docinfo "
  <refentryinfo>
    <address><email>apt@packages.debian.org</email></address>
-   <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>
+   <author>
+     <firstname>Jason</firstname> <surname>Gunthorpe</surname>
+     <contrib></contrib>
+   </author>
    <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>
    <date>28 October 2008</date>
    <productname>Linux</productname>
@@ -176,6 +179,7 @@
    <author>
     <firstname>Jason</firstname>
     <surname>Gunthorpe</surname>
+    <contrib></contrib>
    </author>
 ">
 
@@ -183,12 +187,14 @@
    <author>
     <firstname>Mike</firstname>
     <surname>O'Connor</surname>
+    <contrib></contrib>
    </author>
 ">
 
 <!ENTITY apt-author.team "
    <author>
     <othername>APT team</othername>
+    <contrib></contrib>
    </author>
 ">
 
@@ -196,25 +202,6 @@
    <productname>Linux</productname>
 ">
 
-<!ENTITY apt-email "
-   <address>
-    <email>apt@packages.debian.org</email>
-   </address>
-">
-
-<!ENTITY apt-author.jgunthorpe "
-   <author>
-    <firstname>Jason</firstname>
-    <surname>Gunthorpe</surname>
-   </author>
-">
-
-<!ENTITY apt-author.team "
-   <author>
-    <othername>APT team</othername>
-   </author>
-">
-
 <!ENTITY apt-copyright "
     <copyright>
      <holder>Jason Gunthorpe</holder>
-- 
cgit v1.2.3


From 1221c3a38f9962ea7ac866eb507fdd798481b5d4 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 8 Sep 2009 17:43:47 +0200
Subject: doc/apt.ent: move the description of files to globally usable
 entities

---
 doc/apt.ent | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

(limited to 'doc/apt.ent')

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 &quot;pinning&quot;,
+     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>
+">
-- 
cgit v1.2.3