Merge 0.7.13.0 from unstable.

2 files changed, 9 insertions, 1 deletions

diff --git a/doc/source/library/apt.cache.rst b/doc/source/library/apt.cache.rst
index ddb2dc64..d0e44598 100644
--- a/doc/source/library/apt.cache.rst
+++ b/doc/source/library/apt.cache.rst
@@ -70,6 +70,11 @@ packages whose state has been changed, eg. packages marked for installation::
     >>> print len(changed) == len(cache.get_changes()) # Both need to have same length
     True
 
+The ProblemResolver class
+--------------------------
+
+.. autoclass:: ProblemResolver
+    :members:
 
 Exceptions
 ----------
diff --git a/doc/source/library/apt_pkg.rst b/doc/source/library/apt_pkg.rst
index ee0c33ef..720b61a3 100644
--- a/doc/source/library/apt_pkg.rst
+++ b/doc/source/library/apt_pkg.rst
@@ -41,13 +41,16 @@ Working with the cache
         Return the :class:`Package()` object for the package name given by
         *pkgname*.
 
-    .. method:: update(progress, list)
+    .. method:: update(progress, list[, pulse_interval])
 
         Update the package cache.
 
         The parameter *progress* points to an :class:`apt.progress.FetchProgress()`
         object. The parameter *list* refers to a :class:`SourceList()` object.
 
+        The optional parameter *pulse_interval* describes the interval between
+        the calls to the :meth:`FetchProgress.pulse` method.
+
     .. attribute:: depends_count
 
         The total number of dependencies.