summaryrefslogtreecommitdiffstats
path: root/Doc/whatsnew/3.3.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-29 09:57:42 (GMT)
committerGeorg Brandl <georg@python.org>2014-10-29 09:57:42 (GMT)
commitbad8d4bb53577fbea939d3490713dc9d941eb27f (patch)
tree4c0c54f3f3d2a671f754cead2fafe30cddead67f /Doc/whatsnew/3.3.rst
parent794e9bf1fe5bd0000f90c1502b16c96eb68a59af (diff)
parentb7354a65ce71ac39d7dec97cce4ca7afdffcb8a3 (diff)
downloadcpython-bad8d4bb53577fbea939d3490713dc9d941eb27f.zip
cpython-bad8d4bb53577fbea939d3490713dc9d941eb27f.tar.gz
cpython-bad8d4bb53577fbea939d3490713dc9d941eb27f.tar.bz2
merge with 3.4
Diffstat (limited to 'Doc/whatsnew/3.3.rst')
-rw-r--r--Doc/whatsnew/3.3.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
index 033be97..6ac3310 100644
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1891,7 +1891,7 @@ socket
* The :class:`~socket.socket` class now supports the PF_RDS protocol family
(http://en.wikipedia.org/wiki/Reliable_Datagram_Sockets and
- http://oss.oracle.com/projects/rds/).
+ https://oss.oracle.com/projects/rds/).
* The :class:`~socket.socket` class now supports the ``PF_SYSTEM`` protocol
family on OS X. (Contributed by Michael Goderbauer in :issue:`13777`.)