[Python-checkins] cpython (merge 3.5 -> 3.6): merge 3.5 (#28525)

[benjamin.peterson]

https://hg.python.org/cpython/rev/f9a04afaeece
changeset:   104684:f9a04afaeece
branch:      3.6
parent:      104681:523aecdb8d5f
parent:      104683:05b5e1aaedc5
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Oct 24 23:00:18 2016 -0700
summary:
  merge 3.5 (#28525)

files:
  Doc/library/gc.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/gc.rst b/Doc/library/gc.rst
--- a/Doc/library/gc.rst
+++ b/Doc/library/gc.rst
@@ -38,7 +38,7 @@
    Returns true if automatic collection is enabled.
 
 
-.. function:: collect(generations=2)
+.. function:: collect(generation=2)
 
    With no arguments, run a full collection.  The optional argument *generation*
    may be an integer specifying which generation to collect (from 0 to 2).  A

-- 
Repository URL: https://hg.python.org/cpython