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

[georg.brandl]

https://hg.python.org/cpython/rev/3b80ee0d4bb5
changeset:   93279:3b80ee0d4bb5
parent:      93277:a4241de1d1fd
parent:      93278:0f50406f9aea
user:        Georg Brandl <georg at python.org>
date:        Thu Oct 30 22:45:30 2014 +0100
summary:
  merge with 3.4

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


diff --git a/Doc/library/ensurepip.rst b/Doc/library/ensurepip.rst
--- a/Doc/library/ensurepip.rst
+++ b/Doc/library/ensurepip.rst
@@ -2,7 +2,7 @@
 ========================================================
 
 .. module:: ensurepip
-   :synopsis: Bootstrapping the ``pip`` installer into an existing Python
+   :synopsis: Bootstrapping the "pip" installer into an existing Python
               installation or virtual environment.
 
 .. versionadded:: 3.4

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