diff --git a/README.txt b/README.txt
index cdceb99be18f734e9cb07b5155b5f7d6e59118a1..183ad4025453c2bd3fe5da8015ba1b66f373c894 100644
--- a/README.txt
+++ b/README.txt
@@ -6,6 +6,12 @@ needed attributes in the normal way.
 
 mock is tested on Python versions 2.4-2.7 and Python 3.
 
+.. note::
+
+    You can install the latest alpha version of `mock (0.8 alpha 1)
+    <http://www.voidspace.org.uk/downloads/mock-0.8.0alpha1.tar.gz#egg=mock-dev>`_
+    with `pip install mock==dev`.
+
 The mock module also provides utility functions / objects to assist with
 testing, particularly monkey patching.
 
diff --git a/docs/examples.txt b/docs/examples.txt
index a4644eea1b2ba89033b0a762c3f59b2d639176d4..6408c945c7cbd299a3ebfac27e5a7a7053794775 100644
--- a/docs/examples.txt
+++ b/docs/examples.txt
@@ -245,6 +245,54 @@ function in the module under test instead of patching it globally:
     >>> file_handle.write.assert_called_with('something')
 
 
+Mocking a Generator Method
+==========================
+
+A generator method is a method that uses the `yield statement
+<http://docs.python.org/reference/simple_stmts.html#the-yield-statement>`_ to
+return a series of values when iterated over.
+
+A generator method is called to return the generator object. It is the generator
+object that is then iterated over. The protocol method for iteration is
+`__iter__ <http://docs.python.org/library/stdtypes.html#container.__iter__>`_,
+so we can mock this using a `MagicMock`.
+
+Here's an example class:
+
+.. doctest::
+
+    >>> class Foo(object):
+    ...     def iter(self):
+    ...         for i in [1, 2, 3]:
+    ...             yield i
+    ...
+    >>> foo = Foo()
+    >>> list(foo.iter())
+    [1, 2, 3]
+
+To configure the values returned from the iteration (implicit in the call to
+`list`), we need to configure the iterator returned by the call to `foo.iter()`.
+
+.. doctest::
+
+    >>> values = [1, 2, 3]
+    >>> mock_foo = MagicMock()
+    >>> iterable = mock_foo.iter.return_value
+    >>> iterator = iter(values)
+    >>> iterable.__iter__.return_value = iterator
+    >>> list(mock_foo.iter())
+    [1, 2, 3]
+
+The above example is done step-by-step. The shorter version is:
+
+.. doctest::
+
+    >>> mock_foo = MagicMock()
+    >>> mock_foo.iter.return_value.__iter__.return_value = iter([1, 2, 3])
+    >>> list(mock_foo.iter())
+    [1, 2, 3]
+
+
 Applying the same patch to every test method
 ============================================