merge from the debian-sid branch

3 files changed, 12 insertions, 1 deletions

diff --git a/doc/source/apt/cache.rst b/doc/source/apt/cache.rst
index d96cba97..beae74a2 100644
--- a/doc/source/apt/cache.rst
+++ b/doc/source/apt/cache.rst
@@ -70,6 +70,11 @@ packages whose state has been changed, eg. packages marked for installation::
     >>> print len(changed) == len(cache.GetChanges()) # Both need to have same length
     True
 
+The ProblemResolver class
+--------------------------
+
+.. autoclass:: ProblemResolver
+    :members:
 
 Exceptions
 ----------
diff --git a/doc/source/apt/index.rst b/doc/source/apt/index.rst
index 5047a0fd..bf39354f 100644
--- a/doc/source/apt/index.rst
+++ b/doc/source/apt/index.rst
@@ -56,3 +56,6 @@ in the package.
 
     Please see :class:`apt.package.Package` for documentation.
 
+.. class:: ProblemResolver
+
+    Please see :class:`apt.cache.ProblemResolver` for documentation.
diff --git a/doc/source/apt_pkg/cache.rst b/doc/source/apt_pkg/cache.rst
index af67d82f..334b7869 100644
--- a/doc/source/apt_pkg/cache.rst
+++ b/doc/source/apt_pkg/cache.rst
@@ -227,7 +227,7 @@ Classes in apt_pkg
         Open the package cache again. The parameter *progress* may be set to
         an :class:`apt.progress.OpProgress()` object or `None`.
 
-    .. method:: Update(progress, list)
+    .. method:: Update(progress, list[, pulseInterval])
 
         Update the package cache.
 
@@ -237,6 +237,9 @@ Classes in apt_pkg
         The parameter *list* refers to an object as returned by
         :func:`apt_pkg.GetPkgSourceList`.
 
+        The optional parameter *pulseInterval* describes the interval between
+        the calls to the :meth:`FetchProgress.pulse` method.
+
     .. attribute:: DependsCount
 
         The total number of dependencies.