merged -r1901..1911 from lp:~donkult/apt/sid

[apt.git] / doc / cache.sgml

diff --git a/doc/cache.sgml b/doc/cache.sgml
index aa87db98680c4c48c9067d0e8273027330681df9..aea5a45c35c580199117872310044143e0fe5c89 100644 (file)
--- a/doc/cache.sgml
+++ b/doc/cache.sgml
@@ -492,7 +492,7 @@ This is the parsed priority value of the package.
 Dependency contains the information for a single dependency record. The records
 are split up like this to ease processing by the client. The base of list
 linked list is Version.DependsList. All forms of dependencies are recorded
 Dependency contains the information for a single dependency record. The records
 are split up like this to ease processing by the client. The base of list
 linked list is Version.DependsList. All forms of dependencies are recorded

-here including Conflicts, Suggests and Recommends.
+here including Conflicts, Breaks, Suggests and Recommends.

 
 <p>
 Multiple depends on the same package must be grouped together in 
 
 <p>
 Multiple depends on the same package must be grouped together in 


@@ -671,6 +671,7 @@ of them.
 #define pkgDEP_Recommends 4
 #define pkgDEP_Conflicts 5
 #define pkgDEP_Replaces 6
 #define pkgDEP_Recommends 4
 #define pkgDEP_Conflicts 5
 #define pkgDEP_Replaces 6

+#define pkgDEP_Breaks 8

 </example>
 </sect1>
 
 </example>
 </sect1>
 


@@ -720,6 +721,8 @@ or'd with the current package.
 #define pkgSTATE_HalfInstalled 4
 #define pkgSTATE_ConfigFiles 5
 #define pkgSTATE_Installed 6
 #define pkgSTATE_HalfInstalled 4
 #define pkgSTATE_ConfigFiles 5
 #define pkgSTATE_Installed 6

+#define pkgSTATE_TriggersAwaited 7
+#define pkgSTATE_TriggersPending 8

 </example>
 </sect1>
 
 </example>
 </sect1>