commit 6e7bd6545384c8939ddc87aded6a20b8dd096e9e
author R David Murray <rdmurray@bitdance.com> Mon Oct 01 21:47:57 2012 -0400
committer R David Murray <rdmurray@bitdance.com> Mon Oct 01 21:47:57 2012 -0400
tree 8e74f7e2f79c1e4e2d66a6a7b2b7e139749a6bcd
parent 3b635cd4476422fbef7e1da1e1de66bbb939d648
parent 258fabefdefecc83914fc16f79f1131d8ee2dc80

Merge #11109: clean up docs, add whatsnew entry, and fix Justin's last name.

Misc/HISTORY

diff --git a/Misc/HISTORY b/Misc/HISTORY
index 47315dc..56507a4 100644
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -3187,8 +3187,8 @@
 - Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError
   if the file is closed.
 
-- Issue #11109: New service_action method for BaseServer, used by ForkingMixin
-  class for cleanup. Initial Patch by Justin Wark.
+- Issue #11109: New service_action method for BaseServer, used by ForkingMixIn
+  class for cleanup. Initial Patch by Justin Warkentin.
 
 - Issue #12045: Avoid duplicate execution of command in
   ctypes.util._get_soname().  Patch by Sijin Joseph.