summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt/cache.py4
-rw-r--r--debian/changelog4
2 files changed, 6 insertions, 2 deletions
diff --git a/apt/cache.py b/apt/cache.py
index be137b76..49097dd2 100644
--- a/apt/cache.py
+++ b/apt/cache.py
@@ -507,7 +507,7 @@ class Cache(object):
self._callbacks[name].append(callback)
def actiongroup(self):
- """Return an ActionGroup() object for the current cache.
+ """Return an action group object for the current cache.
Action groups can be used to speedup actions. The action group is
active as soon as it is created, and disabled when the object is
@@ -520,7 +520,7 @@ class Cache(object):
for package in my_selected_packages:
package.mark_install()
- This way, the ActionGroup is automatically released as soon as the
+ This way, the action group is automatically released as soon as the
with statement block is left. It also has the benefit of making it
clear which parts of the code run with a action group and which
don't.
diff --git a/debian/changelog b/debian/changelog
index 758c49b9..7fa0f624 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
python-apt (0.8.2) UNRELEASED; urgency=low
+ [ Michael Vogt ]
* merged from ubuntu:
- use logging instead of print
- update distro template Ubuntu.info.in
@@ -10,6 +11,9 @@ python-apt (0.8.2) UNRELEASED; urgency=low
- updated, thanks to Sergio Cipolla (closes: #628398)
* po/da.po:
- updated, thanks to Joe Dalton (closes: #631309)
+
+ [ Tshepang Lekhonkhobe ]
+ * rm usage of camelcase in cache.py doc (closes: #626617)
-- Michael Vogt <mvo@debian.org> Wed, 19 Oct 2011 18:03:42 +0200