Merge branch 'debian/jessie' into debian/experimental

[apt.git] / doc / dpkg-tech.dbk

diff --git a/doc/dpkg-tech.dbk b/doc/dpkg-tech.dbk
index e7d150cee5badbaba70254e71c53cadb466d12df..2584cf640bce1c57739811e28a74ec813544ec2d 100644 (file)
--- a/doc/dpkg-tech.dbk
+++ b/doc/dpkg-tech.dbk
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- -*- DocBook -*- -->

 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [

+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;

 <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
 <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;

+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;

 ]>
 
 <book lang="en">
 ]>
 
 <book lang="en">


@@ -221,13 +222,11 @@ Where <replaceable>Want</replaceable> may be one of
 <emphasis>unknown</emphasis>, <emphasis>install</emphasis>,
 <emphasis>hold</emphasis>, <emphasis>deinstall</emphasis>,
 <emphasis>purge</emphasis>. <replaceable>Flag</replaceable> may
 <emphasis>unknown</emphasis>, <emphasis>install</emphasis>,
 <emphasis>hold</emphasis>, <emphasis>deinstall</emphasis>,
 <emphasis>purge</emphasis>. <replaceable>Flag</replaceable> may

-be one of <emphasis>ok</emphasis>, <emphasis>reinstreq</emphasis>,
-<emphasis>hold</emphasis>,
-<emphasis>hold-reinstreq</emphasis>. <replaceable>Status</replaceable> may
-be one of <emphasis>not-installed</emphasis>, <emphasis>unpacked</emphasis>,
-<emphasis>half-configured</emphasis>, <emphasis>installed</emphasis>,
-<emphasis>half-installed</emphasis> <emphasis>config-files</emphasis>,
-<emphasis>post-inst-failed</emphasis>, <emphasis>removal-failed</emphasis>.
+be one of <emphasis>ok</emphasis>, <emphasis>reinstreq</emphasis>.
+<replaceable>Status</replaceable> may
+be one of <emphasis>not-installed</emphasis>, <emphasis>config-files</emphasis>,
+<emphasis>half-installed</emphasis>, <emphasis>unpacked</emphasis>,
+<emphasis>half-configured</emphasis> and <emphasis>installed</emphasis>.

 The states are as follows:-
 </para>
 <variablelist>
 The states are as follows:-
 </para>
 <variablelist>


@@ -286,22 +285,6 @@ nothing else.
 </para>
 </listitem>
 </varlistentry>
 </para>
 </listitem>
 </varlistentry>

-<varlistentry>
-<term>post-inst-failed</term>
-<listitem>
-<para>
-Old name for half-configured. Do not use.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>removal-failed</term>
-<listitem>
-<para>
-Old name for half-installed. Do not use.
-</para>
-</listitem>
-</varlistentry>

 </variablelist>
 <para>
 The two last items are only left in dpkg for compatibility - they are
 </variablelist>
 <para>
 The two last items are only left in dpkg for compatibility - they are