summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-08-02 18:06:19 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-08-02 18:06:19 (GMT)
commit9c46480063c7cb758525654066158f33a60b2b12 (patch)
treef1396bb69cb6394445abab182f7e8169898f4639
parent7761b951db469106de297cda1aaa24a95d52d833 (diff)
parente4f9e2ff2198357605e38e4e1cfade5fbe097213 (diff)
downloadcpython-9c46480063c7cb758525654066158f33a60b2b12.zip
cpython-9c46480063c7cb758525654066158f33a60b2b12.tar.gz
cpython-9c46480063c7cb758525654066158f33a60b2b12.tar.bz2
merge heads
-rw-r--r--Doc/library/stdtypes.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 8a117ba..aa7af6d 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2329,7 +2329,7 @@ An example of dictionary view usage::
>>> keys & {'eggs', 'bacon', 'salad'}
{'bacon'}
>>> keys ^ {'sausage', 'juice'}
- {'juice', 'eggs', 'bacon', 'spam'}
+ {'juice', 'sausage', 'bacon', 'spam'}
.. _typememoryview: