[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #29217: Merge 3.5.

[xiang.zhang]

https://hg.python.org/cpython/rev/aabb9360ff93
changeset:   106079:aabb9360ff93
branch:      3.6
parent:      106075:d966ccda9f17
parent:      106078:1f8e8e16e996
user:        Xiang Zhang <angwerzx at 126.com>
date:        Tue Jan 10 11:30:02 2017 +0800
summary:
  Issue #29217: Merge 3.5.

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


diff --git a/Doc/library/uuid.rst b/Doc/library/uuid.rst
--- a/Doc/library/uuid.rst
+++ b/Doc/library/uuid.rst
@@ -111,7 +111,7 @@
 .. attribute:: UUID.variant
 
    The UUID variant, which determines the internal layout of the UUID. This will be
-   one of the integer constants :const:`RESERVED_NCS`, :const:`RFC_4122`,
+   one of the constants :const:`RESERVED_NCS`, :const:`RFC_4122`,
    :const:`RESERVED_MICROSOFT`, or :const:`RESERVED_FUTURE`.
 
 

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