Merge lp:~jml/testtools/epytext-fixes into lp:~testtools-committers/testtools/trunk

[Jonathan Lange]

Fixes epytext glitches.

[Robert Collins (lifeless)]

Doit

=== modified file 'testtools/tags.py'
--- testtools/tags.py	2012-04-12 16:26:02 +0000
+++ testtools/tags.py	2012-09-21 15:26:50 +0000
@@ -9,9 +9,9 @@
     def __init__(self, parent=None):
         """Create a new TagContext.
 
-        :parent: If provided, uses this as the parent context.  Any tags that
-            are current on the parent at the time of construction are current
-            in this context.
+        :param parent: If provided, uses this as the parent context.  Any tags
+            that are current on the parent at the time of construction are
+            current in this context.
         """
         self.parent = parent
         self._tags = set()

=== modified file 'testtools/testresult/real.py'
--- testtools/testresult/real.py	2012-05-07 02:51:19 +0000
+++ testtools/testresult/real.py	2012-09-21 15:26:50 +0000
@@ -357,12 +357,12 @@
 class ThreadsafeForwardingResult(TestResult):
     """A TestResult which ensures the target does not receive mixed up calls.
 
-    Multiple ``ThreadsafeForwardingResult``s can forward to the same target
+    Multiple ``ThreadsafeForwardingResults`` can forward to the same target
     result, and that target result will only ever receive the complete set of
     events for one test at a time.
 
     This is enforced using a semaphore, which further guarantees that tests
-    will be sent atomically even if the ``ThreadsafeForwardingResult``s are in
+    will be sent atomically even if the ``ThreadsafeForwardingResults`` are in
     different threads.
 
     ``ThreadsafeForwardingResult`` is typically used by