merged from the debian-sid branch

2 files changed, 4 insertions, 4 deletions

diff --git a/doc/source/tutorials/apt-cdrom.rst b/doc/source/tutorials/apt-cdrom.rst
index 0561e082..5dd88743 100644
--- a/doc/source/tutorials/apt-cdrom.rst
+++ b/doc/source/tutorials/apt-cdrom.rst
@@ -98,7 +98,7 @@ it is a boolean argument. Afterwards you could use
 location of the mount pint. ``('c',"config-file","","ConfigFile")`` shows how
 to include configuration files. This option takes a parameter which points to
 a configuration file which will be added to the configuration space.
-('o',"option","","ArbItem") is yet another type of option, which allows users
+``('o',"option","","ArbItem")`` is yet another type of option, which allows users
 to set configuration options on the commandline.
 
 Now we have to check whether help or version is specified, and print a message
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.