[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#20110)

[benjamin.peterson]

http://hg.python.org/cpython/rev/3e75f649e93b
changeset:   88264:3e75f649e93b
parent:      88262:04af288c004c
parent:      88263:203ca77ea819
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Jan 02 16:48:24 2014 -0600
summary:
  merge 3.3 (#20110)

files:
  Doc/reference/datamodel.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -495,7 +495,7 @@
       | :attr:`__annotations__` | A dict containing annotations | Writable  |
       |                         | of parameters.  The keys of   |           |
       |                         | the dict are the parameter    |           |
-      |                         | names, or ``'return'`` for    |           |
+      |                         | names, and ``'return'`` for   |           |
       |                         | the return annotation, if     |           |
       |                         | provided.                     |           |
       +-------------------------+-------------------------------+-----------+

-- 
Repository URL: http://hg.python.org/cpython