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

[georg.brandl]

http://hg.python.org/cpython/rev/a3d09c19bb93
changeset:   86127:a3d09c19bb93
parent:      86125:c1070d71f323
parent:      86126:66ef63a77e9d
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 06 19:24:00 2013 +0200
summary:
  merge with 3.3

files:
  Doc/library/ipaddress.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -282,10 +282,10 @@
 IPv6).
 
 
-Logical operators
-"""""""""""""""""
+Comparison operators
+""""""""""""""""""""
 
-Address objects can be compared with the usual set of logical operators.  Some
+Address objects can be compared with the usual set of comparison operators.  Some
 examples::
 
    >>> IPv4Address('127.0.0.2') > IPv4Address('127.0.0.1')

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