merge heads.

d741d2b2 · Senthil Kumaran · 23c21041 · e62bada4 · d741d2b2
Commit d741d2b2 authored Jul 31, 2011 by Senthil Kumaran
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Doc/library/stdtypes.rst Doc/library/stdtypes.rst +2 -1

No files found.
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2930,7 +2930,8 @@ This object is used by extended slice notation (see :ref:`slicings`).  It
 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