diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-10-15 10:58:42 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-10-15 10:58:42 +0200 |
| commit | 2e754964b0570ff72c82aa012142adf504e01f0e (patch) | |
| tree | a6cf324f43fe5fd11a5651c6f8186a987a1da922 /doc/source/library | |
| parent | 43d87e1b14719750585412ab1d15fc30e280b7d0 (diff) | |
| parent | 7bd938dd78ab27ec23ffd84811dbdfa5dd83593a (diff) | |
| download | python-apt-2e754964b0570ff72c82aa012142adf504e01f0e.tar.gz | |
merge from the debian-sid branch
Diffstat (limited to 'doc/source/library')
| -rw-r--r-- | doc/source/library/apt.progress.base.rst | 2 | ||||
| -rw-r--r-- | doc/source/library/apt_pkg.rst | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/source/library/apt.progress.base.rst b/doc/source/library/apt.progress.base.rst index 22006f77..7d43fe92 100644 --- a/doc/source/library/apt.progress.base.rst +++ b/doc/source/library/apt.progress.base.rst @@ -51,7 +51,7 @@ AcquireProgress is called whenever a media change is needed to ask the user to insert the needed media. - The parameter *media* decribes the name of the the media type that + The parameter *media* decribes the name of the media type that should be changed, whereas the parameter *drive* should be the identifying name of the drive whose media should be changed. diff --git a/doc/source/library/apt_pkg.rst b/doc/source/library/apt_pkg.rst index b5ee1a53..7a359652 100644 --- a/doc/source/library/apt_pkg.rst +++ b/doc/source/library/apt_pkg.rst @@ -47,7 +47,7 @@ Working with the cache The cache supports colon-separated name:architecture pairs. For normal architectures, they are equal to a (name, architecture) - tuple. For the the "any" architecture behavior is different, as + tuple. For the "any" architecture behavior is different, as "name:any" is equivalent to ("name:any", "any"). This is done so that "name:any" matches all packages with that name which have Multi-Arch: allowed set. @@ -410,17 +410,17 @@ Installing with :class:`PackageManager` .. attribute:: RESULT_COMPLETED - A constant for checking whether the the result of the call to + A constant for checking whether the result of the call to :meth:`do_install` is 'failed'. .. attribute:: RESULT_FAILED - A constant for checking whether the the result of the call to + A constant for checking whether the result of the call to :meth:`do_install` is 'failed'. .. attribute:: RESULT_INCOMPLETE - A constant for checking whether the the result of the call to + A constant for checking whether the result of the call to :meth:`do_install` is 'incomplete'. All instances of this class also support the following methods: |