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

[terry.reedy]

https://hg.python.org/cpython/rev/1f1cae1f6121
changeset:   96583:1f1cae1f6121
branch:      3.5
parent:      96579:4e7dcf64bba7
parent:      96582:ccb0f43964e0
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Fri Jun 12 15:45:05 2015 -0400
summary:
  Merge with 3.4

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


diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -1117,7 +1117,7 @@
 
 * Sets and frozensets define comparison operators to mean subset and superset
   tests.  Those relations do not define total orderings (the two sets ``{1,2}``
-  and {2,3} are not equal, nor subsets of one another, nor supersets of one
+  and ``{2,3}`` are not equal, nor subsets of one another, nor supersets of one
   another).  Accordingly, sets are not appropriate arguments for functions
   which depend on total ordering.  For example, :func:`min`, :func:`max`, and
   :func:`sorted` produce undefined results given a list of sets as inputs.

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