merge with 0.6

tests/root/contents.txt

@@ -24,6 +24,7 @@ Contents:
    metadata
    extensions
    doctest
+   extensions
 
    Python <http://python.org/>
 

tests/root/extensions.txt

@@ -6,3 +6,23 @@ extlinks
 
 Test diverse links: :issue:`1000` and :pyurl:`dev/`, also with
 :issue:`explicit caption <1042>`.
+
+
+todo
+----
+
+.. todo::
+
+   Test the todo extension.
+
+.. todo::
+
+   Test with |sub| (see #286).
+
+.. |sub| replace:: substitution references
+
+
+list of all todos
+^^^^^^^^^^^^^^^^^
+
+.. todolist::