From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 17 Jan 2014 15:31:19 +0000 (-0600)
Subject: Merge typo/grammar fixes from 3.3.
X-Git-Tag: v3.4.0b3~121
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50c8583492dfe475a44ffc3cd4ed96903a844144;p=python

Merge typo/grammar fixes from 3.3.
---

50c8583492dfe475a44ffc3cd4ed96903a844144
diff --cc Misc/NEWS
index 662b2cd37c,d4de9d07c3..f031f91457
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -41,9 -59,9 +41,9 @@@ Librar
    functions now conform to PEP 3333 when handle non-ASCII URLs.
  
  - Issue #19097: Raise the correct Exception when cgi.FieldStorage is given an
-   Invalid fileobj.
+   invalid fileobj.
  
 -- Issue #20217: Fix build in SCHED_SPORADIC is defined.
 +- Issue #20152: Ported Python/import.c over to Argument Clinic.
  
  - Issue #13107: argparse and optparse no longer raises an exception when output
    a help on environment with too small COLUMNS.  Based on patch by
@@@ -447,7 -267,9 +447,7 @@@ Test
  
  - Issue #19320: test_tcl no longer fails when wantobjects is false.
  
- - Issue #19919: Fix flacky SSL test. connect_ex() sometimes returns
 -- Issue #19683: Removed empty tests from test_minidom.  Patch by Ajitesh Gupta.
 -
+ - Issue #19919: Fix flaky SSL test. connect_ex() sometimes returns
    EWOULDBLOCK on Windows or VMs hosted on Windows.
  
  - Issue #19912: Added tests for ntpath.splitunc().
@@@ -496,7 -309,10 +496,7 @@@ Documentatio
  - Issue #20253: Fixed a typo in the ipaddress docs that advertised an
    illegal attribute name.  Found by INADA Naoki.
  
- - Issue #18840: Introduce the json module in the tutorial, and deemphasize
 -- Issue #19963: Document that importlib.import_module() no longer requires
 -  importing parent packages separately.
 -
+ - Issue #18840: Introduce the json module in the tutorial, and de-emphasize
    the pickle module.
  
  - Issue #19845: Updated the Compiling Python on Windows section.