changeset:   83574:747cede24367
parent:      83572:cf65c7a75f55
parent:      83573:474f28bf67b3
user:        Ezio Melotti <ezio.melotti@gmail.com>
date:        Tue Apr 30 23:34:41 2013 +0300
description:
#16518: merge with 3.3.


diff -r cf65c7a75f55 -r 747cede24367 Doc/glossary.rst
--- a/Doc/glossary.rst	Tue Apr 30 09:41:40 2013 -0400
+++ b/Doc/glossary.rst	Tue Apr 30 23:34:41 2013 +0300
@@ -78,6 +78,10 @@
       Benevolent Dictator For Life, a.k.a. `Guido van Rossum
       <http://www.python.org/~guido/>`_, Python's creator.
 
+   bytes-like object
+      An object that supports the :ref:`bufferobjects`, like :class:`bytes` or
+      :class:`bytearray`.
+
    bytecode
       Python source code is compiled into bytecode, the internal representation
       of a Python program in the CPython interpreter.  The bytecode is also