diff --git a/jedi/evaluate.py b/jedi/evaluate.py
index 60ef33bb..3efd3b8d 100644
--- a/jedi/evaluate.py
+++ b/jedi/evaluate.py
@@ -8,7 +8,7 @@ search functions `get_names_for_scope` and `get_scopes_for_name`. At the end
 there are the `follow_` functions, which evaluate a statement, or parts of a
 statement.
 
-TODO nonlocal statement, needed or can be ignored? (py3k)
+.. todo:: nonlocal statement, needed or can be ignored? (py3k)
 """
 from _compatibility import next, property, hasattr, is_py3k, use_metaclass, \
                             unicode
diff --git a/jedi/parsing.py b/jedi/parsing.py
index c239aa6e..a7d600af 100644
--- a/jedi/parsing.py
+++ b/jedi/parsing.py
@@ -13,18 +13,21 @@ This original codebase of this parser, which has been refactored and heavily
 changed, was programmed by Aaron Griffin <aaronmgriffin@gmail.com>.
 
 **The structure of the following script:**
-A Scope has
+
+A Scope has:
+
 - imports (Import)
 - subscopes (Scope, Class, Function, Flow)
 - statements (Statement)
 
-All these objects have `Name`s. `Call` and `Array` are used as detail objects
-of a statement.
+All these objects have ``Name``. ``Call`` and ``Array`` are used as detail
+objects of a statement.
 
 All those classes are being generated by PyFuzzyParser, which takes python text
 as input and ignores just all the non-python stuff. Basically you could feed it
 a perl script, and it should still work (which means throw no error).
-TODO remove docstr params from Scope.__init__()
+
+.. todo:: remove docstr params from Scope.__init__()
 """
 from _compatibility import (next, literal_eval, StringIO, unicode,
                             property, cleandoc, Python3Method)