Remove newline in url that broke the link in the docs.

Fix syntax error in docs example.

Remove conflict marker remains from previous conflict.

Remove trailing whitespace from source example in docs

Resolve syntax errors in doc sample code.

doc/for-test-authors.rst

@@ -305,7 +305,6 @@ function in ``testtools.assertions`` This behaves like the method version does::
             assert_that(result, Not(Equals(50)))
 
 
-=======
 Delayed Assertions
 ~~~~~~~~~~~~~~~~~~
 
@@ -463,7 +462,7 @@ example::
       except RuntimeError:
           exc_info = sys.exc_info()
       self.assertThat(exc_info, MatchesException(RuntimeError))
-      self.assertThat(exc_info, MatchesException(RuntimeError('bar'))
+      self.assertThat(exc_info, MatchesException(RuntimeError('bar')))
 
 Most of the time, you will want to uses `The raises helper`_ instead.
 
@@ -653,7 +652,7 @@ Used to add custom notes to a matcher.  For example::
   def test_annotate_example(self):
       result = 43
       self.assertThat(
-          result, Annotate("Not the answer to the Question!", Equals(42))
+          result, Annotate("Not the answer to the Question!", Equals(42)))
 
 Since the annotation is only ever displayed when there is a mismatch
 (e.g. when ``result`` does not equal 42), it's a good idea to phrase the note
@@ -866,7 +865,7 @@ matcher based on it::
           divisible, '{0} is not divisible by {1}')
       self.assertThat(7, IsDivisibleBy(1))
       self.assertThat(7, IsDivisibleBy(7))
-      self.assertThat(7, IsDivisibleBy(2)))
+      self.assertThat(7, IsDivisibleBy(2))
       # This will fail.
 
 Which will produce the error message::
@@ -1399,7 +1398,7 @@ id and can be used when filtering tests by id. (e.g. via ``--load-list``)::
       def test_one(self):
           pass
 
-      @attr('more', 'than', 'one)
+      @attr('more', 'than', 'one')
       def test_two(self):
           pass
 

doc/hacking.rst

@@ -93,10 +93,10 @@ Tests belong in ``testtools/tests/``.
 Committing to trunk
 -------------------
 
-Testtools is maintained using git, with its master repo at https://github.com
-/testing-cabal/testtools. This gives every contributor the ability to commit
-their work to their own branches. However permission must be granted to allow
-contributors to commit to the trunk branch.
+Testtools is maintained using git, with its master repo at
+https://github.com/testing-cabal/testtools. This gives every contributor the
+ability to commit their work to their own branches. However permission must be
+granted to allow contributors to commit to the trunk branch.
 
 Commit access to trunk is obtained by joining the `testing-cabal`_, either as an
 Owner or a Committer. Commit access is contingent on obeying the testtools

doc/overview.rst

@@ -26,7 +26,7 @@ What better way to start than with a contrived code snippet?::
       def attach_log_file(self):
           self.addDetail(
               'log-file',
-              Content(UTF8_TEXT
+              Content(UTF8_TEXT,
                       lambda: open(self.server.logfile, 'r').readlines()))
 
       def test_server_is_cool(self):