[Python-3000-checkins] r59305 - python/branches/py3k/Doc/glossary.rst

[georg.brandl]

Author: georg.brandl
Date: Mon Dec  3 22:07:25 2007
New Revision: 59305

Modified:
   python/branches/py3k/Doc/glossary.rst
Log:
Fix merging glitch.


Modified: python/branches/py3k/Doc/glossary.rst
==============================================================================
--- python/branches/py3k/Doc/glossary.rst	(original)
+++ python/branches/py3k/Doc/glossary.rst	Mon Dec  3 22:07:25 2007
@@ -400,7 +400,7 @@
       :term:`immutable` keys rather than integers.
 
    slice
-      A list containing a portion of an indexed list-like object.  A slice is
+      An object usually containing a portion of a :term:`sequence`.  A slice is
       created using the subscript notation, ``[]`` with colons between numbers
       when several are given, such as in ``variable_name[1:3:5]``.  The bracket
       (subscript) notation uses :class:`slice` objects internally.