Issue #22812: Fix unittest discovery examples.

Patch from Pam McA'Nulty.

diff --cc Doc/library/unittest.rst
Simple merge

diff --cc Misc/ACKS
index 7418d02b1d3b35762b4133b519cf05ebe23cbceb,cb4f5a6ea99fbb76f18263cf4d8f64a8e1b34d13..b60ee733b604043296771705877549ed8ef9807b
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -920,8 -894,8 +920,9 @@@ Daniel Ma
  Madison May
  Lucas Maystre
  Arnaud Mazin
+ Pam McA'Nulty
  Matt McClure
 +Jack McCracken
  Rebecca McCreary
  Kirk McDonald
  Chris McDonough

diff --cc Misc/NEWS
index 5035e4738ef4083d88dafc9df59e0703143cfdb7,b4fa7a1a0e980fee17cf4388949a5f53947d74f4..7dd4aa4fd7592a451f4a15660457afaf4c02113e
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -13,71 -10,67 +13,74 @@@ Release date: TB
  Core and Builtins
  -----------------
  
 -- Issue #21167: NAN operations are now handled correctly when python is
 -  compiled with ICC even if -fp-model strict is not specified.
  
 -- Issue #4395: Better testing and documentation of binary operators.
 -  Patch by Martin Panter.
 +Library
 +-------
  
 -- Issue #24467: Fixed possible buffer over-read in bytearray. The bytearray
 -  object now always allocates place for trailing null byte and it's buffer now
 -  is always null-terminated.
 +- Issue #20362: Honour TestCase.longMessage correctly in assertRegex.
 +  Patch from Ilia Kurenkov.
  
 -- Issue #24115: Update uses of PyObject_IsTrue(), PyObject_Not(),
 -  PyObject_IsInstance(), PyObject_RichCompareBool() and _PyDict_Contains()
 -  to check for and handle errors correctly.
 +- Issue #24847: Removes vcruntime140.dll dependency from Tcl/Tk.
  
 -- Issue #24257: Fixed system error in the comparison of faked
 -  types.SimpleNamespace.
 +- Issue #23572: Fixed functools.singledispatch on classes with falsy
 +  metaclasses.  Patch by Ethan Furman.
  
 -- Issue #22939: Fixed integer overflow in iterator object.  Patch by
 -  Clement Rouault.
  
 -- Issue #23985: Fix a possible buffer overrun when deleting a slice from
 -  the front of a bytearray and then appending some other bytes data.
 +Documentation
 +-------------
  
 -- Issue #24102: Fixed exception type checking in standard error handlers.
++- Issue #22812: Fix unittest discovery examples.
++  Patch from Pam McA'Nulty.
+ 
 -- Issue #23757: PySequence_Tuple() incorrectly called the concrete list API
 -  when the data was a list subclass.
  
 -- Issue #24407: Fix crash when dict is mutated while being updated.
 +What's New in Python 3.5.0 release candidate 2?
 +===============================================
  
 -- Issue #24096: Make warnings.warn_explicit more robust against mutation of the
 -  warnings.filters list.
 +Release date: 2015-08-23
  
 -- Issue #23996: Avoid a crash when a delegated generator raises an
 -  unnormalized StopIteration exception.  Patch by Stefan Behnel.
 +Core and Builtins
 +-----------------
  
 -- Issue #24022: Fix tokenizer crash when processing undecodable source code.
 +- Issue #21167: NAN operations are now handled correctly when python is
 +  compiled with ICC even if -fp-model strict is not specified.
  
 -- Issue #23309: Avoid a deadlock at shutdown if a daemon thread is aborted
 -  while it is holding a lock to a buffered I/O object, and the main thread
 -  tries to use the same I/O object (typically stdout or stderr).  A fatal
 -  error is emitted instead.
 +Library
 +-------
  
 -- Issue #22977: Fixed formatting Windows error messages on Wine.
 -  Patch by Martin Panter.
 +- Issue #24764: cgi.FieldStorage.read_multi() now ignores the Content-Length
 +  header in part headers. Patch written by Peter Landry and reviewed by Pierre
 +  Quentel.
  
 -- Issue #23803: Fixed str.partition() and str.rpartition() when a separator
 -  is wider then partitioned string.
 +- Issue #24774: Fix docstring in http.server.test. Patch from Chiu-Hsiang Hsu.
  
 -- Issue #23192: Fixed generator lambdas.  Patch by Bruno Cauet.
 +- Issue #21159: Improve message in configparser.InterpolationMissingOptionError.
 +  Patch from Łukasz Langa.
  
 -- Issue #23629: Fix the default __sizeof__ implementation for variable-sized
 -  objects.
 +- Issue #24847: Fixes tcltk installer layout of VC runtime DLL
  
 -- Issue #24044: Fix possible null pointer dereference in list.sort in out of
 -  memory conditions.
 +- Issue #24839: platform._syscmd_ver raises DeprecationWarning
  
 -- Issue #21354: PyCFunction_New function is exposed by python DLL again.
 +- Issue #24867: Fix Task.get_stack() for 'async def' coroutines
  
 -- Issue #23812: Fix asyncio.Queue.get() to avoid loosing items on cancellation.
 -  Patch by Gustavo J. A. M. Carneiro.
 +Documentation
 +-------------
 +
 +- Issue #23725: Overhaul tempfile docs. Note deprecated status of mktemp.
 +  Patch from Zbigniew Jędrzejewski-Szmek.
 +
 +What's New in Python 3.5.0 release candidate 1?
 +===============================================
 +
 +Release date: 2015-08-09
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #24492: A "package" lacking a __name__ attribute when trying to perform
 +  a ``from .. import ...`` statement will trigger an ImportError instead of an
 +  AttributeError.
 +
 +- Issue #24667: Resize odict in all cases that the underlying dict resizes.
  
  Library
  -------