merge heads.

2011-07-31 11:50:15 +08:00 · 2011-07-31 11:50:15 +08:00 · d741d2b2ab
parent 23c2104118 e62bada41e
commit d741d2b2ab
1 changed files with 2 additions and 1 deletions
--- 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