From: Georg Brandl <georg@python.org>
Date: Mon, 3 Dec 2007 21:07:25 +0000 (+0000)
Subject: Fix merging glitch.
X-Git-Tag: v3.0a2~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6fe37bab927bd00e0f2fed8a431adb7d2b6d303;p=thirdparty%2FPython%2Fcpython.git

Fix merging glitch.
---

diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 6465c8315687..3459bdada72a 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -400,7 +400,7 @@ Glossary
       :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.