Updated multiprocessing module docs and main doc link page

1 files changed, 9 insertions, 12 deletions

diff --git a/functional_tests/doc_tests/test_multiprocess/multiprocess.rst b/functional_tests/doc_tests/test_multiprocess/multiprocess.rst
index c1ba530..8de2802 100644
--- a/functional_tests/doc_tests/test_multiprocess/multiprocess.rst
+++ b/functional_tests/doc_tests/test_multiprocess/multiprocess.rst
@@ -3,8 +3,9 @@ Parallel Testing with nose
 
 .. Note ::
 
-   The multiprocess plugin requires the multiprocessing_ module, available from
-   PyPI and at http://code.google.com/p/python-multiprocessing/.
+   Use of the multiprocess plugin on python 2.5 or earlier requires
+   the multiprocessing_ module, available from PyPI and at
+   http://code.google.com/p/python-multiprocessing/.
 
 ..
 
@@ -14,10 +15,6 @@ speed up CPU-bound test runs, it is mainly useful for IO-bound tests
 that spend most of their time waiting for data to arrive from someplace
 else and can benefit from parallelization.
 
-.. warning ::
-
-   The multiprocess plugin is not available on Windows.
-
 .. _multiprocessing : http://code.google.com/p/python-multiprocessing/
 
 How tests are distributed
@@ -66,7 +63,7 @@ A class might look like::
       @classmethod
       def setup_class(cls):
           ...
-      
+
 Alternatively, If a context's fixtures may only be run once, or may not run
 concurrently, but *may* be shared by tests running in different processes
 -- for instance a package-level fixture that starts an external http server or
@@ -106,11 +103,11 @@ and the third is unmarked. They all define the same fixtures:
     def setup():
         print "setup called"
         called.append('setup')
-        
+
     def teardown():
         print "teardown called"
         called.append('teardown')
-    
+
 And each has two tests that just test that ``setup()`` has been called
 once and only once.
 
@@ -135,7 +132,7 @@ all tests pass.
     >>> test_can_split = os.path.join(support, 'test_can_split.py')
 
 The module with shared fixtures passes.
-    
+
     >>> run(argv=['nosetests', '-v', test_shared]) #doctest: +REPORT_NDIFF
     setup called
     test_shared.TestMe.test_one ... ok
@@ -149,7 +146,7 @@ The module with shared fixtures passes.
     OK
 
 As does the module with no fixture annotations.
-    
+
     >>> run(argv=['nosetests', '-v', test_not_shared]) #doctest: +REPORT_NDIFF
     setup called
     test_not_shared.TestMe.test_one ... ok
@@ -163,7 +160,7 @@ As does the module with no fixture annotations.
     OK
 
 And the module that marks its fixtures as re-entrant.
-    
+
     >>> run(argv=['nosetests', '-v', test_can_split]) #doctest: +REPORT_NDIFF
     setup called
     test_can_split.TestMe.test_one ... ok