[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

[georg.brandl]

https://hg.python.org/cpython/rev/4686aca7501e
changeset:   93272:4686aca7501e
parent:      93270:9516cda2bd70
parent:      93271:589163b3127e
user:        Georg Brandl <georg at python.org>
date:        Thu Oct 30 22:31:35 2014 +0100
summary:
  merge with 3.4

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


diff --git a/Doc/contents.rst b/Doc/contents.rst
--- a/Doc/contents.rst
+++ b/Doc/contents.rst
@@ -22,7 +22,7 @@
    copyright.rst
    license.rst
 
-.. include legacy packaging docs in build
+.. to include legacy packaging docs in build
 
 .. toctree::
    :hidden:

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