diff options
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/library/apt.progress.base.rst | 6 | ||||
| -rw-r--r-- | doc/source/library/apt_pkg.rst | 2 | ||||
| -rw-r--r-- | doc/source/tutorials/contributing.rst | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/source/library/apt.progress.base.rst b/doc/source/library/apt.progress.base.rst index 3fd2a7a0..22006f77 100644 --- a/doc/source/library/apt.progress.base.rst +++ b/doc/source/library/apt.progress.base.rst @@ -233,7 +233,7 @@ InstallProgress (Abstract) Called when a error is detected during the install. - The following method should be overriden to implement progress reporting + The following method should be overridden to implement progress reporting for dpkg-based runs i.e. calls to :meth:`run` with a filename: .. method:: processing(pkg, stage) @@ -252,7 +252,7 @@ InstallProgress file (:file:`/var/lib/dpkg/status`) and documented in :manpage:`dpkg(1)`. - The following methods should be overriden to implement progress reporting + The following methods should be overridden to implement progress reporting for :meth:`run` calls with an :class:`apt_pkg.PackageManager` object as their parameter: @@ -274,7 +274,7 @@ InstallProgress This method is called when all changes have been applied. There are also several methods which are fully implemented and should not - be overriden by subclasses unless the subclass has very special needs: + be overridden by subclasses unless the subclass has very special needs: .. method:: fork() -> int diff --git a/doc/source/library/apt_pkg.rst b/doc/source/library/apt_pkg.rst index 81f2d408..ffef9c50 100644 --- a/doc/source/library/apt_pkg.rst +++ b/doc/source/library/apt_pkg.rst @@ -45,7 +45,7 @@ Working with the cache .. note:: - The cache supports colon-seperated name:architecture pairs. For + 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 "name:any" is equivalent to ("name:any", "any"). This is done so diff --git a/doc/source/tutorials/contributing.rst b/doc/source/tutorials/contributing.rst index 0735982b..aae7f382 100644 --- a/doc/source/tutorials/contributing.rst +++ b/doc/source/tutorials/contributing.rst @@ -232,12 +232,12 @@ The coding style for all code written in python is :PEP:`8`. Exceptions from this rule are the documentation, where code is sometimes formatted differently to explain aspects, and functions provided for 0.7 compatibility purposes. -When writing code, use tools like pylint, pyflakes, pychecker and pep8.py from -http://svn.browsershots.org/trunk/devtools/pep8/ to verify that your code is +When writing code, use tools like pylint, pyflakes, pychecker and pep8.py +(all available from Debian/Ubuntu) to verify that your code is OK. Fix all the problems which seem reasonable, and mention the unfixed issues when asking for merge. -In order to make the automatic generation of Python 3 code using 2to possible, +In order to make the automatic generation of Python 3 code using 2to3 possible, code written in Python may not utilize any functionality unsupported by 2to3 or deprecated as of Python 2.6. |