* apt-pkg/deb/debsystem.cc:

  - add better config item for extended_states file

3 files changed, 10 insertions, 8 deletions

diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml
index 3f6cc78f5..8e07cd7d9 100644
--- a/doc/apt-mark.8.xml
+++ b/doc/apt-mark.8.xml
@@ -121,12 +121,7 @@
 
  <refsect1><title>Files</title>
    <variablelist>
-      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>
-      <listitem><para>Status list of auto-installed packages.
-		      Configuration Item: <literal>Dir::State</literal>
-		      sets the path to the <filename>extended_states</filename> file.
-      </para></listitem>
-      </varlistentry>
+	&file-extended_states;
    </variablelist>
  </refsect1>
 
diff --git a/doc/apt.ent b/doc/apt.ent
index 494c6b02c..0d037c8bb 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -363,6 +363,14 @@
      </varlistentry>
 ">
 
+<!ENTITY file-extended_states "
+      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>
+      <listitem><para>Status list of auto-installed packages.
+      Configuration Item: <literal>Dir::State::extended_states</literal>.
+      </para></listitem>
+      </varlistentry>
+">
+
 <!-- TRANSLATOR: This is the section header for the following paragraphs - comparable
      to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->
 <!ENTITY translation-title "TRANSLATION">
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index d168417d8..487c09acb 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -294,9 +294,8 @@ Dir "/"
   State "var/lib/apt/" 
   {
      Lists "lists/";
-     xstatus "xstatus";
-     userstatus "status.user";
      status "/var/lib/dpkg/status";
+     extended_states "extended_states";
      cdroms "cdroms.list";
   };