[Python-checkins] cpython (merge 2.7 -> 2.7): merge heads.

[senthil.kumaran]

http://hg.python.org/cpython/rev/28f48324e42f
changeset:   71653:28f48324e42f
branch:      2.7
parent:      71652:abf6887b58c1
parent:      71649:ff9d5e6dfdb8
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sun Jul 31 11:50:15 2011 +0800
summary:
  merge heads.

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


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2930,7 +2930,8 @@
 supports no special operations.  There is exactly one ellipsis object, named
 :const:`Ellipsis` (a built-in name).
 
-It is written as ``Ellipsis`` or ``...``.
+It is written as ``Ellipsis``.  When in a subscript, it can also be written as
+``...``, for example ``seq[...]``.
 
 
 The NotImplemented Object

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