summaryrefslogtreecommitdiffstats
path: root/Doc/whatsnew
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
parent794e9bf1fe5bd0000f90c1502b16c96eb68a59af (diff)
parentb7354a65ce71ac39d7dec97cce4ca7afdffcb8a3 (diff)
downloadcpython-bad8d4bb53577fbea939d3490713dc9d941eb27f.zip
cpython-bad8d4bb53577fbea939d3490713dc9d941eb27f.tar.gz
cpython-bad8d4bb53577fbea939d3490713dc9d941eb27f.tar.bz2
merge with 3.4
Diffstat (limited to 'Doc/whatsnew')
-rw-r--r--Doc/whatsnew/2.0.rst2
-rw-r--r--Doc/whatsnew/2.3.rst2
-rw-r--r--Doc/whatsnew/2.6.rst4
-rw-r--r--Doc/whatsnew/2.7.rst2
-rw-r--r--Doc/whatsnew/3.1.rst2
-rw-r--r--Doc/whatsnew/3.2.rst4
-rw-r--r--Doc/whatsnew/3.3.rst2
-rw-r--r--Doc/whatsnew/changelog.rst1
8 files changed, 9 insertions, 10 deletions
diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst
index 6b7e5cf..2c952ac 100644
--- a/Doc/whatsnew/2.0.rst
+++ b/Doc/whatsnew/2.0.rst
@@ -1003,7 +1003,7 @@ Relationship to PyXML
The XML Special Interest Group has been working on XML-related Python code for a
while. Its code distribution, called PyXML, is available from the SIG's Web
-pages at https://www.python.org/sigs/xml-sig/. The PyXML distribution also used
+pages at https://www.python.org/community/sigs/current/xml-sig. The PyXML distribution also used
the package name ``xml``. If you've written programs that used PyXML, you're
probably wondering about its compatibility with the 2.0 :mod:`xml` package.
diff --git a/Doc/whatsnew/2.3.rst b/Doc/whatsnew/2.3.rst
index 691447c..f478c09 100644
--- a/Doc/whatsnew/2.3.rst
+++ b/Doc/whatsnew/2.3.rst
@@ -1330,7 +1330,7 @@ complete list of changes, or look through the CVS logs for all the details.
(Contributed by Kevin O'Connor.)
* The IDLE integrated development environment has been updated using the code
- from the IDLEfork project (http://idlefork.sf.net). The most notable feature is
+ from the IDLEfork project (http://idlefork.sourceforge.net). The most notable feature is
that the code being developed is now executed in a subprocess, meaning that
there's no longer any need for manual ``reload()`` operations. IDLE's core code
has been incorporated into the standard library as the :mod:`idlelib` package.
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index 530aaf3..e763265 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -238,7 +238,7 @@ have adopted Sphinx as their documentation tool.
`Sphinx <http://sphinx-doc.org/>`__
Documentation and code for the Sphinx toolchain.
- `Docutils <http://docutils.sf.net>`__
+ `Docutils <http://docutils.sourceforge.net>`__
The underlying reStructuredText parser and toolset.
@@ -2363,7 +2363,7 @@ changes, or look through the Subversion logs for all the details.
negotiation itself. (Patch contributed by Bill Fenner;
:issue:`829951`.)
-* The :mod:`socket` module now supports TIPC (http://tipc.sf.net),
+* The :mod:`socket` module now supports TIPC (http://tipc.sourceforge.net/),
a high-performance non-IP-based protocol designed for use in clustered
environments. TIPC addresses are 4- or 5-tuples.
(Contributed by Alberto Bertogli; :issue:`1646`.)
diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index a4659f0..ed1446c 100644
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -708,7 +708,7 @@ Some smaller changes made to the core Python language are:
The :func:`contextlib.nested` function provides a very similar
function, so it's no longer necessary and has been deprecated.
- (Proposed in http://codereview.appspot.com/53094; implemented by
+ (Proposed in https://codereview.appspot.com/53094; implemented by
Georg Brandl.)
* Conversions between floating-point numbers and strings are
diff --git a/Doc/whatsnew/3.1.rst b/Doc/whatsnew/3.1.rst
index 42c44a0..f272da4 100644
--- a/Doc/whatsnew/3.1.rst
+++ b/Doc/whatsnew/3.1.rst
@@ -172,7 +172,7 @@ Some smaller changes made to the core Python language are:
needed and is now deprecated.
(Contributed by Georg Brandl and Mattias Brändström;
- `appspot issue 53094 <http://codereview.appspot.com/53094>`_.)
+ `appspot issue 53094 <https://codereview.appspot.com/53094>`_.)
* ``round(x, n)`` now returns an integer if *x* is an integer.
Previously it returned a float::
diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
index 3b45459..5171f3c 100644
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -2478,7 +2478,7 @@ members of the community to create and share external changesets. See
To learn to use the new version control system, see the `tutorial by Joel
Spolsky <http://hginit.com>`_ or the `Guide to Mercurial Workflows
-<http://mercurial.selenic.com/guide/>`_.
+<http://mercurial.selenic.com/guide>`_.
Build and C API Changes
@@ -2649,7 +2649,7 @@ require changes to your code:
outfile.write(line)
(Contributed by Georg Brandl and Mattias Brändström;
- `appspot issue 53094 <http://codereview.appspot.com/53094>`_.)
+ `appspot issue 53094 <https://codereview.appspot.com/53094>`_.)
* :func:`struct.pack` now only allows bytes for the ``s`` string pack code.
Formerly, it would accept text arguments and implicitly encode them to bytes
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`.)
diff --git a/Doc/whatsnew/changelog.rst b/Doc/whatsnew/changelog.rst
index 57e2dab..07f9094 100644
--- a/Doc/whatsnew/changelog.rst
+++ b/Doc/whatsnew/changelog.rst
@@ -3,4 +3,3 @@ Changelog
+++++++++
.. miscnews:: ../../Misc/NEWS
-