merge default into release2.7.x

104 files changed, 897 insertions, 721 deletions

diff --git a/pypy/doc/architecture.rst b/pypy/doc/architecture.rst
index 7b48a02bb0..dd1571f7c5 100644
--- a/pypy/doc/architecture.rst
+++ b/pypy/doc/architecture.rst
@@ -15,7 +15,7 @@ We aim to provide a compliant, flexible and fast implementation of the Python_
 Language which uses the RPython toolchain to enable new advanced high-level
 features without having to encode the low-level details.  We call this PyPy.
 
-.. _Python: http://docs.python.org/reference/
+.. _Python: https://docs.python.org/3/reference/
 
 
 High Level Goals
@@ -134,6 +134,6 @@ during translation.  Moreover, this is not reference counting; it is a real
 GC written as more RPython code.  The best one we have so far is in
 ``rpython/memory/gc/incminimark.py``.
 
-.. _`Getting Started with RPython`: http://rpython.readthedocs.org/en/latest/getting-started.html
-.. _RPython By Example: http://mesapy.org/rpython-by-example/
+.. _`Getting Started with RPython`: https://rpython.readthedocs.io/en/latest/getting-started.html
+.. _RPython By Example: https://mesapy.org/rpython-by-example/
 
diff --git a/pypy/doc/build.rst b/pypy/doc/build.rst
index 4c0b5ea26c..248e143ed8 100644
--- a/pypy/doc/build.rst
+++ b/pypy/doc/build.rst
@@ -1,3 +1,5 @@
+.. _building-from-source:
+
 Building PyPy from Source
 =========================
 
@@ -19,7 +21,7 @@ translated (hopefully functional) binary packages are available on our
 buildbot's `nightly builds`_
 
 .. _here: contributing.html
-.. _`nightly builds`: http://buildbot.pypy.org/nightly
+.. _`nightly builds`: https://buildbot.pypy.org/nightly
 
 You will need the build dependencies below to run the tests.
 
@@ -32,12 +34,12 @@ will need to obtain a copy of the sources.  This can be done either by
 repository using mercurial.  We suggest using mercurial if you want to access
 the current development.
 
-.. _downloading them from the download page: http://pypy.org/download.html
+.. _downloading them from the download page: https://www.pypy.org/download.html
 
 You must issue the following command on your
 command line, DOS box, or terminal::
 
-    hg clone http://foss.heptapod.net/pypy/pypy pypy
+    hg clone https://foss.heptapod.net/pypy/pypy pypy
 
 This will clone the repository and place it into a directory
 named ``pypy``, and will get you the PyPy source in ``pypy/pypy`` and
@@ -54,7 +56,7 @@ using::
 
 where XXXXX is the revision id.
 
-.. _our nightly tests: http://buildbot.pypy.org/summary?branch=<trunk>
+.. _our nightly tests: https://buildbot.pypy.org/summary?branch=%3Ctrunk%3E
 
 
 Install build-time dependencies
@@ -63,7 +65,7 @@ Install build-time dependencies
 Windows, see the `windows document`_ . 
 
 .. _`windows document`: windows.html
-.. _`RPython documentation`: http://rpython.readthedocs.org
+.. _`RPython documentation`: https://rpython.readthedocs.org
 
 The host Python needs to have CFFI installed. If translating on PyPy, CFFI is
 already installed. If translating on CPython, you need to install it, e.g.
@@ -92,8 +94,10 @@ Make sure to have these libraries (with development headers) installed
 before building PyPy, otherwise the resulting binary will not contain
 these modules.  Furthermore, the following libraries should be present
 after building PyPy, otherwise the corresponding CFFI modules are not
-built (you can run or re-run `pypy/tool/release/package.py` to retry
-to build them; you don't need to re-translate the whole PyPy):
+built (you can run or re-run `lib_pypy/pypy_tools/build_cffi_imports.py`_ to
+build them; you don't need to re-translate the whole PyPy):
+
+.. _`lib_pypy/pypy_tools/build_cffi_imports.py`: https://foss.heptapod.net/pypy/pypy/-/blob/branch/default/lib_pypy/pypy_tools/build_cffi_imports.py
 
 sqlite3
     libsqlite3
@@ -222,13 +226,12 @@ Build cffi import libraries for the stdlib
 ------------------------------------------
 
 Various stdlib modules require a separate build step to create the cffi
-import libraries in the `out-of-line API mode`_. This is done by the following
+import libraries in the :ref:`out-of-line API mode <performance>`. This is done by the following
 command::
 
    cd pypy/goal
    PYTHONPATH=../.. ./pypy-c ../../lib_pypy/pypy_tools/build_cffi_imports.py
 
-.. _`out-of-line API mode`: http://cffi.readthedocs.org/en/latest/overview.html#real-example-api-level-out-of-line
 
 Packaging (preparing for installation)
 --------------------------------------
diff --git a/pypy/doc/coding-guide.rst b/pypy/doc/coding-guide.rst
index 11345067f1..f07123110e 100644
--- a/pypy/doc/coding-guide.rst
+++ b/pypy/doc/coding-guide.rst
@@ -143,8 +143,8 @@ interpreter.   When doing its work of interpreting bytecode our Python
 implementation must behave in a static way often referenced as
 "RPythonic".
 
-.. _Starkiller: http://people.csail.mit.edu/jrb/Projects/starkiller.pdf
-.. _ShedSkin: http://shed-skin.blogspot.com/
+.. _Starkiller: https://people.csail.mit.edu/jrb/Projects/starkiller.pdf
+.. _ShedSkin: https://shed-skin.blogspot.com/
 
 However, when the PyPy interpreter is started as a Python program, it
 can use all of the Python language until it reaches a certain point in
@@ -563,7 +563,7 @@ basically two types of unit tests:
 - **Application Level tests**. They run at application level which means
   that they look like straight python code but they are interpreted by PyPy.
 
-.. _py.test: http://pytest.org/
+.. _py.test: https://pytest.org/
 
 
 Interpreter level tests
@@ -704,9 +704,9 @@ and can once they are installed coverage testing can be invoked via::
 
   python test_all.py --cov file_or_direcory_to_cover file_or_directory
 
-.. _pytest-cov: http://pypi.python.org/pypi/pytest-cov
-.. _coverage: http://pypi.python.org/pypi/coverage
-.. _cov-core: http://pypi.python.org/pypi/cov-core
+.. _pytest-cov: https://pypi.python.org/pypi/pytest-cov
+.. _coverage: https://pypi.python.org/pypi/coverage
+.. _cov-core: https://pypi.python.org/pypi/cov-core
 
 
 Test conventions
@@ -734,10 +734,10 @@ You can simply edit or add '.rst' files which contain ReST-markuped
 files.  Here is a `ReST quickstart`_ but you can also just look
 at the existing documentation and see how things work.
 
-Note that the web site of http://pypy.org/ is maintained separately.
+Note that the web site of https://pypy.org/ is maintained separately.
 It is in the repository https://foss.heptapod.net/pypy/pypy.org
 
-.. _ReST quickstart: http://docutils.sourceforge.net/docs/user/rst/quickref.html
+.. _ReST quickstart: https://docutils.sourceforge.net/docs/user/rst/quickref.html
 
 
 Automatically test documentation/website changes
@@ -761,4 +761,4 @@ the documentation issue::
 
 which will check that remote URLs are reachable.
 
-.. _sphinx: http://sphinx.pocoo.org/
+.. _sphinx: https://sphinx.pocoo.org/
diff --git a/pypy/doc/conf.py b/pypy/doc/conf.py
index fbd3674a8b..4677dd83e6 100644
--- a/pypy/doc/conf.py
+++ b/pypy/doc/conf.py
@@ -41,9 +41,25 @@ if not on_rtd:  # only import and set the theme if we're building docs locally
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.extlinks',
-              'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.ifconfig',
-              'sphinx.ext.graphviz', 'pypyconfig']
+extensions = ['sphinx.ext.autodoc',
+              'sphinx.ext.doctest',
+              'sphinx.ext.extlinks',
+              'sphinx.ext.intersphinx',
+              'sphinx.ext.todo',
+              'sphinx.ext.ifconfig',
+              'sphinx.ext.graphviz',
+              'pypyconfig',
+              'sphinx_affiliates']
+
+# Canonical URL (including the '/') so searching from rpython docs finds these
+affiliate_options = {
+    'canonical_url': "https://doc.pypy.org/en/latest/"
+}
+
+# Other sites to add to the search of this site
+sphinx_affiliates = [
+    'https://rpython.readthedocs.io/en/latest/affiliate_searchindex.js',
+]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -222,7 +238,9 @@ htmlhelp_basename = 'PyPydoc'
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {'python': ('http://docs.python.org/2.7', None),
-                       'rpython': ('http://rpython.readthedocs.org/en/latest/', None)}
+                       'rpython': ('http://rpython.readthedocs.org/en/latest/', None),
+                       'cffi': ('https://cffi.readthedocs.io/en/latest/', None),
+                      }
 
 # -- Options for manpage output-------------------------------------------------
 
@@ -232,4 +250,4 @@ man_pages = [
    u'The PyPy Project', 1)
 ]
 
-extlinks = {'source': ('https://foss.heptapod.net/pypy/pypy/src/default/%s', '')}
+extlinks = {'source': ('https://foss.heptapod.net/pypy/pypy/-/tree/branch/default/%s', '')}
diff --git a/pypy/doc/contributing.rst b/pypy/doc/contributing.rst
index 66c36c5f52..bb2f9b445e 100644
--- a/pypy/doc/contributing.rst
+++ b/pypy/doc/contributing.rst
@@ -46,8 +46,8 @@ EuroPython or PyCon. Upcoming events are usually announced on `the blog`_.
 
 Further Reading: :ref:`Contact <contact>`
 
-.. _the blog: http://morepypy.blogspot.com
-.. _pypy-dev mailing list: http://mail.python.org/mailman/listinfo/pypy-dev
+.. _the blog: https://morepypy.blogspot.com
+.. _pypy-dev mailing list: https://mail.python.org/mailman/listinfo/pypy-dev
 
 
 Your first contribution
@@ -70,7 +70,7 @@ Some ideas for first contributions are:
 * Test failures - find a failing test in the `nightly builds`_, and fix it
 * Missing language features - these are listed in our `issue tracker`_
 
-.. _nightly builds: http://buildbot.pypy.org/nightly/
+.. _nightly builds: https://buildbot.pypy.org/nightly/
 .. _issue tracker: https://foss.heptapod.net/pypy/pypy/issues
 
 Source Control
@@ -124,7 +124,7 @@ Clone
 * Clone the PyPy repo to your local machine with the command
   ``hg clone https://foss.heptapod.net/pypy/pypy``.  It takes a minute or two
   operation but only ever needs to be done once.  See also
-  http://pypy.org/download.html#building-from-source .
+  https://pypy.org/download.html#building-from-source .
   If you already cloned the repo before, even if some time ago,
   then you can reuse the same clone by editing the file ``.hg/hgrc`` in
   your clone to contain the line ``default =
@@ -273,7 +273,7 @@ not one of those. You may consider familiarizing yourself with `pytest`_,
 since this is a tool we use for tests.
 This leads to the next issue:
 
-.. _pytest: http://pytest.org/
+.. _pytest: https://pytest.org/
 
 py.test and the py lib
 ----------------------
@@ -286,14 +286,14 @@ writing, logging and some other support  functionality.
 You don't necessarily need to install these two libraries because
 we also ship them inlined in the PyPy source tree.
 
-.. _py library: http://pylib.readthedocs.org/
+.. _py library: https://pylib.readthedocs.org/
 
 Running PyPy's unit tests
 -------------------------
 
 PyPy development always was and is still thoroughly test-driven.
 We use the flexible `py.test testing tool`_ which you can `install independently
-<http://pytest.org/latest/getting-started.html#getstarted>`_ and use for other projects.
+<https://pytest.org/latest/getting-started.html#getstarted>`_ and use for other projects.
 
 The PyPy source tree comes with an inlined version of ``py.test``
 which you can invoke by typing::
@@ -336,8 +336,8 @@ a hack that doesn't work in all cases and it is usually extremely slow:
 extract a minimal failing test of at most a few lines, and put it into one of
 our own tests in ``pypy/*/test/``.
 
-.. _py.test testing tool: http://pytest.org
-.. _py.test usage and invocations: http://pytest.org/latest/usage.html#usage
+.. _py.test testing tool: https://pytest.org
+.. _py.test usage and invocations: https://pytest.org/latest/usage.html#usage
 .. _`build requirements`: build.html#install-build-time-dependencies
 
 Testing After Translation
@@ -492,7 +492,7 @@ graphviz & pygame for flow graph viewing (highly recommended)
 graphviz and pygame are both necessary if you want to look at generated flow
 graphs:
 
-    graphviz: http://www.graphviz.org/Download.php
+    graphviz: https://www.graphviz.org/Download.php
 
-    pygame: http://www.pygame.org/download.shtml
+    pygame: https://www.pygame.org/download.shtml
 
diff --git a/pypy/doc/cpython_differences.rst b/pypy/doc/cpython_differences.rst
index 9cdc4d8f5b..4d2dad06be 100644
--- a/pypy/doc/cpython_differences.rst
+++ b/pypy/doc/cpython_differences.rst
@@ -97,8 +97,8 @@ objects referencing each other, their ``__del__`` methods are called anyway;
 CPython would instead put them into the list ``garbage`` of the ``gc``
 module.  More information is available on the blog `[1]`__ `[2]`__.
 
-.. __: http://morepypy.blogspot.com/2008/02/python-finalizers-semantics-part-1.html
-.. __: http://morepypy.blogspot.com/2008/02/python-finalizers-semantics-part-2.html
+.. __: https://morepypy.blogspot.com/2008/02/python-finalizers-semantics-part-1.html
+.. __: https://morepypy.blogspot.com/2008/02/python-finalizers-semantics-part-2.html
 
 Note that this difference might show up indirectly in some cases.  For
 example, a generator left pending in the middle is --- again ---
@@ -107,7 +107,7 @@ difference if the ``yield`` keyword it is suspended at is itself
 enclosed in a ``try:`` or a ``with:`` block.  This shows up for example
 as `issue 736`__.
 
-.. __: http://bugs.pypy.org/issue736
+.. __: https://bugs.pypy.org/issue736
 
 Using the default GC (called ``minimark``), the built-in function ``id()``
 works like it does in CPython.  With other GCs it returns numbers that
@@ -578,11 +578,11 @@ The extension modules (i.e. modules written in C, in the standard CPython)
 that are neither mentioned above nor in :source:`lib_pypy/` are not available in PyPy.
 (You may have a chance to use them anyway with `cpyext`_.)
 
-.. _cpyext: http://morepypy.blogspot.com/2010/04/using-cpython-extension-modules-with.html
+.. _cpyext: https://morepypy.blogspot.com/2010/04/using-cpython-extension-modules-with.html
 
 
-.. _`is ignored in PyPy`: http://bugs.python.org/issue14621
-.. _`little point`: http://events.ccc.de/congress/2012/Fahrplan/events/5152.en.html
+.. _`is ignored in PyPy`: https://bugs.python.org/issue14621
+.. _`little point`: https://events.ccc.de/congress/2012/Fahrplan/events/5152.en.html
 .. _`#2072`: https://foss.heptapod.net/pypy/pypy/issue/2072/
 .. _`issue #2653`: https://foss.heptapod.net/pypy/pypy/issues/2653/
 .. _SyntaxError: https://morepypy.blogspot.co.il/2018/04/improving-syntaxerror-in-pypy.html
diff --git a/pypy/doc/embedding.rst b/pypy/doc/embedding.rst
index a37eb6762b..6b9d9b7e50 100644
--- a/pypy/doc/embedding.rst
+++ b/pypy/doc/embedding.rst
@@ -17,7 +17,7 @@ recent versions of PyPy.
    support,`__ which gives a simpler approach that works on CPython as well
    as PyPy.
 
-.. __: http://cffi.readthedocs.org/en/latest/embedding.html
+.. __: https://cffi.readthedocs.org/en/latest/embedding.html
 
 The resulting shared library exports very few functions, however they are
 enough to accomplish everything you need, provided you follow a few principles.
@@ -278,7 +278,7 @@ In case you want to use pthreads, what you need to do is to call
 ``pypy_thread_attach`` from each of the threads that you created (but not
 from the main thread) and call ``pypy_init_threads`` from the main thread.
 
-.. _`cffi`: http://cffi.readthedocs.org/
-.. _`uwsgi`: http://uwsgi-docs.readthedocs.org/en/latest/
-.. _`PyPy uwsgi plugin`: http://uwsgi-docs.readthedocs.org/en/latest/PyPy.html
+.. _`cffi`: https://cffi.readthedocs.org/
+.. _`uwsgi`: https://uwsgi-docs.readthedocs.org/en/latest/
+.. _`PyPy uwsgi plugin`: https://uwsgi-docs.readthedocs.org/en/latest/PyPy.html
 .. _`how to compile PyPy`: getting-started.html
diff --git a/pypy/doc/eventhistory.rst b/pypy/doc/eventhistory.rst
index 5e42dc7035..447ae986af 100644
--- a/pypy/doc/eventhistory.rst
+++ b/pypy/doc/eventhistory.rst
@@ -6,7 +6,7 @@ More sprints
     all year round.  **This page is no longer maintained!**  See `our blog`_
     for upcoming events.
 
-.. _our blog: http://morepypy.blogspot.com/
+.. _our blog: https://morepypy.blogspot.com/
 
 
 EuroPython PyPy sprint 6-9 July 2006
@@ -28,8 +28,8 @@ this year, `XP 2006`_ and `Agile 2006`_.
 Both experience reports focus on aspects of the sprint-driven
 development method that is being used in PyPy.
 
-.. _XP 2006: http://virtual.vtt.fi/virtual/xp2006/
-.. _Agile 2006: http://www.agile2006.org/
+.. _XP 2006: https://virtual.vtt.fi/virtual/xp2006/
+.. _Agile 2006: https://www.agile2006.org/
 
 
 Duesseldorf PyPy sprint 2-9 June 2006
@@ -56,7 +56,7 @@ backends. For more details, read the last `sprint status`_ page and
 enjoy the pictures_.
 
 .. _sprint status: https://foss.heptapod.net/pypy/extradoc/blob/branch/default/sprintinfo/tokyo/tokyo-planning.txt
-.. _pictures: http://www.flickr.com/photos/19046555@N00/sets/72057594116388174/
+.. _pictures: https://www.flickr.com/photos/19046555@N00/sets/72057594116388174/
 
 
 PyPy at Python UK/ACCU Conference (United Kingdom)
@@ -65,7 +65,7 @@ PyPy at Python UK/ACCU Conference (United Kingdom)
 *April 19th - April 22nd 2006.* Several talks about PyPy were hold at
 this year's Python UK/ACCU conference. Read more at the `ACCU site`_.
 
-.. _ACCU site: http://accu.org/
+.. _ACCU site: https://accu.org/
 
 
 PyPy at XPDay France 2006 in Paris March 23rd - March 24th 2006
@@ -76,7 +76,7 @@ sponsoring and which was held in Paris. There was over a hundred
 attendants. Interesting talks included Python as an agile language and
 Tools for continuous integration.
 
-.. _french XP Day: http://www.xpday.fr/
+.. _french XP Day: https://www.xpday.fr/
 
 
 Logic Sprint at Louvain-la-Neuve University (Louvain-la-Neuve, Belgium)
@@ -106,7 +106,7 @@ Talks at PyCon 2006 (Dallas, Texas, USA)
 
 *Feb 24th - Feb 26th 2006.* PyPy developers spoke at PyCon 2006.
 
-.. _PyCon 2006: http://us.pycon.org/TX2006/HomePage
+.. _PyCon 2006: https://us.pycon.org/TX2006/HomePage
 
 
 PyPy at Solutions Linux in Paris January 31st - February 2nd 2006
@@ -191,8 +191,8 @@ way back.
 *(10/18/2005)*
 
 .. _Logilab offices in Paris: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/sprintinfo/paris-2005-sprint.txt 
-.. _JIT: http://en.wikipedia.org/wiki/Just-in-time_compilation
-.. _continuation-passing: http://en.wikipedia.org/wiki/Continuation_passing_style
+.. _JIT: https://en.wikipedia.org/wiki/Just-in-time_compilation
+.. _continuation-passing: https://en.wikipedia.org/wiki/Continuation_passing_style
 .. _report about day one: https://mail.python.org/pipermail/pypy-dev/2005-October/002510.html
 .. _one about day two and three: https://mail.python.org/pipermail/pypy-dev/2005-October/002512.html
 .. _the rest of the sprint: https://mail.python.org/pipermail/pypy-dev/2005-October/002514.html
@@ -242,7 +242,7 @@ having a good time.
 .. _day 4 and day 5: https://mail.python.org/pipermail/pypy-dev/2005-July/002234.html
 .. _day 6: https://mail.python.org/pipermail/pypy-dev/2005-July/002239.html
 .. _day 7: https://mail.python.org/pipermail/pypy-dev/2005-August/002245.html
-.. _Trillke-Gut: http://www.trillke.net
+.. _Trillke-Gut: https://www.trillke.net
 
 
 EuroPython 2005 sprints finished
@@ -265,6 +265,6 @@ the LLVM backends and type inference in general.
 .. _day 3: https://mail.python.org/pipermail/pypy-dev/2005-June/002172.html
 .. _pypy-dev: https://mail.python.org/mailman/listinfo/pypy-dev
 
-.. _EuroPython: http://europython.org
+.. _EuroPython: https://europython.org
 .. _sprint announcement: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/sprintinfo/EP2005-announcement.html
 .. _list of people coming: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/sprintinfo/EP2005-people.html
diff --git a/pypy/doc/extending.rst b/pypy/doc/extending.rst
index bb85673c3d..54ab1eaca2 100644
--- a/pypy/doc/extending.rst
+++ b/pypy/doc/extending.rst
@@ -34,8 +34,8 @@ could still be improved, but is already good.)
 
 See the documentation here__.
 
-.. __: http://cffi.readthedocs.org/
-.. __: http://cffi.readthedocs.org/
+.. __: https://cffi.readthedocs.org/
+.. __: https://cffi.readthedocs.org/
 
 
 CTypes
@@ -48,14 +48,14 @@ CPython, but close enough for most cases.
 More (but older) information is available :doc:`here <discussion/ctypes-implementation>`.
 Also, ctypes' performance is not as good as CFFI's.
 
-.. _CPython ctypes: http://docs.python.org/library/ctypes.html
+.. _CPython ctypes: https://docs.python.org/library/ctypes.html
 
 PyPy implements ctypes as pure Python code around two built-in modules
 called ``_rawffi`` and ``_rawffi.alt``, which give a very low-level binding to
 the C library libffi_.  Nowadays it is not recommended to use directly
 these two modules.
 
-.. _libffi: http://sourceware.org/libffi/
+.. _libffi: https://sourceware.org/libffi/
 
 
 cppyy
diff --git a/pypy/doc/extradoc.rst b/pypy/doc/extradoc.rst
index ba4d8f06bd..5d7717fe94 100644
--- a/pypy/doc/extradoc.rst
+++ b/pypy/doc/extradoc.rst
@@ -75,18 +75,18 @@ Papers
 .. _A Way Forward in Parallelising Dynamic Languages: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/icooolps2014/position-paper.pdf
 .. _Runtime Feedback in a Meta-Tracing JIT for Efficient Dynamic Languages: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/icooolps2011/jit-hints.pdf
 .. _Allocation Removal by Partial Evaluation in a Tracing JIT: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/pepm2011/bolz-allocation-removal.pdf
-.. _Towards a Jitting VM for Prolog Execution: http://stups.hhu.de/mediawiki/images/a/a7/Pub-BoLeSch2010.pdf
-.. _High performance implementation of Python for CLI/.NET with JIT compiler generation for dynamic languages: http://buildbot.pypy.org/misc/antocuni-thesis.pdf
+.. _Towards a Jitting VM for Prolog Execution: https://stups.hhu.de/mediawiki/images/a/a7/Pub-BoLeSch2010.pdf
+.. _High performance implementation of Python for CLI/.NET with JIT compiler generation for dynamic languages: https://buildbot.pypy.org/misc/antocuni-thesis.pdf
 .. _How to *not* write Virtual Machines for Dynamic Languages: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/dyla2007/dyla.pdf
 .. _`Tracing the Meta-Level: PyPy's Tracing JIT Compiler`: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/icooolps2009/bolz-tracing-jit.pdf
 .. _`Faster than C#: Efficient Implementation of Dynamic Languages on .NET`: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/icooolps2009-dotnet/cli-jit.pdf
 .. _Automatic JIT Compiler Generation with Runtime Partial Evaluation: https://www.researchgate.net/profile/Davide_Ancona/publication/252023163_Automatic_generation_of_JIT_compilers_for_dynamic_languages_in_NET/links/53f2098e0cf2bc0c40e70023/Automatic-generation-of-JIT-compilers-for-dynamic-languages-in-NET.pdf
-.. _`RPython: A Step towards Reconciling Dynamically and Statically Typed OO Languages`: http://www.disi.unige.it/person/AnconaD/papers/DynamicLanguages_abstracts.html#AACM-DLS07
+.. _`RPython: A Step towards Reconciling Dynamically and Statically Typed OO Languages`: https://www.disi.unige.it/person/AnconaD/papers/DynamicLanguages_abstracts.html#AACM-DLS07
 .. _EU Reports: index-report.html
-.. _Hardware Transactional Memory Support for Lightweight Dynamic Language Evolution: http://sabi.net/nriley/pubs/dls6-riley.pdf
-.. _`PyGirl: Generating Whole-System VMs from High-Level Prototypes using PyPy`: http://scg.unibe.ch/archive/papers/Brun09cPyGirl.pdf
-.. _Representation-Based Just-in-Time Specialization and the Psyco Prototype for Python: http://psyco.sourceforge.net/psyco-pepm-a.ps.gz
-.. _Back to the Future in One Week -- Implementing a Smalltalk VM in PyPy: http://dx.doi.org/10.1007/978-3-540-89275-5_7
+.. _Hardware Transactional Memory Support for Lightweight Dynamic Language Evolution: https://sabi.net/nriley/pubs/dls6-riley.pdf
+.. _`PyGirl: Generating Whole-System VMs from High-Level Prototypes using PyPy`: https://scg.unibe.ch/archive/papers/Brun09cPyGirl.pdf
+.. _Representation-Based Just-in-Time Specialization and the Psyco Prototype for Python: https://psyco.sourceforge.net/psyco-pepm-a.ps.gz
+.. _Back to the Future in One Week -- Implementing a Smalltalk VM in PyPy: https://dx.doi.org/10.1007/978-3-540-89275-5_7
 .. _Automatic generation of JIT compilers for dynamic languages in .NET: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/ecoop2009/main.pdf
 .. _Core Object Optimization Results: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/eu-report/D06.1_Core_Optimizations-2007-04-30.pdf
 .. _Compiling Dynamic Language Implementations: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/eu-report/D05.1_Publish_on_translating_a_very-high-level_description.pdf
@@ -266,8 +266,8 @@ Talks in 2003
   introduction for the Amsterdam PyPy-Sprint Dec 2003.
 
 
-.. _PyCon 2010: http://morepypy.blogspot.com/2010/02/pycon-2010-report.html
-.. _RuPy 2009: http://morepypy.blogspot.com/2009/11/pypy-on-rupy-2009.html
+.. _PyCon 2010: https://morepypy.blogspot.com/2010/02/pycon-2010-report.html
+.. _RuPy 2009: https://morepypy.blogspot.com/2009/11/pypy-on-rupy-2009.html
 .. _PyPy 3000: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/ep2006/pypy3000.txt
 .. _What can PyPy do for you: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/ep2006/usecases-slides.txt
 .. _PyPy introduction at EuroPython 2006: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/ep2006/intro.pdf
@@ -290,12 +290,12 @@ Talks in 2003
 .. _EuroPython talks 2009: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/ep2009/
 .. _PyCon talks 2009: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/pycon2009/
 .. _Wroclaw (Poland) presentation: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/wroclaw2009/talk.pdf
-.. _PyPy talk at OpenBossa 09: http://morepypy.blogspot.com/2009/03/pypy-talk-at-openbossa-09.html
+.. _PyPy talk at OpenBossa 09: https://morepypy.blogspot.com/2009/03/pypy-talk-at-openbossa-09.html
 .. _at SFI 08: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/sfi2008/
 .. _at PyCon Poland 08: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/pyconpl-2008/talk.pdf
 .. _The PyPy Project and You: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/osdc2008/osdc08.pdf
 .. _EuroPython talks 2008: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/ep2008/
-.. _Maemo summit: http://morepypy.blogspot.com/2008/09/pypypython-at-maemo-summit.html
+.. _Maemo summit: https://morepypy.blogspot.com/2008/09/pypypython-at-maemo-summit.html
 .. _PyCon UK 2008 - JIT: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/pycon-uk-2008/jit/pypy-vm.pdf
 .. _PyCon UK 2008 - Status: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/pycon-uk-2008/status/status.pdf
 .. _PyCon Italy 2008: https://foss.heptapod.net/pypy/extradoc/raw/branch/default/talk/pycon-italy-2008/pypy-vm.pdf
@@ -357,17 +357,17 @@ Related projects
   through it is a lot of fun.
 
 .. _TraceMonkey: https://wiki.mozilla.org/JavaScript:TraceMonkey
-.. _CLR under the hood: http://download.microsoft.com/download/2/4/d/24dfac0e-fec7-4252-91b9-fb2310603f14/CLRUnderTheHood.BradA.ppt
-.. _Stackless: http://stackless.com
-.. _Psyco: http://psyco.sourceforge.net
-.. _Jython: http://www.jython.org
-.. _Squeak: http://www.squeak.org/
-.. _Croquet: http://www.opencroquet.org/
-.. _transparent dynamic optimization: http://www.hpl.hp.com/techreports/1999/HPL-1999-77.pdf
-.. _Dynamo: http://www.hpl.hp.com/techreports/1999/HPL-1999-78.pdf
-.. _LLVM: http://llvm.org/
-.. _IronPython: http://ironpython.codeplex.com/
-.. _Dynamic Native Optimization of Native Interpreters: http://people.csail.mit.edu/gregs/dynamorio.html
-.. _JikesRVM: http://www.jikesrvm.org/
-.. _Tunes: http://tunes.org
-.. _old Tunes Wiki: http://buildbot.pypy.org/misc/cliki.tunes.org/
+.. _CLR under the hood: https://download.microsoft.com/download/2/4/d/24dfac0e-fec7-4252-91b9-fb2310603f14/CLRUnderTheHood.BradA.ppt
+.. _Stackless: https://stackless.com
+.. _Psyco: https://psyco.sourceforge.net
+.. _Jython: https://www.jython.org
+.. _Squeak: https://www.squeak.org/
+.. _Croquet: https://www.opencroquet.org/
+.. _transparent dynamic optimization: https://www.hpl.hp.com/techreports/1999/HPL-1999-77.pdf
+.. _Dynamo: https://www.hpl.hp.com/techreports/1999/HPL-1999-78.pdf
+.. _LLVM: https://llvm.org/
+.. _IronPython: https://ironpython.codeplex.com/
+.. _Dynamic Native Optimization of Native Interpreters: https://people.csail.mit.edu/gregs/dynamorio.html
+.. _JikesRVM: https://www.jikesrvm.org/
+.. _Tunes: https://tunes.org
+.. _old Tunes Wiki: https://buildbot.pypy.org/misc/cliki.tunes.org/
diff --git a/pypy/doc/faq.rst b/pypy/doc/faq.rst
index 7f78c1c2bb..df406bdda4 100644
--- a/pypy/doc/faq.rst
+++ b/pypy/doc/faq.rst
@@ -5,7 +5,7 @@ Frequently Asked Questions
 
 See also: `Frequently ask questions about RPython.`__
 
-.. __: http://rpython.readthedocs.org/en/latest/faq.html
+.. __: https://rpython.readthedocs.org/en/latest/faq.html
 
 ---------------------------
 
@@ -115,7 +115,7 @@ recommend that you use the cffi_ module to interface with C code.
 For more information about how we manage refcounting semamtics see 
 rawrefcount_
 
-.. _cffi: http://cffi.readthedocs.org/
+.. _cffi: https://cffi.readthedocs.org/
 .. _rawrefcount: discussion/rawrefcount.html   
 
 
@@ -244,8 +244,8 @@ debugger features.  This prevents tail calls, as summarized by Guido
 van Rossum in two__ blog__ posts.  Moreover, neither the JIT nor
 Stackless__ change anything to that.
 
-.. __: http://neopythonic.blogspot.com/2009/04/tail-recursion-elimination.html
-.. __: http://neopythonic.blogspot.com/2009/04/final-words-on-tail-calls.html
+.. __: https://neopythonic.blogspot.com/2009/04/tail-recursion-elimination.html
+.. __: https://neopythonic.blogspot.com/2009/04/final-words-on-tail-calls.html
 .. __: stackless.html
 
 
@@ -274,9 +274,9 @@ timings with CPython, even relatively simple programs need to run *at
 least* one second, preferrably at least a few seconds.  Large,
 complicated programs need even more time to warm-up the JIT.
 
-.. _benchmarking site: http://speed.pypy.org
+.. _benchmarking site: https://speed.pypy.org
 
-.. _your tests are not a benchmark: http://alexgaynor.net/2013/jul/15/your-tests-are-not-benchmark/
+.. _your tests are not a benchmark: https://alexgaynor.net/2013/jul/15/your-tests-are-not-benchmark/
 
 I wrote a 3-lines benchmark and it's not faster than CPython.  Why?
 -------------------------------------------------------------------
@@ -317,7 +317,7 @@ Would type annotations help PyPy's performance?
 Two examples of type annotations that are being proposed for improved
 performance are `Cython types`__ and `PEP 484 - Type Hints`__.
 
-.. __: http://docs.cython.org/src/reference/language_basics.html#declaring-data-types
+.. __: https://docs.cython.org/src/reference/language_basics.html#declaring-data-types
 .. __: https://www.python.org/dev/peps/pep-0484/
 
 **Cython types** are, by construction, similar to C declarations.  For
@@ -379,11 +379,11 @@ interpreter; preliminary versions of a `JavaScript interpreter`_
 (produced during a sprint).  On the `PyPy bitbucket page`_ there is also a
 Scheme and an Io implementation; both of these are unfinished at the moment.
 
-.. _Topaz: http://docs.topazruby.com/en/latest/
-.. _Hippy: http://morepypy.blogspot.ch/2012/07/hello-everyone.html
+.. _Topaz: https://docs.topazruby.com/en/latest/
+.. _Hippy: https://morepypy.blogspot.ch/2012/07/hello-everyone.html
 .. _JavaScript interpreter: https://bitbucket.org/pypy/lang-js/
 .. _Prolog interpreter: https://bitbucket.org/cfbolz/pyrolog/
-.. _SmallTalk interpreter: http://dx.doi.org/10.1007/978-3-540-89275-5_7
+.. _SmallTalk interpreter: https://dx.doi.org/10.1007/978-3-540-89275-5_7
 .. _PyPy bitbucket page: https://bitbucket.org/pypy/
 
 
@@ -402,7 +402,7 @@ the most immediate way to get feedback (at least during some parts of the day;
 most PyPy developers are in Europe) and the `mailing list`_ is better for long
 discussions.
 
-.. _mailing list: http://mail.python.org/mailman/listinfo/pypy-dev
+.. _mailing list: https://mail.python.org/mailman/listinfo/pypy-dev
 
 
 OSError: ... cannot restore segment prot after reloc... Help?
@@ -431,7 +431,7 @@ Missing features or incompatibilities with CPython are considered
 bugs, and they are welcome.  (See also our list of `known
 incompatibilities`__.)
 
-.. __: http://pypy.org/compat.html
+.. __: https://pypy.org/compat.html
 
 For bugs of the kind "I'm getting a PyPy crash or a strange
 exception", please note that: **We can't do anything without
diff --git a/pypy/doc/glossary.rst b/pypy/doc/glossary.rst
index acdf807f01..50cc7c035c 100644
--- a/pypy/doc/glossary.rst
+++ b/pypy/doc/glossary.rst
@@ -13,7 +13,7 @@ Glossary
 
    CPython
       The "default" implementation of Python, written in C and
-      distributed by the PSF_ on http://www.python.org.
+      distributed by the PSF_ on https://www.python.org.
 
    interpreter level
       Code running at this level is part of the implementation of the
@@ -38,7 +38,7 @@ Glossary
    stackless
       Technology that enables various forms of non conventional control
       flow, such as coroutines, greenlets and tasklets.  Inspired by
-      Christian Tismer's `Stackless Python <http://www.stackless.com>`__.
+      Christian Tismer's `Stackless Python <https://www.stackless.com>`__.
 
    standard interpreter
       It is the :ref:`subsystem implementing the Python language <python-interpreter>`, composed
@@ -49,4 +49,4 @@ Glossary
        global (i.e. prebuilt) lists and dictionaries are supposed to be
        immutable ("prebuilt constant" is sometimes abbreviated to "pbc").
 
-.. _PSF: http://www.python.org/psf/
+.. _PSF: https://www.python.org/psf/
diff --git a/pypy/doc/how-to-release.rst b/pypy/doc/how-to-release.rst
index 7bab5345f6..43cc823fcb 100644
--- a/pypy/doc/how-to-release.rst
+++ b/pypy/doc/how-to-release.rst
@@ -120,15 +120,12 @@ Other steps
   * download the builds, repackage binaries. Tag the release-candidate version
     (it is important to mark this as a candidate since usually at least two
     tries are needed to complete the process) and download and repackage source
-    from bitbucket. You may find it convenient to use the ``repackage.sh``
+    from the buildbot. You may find it convenient to use the ``repackage.sh``
     script in pypy/tool/release to do this. 
 
-    Otherwise repackage and upload source "-src.tar.bz2" to bitbucket
-    and to cobra, as some packagers prefer a clearly labeled source package
-    ( download e.g.  https://bitbucket.org/pypy/pypy/get/release-2.5.x.tar.bz2,
-    unpack, rename the top-level directory to "pypy-2.5.0-src", repack, and upload)
+    Also repackage and upload source "-src.tar.bz2"
 
-  * Upload binaries to https://bitbucket.org/pypy/pypy/downloads
+  * Upload binaries to https://buildbot.pypy.org/mirror
 
 * Send out a mailing list message asking for last-minute comments and testing
 
diff --git a/pypy/doc/index-of-whatsnew.rst b/pypy/doc/index-of-whatsnew.rst
index f8c16a6220..50ee986f13 100644
--- a/pypy/doc/index-of-whatsnew.rst
+++ b/pypy/doc/index-of-whatsnew.rst
@@ -7,6 +7,7 @@ CPython 2.7 compatible versions
 .. toctree::
 
    whatsnew-head.rst
+   whatsnew-pypy2-7.3.2.rst
    whatsnew-pypy2-7.3.1.rst
    whatsnew-pypy2-7.3.0.rst
    whatsnew-pypy2-7.2.0.rst
diff --git a/pypy/doc/index-report.rst b/pypy/doc/index-report.rst
index af110503cb..976128fb81 100644
--- a/pypy/doc/index-report.rst
+++ b/pypy/doc/index-report.rst
@@ -95,10 +95,10 @@ to virtual machine construction`_.  Extends the content previously
 available in the document "Memory management and threading models as
 translation aspects -- solutions and challenges".  *(2007-02-28)*
 
-.. _py-lib: http://pylib.org/
-.. _py.test: http://pytest.org/
-.. _codespeak: http://codespeak.net/
-.. _pypy-dev: http://mail.python.org/mailman/listinfo/pypy-dev
+.. _py-lib: https://pylib.org/
+.. _py.test: https://pytest.org/
+.. _codespeak: https://codespeak.net/
+.. _pypy-dev: https://mail.python.org/mailman/listinfo/pypy-dev
 
 
 Reports of 2006
@@ -139,33 +139,33 @@ properties into our interpreter during the translation process.
 `D14.1 Report about Milestone/Phase 1`_ describes what happened in the PyPy
 project during the first year of EU funding (December 2004 - December 2005)
 
-.. _PyPy EU Final Activity Report: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/PYPY-EU-Final-Activity-Report.pdf
-.. _D01.2-4 Project Organization: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D01.2-4_Project_Organization-2007-03-28.pdf
-.. _D02.1 Development Tools and Website: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D02.1_Development_Tools_and_Website-2007-03-21.pdf
-.. _D02.2 Release Scheme: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D02.2_Release_Scheme-2007-03-30.pdf
-.. _D02.3 Testing Tool: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D02.3_Testing_Framework-2007-03-23.pdf
-.. _D03.1 Extension Compiler: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D03.1_Extension_Compiler-2007-03-21.pdf
-.. _D04.1 Partial Python Implementation: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D04.1_Partial_Python_Implementation_on_top_of_CPython.pdf
-.. _D04.2 Complete Python Implementation: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D04.2_Complete_Python_Implementation_on_top_of_CPython.pdf
-.. _D04.3 Parser and Bytecode Compiler: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D04.3_Report_about_the_parser_and_bytecode_compiler.pdf
-.. _D04.4 PyPy as a Research Tool: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D04.4_Release_PyPy_as_a_research_tool.pdf
-.. _D05.1 Compiling Dynamic Language Implementations: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D05.1_Publish_on_translating_a_very-high-level_description.pdf
-.. _D05.2 A Compiled Version of PyPy: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D05.2_A_compiled,_self-contained_version_of_PyPy.pdf
-.. _D05.3 Implementation with Translation Aspects: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D05.3_Publish_on_implementation_with_translation_aspects.pdf
-.. _D05.4 Encapsulating Low Level Aspects: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D05.4_Publish_on_encapsulating_low_level_language_aspects.pdf
-.. _D06.1 Core Object Optimization Results: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D06.1_Core_Optimizations-2007-04-30.pdf
-.. _D07.1 Massive Parallelism and Translation Aspects: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D07.1_Massive_Parallelism_and_Translation_Aspects-2007-02-28.pdf
-.. _D08.2 JIT Compiler Architecture: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D08.2_JIT_Compiler_Architecture-2007-05-01.pdf
-.. _D08.1 JIT Compiler Release: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D08.1_JIT_Compiler_Release-2007-04-30.pdf
-.. _D09.1 Constraint Solving and Semantic Web: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D09.1_Constraint_Solving_and_Semantic_Web-2007-05-11.pdf
-.. _D10.1 Aspect-Oriented, Design-by-Contract Programming and RPython static checking: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D10.1_Aspect_Oriented_Programming_in_PyPy-2007-03-22.pdf
-.. _D11.1 PyPy for Embedded Devices: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D11.1_PyPy_for_Embedded_Devices-2007-03-26.pdf
-.. _D12.1 High-Level-Backends and Feature Prototypes: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D12.1_H-L-Backends_and_Feature_Prototypes-2007-03-22.pdf
-.. _D13.1 Integration and Configuration: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D13.1_Integration_and_Configuration-2007-03-30.pdf
-.. _D14.1 Report about Milestone/Phase 1: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D14.1_Report_about_Milestone_Phase_1.pdf
-.. _D14.2 Tutorials and Guide Through the PyPy Source Code: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D14.2_Tutorials_and_Guide_Through_the_PyPy_Source_Code-2007-03-22.pdf
-.. _D14.3 Report about Milestone/Phase 2: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D14.3_Report_about_Milestone_Phase_2-final-2006-08-03.pdf
-.. _D14.4 PyPy-1.0 Milestone report: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D14.4_Report_About_Milestone_Phase_3-2007-05-01.pdf
-.. _D14.5 Documentation of the development process: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D14.5_Documentation_of_the_development_process-2007-03-30.pdf
-
-.. _PyPy's approach to virtual machine construction: https://bitbucket.org/pypy/extradoc/raw/tip/talk/dls2006/pypy-vm-construction.pdf
+.. _PyPy EU Final Activity Report: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/PYPY-EU-Final-Activity-Report.pdf
+.. _D01.2-4 Project Organization: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D01.2-4_Project_Organization-2007-03-28.pdf
+.. _D02.1 Development Tools and Website: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D02.1_Development_Tools_and_Website-2007-03-21.pdf
+.. _D02.2 Release Scheme: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D02.2_Release_Scheme-2007-03-30.pdf
+.. _D02.3 Testing Tool: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D02.3_Testing_Framework-2007-03-23.pdf
+.. _D03.1 Extension Compiler: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D03.1_Extension_Compiler-2007-03-21.pdf
+.. _D04.1 Partial Python Implementation: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D04.1_Partial_Python_Implementation_on_top_of_CPython.pdf
+.. _D04.2 Complete Python Implementation: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D04.2_Complete_Python_Implementation_on_top_of_CPython.pdf
+.. _D04.3 Parser and Bytecode Compiler: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D04.3_Report_about_the_parser_and_bytecode_compiler.pdf
+.. _D04.4 PyPy as a Research Tool: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D04.4_Release_PyPy_as_a_research_tool.pdf
+.. _D05.1 Compiling Dynamic Language Implementations: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D05.1_Publish_on_translating_a_very-high-level_description.pdf
+.. _D05.2 A Compiled Version of PyPy: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D05.2_A_compiled,_self-contained_version_of_PyPy.pdf
+.. _D05.3 Implementation with Translation Aspects: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D05.3_Publish_on_implementation_with_translation_aspects.pdf
+.. _D05.4 Encapsulating Low Level Aspects: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D05.4_Publish_on_encapsulating_low_level_language_aspects.pdf
+.. _D06.1 Core Object Optimization Results: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D06.1_Core_Optimizations-2007-04-30.pdf
+.. _D07.1 Massive Parallelism and Translation Aspects: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D07.1_Massive_Parallelism_and_Translation_Aspects-2007-02-28.pdf
+.. _D08.2 JIT Compiler Architecture: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D08.2_JIT_Compiler_Architecture-2007-05-01.pdf
+.. _D08.1 JIT Compiler Release: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D08.1_JIT_Compiler_Release-2007-04-30.pdf
+.. _D09.1 Constraint Solving and Semantic Web: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D09.1_Constraint_Solving_and_Semantic_Web-2007-05-11.pdf
+.. _D10.1 Aspect-Oriented, Design-by-Contract Programming and RPython static checking: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D10.1_Aspect_Oriented_Programming_in_PyPy-2007-03-22.pdf
+.. _D11.1 PyPy for Embedded Devices: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D11.1_PyPy_for_Embedded_Devices-2007-03-26.pdf
+.. _D12.1 High-Level-Backends and Feature Prototypes: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D12.1_H-L-Backends_and_Feature_Prototypes-2007-03-22.pdf
+.. _D13.1 Integration and Configuration: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D13.1_Integration_and_Configuration-2007-03-30.pdf
+.. _D14.1 Report about Milestone/Phase 1: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D14.1_Report_about_Milestone_Phase_1.pdf
+.. _D14.2 Tutorials and Guide Through the PyPy Source Code: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D14.2_Tutorials_and_Guide_Through_the_PyPy_Source_Code-2007-03-22.pdf
+.. _D14.3 Report about Milestone/Phase 2: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D14.3_Report_about_Milestone_Phase_2-final-2006-08-03.pdf
+.. _D14.4 PyPy-1.0 Milestone report: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D14.4_Report_About_Milestone_Phase_3-2007-05-01.pdf
+.. _D14.5 Documentation of the development process: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/eu-report/D14.5_Documentation_of_the_development_process-2007-03-30.pdf
+
+.. _PyPy's approach to virtual machine construction: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/talk/dls2006/pypy-vm-construction.pdf
diff --git a/pypy/doc/index.rst b/pypy/doc/index.rst
index ebb2a26e00..e63dbc3daa 100644
--- a/pypy/doc/index.rst
+++ b/pypy/doc/index.rst
@@ -15,9 +15,9 @@ implementation of the Python_ language.
 All of the documentation and source code is available under the MIT license,
 unless otherwise specified. Consult :source:`LICENSE`.
 
-.. _fast: http://speed.pypy.org
-.. _Python: http://python.org/
-.. _PyPy website: http://pypy.org/
+.. _fast: https://speed.pypy.org
+.. _Python: https://python.org/
+.. _PyPy website: https://pypy.org/
 
 
 .. _getting-started-index:
@@ -104,8 +104,8 @@ Meeting PyPy developers
 
 .. _#pypy on irc.freenode.net: irc://irc.freenode.net/pypy
 .. _here: https://quodlibet.duckdns.org/irc/pypy/latest.log.html#irc-end
-.. _Development mailing list: http://mail.python.org/mailman/listinfo/pypy-dev
-.. _Commit mailing list: http://mail.python.org/mailman/listinfo/pypy-commit
+.. _Development mailing list: https://mail.python.org/mailman/listinfo/pypy-dev
+.. _Commit mailing list: https://mail.python.org/mailman/listinfo/pypy-commit
 .. _Development bug/feature tracker: https://foss.heptapod.net/pypy/pypy/issues
 
 
diff --git a/pypy/doc/install.rst b/pypy/doc/install.rst
index 9fb9261205..d81908400d 100644
--- a/pypy/doc/install.rst
+++ b/pypy/doc/install.rst
@@ -26,9 +26,9 @@ may work on your system.
 Please note that the nightly builds are not
 guaranteed to be as stable as official releases, use them at your own risk.
 
-.. _most recent release: http://pypy.org/download.html
-.. _development nightly build: http://buildbot.pypy.org/nightly/trunk/
-.. _Linux binaries: http://pypy.org/download.html#linux-binaries-and-common-distributions
+.. _most recent release: https://pypy.org/download.html
+.. _development nightly build: https://buildbot.pypy.org/nightly/trunk/
+.. _Linux binaries: https://pypy.org/download.html#linux-binaries-and-common-distributions
 
 Installing PyPy
 ~~~~~~~~~~~~~~~
@@ -99,7 +99,7 @@ You should still upgrade pip and wheel to the latest versions via::
 
     $ my-pypy-env/bin/pypy -mpip install -U pip wheel
 
-.. _pip: http://pypi.python.org/pypi/pip
+.. _pip: https://pypi.python.org/pypi/pip
 .. _ensurepip: https://docs.python.org/3/library/ensurepip.html
 
 Building PyPy yourself
diff --git a/pypy/doc/introduction.rst b/pypy/doc/introduction.rst
index 063540f7e3..d029e74d3b 100644
--- a/pypy/doc/introduction.rst
+++ b/pypy/doc/introduction.rst
@@ -30,5 +30,5 @@ language implementation itself.
 
 For more details, have a look at our :doc:`architecture overview <architecture>`.
 
-.. _Python: http://python.org
+.. _Python: https://python.org
 .. _
diff --git a/pypy/doc/jit-hooks.rst b/pypy/doc/jit-hooks.rst
index c1dabe66cb..2c2292284a 100644
--- a/pypy/doc/jit-hooks.rst
+++ b/pypy/doc/jit-hooks.rst
@@ -1,3 +1,5 @@
+.. _jit-hooks:
+
 JIT hooks
 =========
 
diff --git a/pypy/doc/objspace.rst b/pypy/doc/objspace.rst
index 399114d904..94bcfc07dd 100644
--- a/pypy/doc/objspace.rst
+++ b/pypy/doc/objspace.rst
@@ -101,7 +101,7 @@ directly correspond to language-level constructs:
    wrapped integer or long, or raise a :py:exc:`TypeError` if the object doesn't have an
    :py:func:`__index__` special method.
 
-.. _as introduced in CPython 2.5: http://www.python.org/dev/peps/pep-0357/
+.. _as introduced in CPython 2.5: https://www.python.org/dev/peps/pep-0357/
 
 .. py:function:: is_(w_x, w_y)
 
@@ -385,7 +385,7 @@ Data Members
    Python's built-in exception classes (:py:class:`KeyError`, :py:class:`IndexError`,
    etc).
 
-.. TODO: is it worth listing out all ~50 builtin exception types (http://docs.python.org/2/library/exceptions.html)?
+.. TODO: is it worth listing out all ~50 builtin exception types (https://docs.python.org/2/library/exceptions.html)?
 
 .. py:data:: ObjSpace.MethodTable
 
diff --git a/pypy/doc/project-documentation.rst b/pypy/doc/project-documentation.rst
index 8d9a2e7a8f..d3cfbd8edf 100644
--- a/pypy/doc/project-documentation.rst
+++ b/pypy/doc/project-documentation.rst
@@ -69,7 +69,7 @@ allow you to customize PyPy.
 
 :doc:`directory cross-reference <dir-reference>`
 
-.. _dynamic-language translation: https://bitbucket.org/pypy/extradoc/raw/tip/eu-report/D05.1_Publish_on_translating_a_very-high-level_description.pdf
+.. _dynamic-language translation: https://foss.heptapod.net/pypy/extradoc/-/tree/branch/extradoc/eu-report/D05.1_Publish_on_translating_a_very-high-level_description.pdf
 
 .. toctree::
    :hidden:
diff --git a/pypy/doc/project-ideas.rst b/pypy/doc/project-ideas.rst
index 82c40636c9..9eeabedd49 100644
--- a/pypy/doc/project-ideas.rst
+++ b/pypy/doc/project-ideas.rst
@@ -40,20 +40,17 @@ to get you thinking:
 Simple tasks for newcomers
 --------------------------
 
-* Tkinter module missing support for threads:
-  https://bitbucket.org/pypy/pypy/issue/1929/tkinter-broken-for-threaded-python-on-both
-
 * Optimize random:
-  https://bitbucket.org/pypy/pypy/issue/1901/try-using-a-different-implementation-of
+  https://foss.heptapod.net/pypy/pypy/-/issues/1901
 
 * Implement AF_XXX packet types of sockets:
-  https://bitbucket.org/pypy/pypy/issue/1942/support-for-af_xxx-sockets
+  https://foss.heptapod.net/pypy/pypy/-/issues/1942
 
 * Help with documentation. One task would be to document rpython configuration
   options currently listed only on :doc:`this site <configuration>` also on the
   RPython_ documentation site.
 
-.. _RPython: http://rpython.readthedocs.io
+.. _RPython: https://rpython.readthedocs.io/en/latest
 
 Mid-to-large tasks
 ------------------
@@ -73,8 +70,8 @@ own improvement ideas. In any case, if you feel like working on some of those
 projects, or anything else in PyPy, pop up on IRC or write to us on the
 `mailing list`_.
 
-.. _issue tracker: http://bugs.pypy.org
-.. _mailing list: http://mail.python.org/mailman/listinfo/pypy-dev
+.. _issue tracker: https://foss.heptapod.net/pypy/pypy/-/issues
+.. _mailing list: https://mail.python.org/mailman/listinfo/pypy-dev
 
 
 Explicit typing in RPython
@@ -111,11 +108,8 @@ NumPy rebooted
 --------------
 
 Our cpyext C-API compatiblity layer can now run upstream NumPy unmodified.
-Release PyPy2.7-v6.0 still fails about 10 of the ~6000 test in the NumPy
-test suite. We need to improve our ctypes structure -> memoryview conversions_,
-and to refactor the way `NumPy adds docstrings`_.
+We need to refactor the way `NumPy adds docstrings`_.
 
-.. _conversions: https://bitbucket.org/pypy/pypy/issues/2930 
 .. _`NumPy adds docstrings`: https://github.com/numpy/numpy/issues/10167
 
 We also are looking for help in how to hijack NumPy dtype conversion and
@@ -150,8 +144,8 @@ this is an ideal task to get started, because it does not require any deep
 knowledge of the internals. Head over to `vmprof-python`_, `vmprof-server`_ and
 `vmprof-integration`_ to find open issues and documentation.
 
-.. _jitviewer: http://vmprof.com
-.. _vmprof.com: http://vmprof.com
+.. _jitviewer: https://vmprof.com
+.. _vmprof.com: https://vmprof.com
 .. _vmprof-python: https://github.com/vmprof/vmprof-python
 .. _vmprof-server: https://github.com/vmprof/vmprof-server
 .. _vmprof-integration: https://github.com/vmprof/vmprof-integration
@@ -259,7 +253,7 @@ to be got from them!):
 
 * `hg`
 
-.. _runner: http://speed.pypy.org
+.. _runner: https://speed.pypy.org
 .. _`CPython site`: https://speed.python.org/
 
 
@@ -311,20 +305,20 @@ Alternatively, an approach we used to recommend was to rewrite C extensions
 using more pypy-friendly technologies, e.g. cffi. Here is a partial list of
 good work that needs to be finished:
 
-**wxPython** https://bitbucket.org/amauryfa/wxpython-cffi
+**wxPython-cffi** `archived copy of the bitbucket repo`_
 
     Status: A project by a PyPy developer to adapt the Phoenix sip build system to cffi
 
-    The project is a continuation of a 2013 GSOC https://bitbucket.org/waedt/wxpython_cffi
+    The project is a continuation of a 2013 GSOC https://waedt.blogspot.com/
+
+    TODO: Revive the archive, merge the latest version of the wrappers and finish
+    the sip conversion
 
-    TODO: Merge the latest version of the wrappers and finish the sip conversion
+.. _`archived copy of the bitbucket repo`: https://bitbucket-archive.softwareheritage.org/projects/am/amauryfa/wxpython-cffi.html
 
 **pygame** https://github.com/CTPUG/pygame_cffi
 
-    Status: see blog post <http://morepypy.blogspot.com/2014/03/pygamecffi-pygame-on-pypy.html>
+    Status: see blog post <https://morepypy.blogspot.com/2014/03/pygamecffi-pygame-on-pypy.html>
 
     TODO: see the end of the blog post
 
-**pyopengl** https://bitbucket.org/duangle/pyopengl-cffi
-
-    Status: unknown
diff --git a/pypy/doc/release-0.6.rst b/pypy/doc/release-0.6.rst
index 4fcb4e6598..430ad1f0b3 100644
--- a/pypy/doc/release-0.6.rst
+++ b/pypy/doc/release-0.6.rst
@@ -13,7 +13,7 @@ Getting started:    getting-started.html
 
 PyPy Documentation: index.html
 
-PyPy Homepage:      http://pypy.org
+PyPy Homepage:      https://pypy.org
 
 PyPy is a MIT-licensed reimplementation of Python written in
 Python itself.  The long term goals are an implementation that
@@ -89,7 +89,7 @@ not have got that far without the coding and feedback support
 from numerous people.   Please feel free to give feedback and 
 raise questions. 
 
-    contact points: http://pypy.org/contact.html
+    contact points: https://pypy.org/contact.html
 
     contributor list: contributor.html
 
diff --git a/pypy/doc/release-0.7.0.rst b/pypy/doc/release-0.7.0.rst
index b1b33b0bb1..1868520227 100644
--- a/pypy/doc/release-0.7.0.rst
+++ b/pypy/doc/release-0.7.0.rst
@@ -45,11 +45,11 @@ become a viable contender in that area sometime next year.
 Where to start? 
 -----------------------------
 
-Getting started:    http://codespeak.net/pypy/dist/pypy/doc/getting-started.html
+Getting started:    https://codespeak.net/pypy/dist/pypy/doc/getting-started.html
 
-PyPy Documentation: http://codespeak.net/pypy/dist/pypy/doc/ 
+PyPy Documentation: https://codespeak.net/pypy/dist/pypy/doc/ 
 
-PyPy Homepage:      http://codespeak.net/pypy/
+PyPy Homepage:      https://codespeak.net/pypy/
 
 The interpreter and object model implementations shipped with
 the 0.7 version can run on their own and implement the core
@@ -74,9 +74,9 @@ not have got that far without the coding and feedback support
 from numerous people.   Please feel free to give feedback and 
 raise questions. 
 
-    contact points: http://codespeak.net/pypy/dist/pypy/doc/contact.html
+    contact points: https://codespeak.net/pypy/dist/pypy/doc/contact.html
 
-    contributor list: http://codespeak.net/pypy/dist/pypy/doc/contributor.html
+    contributor list: https://codespeak.net/pypy/dist/pypy/doc/contributor.html
 
 have fun, 
     
diff --git a/pypy/doc/release-0.8.0.rst b/pypy/doc/release-0.8.0.rst
index 19b90ae1b9..e624b0f090 100644
--- a/pypy/doc/release-0.8.0.rst
+++ b/pypy/doc/release-0.8.0.rst
@@ -53,11 +53,11 @@ European Union's IST programme.
 Where to start? 
 -----------------------------
 
-Getting started:    http://codespeak.net/pypy/dist/pypy/doc/getting-started.html
+Getting started:    https://codespeak.net/pypy/dist/pypy/doc/getting-started.html
 
-PyPy Documentation: http://codespeak.net/pypy/dist/pypy/doc/ 
+PyPy Documentation: https://codespeak.net/pypy/dist/pypy/doc/ 
 
-PyPy Homepage:      http://codespeak.net/pypy/
+PyPy Homepage:      https://codespeak.net/pypy/
 
 The interpreter and object model implementations shipped with
 the 0.8 version can run on their own and implement the core
@@ -94,7 +94,7 @@ not have got that far without the coding and feedback support
 from numerous people.   Please feel free to give feedback and 
 raise questions. 
 
-    contact points: http://codespeak.net/pypy/dist/pypy/doc/contact.html
+    contact points: https://codespeak.net/pypy/dist/pypy/doc/contact.html
 
 
 have fun, 
@@ -102,7 +102,7 @@ have fun,
     the pypy team, (Armin Rigo, Samuele Pedroni, 
     Holger Krekel, Christian Tismer, 
     Carl Friedrich Bolz, Michael Hudson, 
-    and many others: http://codespeak.net/pypy/dist/pypy/doc/contributor.html)
+    and many others: https://codespeak.net/pypy/dist/pypy/doc/contributor.html)
 
 PyPy development and activities happen as an open source project  
 and with the support of a consortium partially funded by a two 
diff --git a/pypy/doc/release-0.9.0.rst b/pypy/doc/release-0.9.0.rst
index 620b1bf398..a718529990 100644
--- a/pypy/doc/release-0.9.0.rst
+++ b/pypy/doc/release-0.9.0.rst
@@ -9,7 +9,7 @@ The highlights of this fourth release of PyPy are:
 
 **implementation of "stackless" features**
     We now support the larger part of the interface of the original
-    Stackless Python -- see http://www.stackless.com for more.  A
+    Stackless Python -- see https://www.stackless.com for more.  A
     significant part of this is the pickling and unpickling of a running
     tasklet.
 
@@ -20,13 +20,13 @@ The highlights of this fourth release of PyPy are:
 **ext-compiler**
     The "extension compiler" is a new way of writing a C extension for
     CPython and PyPy at the same time. For more information, see its
-    documentation: http://codespeak.net/pypy/dist/pypy/doc/extcompiler.html
+    documentation: https://codespeak.net/pypy/dist/pypy/doc/extcompiler.html
 
 **rctypes**
     Most useful in combination with the ext-compiler is the fact that our
     translation framework can translate code that uses the
     standard-in-Python-2.5 ctypes module.  See its documentation for more:
-    http://codespeak.net/pypy/dist/pypy/doc/rctypes.html
+    https://codespeak.net/pypy/dist/pypy/doc/rctypes.html
 
 **framework GCs** 
     PyPy's interpreter can now be compiled to use a garbage collector
@@ -42,7 +42,7 @@ The highlights of this fourth release of PyPy are:
 **logic space preview**
     This release contains the first version of the logic object space,
     which will add logical variables to Python.  See its docs for more:
-    http://codespeak.net/pypy/dist/pypy/doc/howto-logicobjspace-0.9.html
+    https://codespeak.net/pypy/dist/pypy/doc/howto-logicobjspace-0.9.html
 
 **high level backends preview**
     This release contains the first versions of new backends targeting high
@@ -59,7 +59,7 @@ The highlights of this fourth release of PyPy are:
 **testing refinements**
     py.test, our testing tool, now has preliminary support for doctests.
     We now run all our tests every night, and you can see the summary at:
-    http://buildbot.pypy.org/summary
+    https://buildbot.pypy.org/summary
 
 What is PyPy (about)? 
 ------------------------------------------------
@@ -86,11 +86,11 @@ Union's IST programme.
 Where to start? 
 -----------------------------
 
-Getting started:    http://codespeak.net/pypy/dist/pypy/doc/getting-started.html
+Getting started:    https://codespeak.net/pypy/dist/pypy/doc/getting-started.html
 
-PyPy Documentation: http://codespeak.net/pypy/dist/pypy/doc/ 
+PyPy Documentation: https://codespeak.net/pypy/dist/pypy/doc/ 
 
-PyPy Homepage:      http://codespeak.net/pypy/
+PyPy Homepage:      https://codespeak.net/pypy/
 
 The interpreter and object model implementations shipped with the 0.9
 version can run on their own and implement the core language features
@@ -118,14 +118,14 @@ not have got that far without the coding and feedback support
 from numerous people.   Please feel free to give feedback and 
 raise questions. 
 
-    contact points: http://codespeak.net/pypy/dist/pypy/doc/contact.html
+    contact points: https://codespeak.net/pypy/dist/pypy/doc/contact.html
 
 have fun, 
     
     the pypy team, (Armin Rigo, Samuele Pedroni, 
     Holger Krekel, Christian Tismer, 
     Carl Friedrich Bolz, Michael Hudson, 
-    and many others: http://codespeak.net/pypy/dist/pypy/doc/contributor.html)
+    and many others: https://codespeak.net/pypy/dist/pypy/doc/contributor.html)
 
 PyPy development and activities happen as an open source project  
 and with the support of a consortium partially funded by a two 
diff --git a/pypy/doc/release-0.99.0.rst b/pypy/doc/release-0.99.0.rst
index a3b454f0b0..e6952f344d 100644
--- a/pypy/doc/release-0.99.0.rst
+++ b/pypy/doc/release-0.99.0.rst
@@ -8,7 +8,7 @@ since PyPy-0.9.0 came out in June 2006!
 
 Main entry point for getting-started/download and documentation: 
 
-    http://codespeak.net/pypy/dist/pypy/doc/index.html
+    https://codespeak.net/pypy/dist/pypy/doc/index.html
 
 Further below you'll find some notes about PyPy,
 the 0.99.0 highlights and our aims for PyPy 1.0. 
@@ -21,7 +21,7 @@ have fun,
     Guido Wesdorp
 
     and many others: 
-    http://codespeak.net/pypy/dist/pypy/doc/contributor.html
+    https://codespeak.net/pypy/dist/pypy/doc/contributor.html
 
 
 What is PyPy? 
@@ -68,7 +68,7 @@ Key 0.99.0 Features
   - Transparent proxies: allow to customize both application and
     builtin objects from application level code.  Works as an addition
     to the Standard Object Space (and is translatable). For details see
-    http://codespeak.net/pypy/dist/pypy/doc/proxy.html
+    https://codespeak.net/pypy/dist/pypy/doc/proxy.html
  
 * optimizations: 
 
@@ -92,7 +92,7 @@ Key 0.99.0 Features
   - the JavaScript backend has evolved to a point where it can be used to write
     AJAX web applications with it. This is still an experimental technique,
     though. For demo applications see:
-    http://play1.codespeak.net/ 
+    https://play1.codespeak.net/ 
 
 * new configuration system: 
   There is a new comprehensive configuration system that allows 
@@ -108,26 +108,26 @@ Key 0.99.0 Features
   and is therefore faster (and not based on libc).
 
 * The stability of stackless features was greatly improved. For more details
-  see: http://codespeak.net/pypy/dist/pypy/doc/stackless.html
+  see: https://codespeak.net/pypy/dist/pypy/doc/stackless.html
 
 * RPython library: The release contains our emerging RPython library that tries
   to make programming in RPython more pleasant. It contains an experimental
   parser generator framework. For more details see:
-  http://codespeak.net/pypy/dist/pypy/doc/rlib.html
+  https://codespeak.net/pypy/dist/pypy/doc/rlib.html
 
 * improved documentation:
   
   - extended documentation about stackless features:
-    http://codespeak.net/pypy/dist/pypy/doc/stackless.html
+    https://codespeak.net/pypy/dist/pypy/doc/stackless.html
   
   - PyPy video documentation: eight hours of talks, interviews and features:
-    http://codespeak.net/pypy/dist/pypy/doc/video-index.html
+    https://codespeak.net/pypy/dist/pypy/doc/video-index.html
 
   - technical reports about various aspects of PyPy:
-    http://codespeak.net/pypy/dist/pypy/doc/index-report.html
+    https://codespeak.net/pypy/dist/pypy/doc/index-report.html
     
   The entry point to all our documentation is:
-  http://codespeak.net/pypy/dist/pypy/doc/index.html
+  https://codespeak.net/pypy/dist/pypy/doc/index.html
 
 
 
diff --git a/pypy/doc/release-1.0.0.rst b/pypy/doc/release-1.0.0.rst
index 4bfcf84116..f0ac204523 100644
--- a/pypy/doc/release-1.0.0.rst
+++ b/pypy/doc/release-1.0.0.rst
@@ -38,21 +38,21 @@ We have prepared several entry points to help you get started:
 
 * The main entry point for JIT documentation and status:
 
-   http://codespeak.net/pypy/dist/pypy/doc/jit.html
+   https://codespeak.net/pypy/dist/pypy/doc/jit.html
 
 * The main documentation and getting-started PyPy entry point:
 
-   http://codespeak.net/pypy/dist/pypy/doc/index.html
+   https://codespeak.net/pypy/dist/pypy/doc/index.html
 
 * Our online "play1" demos showcasing various Python interpreters,
   features (and a new way to program AJAX applications):
 
-   http://play1.codespeak.net/
+   https://play1.codespeak.net/
 
 * Our detailed and in-depth Reports about various aspects of the
   project:
 
-   http://codespeak.net/pypy/dist/pypy/doc/index-report.html
+   https://codespeak.net/pypy/dist/pypy/doc/index-report.html
 
 In the next few months we are going to discuss the goals and form of
 the next stage of development - now more than ever depending on your
@@ -68,7 +68,7 @@ have fun,
     Maciej Fijalkowski, Alexandre Fayolle
 
     and many others:
-    http://codespeak.net/pypy/dist/pypy/doc/contributor.html
+    https://codespeak.net/pypy/dist/pypy/doc/contributor.html
 
 
 What is PyPy?
@@ -108,7 +108,7 @@ maintain conceptual integrity of the project and to discuss and deal
 with funding opportunities related to further PyPy sprinting and
 developments. See here for results of the discussion so far:
 
-    http://codespeak.net/pipermail/pypy-dev/2007q1/003577.html
+    https://codespeak.net/pipermail/pypy-dev/2007q1/003577.html
 
 
 1.0.0 Feature highlights
@@ -120,32 +120,32 @@ Here is a summary list of key features included in PyPy 1.0:
 - The Just-In-Time compiler generator, now capable of generating the
   first JIT compiler versions of our Python interpreter:
 
-   http://codespeak.net/pypy/dist/pypy/doc/jit.html
+   https://codespeak.net/pypy/dist/pypy/doc/jit.html
 
 - More Python interpreter optimizations (a CALL_METHOD bytecode, a method
   cache, rope-based strings), now running benchmarks at around half of
   CPython's speed (without the JIT):
 
-   http://codespeak.net/pypy/dist/pypy/doc/interpreter-optimizations.html
+   https://codespeak.net/pypy/dist/pypy/doc/interpreter-optimizations.html
 
 - The Python interpreter can be translated to .NET and enables
   interactions with the CLR libraries:
 
-   http://codespeak.net/pypy/dist/pypy/doc/cli-backend.html
-   http://codespeak.net/pypy/dist/pypy/doc/clr-module.html
+   https://codespeak.net/pypy/dist/pypy/doc/cli-backend.html
+   https://codespeak.net/pypy/dist/pypy/doc/clr-module.html
 
 - Aspect Oriented Programming facilities (based on mutating the Abstract
   Syntax Tree):
 
-   http://codespeak.net/pypy/dist/pypy/doc/aspect_oriented_programming.html
-   http://codespeak.net/pypy/extradoc/eu-report/D10.1_Aspect_Oriented_Programming_in_PyPy-2007-03-22.pdf
+   https://codespeak.net/pypy/dist/pypy/doc/aspect_oriented_programming.html
+   https://codespeak.net/pypy/extradoc/eu-report/D10.1_Aspect_Oriented_Programming_in_PyPy-2007-03-22.pdf
 
 - The JavaScript backend has evolved to a point where it can be used to
   write AJAX web applications with it. This is still an experimental
   technique, though. For demo applications which also showcase various
   generated Python and PROLOG interpreters, see:
 
-   http://play1.codespeak.net/
+   https://play1.codespeak.net/
 
 - Proxying object spaces and features of our Python interpreter:
 
@@ -160,7 +160,7 @@ Here is a summary list of key features included in PyPy 1.0:
 For a detailed description and discussion of high level backends and
 Python interpreter features, please see our extensive "D12" report:
 
-http://codespeak.net/pypy/extradoc/eu-report/D12.1_H-L-Backends_and_Feature_Prototypes-2007-03-22.pdf
+https://codespeak.net/pypy/extradoc/eu-report/D12.1_H-L-Backends_and_Feature_Prototypes-2007-03-22.pdf
 
 
 Funding partners and organizations
diff --git a/pypy/doc/release-1.1.0.rst b/pypy/doc/release-1.1.0.rst
index f7d1502e65..28c81518c2 100644
--- a/pypy/doc/release-1.1.0.rst
+++ b/pypy/doc/release-1.1.0.rst
@@ -9,11 +9,11 @@ interpreter more stable and bug-free.
 
 Download page:
     
-   http://codespeak.net/pypy/dist/pypy/doc/download.html
+   https://codespeak.net/pypy/dist/pypy/doc/download.html
 
 PyPy's Getting Started lives at:
 
-   http://codespeak.net/pypy/dist/pypy/doc/getting-started.html
+   https://codespeak.net/pypy/dist/pypy/doc/getting-started.html
 
 Highlights of This Release
 ==========================
@@ -22,8 +22,8 @@ Highlights of This Release
     among them ctypes, sqlite3, csv, and many more. Most of these extension 
     modules are fully supported under Windows as well.
 
-    http://codespeak.net/pypy/dist/pypy/doc/cpython_differences.html
-    http://morepypy.blogspot.com/2008/06/pypy-improvements.html
+    https://codespeak.net/pypy/dist/pypy/doc/cpython_differences.html
+    https://morepypy.blogspot.com/2008/06/pypy-improvements.html
 
   - Through a large number of tweaks, performance has been improved by
     10%-50% since the 1.0 release. The Python interpreter is now between
@@ -31,7 +31,7 @@ Highlights of This Release
     part of these speed-ups come from our new generational garbage
     collectors.
 
-    http://codespeak.net/pypy/dist/pypy/doc/garbage_collection.html
+    https://codespeak.net/pypy/dist/pypy/doc/garbage_collection.html
 
   - Our Python interpreter now supports distutils as well as
     easy_install for pure-Python modules.
@@ -40,20 +40,20 @@ Highlights of This Release
     run now: Django, Pylons, BitTorrent, Twisted, SymPy, Pyglet, Nevow,
     Pinax:
 
-    http://morepypy.blogspot.com/2008/08/pypy-runs-unmodified-django-10-beta.html
-    http://morepypy.blogspot.com/2008/07/pypys-python-runs-pinax-django.html
-    http://morepypy.blogspot.com/2008/06/running-nevow-on-top-of-pypy.html
+    https://morepypy.blogspot.com/2008/08/pypy-runs-unmodified-django-10-beta.html
+    https://morepypy.blogspot.com/2008/07/pypys-python-runs-pinax-django.html
+    https://morepypy.blogspot.com/2008/06/running-nevow-on-top-of-pypy.html
 
   - A buildbot was set up to run the various tests that PyPy is using
     nightly on Windows and Linux machines:
 
-    http://codespeak.net:8099/
+    https://codespeak.net:8099/
 
   - Sandboxing support: It is possible to translate the Python
     interpreter in a special way so that the result is fully sandboxed.
     
-    http://codespeak.net/pypy/dist/pypy/doc/sandbox.html
-    http://blog.sandbox.lt/en/WSGI%20and%20PyPy%20sandbox
+    https://codespeak.net/pypy/dist/pypy/doc/sandbox.html
+    https://blog.sandbox.lt/en/WSGI%20and%20PyPy%20sandbox
 
 
 Other Changes
@@ -63,9 +63,9 @@ Other Changes
     interface with .NET libraries when translating the Python
     interpreter to the CLI.
 
-    http://codespeak.net/pypy/dist/pypy/doc/clr-module.html
-    http://morepypy.blogspot.com/2008/01/pypynet-goes-windows-forms.html
-    http://morepypy.blogspot.com/2008/01/improve-net-integration.html
+    https://codespeak.net/pypy/dist/pypy/doc/clr-module.html
+    https://morepypy.blogspot.com/2008/01/pypynet-goes-windows-forms.html
+    https://morepypy.blogspot.com/2008/01/improve-net-integration.html
 
   - Stackless improvements: PyPy's ``stackless`` module is now more
     complete. We added channel preferences which change details of the
@@ -75,7 +75,7 @@ Other Changes
   - Classic classes are enabled by default now. In addition, they have
     been greatly optimized and debugged:
 
-    http://morepypy.blogspot.com/2007/12/faster-implementation-of-classic.html
+    https://morepypy.blogspot.com/2007/12/faster-implementation-of-classic.html
 
   - PyPy's Python interpreter can be translated to Java bytecode now to
     produce a pypy-jvm. At the moment there is no integration with
@@ -85,7 +85,7 @@ Other Changes
     make it possible to cross-compile our Python interpreter to Nokia's
     Maemo platform:
 
-    http://codespeak.net/pypy/dist/pypy/doc/maemo.html
+    https://codespeak.net/pypy/dist/pypy/doc/maemo.html
 
   - Some effort was spent to make the Python interpreter more
     memory-efficient. This includes the implementation of a mark-compact
@@ -94,7 +94,7 @@ Other Changes
     objects smaller, e.g. class instances are often only 50% of the size
     of CPython.
 
-    http://morepypy.blogspot.com/2008/10/dsseldorf-sprint-report-days-1-3.html
+    https://morepypy.blogspot.com/2008/10/dsseldorf-sprint-report-days-1-3.html
 
   - The support for the trace hook in the Python interpreter was
     improved to be able to trace the execution of builtin functions and
@@ -108,9 +108,9 @@ Other Changes
     incarnation of the JIT generator. The new JIT generator is in active
     development, but not included in the release.
 
-    http://codespeak.net/pipermail/pypy-dev/2009q2/005143.html
-    http://morepypy.blogspot.com/2009/03/good-news-everyone.html
-    http://morepypy.blogspot.com/2009/03/jit-bit-of-look-inside.html
+    https://codespeak.net/pipermail/pypy-dev/2009q2/005143.html
+    https://morepypy.blogspot.com/2009/03/good-news-everyone.html
+    https://morepypy.blogspot.com/2009/03/jit-bit-of-look-inside.html
 
 
 What is PyPy?
@@ -143,4 +143,4 @@ Have fun,
     Maciek Fijalkowski, Samuele Pedroni
 
     and many others:
-    http://codespeak.net/pypy/dist/pypy/doc/contributor.html
+    https://codespeak.net/pypy/dist/pypy/doc/contributor.html
diff --git a/pypy/doc/release-1.2.0.rst b/pypy/doc/release-1.2.0.rst
index 7fb858f4f8..35db302c68 100644
--- a/pypy/doc/release-1.2.0.rst
+++ b/pypy/doc/release-1.2.0.rst
@@ -10,7 +10,7 @@ them).  The main theme for the 1.2 release is speed.
 
 Main site:
 
-    http://pypy.org/
+    https://pypy.org/
 
 The JIT is stable and we don't observe crashes. Nevertheless we
 would recommend you to treat it as beta software and as a way to try
@@ -25,10 +25,10 @@ Highlights of This Release
 * Various interpreter optimizations that improve performance
   as well as help save memory.
 
-* Introducing a new PyPy website at http://pypy.org/ , made by
+* Introducing a new PyPy website at https://pypy.org/ , made by
   tav and improved by the PyPy team.
 
-* Introducing http://speed.pypy.org/ , a new service that
+* Introducing https://speed.pypy.org/ , a new service that
   monitors our performance nightly, made by Miquel Torres.
 
 * There will be ubuntu packages on "PyPy's PPA" made by
@@ -48,7 +48,7 @@ Known JIT problems (or why you should consider this beta software):
 
 
 If you want to try PyPy, go to the "download page" on our excellent
-new site at http://pypy.org/download.html and find the binary for
+new site at https://pypy.org/download.html and find the binary for
 your platform. If the binary does not work (e.g. on Linux, because
 of different versions of external .so dependencies), or if your
 platform is not supported, you can try building from the source.
@@ -78,4 +78,4 @@ Together with
     Samuele Pedroni
 
 and many others:
-    http://codespeak.net/pypy/dist/pypy/doc/contributor.html
+    https://codespeak.net/pypy/dist/pypy/doc/contributor.html
diff --git a/pypy/doc/release-1.4.0.rst b/pypy/doc/release-1.4.0.rst
index 13812d7650..185cae0559 100644
--- a/pypy/doc/release-1.4.0.rst
+++ b/pypy/doc/release-1.4.0.rst
@@ -7,7 +7,7 @@ in our long journey, as PyPy 1.4 is the first PyPy release that can translate
 itself faster than CPython.  Starting today, we are using PyPy more for
 our every-day development.  So may you :) You can download it here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 What is PyPy
 ============
@@ -46,12 +46,12 @@ More highlights
 
 * Other speed improvements, like JITted calls to functions like map().
 
-.. _virtualenv: http://pypi.python.org/pypi/virtualenv
-.. _`Virtualenv support`: http://morepypy.blogspot.com/2010/08/using-virtualenv-with-pypy.html
-.. _`in production`: http://morepypy.blogspot.com/2010/11/running-large-radio-telescope-software.html
-.. _`our blog`: http://morepypy.blogspot.com
-.. _`pypy 1.4 and pypy 1.3`: http://speed.pypy.org/comparison/?exe=1%2B41,1%2B172&ben=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20&env=1&hor=false&bas=1%2B41&chart=normal+bars
-.. _`pypy 1.4 and cpython 2.6`: http://speed.pypy.org/comparison/?exe=2%2B35,1%2B172&ben=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20&env=1&hor=false&bas=2%2B35&chart=normal+bars
+.. _virtualenv: https://pypi.python.org/pypi/virtualenv
+.. _`Virtualenv support`: https://morepypy.blogspot.com/2010/08/using-virtualenv-with-pypy.html
+.. _`in production`: https://morepypy.blogspot.com/2010/11/running-large-radio-telescope-software.html
+.. _`our blog`: https://morepypy.blogspot.com
+.. _`pypy 1.4 and pypy 1.3`: https://speed.pypy.org/comparison/?exe=1%2B41,1%2B172&ben=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20&env=1&hor=false&bas=1%2B41&chart=normal+bars
+.. _`pypy 1.4 and cpython 2.6`: https://speed.pypy.org/comparison/?exe=2%2B35,1%2B172&ben=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20&env=1&hor=false&bas=2%2B35&chart=normal+bars
 
 Cheers,
 
diff --git a/pypy/doc/release-1.4.1.rst b/pypy/doc/release-1.4.1.rst
index c8af0b9c9f..70bc704aab 100644
--- a/pypy/doc/release-1.4.1.rst
+++ b/pypy/doc/release-1.4.1.rst
@@ -7,7 +7,7 @@ release consolidates all the bug fixes that occurred since the
 previous release.  To everyone that took the trouble to report
 them, we want to say thank you.
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 What is PyPy
 ============
@@ -45,7 +45,7 @@ More highlights
   Antonio Cuni) for the effort) and moved to bitbucket.  The new
   command to check out a copy of PyPy is::
 
-        hg clone http://bitbucket.org/pypy/pypy
+        hg clone https://bitbucket.org/pypy/pypy
 
 * In long-running processes, the assembler generated by old
   JIT-compilations is now freed.  There should be no more leak,
diff --git a/pypy/doc/release-1.5.0.rst b/pypy/doc/release-1.5.0.rst
index e3047d5ee2..c8ebc857ef 100644
--- a/pypy/doc/release-1.5.0.rst
+++ b/pypy/doc/release-1.5.0.rst
@@ -7,7 +7,7 @@ PyPy with the features of CPython 2.7.1, including the standard library. Thus
 all the features of `CPython 2.6`_ and `CPython 2.7`_ are now supported. It
 also contains additional performance improvements. You can download it here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 What is PyPy?
 =============
@@ -47,7 +47,7 @@ More highlights
   ``postgresql``.  However, there are no prebuilt binaries for this.
 
 - Our developer documentation was moved to Sphinx and cleaned up.
-  (click 'Dev Site' on http://pypy.org/ .)
+  (click 'Dev Site' on https://pypy.org/ .)
 
 - and many small things :-)
 
@@ -58,14 +58,14 @@ Carl Friedrich Bolz, Laura Creighton, Antonio Cuni, Maciej Fijalkowski,
 Amaury Forgeot d'Arc, Alex Gaynor, Armin Rigo and the PyPy team
 
 
-.. _`CPython 2.6`: http://docs.python.org/dev/whatsnew/2.6.html
-.. _`CPython 2.7`: http://docs.python.org/dev/whatsnew/2.7.html
+.. _`CPython 2.6`: https://docs.python.org/dev/whatsnew/2.6.html
+.. _`CPython 2.7`: https://docs.python.org/dev/whatsnew/2.7.html
 
-.. _`our blog`: http://morepypy.blogspot.com
-.. _`pypy 1.5 and pypy 1.4`: http://bit.ly/joPhHo
-.. _`pypy 1.5 and cpython 2.6.2`: http://bit.ly/mbVWwJ
+.. _`our blog`: https://morepypy.blogspot.com
+.. _`pypy 1.5 and pypy 1.4`: https://bit.ly/joPhHo
+.. _`pypy 1.5 and cpython 2.6.2`: https://bit.ly/mbVWwJ
 
-.. _`loop invariant code motion`: http://morepypy.blogspot.com/2011/01/loop-invariant-code-motion.html
-.. _`Tkinter and IDLE`: http://morepypy.blogspot.com/2011/04/using-tkinter-and-idle-with-pypy.html
-.. _`cProfile`: http://docs.python.org/library/profile.html
+.. _`loop invariant code motion`: https://morepypy.blogspot.com/2011/01/loop-invariant-code-motion.html
+.. _`Tkinter and IDLE`: https://morepypy.blogspot.com/2011/04/using-tkinter-and-idle-with-pypy.html
+.. _`cProfile`: https://docs.python.org/library/profile.html
 .. _`external fork`: https://bitbucket.org/alex_gaynor/pypy-postgresql
diff --git a/pypy/doc/release-1.6.0.rst b/pypy/doc/release-1.6.0.rst
index 2faa582eb1..22e9da36a9 100644
--- a/pypy/doc/release-1.6.0.rst
+++ b/pypy/doc/release-1.6.0.rst
@@ -8,7 +8,7 @@ Windows 32bit and OS X 64bit. This version fully implements Python 2.7.1 and
 has beta level support for loading CPython C extensions.  You can download it
 here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 What is PyPy?
 =============
@@ -30,7 +30,7 @@ layers which compose PyPy.  In particular, we improved: the Garbage Collector,
 the JIT warmup time, the optimizations performed by the JIT, the quality of
 the generated machine code and the implementation of our Python interpreter.
 
-.. _`pypy 1.5 and cpython 2.6.2`: http://speed.pypy.org
+.. _`pypy 1.5 and cpython 2.6.2`: https://speed.pypy.org
 
 
 Highlights
@@ -88,6 +88,6 @@ Hakan Ardo, Carl Friedrich Bolz, Laura Creighton, Antonio Cuni,
 Maciej Fijalkowski, Amaury Forgeot d'Arc, Alex Gaynor,
 Armin Rigo and the PyPy team
 
-.. _`jitviewer`: http://morepypy.blogspot.com/2011/08/visualization-of-jitted-code.html
+.. _`jitviewer`: https://morepypy.blogspot.com/2011/08/visualization-of-jitted-code.html
 .. _`bug tracker`: https://bugs.pypy.org
 
diff --git a/pypy/doc/release-1.7.0.rst b/pypy/doc/release-1.7.0.rst
index 6f8e447969..bac6ac4e59 100644
--- a/pypy/doc/release-1.7.0.rst
+++ b/pypy/doc/release-1.7.0.rst
@@ -9,7 +9,7 @@ the "sweet spot" of PyPy. That is, classes of Python code that PyPy can greatly
 speed up should be vastly improved with this release. You can download the 1.7
 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 What is PyPy?
 =============
@@ -26,7 +26,7 @@ can greatly speed up. On average on
 our benchmark suite, PyPy 1.7 is around **30%** faster than PyPy 1.6 and up
 to **20 times** faster on some benchmarks.
 
-.. _`pypy 1.7 and cpython 2.7.1`: http://speed.pypy.org
+.. _`pypy 1.7 and cpython 2.7.1`: https://speed.pypy.org
 
 
 Highlights
@@ -89,6 +89,6 @@ of those happen faster, we urge you to donate to `numpy proposal`_ or
 `py3k proposal`_. In case you want PyPy to progress, but you trust us with
 the general direction, you can always donate to the `general pot`_.
 
-.. _`numpy proposal`: http://pypy.org/numpydonate.html
-.. _`py3k proposal`: http://pypy.org/py3donate.html
-.. _`general pot`: http://pypy.org
+.. _`numpy proposal`: https://pypy.org/numpydonate.html
+.. _`py3k proposal`: https://pypy.org/py3donate.html
+.. _`general pot`: https://pypy.org
diff --git a/pypy/doc/release-1.8.0.rst b/pypy/doc/release-1.8.0.rst
index cad5251bbf..667aa8e339 100644
--- a/pypy/doc/release-1.8.0.rst
+++ b/pypy/doc/release-1.8.0.rst
@@ -13,9 +13,9 @@ roughly 10% on average since the previous release.
 
 you can download the PyPy 1.8 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
-.. _`list strategies`: http://morepypy.blogspot.com/2011/10/more-compact-lists-with-list-strategies.html
+.. _`list strategies`: https://morepypy.blogspot.com/2011/10/more-compact-lists-with-list-strategies.html
 
 What is PyPy?
 =============
@@ -28,7 +28,7 @@ This release supports x86 machines running Linux 32/64, Mac OS X 32/64 or
 Windows 32. Windows 64 work has been stalled, we would welcome a volunteer
 to handle that.
 
-.. _`pypy 1.8 and cpython 2.7.1`: http://speed.pypy.org
+.. _`pypy 1.8 and cpython 2.7.1`: https://speed.pypy.org
 
 
 Highlights
@@ -90,9 +90,9 @@ the release or is not ready yet. Highlights include:
 Cheers,
 The PyPy Team
 
-.. _`brief overview`: http://doc.pypy.org/en/latest/jit-hooks.html
-.. _`numpy status page`: http://buildbot.pypy.org/numpy-status/latest.html
-.. _`numpy status update blog report`: http://morepypy.blogspot.com/2012/01/numpypy-status-update.html
-.. _`numpypy`: http://pypy.org/numpydonate.html
-.. _`py3k`: http://pypy.org/py3donate.html
-.. _`our plans`: http://morepypy.blogspot.com/2012/01/transactional-memory-ii.html
+.. _`brief overview`: https://doc.pypy.org/en/latest/jit-hooks.html
+.. _`numpy status page`: https://buildbot.pypy.org/numpy-status/latest.html
+.. _`numpy status update blog report`: https://morepypy.blogspot.com/2012/01/numpypy-status-update.html
+.. _`numpypy`: https://pypy.org/numpydonate.html
+.. _`py3k`: https://pypy.org/py3donate.html
+.. _`our plans`: https://morepypy.blogspot.com/2012/01/transactional-memory-ii.html
diff --git a/pypy/doc/release-1.9.0.rst b/pypy/doc/release-1.9.0.rst
index 5e41e74eae..6d498f3f63 100644
--- a/pypy/doc/release-1.9.0.rst
+++ b/pypy/doc/release-1.9.0.rst
@@ -9,9 +9,9 @@ It also brings an improved situation on Windows and OS X.
 
 You can download the PyPy 1.9 release here:
 
-    http://pypy.org/download.html 
+    https://pypy.org/download.html 
 
-.. _`numpypy`: http://pypy.org/numpydonate.html
+.. _`numpypy`: https://pypy.org/numpydonate.html
 
 
 What is PyPy?
@@ -25,7 +25,7 @@ This release supports x86 machines running Linux 32/64, Mac OS X 64 or
 Windows 32.  Windows 64 work is still stalling, we would welcome a volunteer
 to handle that.
 
-.. _`pypy 1.9 and cpython 2.7.2`: http://speed.pypy.org
+.. _`pypy 1.9 and cpython 2.7.2`: https://speed.pypy.org
 
 
 Thanks to our donors
@@ -51,9 +51,9 @@ yet: people interested in them need to grab and (attempt to) translate
 PyPy from the corresponding branches (respectively ``py3k`` and
 ``stm-thread``).
 
-.. _`NumPy in PyPy`: http://pypy.org/numpydonate.html
-.. _`Py3k (Python 3)`: http://pypy.org/py3donate.html
-.. _`Software Transactional Memory`: http://pypy.org/tmdonate.html
+.. _`NumPy in PyPy`: https://pypy.org/numpydonate.html
+.. _`Py3k (Python 3)`: https://pypy.org/py3donate.html
+.. _`Software Transactional Memory`: https://pypy.org/tmdonate.html
 
 Highlights
 ==========
@@ -96,8 +96,8 @@ Highlights
 
 * List comprehension has been improved.
 
-.. _`numpy-status`: http://buildbot.pypy.org/numpy-status/latest.html
-.. _`JIT hooks documentation`: http://doc.pypy.org/en/latest/jit-hooks.html
+.. _`numpy-status`: https://buildbot.pypy.org/numpy-status/latest.html
+.. _`JIT hooks documentation`: https://doc.pypy.org/en/latest/jit-hooks.html
 
 JitViewer
 =========
@@ -105,7 +105,7 @@ JitViewer
 There will be a corresponding 1.9 release of JitViewer which is guaranteed
 to work with PyPy 1.9. See the `JitViewer docs`_ for details.
 
-.. _`JitViewer docs`: http://bitbucket.org/pypy/jitviewer
+.. _`JitViewer docs`: https://bitbucket.org/pypy/jitviewer
 
 Cheers,
 The PyPy Team
diff --git a/pypy/doc/release-2.0.0-beta1.rst b/pypy/doc/release-2.0.0-beta1.rst
index d5e091416d..a8ff9b1e59 100644
--- a/pypy/doc/release-2.0.0-beta1.rst
+++ b/pypy/doc/release-2.0.0-beta1.rst
@@ -14,7 +14,7 @@ numerous improvements to the numpy in pypy effort, cpyext and performance.
 
 You can download the PyPy 2.0 beta 1 release here:
 
-    http://pypy.org/download.html 
+    https://pypy.org/download.html 
 
 What is PyPy?
 =============
@@ -28,7 +28,7 @@ Windows 32. It also supports ARM machines running Linux.
 Windows 64 work is still stalling, we would welcome a volunteer
 to handle that.
 
-.. _`pypy 2.0 beta 1 and cpython 2.7.3`: http://bit.ly/USXqpP
+.. _`pypy 2.0 beta 1 and cpython 2.7.3`: https://bit.ly/USXqpP
 
 How to use PyPy?
 ================
@@ -37,10 +37,10 @@ We suggest using PyPy from a `virtualenv`_. Once you have a virtualenv
 installed, you can follow instructions from `pypy documentation`_ on how
 to proceed. This document also covers other `installation schemes`_.
 
-.. _`pypy documentation`: http://doc.pypy.org/en/latest/getting-started.html#installing-using-virtualenv
-.. _`virtualenv`: http://www.virtualenv.org/en/latest/
-.. _`installation schemes`: http://doc.pypy.org/en/latest/getting-started.html#installing-pypy
-.. _`PyPy and pip`: http://doc.pypy.org/en/latest/getting-started.html#installing-pypy
+.. _`pypy documentation`: https://doc.pypy.org/en/latest/getting-started.html#installing-using-virtualenv
+.. _`virtualenv`: https://www.virtualenv.org/en/latest/
+.. _`installation schemes`: https://doc.pypy.org/en/latest/getting-started.html#installing-pypy
+.. _`PyPy and pip`: https://doc.pypy.org/en/latest/getting-started.html#installing-pypy
 
 Regressions
 ===========
@@ -101,8 +101,8 @@ Highlights
   unicode strings, which means that now such collections will be both faster
   and more compact.
 
-.. _`cpython issue tracker`: http://bugs.python.org/issue14621
-.. _`jit hooks`: http://doc.pypy.org/en/latest/jit-hooks.html
+.. _`cpython issue tracker`: https://bugs.python.org/issue14621
+.. _`jit hooks`: https://doc.pypy.org/en/latest/jit-hooks.html
 
 Things we're working on
 =======================
diff --git a/pypy/doc/release-2.0.0-beta2.rst b/pypy/doc/release-2.0.0-beta2.rst
index 0e27de8523..e5d1b491a6 100644
--- a/pypy/doc/release-2.0.0-beta2.rst
+++ b/pypy/doc/release-2.0.0-beta2.rst
@@ -23,7 +23,7 @@ make it happen before the 2.0 final. The new major features are:
 
 You can download the PyPy 2.0 beta 2 release here:
 
-    http://pypy.org/download.html 
+    https://pypy.org/download.html 
 
 What is PyPy?
 =============
@@ -38,7 +38,7 @@ disabled for the beta 2 release.
 Windows 64 work is still stalling, we would welcome a volunteer
 to handle that.
 
-.. _`pypy 2.0 beta 2 and cpython 2.7.3`: http://bit.ly/USXqpP
+.. _`pypy 2.0 beta 2 and cpython 2.7.3`: https://bit.ly/USXqpP
 
 How to use PyPy?
 ================
@@ -47,9 +47,9 @@ We suggest using PyPy from a `virtualenv`_. Once you have a virtualenv
 installed, you can follow instructions from `pypy documentation`_ on how
 to proceed. This document also covers other `installation schemes`_.
 
-.. _`pypy documentation`: http://doc.pypy.org/en/latest/getting-started.html#installing-using-virtualenv
-.. _`virtualenv`: http://www.virtualenv.org/en/latest/
-.. _`installation schemes`: http://doc.pypy.org/en/latest/getting-started.html#installing-pypy
+.. _`pypy documentation`: https://doc.pypy.org/en/latest/getting-started.html#installing-using-virtualenv
+.. _`virtualenv`: https://www.virtualenv.org/en/latest/
+.. _`installation schemes`: https://doc.pypy.org/en/latest/getting-started.html#installing-pypy
 
 Highlights
 ==========
@@ -83,10 +83,10 @@ Improvements since 1.9
   unicode strings, which means that now such collections will be both faster
   and more compact.
 
-.. _`eventlet`: http://eventlet.net/
-.. _`gevent`: http://www.gevent.org/
-.. _`cffi`: http://cffi.readthedocs.org/en/release-0.6/
-.. _`JIT hooks`: http://doc.pypy.org/en/latest/jit-hooks.html
+.. _`eventlet`: https://eventlet.net/
+.. _`gevent`: https://www.gevent.org/
+.. _`cffi`: https://cffi.readthedocs.org/en/release-0.6/
+.. _`JIT hooks`: https://doc.pypy.org/en/latest/jit-hooks.html
 .. _`pypycore`: https://github.com/gevent-on-pypy/pypycore
 .. _`pypy-hacks`: https://github.com/schmir/gevent/tree/pypy-hacks
 .. _`_curses.py`: https://bitbucket.org/pypy/pypy/src/aefddd47f224e3c12e2ea74f5c796d76f4355bdb/lib_pypy/_curses.py?at=default
diff --git a/pypy/doc/release-2.0.0.rst b/pypy/doc/release-2.0.0.rst
index c5bac376a5..58a847030b 100644
--- a/pypy/doc/release-2.0.0.rst
+++ b/pypy/doc/release-2.0.0.rst
@@ -9,7 +9,7 @@ provide stable releases more often.
 
 You can download the PyPy 2.0 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 The two biggest changes since PyPy 1.9 are:
 
@@ -19,10 +19,10 @@ The two biggest changes since PyPy 1.9 are:
 * PyPy now contains release 0.6 of `cffi`_ as a builtin module, which
   is preferred way of calling C from Python that works well on PyPy
 
-.. _`cffi`: http://cffi.readthedocs.org
+.. _`cffi`: https://cffi.readthedocs.org
 
 If you're using PyPy for anything, it would help us immensely if you fill out
-the following survey: http://bit.ly/pypysurvey This is for the developers
+the following survey: https://bit.ly/pypysurvey This is for the developers
 eyes and we will not make any information public without your agreement.
 
 What is PyPy?
@@ -37,7 +37,7 @@ Windows 32.  Windows 64 work is still stalling, we would welcome a volunteer
 to handle that. ARM support is on the way, as you can see from the recently
 released alpha for ARM.
 
-.. _`pypy 2.0 and cpython 2.7.3`: http://speed.pypy.org
+.. _`pypy 2.0 and cpython 2.7.3`: https://speed.pypy.org
 
 Highlights
 ==========
diff --git a/pypy/doc/release-2.0.1.rst b/pypy/doc/release-2.0.1.rst
index 425fa4d601..b24236f1e2 100644
--- a/pypy/doc/release-2.0.1.rst
+++ b/pypy/doc/release-2.0.1.rst
@@ -5,7 +5,7 @@ PyPy 2.0.1 - Bohr Smørrebrød
 We're pleased to announce PyPy 2.0.1.  This is a stable bugfix release
 over `2.0`_.  You can download it here:
   
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 The fixes are mainly about fatal errors or crashes in our stdlib.  See
 below for more details.
@@ -20,7 +20,7 @@ due to its integrated tracing JIT compiler.
 This release supports x86 machines running Linux 32/64, Mac OS X 64 or
 Windows 32.  Support for ARM is progressing but not bug-free yet.
 
-.. _`pypy 2.0 and cpython 2.7.3`: http://speed.pypy.org
+.. _`pypy 2.0 and cpython 2.7.3`: https://speed.pypy.org
 
 Highlights
 ==========
@@ -38,7 +38,7 @@ Highlights
 - work around an eventlet issue with `socket._decref_socketios()`__.
 
 .. __: https://bugs.pypy.org/issue1482
-.. __: http://mail.python.org/pipermail/pypy-dev/2013-May/011362.html
+.. __: https://mail.python.org/pipermail/pypy-dev/2013-May/011362.html
 .. __: https://bugs.pypy.org/issue1468
 .. _2.0: release-2.0.0.html
 
diff --git a/pypy/doc/release-2.0.2.rst b/pypy/doc/release-2.0.2.rst
index f1587eeb2f..e7a6dddaba 100644
--- a/pypy/doc/release-2.0.2.rst
+++ b/pypy/doc/release-2.0.2.rst
@@ -5,7 +5,7 @@ PyPy 2.0.2 - Fermi Panini
 We're pleased to announce PyPy 2.0.2.  This is a stable bugfix release
 over `2.0`_ and `2.0.1`_.  You can download it here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 It fixes a crash in the JIT when calling external C functions (with
 ctypes/cffi) in a multithreaded context.
@@ -23,7 +23,7 @@ due to its integrated tracing JIT compiler.
 This release supports x86 machines running Linux 32/64, Mac OS X 64 or
 Windows 32.  Support for ARM is progressing but not bug-free yet.
 
-.. _`pypy 2.0 and cpython 2.7.3`: http://speed.pypy.org
+.. _`pypy 2.0 and cpython 2.7.3`: https://speed.pypy.org
 
 Highlights
 ==========
diff --git a/pypy/doc/release-2.1.0-beta1.rst b/pypy/doc/release-2.1.0-beta1.rst
index 5537341997..d752b15aa8 100644
--- a/pypy/doc/release-2.1.0-beta1.rst
+++ b/pypy/doc/release-2.1.0-beta1.rst
@@ -10,9 +10,9 @@ Foundation`_ for supporting the work to finish PyPy's ARM support.
 
 You can download the PyPy 2.1 beta 1 release here:
 
-    http://pypy.org/download.html 
+    https://pypy.org/download.html 
 
-.. _`Raspberry Pi Foundation`: http://www.raspberrypi.org
+.. _`Raspberry Pi Foundation`: https://www.raspberrypi.org
 
 Highlights
 ==========
@@ -62,10 +62,10 @@ We suggest using PyPy from a `virtualenv`_. Once you have a virtualenv
 installed, you can follow instructions from `pypy documentation`_ on how
 to proceed. This document also covers other `installation schemes`_.
 
-.. _`pypy documentation`: http://doc.pypy.org/en/latest/getting-started.html#installing-using-virtualenv
-.. _`virtualenv`: http://www.virtualenv.org/en/latest/
-.. _`installation schemes`: http://doc.pypy.org/en/latest/getting-started.html#installing-pypy
-.. _`PyPy and pip`: http://doc.pypy.org/en/latest/getting-started.html#installing-pypy
+.. _`pypy documentation`: https://doc.pypy.org/en/latest/getting-started.html#installing-using-virtualenv
+.. _`virtualenv`: https://www.virtualenv.org/en/latest/
+.. _`installation schemes`: https://doc.pypy.org/en/latest/getting-started.html#installing-pypy
+.. _`PyPy and pip`: https://doc.pypy.org/en/latest/getting-started.html#installing-pypy
 
 
 Cheers,
diff --git a/pypy/doc/release-2.1.0-beta2.rst b/pypy/doc/release-2.1.0-beta2.rst
index 6b3a8b18bc..d066c1020e 100644
--- a/pypy/doc/release-2.1.0-beta2.rst
+++ b/pypy/doc/release-2.1.0-beta2.rst
@@ -7,7 +7,7 @@ This beta adds one new feature to the 2.1 release and contains several bugfixes
 
 You can download the PyPy 2.1 beta 1 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 Highlights
 ==========
@@ -56,10 +56,10 @@ We suggest using PyPy from a `virtualenv`_. Once you have a virtualenv
 installed, you can follow instructions from `pypy documentation`_ on how
 to proceed. This document also covers other `installation schemes`_.
 
-.. _`pypy documentation`: http://doc.pypy.org/en/latest/getting-started.html#installing-using-virtualenv
-.. _`virtualenv`: http://www.virtualenv.org/en/latest/
-.. _`installation schemes`: http://doc.pypy.org/en/latest/getting-started.html#installing-pypy
-.. _`PyPy and pip`: http://doc.pypy.org/en/latest/getting-started.html#installing-pypy
+.. _`pypy documentation`: https://doc.pypy.org/en/latest/getting-started.html#installing-using-virtualenv
+.. _`virtualenv`: https://www.virtualenv.org/en/latest/
+.. _`installation schemes`: https://doc.pypy.org/en/latest/getting-started.html#installing-pypy
+.. _`PyPy and pip`: https://doc.pypy.org/en/latest/getting-started.html#installing-pypy
 
 
 Cheers,
diff --git a/pypy/doc/release-2.1.0.rst b/pypy/doc/release-2.1.0.rst
index ca4555b4c8..f24aedb397 100644
--- a/pypy/doc/release-2.1.0.rst
+++ b/pypy/doc/release-2.1.0.rst
@@ -8,17 +8,17 @@ This release also contains several bugfixes and performance improvements.
 
 You can download the PyPy 2.1 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank the `Raspberry Pi Foundation`_ for supporting the work
 to finish PyPy's ARM support.
 
-.. _`Raspberry Pi Foundation`: http://www.raspberrypi.org
+.. _`Raspberry Pi Foundation`: https://www.raspberrypi.org
 
 The first beta of PyPy3 2.1, targeting version 3 of the Python language, was
 just released, more details can be found `here`_.
 
-.. _`here`: http://morepypy.blogspot.com/2013/07/pypy3-21-beta-1.html
+.. _`here`: https://morepypy.blogspot.com/2013/07/pypy3-21-beta-1.html
 
 What is PyPy?
 =============
@@ -42,7 +42,7 @@ currently target ``ARMv7``.
 Windows 64 work is still stalling, we would welcome a volunteer
 to handle that.
 
-.. _`pypy 2.1 and cpython 2.7.2`: http://speed.pypy.org
+.. _`pypy 2.1 and cpython 2.7.2`: https://speed.pypy.org
 
 Highlights
 ==========
diff --git a/pypy/doc/release-2.2.0.rst b/pypy/doc/release-2.2.0.rst
index 3217598365..63691d35d7 100644
--- a/pypy/doc/release-2.2.0.rst
+++ b/pypy/doc/release-2.2.0.rst
@@ -10,7 +10,7 @@ This release also contains several bugfixes and performance improvements.
 
 You can download the PyPy 2.2 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project. We showed quite a bit of progress on all three projects (see below)
@@ -25,7 +25,7 @@ projects are:
 
 * NumPy: the work done is included in the PyPy 2.2 release. More details below.
 
-.. _`Raspberry Pi Foundation`: http://www.raspberrypi.org
+.. _`Raspberry Pi Foundation`: https://www.raspberrypi.org
 
 What is PyPy?
 =============
@@ -40,7 +40,7 @@ This release supports x86 machines running Linux 32/64, Mac OS X 64, Windows
 Work on the native Windows 64 is still stalling, we would welcome a volunteer
 to handle that.
 
-.. _`pypy 2.2 and cpython 2.7.2`: http://speed.pypy.org
+.. _`pypy 2.2 and cpython 2.7.2`: https://speed.pypy.org
 
 Highlights
 ==========
diff --git a/pypy/doc/release-2.2.1.rst b/pypy/doc/release-2.2.1.rst
index fdad2cf57b..c5e0b8dfea 100644
--- a/pypy/doc/release-2.2.1.rst
+++ b/pypy/doc/release-2.2.1.rst
@@ -7,7 +7,7 @@ language. This is a bugfix release over 2.2.
 
 You can download the PyPy 2.2.1 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 What is PyPy?
 =============
@@ -22,7 +22,7 @@ This release supports x86 machines running Linux 32/64, Mac OS X 64, Windows
 Work on the native Windows 64 is still stalling, we would welcome a volunteer
 to handle that.
 
-.. _`pypy 2.2 and cpython 2.7.2`: http://speed.pypy.org
+.. _`pypy 2.2 and cpython 2.7.2`: https://speed.pypy.org
 
 Highlights
 ==========
diff --git a/pypy/doc/release-2.3.0.rst b/pypy/doc/release-2.3.0.rst
index 74b03c570a..312bf90ca6 100644
--- a/pypy/doc/release-2.3.0.rst
+++ b/pypy/doc/release-2.3.0.rst
@@ -15,7 +15,7 @@ PyPy can now be embedded in a hosting application, for instance inside `uWSGI`_
 
 You can download the PyPy 2.3 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project, and for those who donate to our three sub-projects.
@@ -31,15 +31,15 @@ so we can finish those projects!  The three sub-projects are:
 
 * `NumPy`_ which is included in the PyPy 2.3 release. More details below.
 
-.. _`Py3k`: http://pypy.org/py3donate.html
-.. _`STM`: http://pypy.org/tmdonate2.html
-.. _ `NumPy`: http://pypy.org/numpydonate.html
-.. _`TDD`: http://doc.pypy.org/en/latest/how-to-contribute.html
-.. _`CFFI`: http://cffi.readthedocs.org
+.. _`Py3k`: https://pypy.org/py3donate.html
+.. _`STM`: https://pypy.org/tmdonate2.html
+.. _ `NumPy`: https://pypy.org/numpydonate.html
+.. _`TDD`: https://doc.pypy.org/en/latest/how-to-contribute.html
+.. _`CFFI`: https://cffi.readthedocs.org
 .. _`cryptography`: https://cryptography.io
 .. _`Pillow`: https://pypi.python.org/pypi/Pillow/2.4.0
 .. _`pygame-cffi`: https://github.com/CTPUG/pygame_cffi
-.. _`uWSGI`: http://uwsgi-docs.readthedocs.org/en/latest/PyPy.html
+.. _`uWSGI`: https://uwsgi-docs.readthedocs.org/en/latest/PyPy.html
 
 What is PyPy?
 =============
@@ -57,8 +57,8 @@ While we support 32 bit python on Windows, work on the native Windows 64
 bit python is still stalling, we would welcome a volunteer
 to `handle that`_.
 
-.. _`pypy 2.3 and cpython 2.7.x`: http://speed.pypy.org
-.. _`handle that`: http://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
+.. _`pypy 2.3 and cpython 2.7.x`: https://speed.pypy.org
+.. _`handle that`: https://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
 
 Highlights
 ==========
@@ -92,8 +92,8 @@ for more information see `whats-new`_:
 
 * Fix handling of tp_name for type objects
 
-.. _`HippyVM`: http://www.hippyvm.com
-.. _`whats-new`: http://doc.pypy.org/en/latest/whatsnew-2.3.0.html
+.. _`HippyVM`: https://www.hippyvm.com
+.. _`whats-new`: https://doc.pypy.org/en/latest/whatsnew-2.3.0.html
 
 
 New Platforms and Features
diff --git a/pypy/doc/release-2.3.1.rst b/pypy/doc/release-2.3.1.rst
index ddf3f8814b..025a074a81 100644
--- a/pypy/doc/release-2.3.1.rst
+++ b/pypy/doc/release-2.3.1.rst
@@ -9,7 +9,7 @@ This release contains several bugfixes and enhancements.
 
 You can download the PyPy 2.3.1 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project, and for those who donate to our three sub-projects.
@@ -23,8 +23,8 @@ so we can finish those projects!  The three sub-projects are:
 
 * `NumPy`_ which requires installation of our fork of upstream numpy, available `on bitbucket`_
 
-.. _`STM`: http://pypy.org/tmdonate2.html
-.. _`NumPy`: http://pypy.org/numpydonate.html
+.. _`STM`: https://pypy.org/tmdonate2.html
+.. _`NumPy`: https://pypy.org/numpydonate.html
 .. _`on bitbucket`: https://www.bitbucket.org/pypy/numpy   
 
 What is PyPy?
@@ -43,8 +43,8 @@ While we support 32 bit python on Windows, work on the native Windows 64
 bit python is still stalling, we would welcome a volunteer
 to `handle that`_.
 
-.. _`pypy 2.3 and cpython 2.7.x`: http://speed.pypy.org
-.. _`handle that`: http://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
+.. _`pypy 2.3 and cpython 2.7.x`: https://speed.pypy.org
+.. _`handle that`: https://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
 
 Highlights
 ==========
@@ -67,7 +67,7 @@ for more information see `whats-new`_:
 
 * Many issues were resolved_ since the 2.3 release on May 8
 
-.. _`whats-new`: http://doc.pypy.org/en/latest/whatsnew-2.3.1.html
+.. _`whats-new`: https://doc.pypy.org/en/latest/whatsnew-2.3.1.html
 .. _resolved: https://bitbucket.org/pypy/pypy/issues?status=resolved
 
 Please try it out and let us know what you think. We especially welcome
diff --git a/pypy/doc/release-2.4.0.rst b/pypy/doc/release-2.4.0.rst
index a5d96054e8..4073fc1eff 100644
--- a/pypy/doc/release-2.4.0.rst
+++ b/pypy/doc/release-2.4.0.rst
@@ -7,7 +7,7 @@ enhancements and bug fixes.
 
 You can download the PyPy 2.4.0 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project, and for those who donate to our three sub-projects.
@@ -26,12 +26,12 @@ any donations up to $10k!  The three sub-projects are:
 * `NumPy`_ which requires installation of our fork of upstream numpy, 
   available `on bitbucket`_
 
-.. _`Py3k`: http://pypy.org/py3donate.html
-.. _`STM`: http://pypy.org/tmdonate2.html
-.. _`NumPy`: http://pypy.org/numpydonate.html
+.. _`Py3k`: https://pypy.org/py3donate.html
+.. _`STM`: https://pypy.org/tmdonate2.html
+.. _`NumPy`: https://pypy.org/numpydonate.html
 .. _`on bitbucket`: https://www.bitbucket.org/pypy/numpy   
 .. _`the Python Software Foundation`: https://www.python.org/psf/
-.. _`match funds`: http://morepypy.blogspot.com/2014/09/python-software-foundation-matching.html
+.. _`match funds`: https://morepypy.blogspot.com/2014/09/python-software-foundation-matching.html
 
 What is PyPy?
 =============
@@ -48,8 +48,8 @@ While we support 32 bit python on Windows, work on the native Windows 64
 bit python is still stalling, we would welcome a volunteer
 to `handle that`_.
 
-.. _`pypy 2.4 and cpython 2.7.x`: http://speed.pypy.org
-.. _`handle that`: http://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
+.. _`pypy 2.4 and cpython 2.7.x`: https://speed.pypy.org
+.. _`handle that`: https://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
 
 Highlights
 ==========
@@ -105,9 +105,9 @@ for more information see `whats-new`_:
   
 * Many issues were resolved_ since the 2.3.1 release on June 8
 
-.. _`whats-new`: http://doc.pypy.org/en/latest/whatsnew-2.4.0.html
+.. _`whats-new`: https://doc.pypy.org/en/latest/whatsnew-2.4.0.html
 .. _resolved: https://bitbucket.org/pypy/pypy/issues?status=resolved
-.. _sandbox: http://doc.pypy.org/en/latest/sandbox.html   
+.. _sandbox: https://doc.pypy.org/en/latest/sandbox.html   
 
 We have further improvements on the way: rpython file handling,
 numpy linalg compatibility, as well
diff --git a/pypy/doc/release-2.5.0.rst b/pypy/doc/release-2.5.0.rst
index 0123da4f26..2649c99e49 100644
--- a/pypy/doc/release-2.5.0.rst
+++ b/pypy/doc/release-2.5.0.rst
@@ -7,7 +7,7 @@ enhancements and bug fixes.
 
 You can download the PyPy 2.5.0 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project, and for those who donate to our three sub-projects, as well as our
@@ -26,9 +26,9 @@ so we can finish those projects! The three sub-projects are:
 * `NumPy`_ which requires installation of our fork of upstream numpy,
   available `on bitbucket`_
 
-.. _`Py3k`: http://pypy.org/py3donate.html
-.. _`STM`: http://pypy.org/tmdonate2.html
-.. _`NumPy`: http://pypy.org/numpydonate.html
+.. _`Py3k`: https://pypy.org/py3donate.html
+.. _`STM`: https://pypy.org/tmdonate2.html
+.. _`NumPy`: https://pypy.org/numpydonate.html
 .. _`on bitbucket`: https://www.bitbucket.org/pypy/numpy
 
 What is PyPy?
@@ -46,8 +46,8 @@ While we support 32 bit python on Windows, work on the native Windows 64
 bit python is still stalling, we would welcome a volunteer
 to `handle that`_.
 
-.. _`pypy and cpython 2.7.x`: http://speed.pypy.org
-.. _`handle that`: http://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
+.. _`pypy and cpython 2.7.x`: https://speed.pypy.org
+.. _`handle that`: https://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
 
 Highlights
 ==========
@@ -87,10 +87,10 @@ Highlights
   our issue tracker at https://bitbucket.org/pypy/pypy/issues or on IRC at
   #pypy.
 
-.. _`PyPy documentation`: http://doc.pypy.org
-.. _`RPython documentation`: http://rpython.readthedocs.org
-.. _`blog post`: http://morepypy.blogspot.com/2015/01/faster-more-memory-efficient-and-more.html
-.. _resolved: http://doc.pypy.org/en/latest/whatsnew-2.5.0.html
+.. _`PyPy documentation`: https://doc.pypy.org
+.. _`RPython documentation`: https://rpython.readthedocs.org
+.. _`blog post`: https://morepypy.blogspot.com/2015/01/faster-more-memory-efficient-and-more.html
+.. _resolved: https://doc.pypy.org/en/latest/whatsnew-2.5.0.html
 
 We have further improvements on the way: rpython file handling,
 finishing numpy linalg compatibility, numpy object dtypes, a better profiler,
diff --git a/pypy/doc/release-2.5.1.rst b/pypy/doc/release-2.5.1.rst
index 81f697d77b..8f277b985d 100644
--- a/pypy/doc/release-2.5.1.rst
+++ b/pypy/doc/release-2.5.1.rst
@@ -6,7 +6,7 @@ We're pleased to announce PyPy 2.5.1, Pineapple `Bromeliad`_ following on the he
 
 You can download the PyPy 2.5.1 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project, and for those who donate to our three sub-projects, as well as our
@@ -24,10 +24,10 @@ so we can finish those projects! The three sub-projects are:
 * `NumPy`_ which requires installation of our fork of upstream numpy,
   available `on bitbucket`_
 
-.. _`Bromeliad`: http://xkcd.com/1498
-.. _`Py3k`: http://pypy.org/py3donate.html
-.. _`STM`: http://pypy.org/tmdonate2.html
-.. _`NumPy`: http://pypy.org/numpydonate.html
+.. _`Bromeliad`: https://xkcd.com/1498
+.. _`Py3k`: https://pypy.org/py3donate.html
+.. _`STM`: https://pypy.org/tmdonate2.html
+.. _`NumPy`: https://pypy.org/numpydonate.html
 .. _`on bitbucket`: https://www.bitbucket.org/pypy/numpy
 
 We would also like to encourage new people to join the project. PyPy has many
@@ -35,10 +35,10 @@ layers and we need help with all of them: `PyPy`_ and `Rpython`_ documentation
 improvements, tweaking popular `modules`_ to run on pypy, or general `help`_ with making
 Rpython's JIT even better.
 
-.. _`PyPy`: http://doc.pypy.org 
-.. _`Rpython`: http://rpython.readthedocs.org
-.. _`modules`: http://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
-.. _`help`: http://doc.pypy.org/en/latest/project-ideas.html
+.. _`PyPy`: https://doc.pypy.org 
+.. _`Rpython`: https://rpython.readthedocs.org
+.. _`modules`: https://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
+.. _`help`: https://doc.pypy.org/en/latest/project-ideas.html
 
 What is PyPy?
 =============
@@ -55,8 +55,8 @@ While we support 32 bit python on Windows, work on the native Windows 64
 bit python is still stalling, we would welcome a volunteer
 to `handle that`_.
 
-.. _`pypy and cpython 2.7.x`: http://speed.pypy.org
-.. _`handle that`: http://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
+.. _`pypy and cpython 2.7.x`: https://speed.pypy.org
+.. _`handle that`: https://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
 
 Highlights 
 ==========
@@ -94,15 +94,15 @@ Highlights
   our issue tracker at https://bitbucket.org/pypy/pypy/issues or on IRC at
   #pypy.
 
-.. _`PyPy documentation`: http://doc.pypy.org
-.. _`RPython documentation`: http://rpython.readthedocs.org
+.. _`PyPy documentation`: https://doc.pypy.org
+.. _`RPython documentation`: https://rpython.readthedocs.org
 .. _`ssl module`: https://docs.python.org/3/library/ssl.html
 .. _`PEP 466`: https://www.python.org/dev/peps/pep-0466
 .. _`PEP 476`: https://www.python.org/dev/peps/pep-0476
 .. _`PEP 477`: https://www.python.org/dev/peps/pep-0477
 .. _`POODLE attack`: https://www.imperialviolet.org/2014/10/14/poodle.html
 .. _`ensurepip module`: https://docs.python.org/2/library/ensurepip.html
-.. _resolved: http://doc.pypy.org/en/latest/whatsnew-2.5.1.html
+.. _resolved: https://doc.pypy.org/en/latest/whatsnew-2.5.1.html
 
 Please try it out and let us know what you think. We welcome
 success stories, `experiments`_,  or `benchmarks`_, we know you are using PyPy, please tell us about it!
@@ -111,5 +111,5 @@ Cheers
 
 The PyPy Team
 
-.. _`experiments`: http://morepypy.blogspot.com/2015/02/experiments-in-pyrlang-with-rpython.html
+.. _`experiments`: https://morepypy.blogspot.com/2015/02/experiments-in-pyrlang-with-rpython.html
 .. _`benchmarks`: https://mithrandi.net/blog/2015/03/axiom-benchmark-results-on-pypy-2-5-0
diff --git a/pypy/doc/release-2.6.0.rst b/pypy/doc/release-2.6.0.rst
index 6d8eba0dad..f0bf53d163 100644
--- a/pypy/doc/release-2.6.0.rst
+++ b/pypy/doc/release-2.6.0.rst
@@ -9,7 +9,7 @@ statistical profiler.
 
 You can download the PyPy 2.6.0 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project, and for those who donate to our three sub-projects, as well as our
@@ -32,9 +32,9 @@ so we can finish those projects! The three sub-projects are:
   available `on bitbucket`_
 
 .. _`cffi`: https://cffi.readthedocs.org
-.. _`Py3k`: http://pypy.org/py3donate.html
-.. _`STM`: http://pypy.org/tmdonate2.html
-.. _`NumPy`: http://pypy.org/numpydonate.html
+.. _`Py3k`: https://pypy.org/py3donate.html
+.. _`STM`: https://pypy.org/tmdonate2.html
+.. _`NumPy`: https://pypy.org/numpydonate.html
 .. _`on bitbucket`: https://www.bitbucket.org/pypy/numpy
 
 We would also like to encourage new people to join the project. PyPy has many
@@ -43,10 +43,10 @@ improvements, tweaking popular `modules`_ to run on pypy, or general `help`_ wit
 RPython's JIT even better. Nine new people contributed since the last release,
 you too could be one of them.
 
-.. _`PyPy`: http://doc.pypy.org 
+.. _`PyPy`: https://doc.pypy.org 
 .. _`RPython`: https://rpython.readthedocs.org
-.. _`modules`: http://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
-.. _`help`: http://doc.pypy.org/en/latest/project-ideas.html
+.. _`modules`: https://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
+.. _`help`: https://doc.pypy.org/en/latest/project-ideas.html
 
 What is PyPy?
 =============
@@ -64,11 +64,11 @@ bit python is still stalling, we would welcome a volunteer
 to `handle that`_. We also welcome developers with other operating systems or
 `dynamic languages`_ to see what RPython can do for them.
 
-.. _`pypy and cpython 2.7.x`: http://speed.pypy.org
-.. _OpenBSD: http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/lang/pypy
+.. _`pypy and cpython 2.7.x`: https://speed.pypy.org
+.. _OpenBSD: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/lang/pypy
 .. _freebsd: https://svnweb.freebsd.org/ports/head/lang/pypy/
-.. _`handle that`: http://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
-.. _`dynamic languages`: http://pypyjs.org
+.. _`handle that`: https://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
+.. _`dynamic languages`: https://pypyjs.org
 
 Highlights 
 ===========
@@ -115,7 +115,7 @@ Highlights
     over 7 times faster than cpython
 
 .. _`vmprof`: https://vmprof.readthedocs.org
-.. _resolved: http://doc.pypy.org/en/latest/whatsnew-2.6.0.html
+.. _resolved: https://doc.pypy.org/en/latest/whatsnew-2.6.0.html
 
 Please try it out and let us know what you think. We welcome
 success stories, `experiments`_,  or `benchmarks`_, we know you are using PyPy, please tell us about it!
diff --git a/pypy/doc/release-2.6.1.rst b/pypy/doc/release-2.6.1.rst
index 12b9dc6721..4f208b0873 100644
--- a/pypy/doc/release-2.6.1.rst
+++ b/pypy/doc/release-2.6.1.rst
@@ -9,7 +9,7 @@ functionality of numpy.
 
 You can download the PyPy 2.6.1 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project, and our volunteers and contributors.  
@@ -21,10 +21,10 @@ layers and we need help with all of them: `PyPy`_ and `RPython`_ documentation
 improvements, tweaking popular `modules`_ to run on pypy, or general `help`_ with making
 RPython's JIT even better. 
 
-.. _`PyPy`: http://doc.pypy.org 
+.. _`PyPy`: https://doc.pypy.org 
 .. _`RPython`: https://rpython.readthedocs.org
-.. _`modules`: http://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
-.. _`help`: http://doc.pypy.org/en/latest/project-ideas.html
+.. _`modules`: https://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
+.. _`help`: https://doc.pypy.org/en/latest/project-ideas.html
 
 What is PyPy?
 =============
@@ -40,10 +40,10 @@ as well as newer **ARM** hardware (ARMv6 or ARMv7, with VFPv3) running Linux.
 We also welcome developers of other
 `dynamic languages`_ to see what RPython can do for them.
 
-.. _`pypy and cpython 2.7.x`: http://speed.pypy.org
-.. _OpenBSD: http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/lang/pypy
+.. _`pypy and cpython 2.7.x`: https://speed.pypy.org
+.. _OpenBSD: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/lang/pypy
 .. _freebsd: https://svnweb.freebsd.org/ports/head/lang/pypy/
-.. _`dynamic languages`: http://pypyjs.org
+.. _`dynamic languages`: https://pypyjs.org
 
 Highlights 
 ===========
@@ -116,7 +116,7 @@ Highlights
     one sequence argument
 
 .. _`vmprof`: https://vmprof.readthedocs.org
-.. _resolved: http://doc.pypy.org/en/latest/whatsnew-2.6.1.html
+.. _resolved: https://doc.pypy.org/en/latest/whatsnew-2.6.1.html
 
 Please try it out and let us know what you think. We welcome
 success stories, `experiments`_,  or `benchmarks`_, we know you are using PyPy, please tell us about it!
diff --git a/pypy/doc/release-4.0.0.rst b/pypy/doc/release-4.0.0.rst
index da93c1c0ae..627d7129ed 100644
--- a/pypy/doc/release-4.0.0.rst
+++ b/pypy/doc/release-4.0.0.rst
@@ -11,7 +11,7 @@ refactored rough edges in rpython, and increased functionality of numpy.
 
 You can download the PyPy 4.0.0 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project.
@@ -78,15 +78,15 @@ and PyPy reaps the benefits of `cffi-1.3`_: improved manangement of object
 lifetimes, __stdcall on Win32, ffi.memmove(), and percolate ``const``,
 ``restrict`` keywords from cdef to C code.
 
-.. _`warmup time and memory overhead used for tracing`: http://morepypy.blogspot.com/2015/10/pypy-memory-and-warmup-improvements-2.html
-.. _`vectorization`: http://pypyvecopt.blogspot.co.at/
-.. _`guards`: http://rpython.readthedocs.org/en/latest/glossary.html
-.. _`PyPy`: http://doc.pypy.org 
+.. _`warmup time and memory overhead used for tracing`: https://morepypy.blogspot.com/2015/10/pypy-memory-and-warmup-improvements-2.html
+.. _`vectorization`: https://pypyvecopt.blogspot.co.at/
+.. _`guards`: https://rpython.readthedocs.org/en/latest/glossary.html
+.. _`PyPy`: https://doc.pypy.org 
 .. _`RPython`: https://rpython.readthedocs.org
 .. _`cffi`: https://cffi.readthedocs.org
-.. _`cffi-1.3`: http://cffi.readthedocs.org/en/latest/whatsnew.html#v1-3-0
-.. _`modules`: http://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
-.. _`help`: http://doc.pypy.org/en/latest/project-ideas.html
+.. _`cffi-1.3`: https://cffi.readthedocs.org/en/latest/whatsnew.html#v1-3-0
+.. _`modules`: https://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
+.. _`help`: https://doc.pypy.org/en/latest/project-ideas.html
 .. _`numpy`: https://bitbucket.org/pypy/numpy
 
 What is PyPy?
@@ -106,12 +106,12 @@ as well as newer **ARM** hardware (ARMv6 or ARMv7, with VFPv3) running Linux.
 We also introduce `support for the 64 bit PowerPC`_ hardware, specifically 
 Linux running the big- and little-endian variants of ppc64.
 
-.. _`pypy and cpython 2.7.x`: http://speed.pypy.org
-.. _OpenBSD: http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/lang/pypy
+.. _`pypy and cpython 2.7.x`: https://speed.pypy.org
+.. _OpenBSD: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/lang/pypy
 .. _freebsd: https://svnweb.freebsd.org/ports/head/lang/pypy/
-.. _`dynamic languages`: http://pypyjs.org
-.. _`support for the 64 bit PowerPC`: http://morepypy.blogspot.com/2015/10/powerpc-backend-for-jit.html
-.. _`here`: http://morepypy.blogspot.com/2015/10/automatic-simd-vectorization-support-in.html
+.. _`dynamic languages`: https://pypyjs.org
+.. _`support for the 64 bit PowerPC`: https://morepypy.blogspot.com/2015/10/powerpc-backend-for-jit.html
+.. _`here`: https://morepypy.blogspot.com/2015/10/automatic-simd-vectorization-support-in.html
 
 Other Highlights (since 2.6.1 release two months ago)
 =====================================================
@@ -204,7 +204,7 @@ Other Highlights (since 2.6.1 release two months ago)
     and locals2fast only if truly necessary
 
 .. _`vmprof`: https://vmprof.readthedocs.org
-.. _resolved: http://doc.pypy.org/en/latest/whatsnew-15.11.0.html
+.. _resolved: https://doc.pypy.org/en/latest/whatsnew-15.11.0.html
 
 Please try it out and let us know what you think. We welcome feedback,
 we know you are using PyPy, please tell us about it!
diff --git a/pypy/doc/release-4.0.1.rst b/pypy/doc/release-4.0.1.rst
index 89d8f23df8..173f03e074 100644
--- a/pypy/doc/release-4.0.1.rst
+++ b/pypy/doc/release-4.0.1.rst
@@ -9,7 +9,7 @@ enhancements in this version as well.
 
 You can download the PyPy 4.0.1 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project.
@@ -27,12 +27,12 @@ While not applicable only to PyPy, `cffi`_ is arguably our most significant
 contribution to the python ecosystem. PyPy 4.0.1 ships with 
 `cffi-1.3.1`_ with the improvements it brings.
 
-.. _`PyPy`: http://doc.pypy.org 
+.. _`PyPy`: https://doc.pypy.org 
 .. _`RPython`: https://rpython.readthedocs.org
 .. _`cffi`: https://cffi.readthedocs.org
-.. _`cffi-1.3.1`: http://cffi.readthedocs.org/en/latest/whatsnew.html#v1-3-1
-.. _`modules`: http://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
-.. _`help`: http://doc.pypy.org/en/latest/project-ideas.html
+.. _`cffi-1.3.1`: https://cffi.readthedocs.org/en/latest/whatsnew.html#v1-3-1
+.. _`modules`: https://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
+.. _`help`: https://doc.pypy.org/en/latest/project-ideas.html
 .. _`numpy`: https://bitbucket.org/pypy/numpy
 
 What is PyPy?
@@ -50,8 +50,8 @@ This release supports **x86** machines on most common operating systems
 newer **ARM** hardware (ARMv6 or ARMv7, with VFPv3) running Linux, and the
 big- and little-endian variants of **ppc64** running Linux.
 
-.. _`pypy and cpython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://pypyjs.org
+.. _`pypy and cpython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://pypyjs.org
 
 Other Highlights (since 4.0.0 released three weeks ago)
 =======================================================
@@ -96,7 +96,7 @@ Other Highlights (since 4.0.0 released three weeks ago)
 
   * Silence some warnings while translating
 
-.. _resolved: http://doc.pypy.org/en/latest/whatsnew-4.0.1.html
+.. _resolved: https://doc.pypy.org/en/latest/whatsnew-4.0.1.html
 
 Please update, and continue to help us make PyPy better.
 
diff --git a/pypy/doc/release-5.0.0.rst b/pypy/doc/release-5.0.0.rst
index 044a40a393..f0ef6d73fb 100644
--- a/pypy/doc/release-5.0.0.rst
+++ b/pypy/doc/release-5.0.0.rst
@@ -20,7 +20,7 @@ vmprof now works on Linux, OS X and Windows on both PyPy and CPython.
 
 You can download the PyPy 5.0 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project.
@@ -38,14 +38,14 @@ While not applicable only to PyPy, `cffi`_ is arguably our most significant
 contribution to the python ecosystem. PyPy 5.0 ships with
 `cffi-1.5.2`_ which now allows embedding PyPy (or cpython) in a C program.
 
-.. _`PyPy`: http://doc.pypy.org
+.. _`PyPy`: https://doc.pypy.org
 .. _`RPython`: https://rpython.readthedocs.org
 .. _`cffi`: https://cffi.readthedocs.org
-.. _`cffi-1.5.2`: http://cffi.readthedocs.org/en/latest/whatsnew.html#v1-5-2
-.. _`modules`: http://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
-.. _`help`: http://doc.pypy.org/en/latest/project-ideas.html
+.. _`cffi-1.5.2`: https://cffi.readthedocs.org/en/latest/whatsnew.html#v1-5-2
+.. _`modules`: https://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
+.. _`help`: https://doc.pypy.org/en/latest/project-ideas.html
 .. _`numpy`: https://bitbucket.org/pypy/numpy
-.. _vmprof: http://vmprof.readthedocs.org
+.. _vmprof: https://vmprof.readthedocs.org
 
 What is PyPy?
 =============
@@ -62,8 +62,8 @@ This release supports **x86** machines on most common operating systems
 newer **ARM** hardware (ARMv6 or ARMv7, with VFPv3) running Linux, and the
 big- and little-endian variants of **PPC64** running Linux.
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://pypyjs.org
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://pypyjs.org
 
 Other Highlights (since 4.0.1 released in November 2015)
 =========================================================
@@ -217,9 +217,9 @@ Other Highlights (since 4.0.1 released in November 2015)
 
   * Fix tokenizer to enforce universal newlines, needed for Python 3 support
 
-.. _resolved: http://doc.pypy.org/en/latest/whatsnew-5.0.0.html
-.. _`hypothesis`: http://hypothesis.readthedocs.org
-.. _`blog post`: http://morepypy.blogspot.com/2016/02/c-api-support-update.html
+.. _resolved: https://doc.pypy.org/en/latest/whatsnew-5.0.0.html
+.. _`hypothesis`: https://hypothesis.readthedocs.org
+.. _`blog post`: https://morepypy.blogspot.com/2016/02/c-api-support-update.html
 
 Please update, and continue to help us make PyPy better.
 
diff --git a/pypy/doc/release-5.0.1.rst b/pypy/doc/release-5.0.1.rst
index 0e78fe71ca..4ee9626c28 100644
--- a/pypy/doc/release-5.0.1.rst
+++ b/pypy/doc/release-5.0.1.rst
@@ -29,8 +29,8 @@ This release supports **x86** machines on most common operating systems
 newer **ARM** hardware (ARMv6 or ARMv7, with VFPv3) running Linux, and the
 big- and little-endian variants of **PPC64** running Linux.
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://pypyjs.org
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://pypyjs.org
 
 Please update, and continue to help us make PyPy better.
 
diff --git a/pypy/doc/release-5.1.0.rst b/pypy/doc/release-5.1.0.rst
index eabd8c1547..9238be77c9 100644
--- a/pypy/doc/release-5.1.0.rst
+++ b/pypy/doc/release-5.1.0.rst
@@ -17,7 +17,7 @@ python ecosystem using the PyPy interpreter.
 
 You can download the PyPy 5.1 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project.
@@ -28,14 +28,14 @@ layers and we need help with all of them: `PyPy`_ and `RPython`_ documentation
 improvements, tweaking popular `modules`_ to run on pypy, or general `help`_
 with making RPython's JIT even better.
 
-.. _`PyPy`: http://doc.pypy.org
+.. _`PyPy`: https://doc.pypy.org
 .. _`RPython`: https://rpython.readthedocs.org
-.. _`modules`: http://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
-.. _`help`: http://doc.pypy.org/en/latest/project-ideas.html
+.. _`modules`: https://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
+.. _`help`: https://doc.pypy.org/en/latest/project-ideas.html
 .. _`numpy`: https://bitbucket.org/pypy/numpy
 .. _cffi: https://cffi.readthedocs.org
-.. _`fully support for the IBM s390x`: http://morepypy.blogspot.com/2016/04/pypy-enterprise-edition.html
-.. _`blog post`: http://morepypy.blogspot.com/2016/04/warmup-improvements-more-efficient.html
+.. _`fully support for the IBM s390x`: https://morepypy.blogspot.com/2016/04/pypy-enterprise-edition.html
+.. _`blog post`: https://morepypy.blogspot.com/2016/04/warmup-improvements-more-efficient.html
 
 What is PyPy?
 =============
@@ -58,8 +58,8 @@ This release supports:
 
   * **s390x** running Linux
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://pypyjs.org
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://pypyjs.org
 
 Other Highlights (since 5.0 released in March 2015)
 =========================================================
@@ -149,7 +149,7 @@ Other Highlights (since 5.0 released in March 2015)
 
   * Update rpython functions with ones needed for py3k
 
-.. _resolved: http://doc.pypy.org/en/latest/whatsnew-5.0.0.html
+.. _resolved: https://doc.pypy.org/en/latest/whatsnew-5.0.0.html
 .. _Numpy: https://bitbucket.org/pypy/numpy
 
 Please update, and continue to help us make PyPy better.
diff --git a/pypy/doc/release-5.1.1.rst b/pypy/doc/release-5.1.1.rst
index 321b0c7dda..9b72d288db 100644
--- a/pypy/doc/release-5.1.1.rst
+++ b/pypy/doc/release-5.1.1.rst
@@ -34,8 +34,8 @@ This release supports:
 
   * **s390x** running Linux
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://pypyjs.org
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://pypyjs.org
 
 Please update, and continue to help us make PyPy better.
 
diff --git a/pypy/doc/release-pypy2.7-v5.3.0.rst b/pypy/doc/release-pypy2.7-v5.3.0.rst
index b37bc2795d..98959e1b96 100644
--- a/pypy/doc/release-pypy2.7-v5.3.0.rst
+++ b/pypy/doc/release-pypy2.7-v5.3.0.rst
@@ -11,13 +11,13 @@ and much of SciPy is supported as well.
 
 We updated cffi_ to version 1.7 (small changes, documented here_).
 
-.. _`PyPy3.3 v5.2 alpha 1`: http://morepypy.blogspot.com/2016/05/pypy33-v52-alpha-1-released.html
+.. _`PyPy3.3 v5.2 alpha 1`: https://morepypy.blogspot.com/2016/05/pypy33-v52-alpha-1-released.html
 .. _cffi: https://cffi.readthedocs.org
-.. _here: http://cffi.readthedocs.io/en/latest/whatsnew.html
+.. _here: https://cffi.readthedocs.io/en/latest/whatsnew.html
 
 You can download the PyPy2.7 v5.3 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project.
@@ -28,10 +28,10 @@ layers and we need help with all of them: `PyPy`_ and `RPython`_ documentation
 improvements, tweaking popular `modules`_ to run on pypy, or general `help`_
 with making RPython's JIT even better.
 
-.. _`PyPy`: http://doc.pypy.org
+.. _`PyPy`: https://doc.pypy.org
 .. _`RPython`: https://rpython.readthedocs.org
-.. _`modules`: http://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
-.. _`help`: http://doc.pypy.org/en/latest/project-ideas.html
+.. _`modules`: https://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
+.. _`help`: https://doc.pypy.org/en/latest/project-ideas.html
 
 What is PyPy?
 =============
@@ -54,8 +54,8 @@ This release supports:
 
   * **s390x** running Linux
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://pypyjs.org
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://pypyjs.org
 
 Other Highlights (since 5.1 released in April 2016)
 =========================================================
@@ -113,7 +113,7 @@ Other Highlights (since 5.1 released in April 2016)
   * Fix issue #2226: Another tweak in the incremental GC- this should ensure
     that progress in the major GC occurs quickly enough in all cases.
 
-  * Clarify and refactor documentation on http://doc.pypy.org
+  * Clarify and refactor documentation on https://doc.pypy.org
 
   * Use "must be unicode, not %T" in unicodedata TypeErrors.
 
@@ -181,7 +181,7 @@ Other Highlights (since 5.1 released in April 2016)
 
   * Compile c snippets with -Werror, and fix warnings it exposed
 
-.. _resolved: http://doc.pypy.org/en/latest/whatsnew-5.3.0.html
+.. _resolved: https://doc.pypy.org/en/latest/whatsnew-5.3.0.html
 .. _Numpy: https://bitbucket.org/pypy/numpy
 .. _`the repo`: https://bitbucket.org/pypy/numpy
 
diff --git a/pypy/doc/release-pypy2.7-v5.3.1.rst b/pypy/doc/release-pypy2.7-v5.3.1.rst
index f246ff971f..1f4b0fc89d 100644
--- a/pypy/doc/release-pypy2.7-v5.3.1.rst
+++ b/pypy/doc/release-pypy2.7-v5.3.1.rst
@@ -7,7 +7,7 @@ due to issues_ reported by users.
 
 Thanks to those who reported the issues.
 
-.. _issues: http://doc.pypy.org/en/latest/whatsnew-pypy2-5.3.1.html
+.. _issues: https://doc.pypy.org/en/latest/whatsnew-pypy2-5.3.1.html
 
 What is PyPy?
 =============
@@ -30,8 +30,8 @@ This release supports:
 
   * **s390x** running Linux
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://pypyjs.org
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://pypyjs.org
 
 Please update, and continue to help us make PyPy better.
 
diff --git a/pypy/doc/release-pypy2.7-v5.4.0.rst b/pypy/doc/release-pypy2.7-v5.4.0.rst
index 93a8184a2e..3837aa17f0 100644
--- a/pypy/doc/release-pypy2.7-v5.4.0.rst
+++ b/pypy/doc/release-pypy2.7-v5.4.0.rst
@@ -17,7 +17,7 @@ growing community of PyPy users. We strongly recommend updating.
 
 You can download the PyPy2.7 v5.4 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project.
@@ -30,10 +30,10 @@ with making RPython's JIT even better.
 
 .. _cffi: https://cffi.readthedocs.org
 .. _JIT: https://morepypy.blogspot.com.au/2016/08/pypy-tooling-upgrade-jitviewer-and.html
-.. _`PyPy`: http://doc.pypy.org
+.. _`PyPy`: https://doc.pypy.org
 .. _`RPython`: https://rpython.readthedocs.org
-.. _`modules`: http://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
-.. _`help`: http://doc.pypy.org/en/latest/project-ideas.html
+.. _`modules`: https://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
+.. _`help`: https://doc.pypy.org/en/latest/project-ideas.html
 
 What is PyPy?
 =============
@@ -56,8 +56,8 @@ This release supports:
 
   * **s390x** running Linux
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://pypyjs.org
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://pypyjs.org
 
 Other Highlights (since 5.3 released in June 2016)
 =========================================================
@@ -210,7 +210,7 @@ Other Highlights (since 5.3 released in June 2016)
     `interp_posix.py`, based on the clean-up of CPython 2.7.x 
 
 .. _`JIT logging`: https://morepypy.blogspot.com/2016/08/pypy-tooling-upgrade-jitviewer-and.html
-.. _resolved: http://doc.pypy.org/en/latest/whatsnew-5.4.0.html
+.. _resolved: https://doc.pypy.org/en/latest/whatsnew-5.4.0.html
 
 Please update, and continue to help us make PyPy better.
 
diff --git a/pypy/doc/release-pypy2.7-v5.4.1.rst b/pypy/doc/release-pypy2.7-v5.4.1.rst
index afe6e3c358..f1050a813b 100644
--- a/pypy/doc/release-pypy2.7-v5.4.1.rst
+++ b/pypy/doc/release-pypy2.7-v5.4.1.rst
@@ -53,8 +53,8 @@ This release supports:
   * **s390x** running Linux
 
 .. _cffi: https://cffi.readthedocs.io
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://pypyjs.org
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://pypyjs.org
 
 Please update, and continue to help us make PyPy better.
 
diff --git a/pypy/doc/release-pypy2.7-v5.6.0.rst b/pypy/doc/release-pypy2.7-v5.6.0.rst
index d64bd0452f..e8fc3717de 100644
--- a/pypy/doc/release-pypy2.7-v5.6.0.rst
+++ b/pypy/doc/release-pypy2.7-v5.6.0.rst
@@ -30,7 +30,7 @@ growing community of PyPy users. We strongly recommend updating.
 
 You can download the PyPy2.7 v5.6 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project.
@@ -43,10 +43,10 @@ with making RPython's JIT even better.
 
 .. _CFFI: https://cffi.readthedocs.io/en/latest/whatsnew.html
 .. _grant: https://morepypy.blogspot.com/2016/08/pypy-gets-funding-from-mozilla-for.html
-.. _`PyPy`: http://doc.pypy.org
+.. _`PyPy`: https://doc.pypy.org
 .. _`RPython`: https://rpython.readthedocs.org
-.. _`modules`: http://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
-.. _`help`: http://doc.pypy.org/en/latest/project-ideas.html
+.. _`modules`: https://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
+.. _`help`: https://doc.pypy.org/en/latest/project-ideas.html
 .. _`enhanced`: https://morepypy.blogspot.co.at/2016/11/vectorization-extended-powerpc-and-s390x.html
 
 What is PyPy?
@@ -70,8 +70,8 @@ This release supports:
 
   * **s390x** running Linux
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://rpython.readthedocs.io/en/latest/examples.html
 
 Other Highlights (since 5.4 released Aug 31, 2016)
 =========================================================
@@ -147,7 +147,7 @@ Other Highlights (since 5.4 released Aug 31, 2016)
   * Refactor and remove dead code from ``optimizeopt``, ``resume``
   
 
-.. _resolved: http://doc.pypy.org/en/latest/whatsnew-5.6.0.html
+.. _resolved: https://doc.pypy.org/en/latest/whatsnew-5.6.0.html
 
 Please update, and continue to help us make PyPy better.
 
diff --git a/pypy/doc/release-pypy3-2.1.0-beta1.rst b/pypy/doc/release-pypy3-2.1.0-beta1.rst
index c2b4b5e77d..b79e0f8b03 100644
--- a/pypy/doc/release-pypy3-2.1.0-beta1.rst
+++ b/pypy/doc/release-pypy3-2.1.0-beta1.rst
@@ -11,7 +11,7 @@ for supporting the work that went into this and future releases.
 
 You can download the PyPy3 2.1 beta 1 release here:
 
-    http://pypy.org/download.html#pypy3-2-1-beta-1
+    https://pypy.org/download.html#pypy3-2-1-beta-1
 
 Highlights
 ==========
@@ -42,14 +42,14 @@ We suggest using PyPy from a `virtualenv`_. Once you have a virtualenv
 installed, you can follow instructions from `pypy documentation`_ on how
 to proceed. This document also covers other `installation schemes`_.
 
-.. _donated: http://morepypy.blogspot.com/2012/01/py3k-and-numpy-first-stage-thanks-to.html
-.. _`py3k proposal`: http://pypy.org/py3donate.html
+.. _donated: https://morepypy.blogspot.com/2012/01/py3k-and-numpy-first-stage-thanks-to.html
+.. _`py3k proposal`: https://pypy.org/py3donate.html
 .. _`known issues`: https://bugs.pypy.org/issue?%40search_text=&title=py3k&%40columns=title&keyword=&id=&%40columns=id&creation=&creator=&release=&activity=&%40columns=activity&%40sort=activity&actor=&priority=&%40group=priority&status=-1%2C1%2C2%2C3%2C4%2C5%2C6&%40columns=status&assignedto=&%40columns=assignedto&%40pagesize=50&%40startwith=0&%40queryname=&%40old-queryname=&%40action=search
 .. _`#1540`: https://bugs.pypy.org/issue1540
 .. _`#1541`: https://bugs.pypy.org/issue1541
-.. _`pypy documentation`: http://doc.pypy.org/en/latest/getting-started.html#installing-using-virtualenv
-.. _`virtualenv`: http://www.virtualenv.org/en/latest/
-.. _`installation schemes`: http://doc.pypy.org/en/latest/getting-started.html#installing-pypy
+.. _`pypy documentation`: https://doc.pypy.org/en/latest/getting-started.html#installing-using-virtualenv
+.. _`virtualenv`: https://www.virtualenv.org/en/latest/
+.. _`installation schemes`: https://doc.pypy.org/en/latest/getting-started.html#installing-pypy
 
 
 Cheers,
diff --git a/pypy/doc/release-pypy3-2.3.1.rst b/pypy/doc/release-pypy3-2.3.1.rst
index 417dc60810..71a6b6a48c 100644
--- a/pypy/doc/release-pypy3-2.3.1.rst
+++ b/pypy/doc/release-pypy3-2.3.1.rst
@@ -10,7 +10,7 @@ for supporting the work that went into this.
 
 You can download the PyPy3 2.3.1 release here:
 
-    http://pypy.org/download.html#pypy3-2-3-1
+    https://pypy.org/download.html#pypy3-2-3-1
 
 Highlights
 ==========
@@ -33,7 +33,7 @@ Highlights
  - Resolved handling of Python 3's exception __context__ unnecessarily forcing
    frame object overhead
 
-.. _`PEP 414`: http://legacy.python.org/dev/peps/pep-0414/
+.. _`PEP 414`: https://legacy.python.org/dev/peps/pep-0414/
 
 What is PyPy?
 ==============
@@ -49,7 +49,7 @@ While we support 32 bit python on Windows, work on the native Windows 64
 bit python is still stalling, we would welcome a volunteer
 to `handle that`_.
 
-.. _`handle that`: http://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
+.. _`handle that`: https://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
 
 How to use PyPy?
 =================
@@ -58,11 +58,11 @@ We suggest using PyPy from a `virtualenv`_. Once you have a virtualenv
 installed, you can follow instructions from `pypy documentation`_ on how
 to proceed. This document also covers other `installation schemes`_.
 
-.. _donated: http://morepypy.blogspot.com/2012/01/py3k-and-numpy-first-stage-thanks-to.html
-.. _`py3k proposal`: http://pypy.org/py3donate.html
-.. _`pypy documentation`: http://doc.pypy.org/en/latest/getting-started.html#installing-using-virtualenv
-.. _`virtualenv`: http://www.virtualenv.org/en/latest/
-.. _`installation schemes`: http://doc.pypy.org/en/latest/getting-started.html#installing-pypy
+.. _donated: https://morepypy.blogspot.com/2012/01/py3k-and-numpy-first-stage-thanks-to.html
+.. _`py3k proposal`: https://pypy.org/py3donate.html
+.. _`pypy documentation`: https://doc.pypy.org/en/latest/getting-started.html#installing-using-virtualenv
+.. _`virtualenv`: https://www.virtualenv.org/en/latest/
+.. _`installation schemes`: https://doc.pypy.org/en/latest/getting-started.html#installing-pypy
 
 
 Cheers,
diff --git a/pypy/doc/release-pypy3-2.4.0.rst b/pypy/doc/release-pypy3-2.4.0.rst
index 2458921677..45ffd7d8ca 100644
--- a/pypy/doc/release-pypy3-2.4.0.rst
+++ b/pypy/doc/release-pypy3-2.4.0.rst
@@ -7,7 +7,7 @@ enhancements and bug fixes.
 
 You can download the PyPy3 2.4.0 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project, and for those who donate to our three sub-projects.
@@ -25,9 +25,9 @@ so we can finish those projects! The three sub-projects are:
 * `NumPy`_ which requires installation of our fork of upstream numpy,
   available `on bitbucket`_
 
-.. _`Py3k`: http://pypy.org/py3donate.html
-.. _`STM`: http://pypy.org/tmdonate2.html
-.. _`NumPy`: http://pypy.org/numpydonate.html
+.. _`Py3k`: https://pypy.org/py3donate.html
+.. _`STM`: https://pypy.org/tmdonate2.html
+.. _`NumPy`: https://pypy.org/numpydonate.html
 .. _`on bitbucket`: https://www.bitbucket.org/pypy/numpy
 
 What is PyPy?
@@ -45,8 +45,8 @@ While we support 32 bit python on Windows, work on the native Windows 64
 bit python is still stalling, we would welcome a volunteer
 to `handle that`_.
 
-.. _`pypy 2.4 and cpython 2.7.x`: http://speed.pypy.org
-.. _`handle that`: http://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
+.. _`pypy 2.4 and cpython 2.7.x`: https://speed.pypy.org
+.. _`handle that`: https://doc.pypy.org/en/latest/windows.html#what-is-missing-for-a-full-64-bit-translation
 
 PyPy3 Highlights
 ================
@@ -109,9 +109,9 @@ directly related to Summer of Code.
 
 * Many issues were resolved_ since the 2.3.1 release in June
 
-.. _`whats-new`: http://doc.pypy.org/en/latest/whatsnew-2.4.0.html
+.. _`whats-new`: https://doc.pypy.org/en/latest/whatsnew-2.4.0.html
 .. _resolved: https://bitbucket.org/pypy/pypy/issues?status=resolved
-.. _sandbox: http://doc.pypy.org/en/latest/sandbox.html
+.. _sandbox: https://doc.pypy.org/en/latest/sandbox.html
 
 We have further improvements on the way: rpython file handling,
 numpy linalg compatibility, as well
diff --git a/pypy/doc/release-pypy3.3-v5.2-alpha1.rst b/pypy/doc/release-pypy3.3-v5.2-alpha1.rst
index 9f4489a2f7..fdd24fabc8 100644
--- a/pypy/doc/release-pypy3.3-v5.2-alpha1.rst
+++ b/pypy/doc/release-pypy3.3-v5.2-alpha1.rst
@@ -10,7 +10,7 @@ for supporting the work that went into this and future releases.
 
 You can download the PyPy3.3 v5.2 alpha 1 release here:
 
-    http://pypy.org/download.html#python-3-3-5-compatible-pypy3-3-v5-2
+    https://pypy.org/download.html#python-3-3-5-compatible-pypy3-3-v5-2
 
 Highlights
 ==========
@@ -59,11 +59,11 @@ Cheers
 
 The PyPy Team
 
-.. _donated: http://morepypy.blogspot.com/2012/01/py3k-and-numpy-first-stage-thanks-to.html
-.. _`py3k proposal`: http://pypy.org/py3donate.html
+.. _donated: https://morepypy.blogspot.com/2012/01/py3k-and-numpy-first-stage-thanks-to.html
+.. _`py3k proposal`: https://pypy.org/py3donate.html
 .. _`PEP 393-like space efficient string representation`: https://bitbucket.org/pypy/pypy/issues/2309/optimized-unicode-representation
 .. _`missing features`: https://bitbucket.org/pypy/pypy/issues?status=new&status=open&component=PyPy3+%28running+Python+3.x%29&kind=enhancement
 .. _`known issues`: https://bitbucket.org/pypy/pypy/issues?status=new&status=open&component=PyPy3%20%28running%20Python%203.x%29
 .. _`#2305`: https://bitbucket.org/pypy/pypy/issues/2305
 .. _`ensurepip`: https://docs.python.org/3/library/ensurepip.html#module-ensurepip
-.. _`dynamic languages`: http://pypyjs.org
+.. _`dynamic languages`: https://pypyjs.org
diff --git a/pypy/doc/release-pypy3.3-v5.5.0.rst b/pypy/doc/release-pypy3.3-v5.5.0.rst
index 45d4f76d65..98ef8a26e4 100644
--- a/pypy/doc/release-pypy3.3-v5.5.0.rst
+++ b/pypy/doc/release-pypy3.3-v5.5.0.rst
@@ -11,7 +11,7 @@ for supporting the work that went into this release.
 
 You can download the PyPy3.3 v5.5.0 release here:
 
-    http://pypy.org/download.html#python-3-3-5-compatible-pypy3-3-v5-5
+    https://pypy.org/download.html#python-3-3-5-compatible-pypy3-3-v5-5
 
 Highlights
 ==========
@@ -58,11 +58,11 @@ Cheers
 
 The PyPy Team
 
-.. _donated: http://morepypy.blogspot.com/2012/01/py3k-and-numpy-first-stage-thanks-to.html
-.. _`py3k proposal`: http://pypy.org/py3donate.html
+.. _donated: https://morepypy.blogspot.com/2012/01/py3k-and-numpy-first-stage-thanks-to.html
+.. _`py3k proposal`: https://pypy.org/py3donate.html
 .. _`PEP 393-like space efficient string representation`: https://bitbucket.org/pypy/pypy/issues/2309/optimized-unicode-representation
 .. _`missing features`: https://bitbucket.org/pypy/pypy/issues?status=new&status=open&component=PyPy3+%28running+Python+3.x%29&kind=enhancement
 .. _`known issues`: https://bitbucket.org/pypy/pypy/issues?status=new&status=open&component=PyPy3%20%28running%20Python%203.x%29
 .. _`#2305`: https://bitbucket.org/pypy/pypy/issues/2305
 .. _`ensurepip`: https://docs.python.org/3/library/ensurepip.html#module-ensurepip
-.. _`dynamic languages`: http://pypyjs.org
+.. _`dynamic languages`: https://pypyjs.org
diff --git a/pypy/doc/release-v5.10.0.rst b/pypy/doc/release-v5.10.0.rst
index 731d66ab05..a743f8d5fb 100644
--- a/pypy/doc/release-v5.10.0.rst
+++ b/pypy/doc/release-v5.10.0.rst
@@ -31,7 +31,7 @@ to improve PyPy 3.5 and probably move to 3.6 during the course of 2018.
 
 You can download the v5.10 releases here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project.
@@ -42,7 +42,7 @@ layers and we need help with all of them: `PyPy`_ and `RPython`_ documentation
 improvements, tweaking popular `modules`_ to run on pypy, or general `help`_
 with making RPython's JIT even better.
 
-.. _vmprof: http://vmprof.readthedocs.io
+.. _vmprof: https://vmprof.readthedocs.io
 .. _grant: https://morepypy.blogspot.com/2016/08/pypy-gets-funding-from-mozilla-for.html
 .. _`PyPy`: index.html
 .. _`RPython`: https://rpython.readthedocs.org
@@ -70,8 +70,8 @@ The PyPy release supports:
 
   * **s390x** running Linux
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://rpython.readthedocs.io/en/latest/examples.html
 
 Changelog
 =========
diff --git a/pypy/doc/release-v5.10.1.rst b/pypy/doc/release-v5.10.1.rst
index a5c25c180e..06ba66b459 100644
--- a/pypy/doc/release-v5.10.1.rst
+++ b/pypy/doc/release-v5.10.1.rst
@@ -29,7 +29,7 @@ Thanks to those who reported the issues.
 
 .. _2718: https://bitbucket.org/pypy/pypy/issues/2718
 .. _2717: https://bitbucket.org/pypy/pypy/issues/2717
-.. _Homebrew: http://brewformulas.org/Pypy
+.. _Homebrew: https://brewformulas.org/Pypy
 
 What is PyPy?
 =============
@@ -52,8 +52,8 @@ This PyPy 3.5 release supports:
 
   * **s390x** running Linux
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://rpython.readthedocs.io/en/latest/examples.html
 
 Please update, and continue to help us make PyPy better.
 
diff --git a/pypy/doc/release-v5.7.0.rst b/pypy/doc/release-v5.7.0.rst
index db54254688..a37242e63d 100644
--- a/pypy/doc/release-v5.7.0.rst
+++ b/pypy/doc/release-v5.7.0.rst
@@ -39,7 +39,7 @@ growing community of PyPy users. We strongly recommend updating.
 
 You can download the v5.7 release here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project.
@@ -80,8 +80,8 @@ The PyPy 2.7 release supports:
 
   * **s390x** running Linux
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://rpython.readthedocs.io/en/latest/examples.html
 
 Highlights of the PyPy2.7, cpyext, and RPython changes (since 5.6 released Nov, 2016)
 =====================================================================================
diff --git a/pypy/doc/release-v5.7.1.rst b/pypy/doc/release-v5.7.1.rst
index 51bacf902f..5eb2f8f6b7 100644
--- a/pypy/doc/release-v5.7.1.rst
+++ b/pypy/doc/release-v5.7.1.rst
@@ -39,8 +39,8 @@ The PyPy 2.7 release supports:
 
   * **s390x** running Linux
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://rpython.readthedocs.io/en/latest/examples.html
 
 Please update, and continue to help us make PyPy better.
 
diff --git a/pypy/doc/release-v5.8.0.rst b/pypy/doc/release-v5.8.0.rst
index f70ada0c8d..1d346d7f95 100644
--- a/pypy/doc/release-v5.8.0.rst
+++ b/pypy/doc/release-v5.8.0.rst
@@ -42,7 +42,7 @@ growing community of PyPy users. We strongly recommend updating.
 
 You can download the v5.8 releases here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project.
@@ -55,7 +55,7 @@ with making RPython's JIT even better.
 
 .. _`profile guided optimization`: https://pythonfiles.wordpress.com/2017/05/12/enabling-profile-guided-optimizations-for-pypy
 .. _shadowstack: config/translation.gcrootfinder.html
-.. _vmprof: http://vmprof.readthedocs.io
+.. _vmprof: https://vmprof.readthedocs.io
 .. _`issues with gcc toolchains`: https://bitbucket.org/pypy/pypy/issues/2572/link-time-optimization-lto-disabled
 .. _CFFI: https://cffi.readthedocs.io/en/latest/whatsnew.html
 .. _grant: https://morepypy.blogspot.com/2016/08/pypy-gets-funding-from-mozilla-for.html
@@ -65,7 +65,7 @@ with making RPython's JIT even better.
 .. _`help`: project-ideas.html
 .. _`options`: config/commandline.html#general-translation-options
 .. _`these benchmarks show`: https://morepypy.blogspot.com/2017/03/async-http-benchmarks-on-pypy3.html
-.. _`Gambit Research`: http://gambitresearch.com
+.. _`Gambit Research`: https://gambitresearch.com
 
 What is PyPy?
 =============
@@ -88,8 +88,8 @@ The PyPy 2.7 release supports:
 
   * **s390x** running Linux
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://rpython.readthedocs.io/en/latest/examples.html
 
 Highlights of the PyPy2.7, cpyext, and RPython changes (since 5.7 released March, 2017)
 =======================================================================================
diff --git a/pypy/doc/release-v5.9.0.rst b/pypy/doc/release-v5.9.0.rst
index df0dc2f8bb..5ff5c31986 100644
--- a/pypy/doc/release-v5.9.0.rst
+++ b/pypy/doc/release-v5.9.0.rst
@@ -44,7 +44,7 @@ growing community of PyPy users. We strongly recommend updating.
 
 You can download the v5.9 releases here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project.
@@ -55,7 +55,7 @@ layers and we need help with all of them: `PyPy`_ and `RPython`_ documentation
 improvements, tweaking popular `modules`_ to run on pypy, or general `help`_
 with making RPython's JIT even better.
 
-.. _vmprof: http://vmprof.readthedocs.io
+.. _vmprof: https://vmprof.readthedocs.io
 .. _CFFI: https://cffi.readthedocs.io/en/latest/whatsnew.html
 .. _grant: https://morepypy.blogspot.com/2016/08/pypy-gets-funding-from-mozilla-for.html
 .. _`PyPy`: index.html
@@ -84,8 +84,8 @@ The PyPy 2.7 release supports:
 
   * **s390x** running Linux
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://rpython.readthedocs.io/en/latest/examples.html
 
 Highlights of the PyPy2.7, cpyext, and RPython changes (since 5.8 released June, 2017)
 ======================================================================================
diff --git a/pypy/doc/release-v6.0.0.rst b/pypy/doc/release-v6.0.0.rst
index b6964d8575..8fa9edc7ed 100644
--- a/pypy/doc/release-v6.0.0.rst
+++ b/pypy/doc/release-v6.0.0.rst
@@ -44,7 +44,7 @@ began working on a Python3.6 implementation, help is welcome.
 
 You can download the v6.0 releases here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project. If PyPy is not quite good enough for your needs, we are available for
@@ -63,7 +63,7 @@ on pypy, or general `help`_ with making RPython's JIT even better.
 .. _pygobject: https://lazka.github.io/posts/2018-04_pypy-pygobject/index.html
 .. _`syntax errors`: https://morepypy.blogspot.com/2018/04/improving-syntaxerror-in-pypy.html
 .. _`hooks`: gc_info.html#gc-hooks
-.. _`cffi`: http://cffi.readthedocs.io
+.. _`cffi`: https://cffi.readthedocs.io
 .. _`cppyy`: https://cppyy.readthedocs.io
 .. _`available as wheels`: https://github.com/antocuni/pypy-wheels
 
@@ -88,8 +88,8 @@ The PyPy release supports:
 
   * **s390x** running Linux
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://rpython.readthedocs.io/en/latest/examples.html
 
 Changelog
 =========
diff --git a/pypy/doc/release-v7.0.0.rst b/pypy/doc/release-v7.0.0.rst
index 9c1a423e7c..55f722504c 100644
--- a/pypy/doc/release-v7.0.0.rst
+++ b/pypy/doc/release-v7.0.0.rst
@@ -24,7 +24,7 @@ performance, has been improved and it is now possible to manually manage the
 GC by using a combination of ``gc.disable`` and ``gc.collect_step``. See the
 `GC blog post`_.
 
-.. _`GC hooks`: http://doc.pypy.org/en/latest/gc_info.html#semi-manual-gc-management
+.. _`GC hooks`: https://doc.pypy.org/en/latest/gc_info.html#semi-manual-gc-management
 
 We updated the `cffi`_ module included in PyPy to version 1.12, and the
 `cppyy`_ backend to 1.4. Please use these to wrap your C and C++ code,
@@ -42,7 +42,7 @@ The utf8 branch that changes internal representation of unicode to utf8 did not
 make it into the release, so there is still more goodness coming.
 You can download the v7.0 releases here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project. If PyPy is not quite good enough for your needs, we are available for
@@ -56,7 +56,7 @@ on pypy, or general `help`_ with making RPython's JIT even better.
 .. _`PyPy`: index.html
 .. _`RPython`: https://rpython.readthedocs.org
 .. _`help`: project-ideas.html
-.. _`cffi`: http://cffi.readthedocs.io
+.. _`cffi`: https://cffi.readthedocs.io
 .. _`cppyy`: https://cppyy.readthedocs.io
 .. _`available as wheels`: https://github.com/antocuni/pypy-wheels
 .. _`GC blog post`: https://morepypy.blogspot.com/2019/01/pypy-for-low-latency-systems.html
@@ -84,8 +84,8 @@ The PyPy release supports:
 Unfortunately at the moment of writing our ARM buildbots are out of service,
 so for now we are **not** releasing any binary for the ARM architecture.
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://rpython.readthedocs.io/en/latest/examples.html
 
 
 Changelog
@@ -149,4 +149,4 @@ We also refactored many parts of the JIT bridge optimizations, as well as cpyext
 internals, and together with new contributors fixed issues, added new
 documentation, and cleaned up the codebase.
 
-.. _contributing: http://doc.pypy.org/en/latest/contributing.html
+.. _contributing: https://doc.pypy.org/en/latest/contributing.html
diff --git a/pypy/doc/release-v7.1.0.rst b/pypy/doc/release-v7.1.0.rst
index b2bf49114e..d5c6f82160 100644
--- a/pypy/doc/release-v7.1.0.rst
+++ b/pypy/doc/release-v7.1.0.rst
@@ -37,7 +37,7 @@ There are open issues with incomplete compatibility and c-extension support.
 
 You can download the v7.1 releases here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project. If PyPy is not quite good enough for your needs, we are available for
@@ -51,7 +51,7 @@ on pypy, or general `help`_ with making RPython's JIT even better.
 .. _`PyPy`: index.html
 .. _`RPython`: https://rpython.readthedocs.org
 .. _`help`: project-ideas.html
-.. _`CFFI`: http://cffi.readthedocs.io
+.. _`CFFI`: https://cffi.readthedocs.io
 .. _`cppyy`: https://cppyy.readthedocs.io
 .. _`available as wheels`: https://github.com/antocuni/pypy-wheels
 
@@ -78,8 +78,8 @@ Unfortunately at the moment of writing our ARM buildbots are out of service,
 so for now we are **not** releasing any binary for the ARM architecture,
 although PyPy does support ARM 32 bit processors.
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://rpython.readthedocs.io/en/latest/examples.html
 
 
 Changelog
diff --git a/pypy/doc/release-v7.1.1.rst b/pypy/doc/release-v7.1.1.rst
index eb27749e79..5c6b278488 100644
--- a/pypy/doc/release-v7.1.1.rst
+++ b/pypy/doc/release-v7.1.1.rst
@@ -23,7 +23,7 @@ There are open issues with incomplete compatibility and c-extension support.
 
 You can download the v7.1.1 releases here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project. If PyPy is not quite good enough for your needs, we are available for
@@ -61,8 +61,8 @@ Unfortunately at the moment of writing our ARM buildbots are out of service,
 so for now we are **not** releasing any binary for the ARM architecture,
 although PyPy does support ARM 32 bit processors.
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://rpython.readthedocs.io/en/latest/examples.html
 
 
 Changelog
diff --git a/pypy/doc/release-v7.2.0.rst b/pypy/doc/release-v7.2.0.rst
index 7a4593ceea..53b0891f60 100644
--- a/pypy/doc/release-v7.2.0.rst
+++ b/pypy/doc/release-v7.2.0.rst
@@ -59,7 +59,7 @@ end-user bug reports, so please continue reporting issues as they crop up.
 
 You can download the v7.2 releases here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project. If PyPy is not quite good enough for your needs, we are available for
@@ -75,7 +75,7 @@ thanks for pitching in.
 .. _`PyPy`: index.html
 .. _`RPython`: https://rpython.readthedocs.org
 .. _`help`: project-ideas.html
-.. _`CFFI`: http://cffi.readthedocs.io
+.. _`CFFI`: https://cffi.readthedocs.io
 .. _`cppyy`: https://cppyy.readthedocs.io
 .. _`available as wheels`: https://github.com/antocuni/pypy-wheels
 .. _`Baroque Software`: https://baroquesoftware.com
@@ -110,8 +110,8 @@ Unfortunately at the moment of writing our ARM buildbots are out of service,
 so for now we are **not** releasing any binary for the ARM architecture (32
 bit), although PyPy does support ARM 32 bit processors. 
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://rpython.readthedocs.io/en/latest/examples.html
 
 
 Changelog
diff --git a/pypy/doc/release-v7.3.0.rst b/pypy/doc/release-v7.3.0.rst
index 9761496335..bd062d39d0 100644
--- a/pypy/doc/release-v7.3.0.rst
+++ b/pypy/doc/release-v7.3.0.rst
@@ -44,7 +44,7 @@ as they crop up.
 
 You can download the v7.3 releases here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project. If PyPy is not quite good enough for your needs, we are available for
@@ -65,7 +65,7 @@ built in or the `multibuild system`_ to build wheels.
 .. _`PyPy`: index.html
 .. _`RPython`: https://rpython.readthedocs.org
 .. _`help`: project-ideas.html
-.. _`CFFI`: http://cffi.readthedocs.io
+.. _`CFFI`: https://cffi.readthedocs.io
 .. _`cppyy`: https://cppyy.readthedocs.io
 .. _`available as wheels`: https://github.com/antocuni/pypy-wheels
 .. _`portable-pypy`: https://github.com/squeaky-pl/portable-pypy
@@ -97,8 +97,8 @@ Unfortunately at the moment of writing our ARM buildbots are out of service,
 so for now we are **not** releasing any binary for the ARM architecture (32
 bit), although PyPy does support ARM 32 bit processors. 
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://rpython.readthedocs.io/en/latest/examples.html
 
 
 Changelog
diff --git a/pypy/doc/release-v7.3.1.rst b/pypy/doc/release-v7.3.1.rst
index 4c0908497d..1d87cc9ce9 100644
--- a/pypy/doc/release-v7.3.1.rst
+++ b/pypy/doc/release-v7.3.1.rst
@@ -55,7 +55,7 @@ as they crop up.
 
 You can find links to download the v7.3.1 releases here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project. If PyPy is not quite good enough for your needs, we are available for
@@ -76,7 +76,7 @@ building wheels for PyPy wheels.
 .. _`PyPy`: index.html
 .. _`RPython`: https://rpython.readthedocs.org
 .. _`help`: project-ideas.html
-.. _`CFFI`: http://cffi.readthedocs.io
+.. _`CFFI`: https://cffi.readthedocs.io
 .. _`cppyy`: https://cppyy.readthedocs.io
 .. _`available as wheels`: https://github.com/antocuni/pypy-wheels
 .. _`portable-pypy`: https://github.com/squeaky-pl/portable-pypy
@@ -114,8 +114,8 @@ Unfortunately at the moment of writing our ARM32 buildbots are out of service,
 so for now we are **not** releasing any binaries for that architecture,
 although PyPy does support ARM 32 bit processors. 
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://rpython.readthedocs.io/en/latest/examples.html
 
 
 Changelog
diff --git a/pypy/doc/release-v7.3.2.rst b/pypy/doc/release-v7.3.2.rst
index d02689b2bc..008db4cf5a 100644
--- a/pypy/doc/release-v7.3.2.rst
+++ b/pypy/doc/release-v7.3.2.rst
@@ -2,6 +2,12 @@
 PyPy v7.3.2: release of 2.7, 3.6, and 3.7 alpha
 ===============================================
 
+.. note:
+  This is a pre-release announcement. When the release actually happens, it
+  will be announced on the `morepypy blog`_
+
+.. _`morepypy blog`: https://morepypy.blogspot.com
+
 The PyPy team is proud to release the version 7.3.2 of PyPy, which includes
 three different interpreters:
 
@@ -13,7 +19,7 @@ three different interpreters:
     
   - PyPy3.7 alpha: which is our first release of an interpreter supporting the
     syntax and the features of Python 3.7, including the stdlib for CPython
-    3.7.4. We call this alpha quality software, but it is based off PyPy 3.6 so
+    3.7.9. We call this alpha quality software, but it is based off PyPy 3.6 so
     issues should be around compatibility and not stability. Please try it out
     and let us know what is broken or missing. We have not implemented the
     `documented changes`_ in the ``re`` module, and other pieces are also
@@ -23,12 +29,13 @@ The interpreters are based on much the same codebase, thus the multiple
 release. This is a micro release, all APIs are compatible with the 7.3.0 (Dec
 2019) and 7.3.1 (April 2020) releases, but read on to find out what is new.
 
-The major new feature is prelminary support for the Universal mode of HPy: a
-new way of writing c-extension modules to totally encapsulate the `PyObject*`.
-The goal, as laid out in the `HPy blog post`_, is to enable a migration path
-for c-extension authors who wish their code to be performant on alternative
-interpreters like GraalPython_ (written on top of the Java virtual machine),
-RustPython_, and PyPy. Thanks to Oracle for sponsoring work on HPy.
+..
+  The major new feature is prelminary support for the Universal mode of HPy: a
+  new way of writing c-extension modules to totally encapsulate the `PyObject*`.
+  The goal, as laid out in the `HPy blog post`_, is to enable a migration path
+  for c-extension authors who wish their code to be performant on alternative
+  interpreters like GraalPython_ (written on top of the Java virtual machine),
+  RustPython_, and PyPy. Thanks to Oracle for sponsoring work on HPy.
 
 Conda Forge now `supports PyPy`_ as a python interpreter. The support is quite
 complete for linux and macOS. This is the result of a lot of
@@ -59,7 +66,7 @@ please continue reporting issues as they crop up.
 
 You can find links to download the v7.3.2 releases here:
 
-    http://pypy.org/download.html
+    https://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
 project. If PyPy is not quite good enough for your needs, we are available for
@@ -80,7 +87,7 @@ building wheels for PyPy.
 .. _`PyPy`: index.html
 .. _`RPython`: https://rpython.readthedocs.org
 .. _`help`: project-ideas.html
-.. _`CFFI`: http://cffi.readthedocs.io
+.. _`CFFI`: https://cffi.readthedocs.io
 .. _`cppyy`: https://cppyy.readthedocs.io
 .. _`multibuild system`: https://github.com/matthew-brett/multibuild
 .. _`cibuildwheel`: https://github.com/joerick/cibuildwheel
@@ -120,8 +127,8 @@ Unfortunately at the moment of writing our ARM32 buildbots are out of service,
 so for now we are **not** releasing any binaries for that architecture,
 although PyPy does support ARM 32 bit processors. 
 
-.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
-.. _`dynamic languages`: http://rpython.readthedocs.io/en/latest/examples.html
+.. _`PyPy and CPython 2.7.x`: https://speed.pypy.org
+.. _`dynamic languages`: https://rpython.readthedocs.io/en/latest/examples.html
 
 
 Changelog
@@ -179,12 +186,18 @@ Changes shared across versions
 - Add ``pypyjit.releaseall()`` that marks all current machine code objects as
   ready to release. They will be released at the next GC (unless they are
   currently in use in the stack of one of the threads).
-
+- Fix possible infinite loop in `tarfile.py`: CPython issue 39017_
+- Reject control characters in http requests: CPython issue 39603_
+- Fix regex in parsing http headers to reject infinite backtracking: CPyton
+  issue 39503_
+- Escape the server title when rendering from ``xmlrpc`` as HTML: CPython issue
+  38243_
 
 
 C-API (cpyext) and c-extensions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- Add ``PyCFunction_Call``
+- Add ``PyCFunction_Call``, ``PyNumber_ToBase``, contiguous part of
+  ``PyMemoryView_GetContiguous``
 - use ``space.getitem`` in ``PySequence_ITEM``, fixes `pybind11 2146`_
 - give preference to ``as_sequence.sq_item`` in ``PySequence_ITEM``
 - In Py_EnterRecursiveCall, ``char*`` -> ``const char *``, `issue 3232`_
@@ -227,6 +240,15 @@ Python 3.6 only
   at ``pypy -m ensurepip``
 - Fix broken ``_socket.share`` on windows
 - Add missing ``os.{gs}et_handle_inheritable`` (PEP 446) on windows
+- Fix ip address hashing in ``ipaddress.py``: CPython issue 41004_
+- Disallow CR/LF in ``email.headerregistry.Address``: CPython issue 39073_
+- Ban ``reuse_address`` parameter in ``loop.create_datagram_endpoint()`` in
+  ``asyncio.base_events``: CPython issue 37228
+- Preventing newline in ``encodongs.uu.filename`` from corrupting the output
+  format: CPython issue 38945
+- Prevent backtracking in regexes in ``http.cookiejar``: Cpython issue 38804_
+- Sync ``email._header_value_parser``, ``email._parseaddr`` and their
+  respective tests: CPython 37461_ and 34155_
 
 Python 3.6 C-API
 ~~~~~~~~~~~~~~~~
@@ -234,36 +256,49 @@ Python 3.6 C-API
   ``PyUnicode_{Find,Read,Write}Char``,
 - Fix ``PyUnicode_*`` handling on windows where ``wchar_t`` is 2 bytes
 
-.. _`issue 3187`: https://foss.heptapod.net/pypy/pypy/issues/3187
-.. _`issue 3178`: https://foss.heptapod.net/pypy/pypy/issues/3178
-.. _`issue 3177`: https://foss.heptapod.net/pypy/pypy/issues/3177
-.. _`issue 3198`: https://foss.heptapod.net/pypy/pypy/issues/3198
-.. _`issue 3232`: https://foss.heptapod.net/pypy/pypy/issues/3232
-.. _`issue 3239`: https://foss.heptapod.net/pypy/pypy/issues/3239
-.. _`issue 3230`: https://foss.heptapod.net/pypy/pypy/issues/3230
-.. _`issue 3242`: https://foss.heptapod.net/pypy/pypy/issues/3242
-.. _`issue 3243`: https://foss.heptapod.net/pypy/pypy/issues/3243
-.. _`issue 3247`: https://foss.heptapod.net/pypy/pypy/issues/3247
-.. _`issue 3250`: https://foss.heptapod.net/pypy/pypy/issues/3250
-.. _`issue 3251`: https://foss.heptapod.net/pypy/pypy/issues/3251
-.. _`issue 3252`: https://foss.heptapod.net/pypy/pypy/issues/3252
-.. _`issue 3255`: https://foss.heptapod.net/pypy/pypy/issues/3255
-.. _`issue 3269`: https://foss.heptapod.net/pypy/pypy/issues/3269
-.. _`issue 3274`: https://foss.heptapod.net/pypy/pypy/issues/3274
-.. _`issue 3282`: https://foss.heptapod.net/pypy/pypy/issues/3282
-.. _`issue 3281`: https://foss.heptapod.net/pypy/pypy/issues/3281
-
-.. _`merge request 723`: https://foss.heptapod.net/pypy/pypy/merge_request/723
-.. _`merge request 729`: https://foss.heptapod.net/pypy/pypy/merge_request/729
-.. _`merge request 730`: https://foss.heptapod.net/pypy/pypy/merge_request/730
-.. _`merge request 736`: https://foss.heptapod.net/pypy/pypy/merge_request/736
-.. _`merge request 732`: https://foss.heptapod.net/pypy/pypy/merge_request/732
-.. _`merge request 744`: https://foss.heptapod.net/pypy/pypy/merge_request/744
+.. _`issue 3187`: https://foss.heptapod.net/pypy/pypy/-/issues/3187
+.. _`issue 3178`: https://foss.heptapod.net/pypy/pypy/-/issues/3178
+.. _`issue 3177`: https://foss.heptapod.net/pypy/pypy/-/issues/3177
+.. _`issue 3188`: https://foss.heptapod.net/pypy/pypy/-/issues/3188
+.. _`issue 3198`: https://foss.heptapod.net/pypy/pypy/-/issues/3198
+.. _`issue 3232`: https://foss.heptapod.net/pypy/pypy/-/issues/3232
+.. _`issue 3239`: https://foss.heptapod.net/pypy/pypy/-/issues/3239
+.. _`issue 3230`: https://foss.heptapod.net/pypy/pypy/-/issues/3230
+.. _`issue 3242`: https://foss.heptapod.net/pypy/pypy/-/issues/3242
+.. _`issue 3243`: https://foss.heptapod.net/pypy/pypy/-/issues/3243
+.. _`issue 3247`: https://foss.heptapod.net/pypy/pypy/-/issues/3247
+.. _`issue 3250`: https://foss.heptapod.net/pypy/pypy/-/issues/3250
+.. _`issue 3251`: https://foss.heptapod.net/pypy/pypy/-/issues/3251
+.. _`issue 3252`: https://foss.heptapod.net/pypy/pypy/-/issues/3252
+.. _`issue 3255`: https://foss.heptapod.net/pypy/pypy/-/issues/3255
+.. _`issue 3269`: https://foss.heptapod.net/pypy/pypy/-/issues/3269
+.. _`issue 3274`: https://foss.heptapod.net/pypy/pypy/-/issues/3274
+.. _`issue 3282`: https://foss.heptapod.net/pypy/pypy/-/issues/3282
+.. _`issue 3281`: https://foss.heptapod.net/pypy/pypy/-/issues/3281
+
+.. _`merge request 723`: https://foss.heptapod.net/pypy/pypy/-/merge_request/723
+.. _`merge request 729`: https://foss.heptapod.net/pypy/pypy/-/merge_request/729
+.. _`merge request 730`: https://foss.heptapod.net/pypy/pypy/-/merge_request/730
+.. _`merge request 736`: https://foss.heptapod.net/pypy/pypy/-/merge_request/736
+.. _`merge request 732`: https://foss.heptapod.net/pypy/pypy/-/merge_request/732
+.. _`merge request 744`: https://foss.heptapod.net/pypy/pypy/-/merge_request/744
 
 .. _31976: https://bugs.python.org/issue31976
 .. _35519: https://bugs.python.org/issue35519
 .. _30465: https://bugs.python.org/issue30465
 .. _39413: https://bugs.python.org/issue39413
-.. _23668: https://bugs.python.org/issue39413
+.. _23668: https://bugs.python.org/issue23668
+.. _29104: https://bugs.python.org/issue29104
+.. _39017: https://bugs.python.org/issue39017
+.. _41014: https://bugs.python.org/issue41014
+.. _39603: https://bugs.python.org/issue39603
+.. _39503: https://bugs.python.org/issue39503
+.. _39073: https://bugs.python.org/issue39073
+.. _37228: https://bugs.python.org/issue37228
+.. _38945: https://bugs.python.org/issue38945
+.. _38804: https://bugs.python.org/issue38804
+.. _38243: https://bugs.python.org/issue38243
+.. _37461: https://bugs.python.org/issue37461
+.. _34155: https://bugs.python.org/issue34155
 
 .. _`pybind11 2146`: https://github.com/pybind/pybind11/pull/2146
diff --git a/pypy/doc/requirements.txt b/pypy/doc/requirements.txt
new file mode 100644
index 0000000000..ff999fd3c2
--- /dev/null
+++ b/pypy/doc/requirements.txt
@@ -0,0 +1 @@
+sphinx-affiliates
diff --git a/pypy/doc/sandbox.rst b/pypy/doc/sandbox.rst
index 235ad228d5..d48a0c6edf 100644
--- a/pypy/doc/sandbox.rst
+++ b/pypy/doc/sandbox.rst
@@ -28,7 +28,7 @@ Note that this is very different from sandboxing at the Python language
 level, i.e. placing restrictions on what kind of Python code the
 attacker is allowed to run (why? read about pysandbox_).
 
-.. _SECCOMP: http://code.google.com/p/seccompsandbox/wiki/overview
+.. _SECCOMP: https://code.google.com/p/seccompsandbox/wiki/overview
 .. _pysandbox: https://mail.python.org/pipermail/python-dev/2013-November/130132.html
 
 Another point of comparison: if we were instead to try to plug CPython
diff --git a/pypy/doc/sprint-reports.rst b/pypy/doc/sprint-reports.rst
index 81e379a1a3..2137e131ba 100644
--- a/pypy/doc/sprint-reports.rst
+++ b/pypy/doc/sprint-reports.rst
@@ -42,38 +42,38 @@ A good summary of the progress over the years.....enjoy!
   * `CERN (July 2010)`_
   * `Düsseldorf (October 2010)`_
 
-.. _Hildesheim (Feb 2003): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/HildesheimReport.txt
-.. _Gothenburg (May 2003): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/gothenburg-2003-sprintreport.txt
-.. _LovainLaNeuve (June 2003): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/LouvainLaNeuveReport.txt
-.. _Berlin (Sept 2003): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/BerlinReport.txt
-.. _Amsterdam (Dec 2003): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/AmsterdamReport.txt
-.. _Vilnius (Nov 2004): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/vilnius-2004-sprintreport.txt
-.. _Leysin (Jan 2005): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/LeysinReport.txt
-.. _PyCon/Washington (March  2005): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/pycon_sprint_report.txt
-.. _Europython/Gothenburg (June 2005): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/ep2005-sprintreport.txt
-.. _Hildesheim (July 2005): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/hildesheim2005-sprintreport.txt
-.. _Heidelberg (Aug 2005): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/Heidelberg-report.txt
-.. _Paris (Oct 2005): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/paris/paris-report.txt
-.. _Gothenburg (Dec 2005): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/gothenburg-2005/gothenburg-dec2005-sprintreport.txt
-.. _Mallorca (Jan 2006): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/mallorca/mallorca-sprintreport.txt
-.. _LouvainLaNeuve (March 2006): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/louvain-la-neuve-2006/report.txt
-.. _Leysin (April 2006): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/leysin-winter-2006-sprintreport.txt
-.. _Tokyo (April 2006): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/tokyo/sprint-report.txt
-.. _Düsseldorf (June 2006): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/ddorf2006/report1.txt
-.. _Europython/Geneva (July 2006): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/post-ep2006/report.txt
-.. _Düsseldorf (October 2006): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/ddorf2006b/report.txt
-.. _Leysin (January 2007): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/leysin-winter-2007/report.txt
-.. _Hildesheim (Feb 2007): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/trillke-2007/sprint-report.txt
-.. _EU report writing sprint: https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/trillke-2007/eu-report-sprint-report.txt
-.. _PyCon/Dallas (Feb 2006): https://bitbucket.org/pypy/extradoc/raw/tip/sprintinfo/pycon06/sprint-report.txt
-.. _Göteborg (November 2007): http://morepypy.blogspot.com/2007_11_01_archive.html
-.. _Leysin (January 2008): http://morepypy.blogspot.com/2008/01/leysin-winter-sport-sprint-started.html
-.. _Berlin (May 2008): http://morepypy.blogspot.com/2008_05_01_archive.html
-.. _Vilnius after EuroPython (July 2008): http://morepypy.blogspot.com/2008/07/europython-2008-pypy-talks-and-sprint.html
-.. _Düsseldorf (August 2008): http://morepypy.blogspot.com/2008_10_01_archive.html
-.. _Wroclaw (February 2009): http://morepypy.blogspot.com/2009/02/wroclaw-2009-sprint-progress-report.html
-.. _Leysin (April 2009): http://morepypy.blogspot.com/2009/04/leysin-sprint-report.html
-.. _Göteborg (August 2009): http://morepypy.blogspot.com/2009/08/gothenburg-jit-sprint-report.html
-.. _Düsseldorf (November 2009): http://morepypy.blogspot.com/2009/11/dusseldorf-sprint-report.html
-.. _CERN (July 2010): http://morepypy.blogspot.com/2010/07/cern-sprint-report-wrapping-c-libraries.html
-.. _Düsseldorf (October 2010): http://morepypy.blogspot.com/2010/10/dusseldorf-sprint-report-2010.html
+.. _Hildesheim (Feb 2003): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/HildesheimReport.txt
+.. _Gothenburg (May 2003): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/gothenburg-2003-sprintreport.txt
+.. _LovainLaNeuve (June 2003): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/LouvainLaNeuveReport.txt
+.. _Berlin (Sept 2003): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/BerlinReport.txt
+.. _Amsterdam (Dec 2003): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/AmsterdamReport.txt
+.. _Vilnius (Nov 2004): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/vilnius-2004-sprintreport.txt
+.. _Leysin (Jan 2005): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/LeysinReport.txt
+.. _PyCon/Washington (March  2005): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/pycon_sprint_report.txt
+.. _Europython/Gothenburg (June 2005): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/ep2005-sprintreport.txt
+.. _Hildesheim (July 2005): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/hildesheim2005-sprintreport.txt
+.. _Heidelberg (Aug 2005): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/Heidelberg-report.txt
+.. _Paris (Oct 2005): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/paris/paris-report.txt
+.. _Gothenburg (Dec 2005): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/gothenburg-2005/gothenburg-dec2005-sprintreport.txt
+.. _Mallorca (Jan 2006): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/mallorca/mallorca-sprintreport.txt
+.. _LouvainLaNeuve (March 2006): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/louvain-la-neuve-2006/report.txt
+.. _Leysin (April 2006): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/leysin-winter-2006-sprintreport.txt
+.. _Tokyo (April 2006): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/tokyo/sprint-report.txt
+.. _Düsseldorf (June 2006): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/ddorf2006/report1.txt
+.. _Europython/Geneva (July 2006): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/post-ep2006/report.txt
+.. _Düsseldorf (October 2006): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/ddorf2006b/report.txt
+.. _Leysin (January 2007): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/leysin-winter-2007/report.txt
+.. _Hildesheim (Feb 2007): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/trillke-2007/sprint-report.txt
+.. _EU report writing sprint: https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/trillke-2007/eu-report-sprint-report.txt
+.. _PyCon/Dallas (Feb 2006): https://foss.heptapod.net/pypy/extradoc/-/blob/branch/extradoc/sprintinfo/pycon06/sprint-report.txt
+.. _Göteborg (November 2007): https://morepypy.blogspot.com/2007_11_01_archive.html
+.. _Leysin (January 2008): https://morepypy.blogspot.com/2008/01/leysin-winter-sport-sprint-started.html
+.. _Berlin (May 2008): https://morepypy.blogspot.com/2008_05_01_archive.html
+.. _Vilnius after EuroPython (July 2008): https://morepypy.blogspot.com/2008/07/europython-2008-pypy-talks-and-sprint.html
+.. _Düsseldorf (August 2008): https://morepypy.blogspot.com/2008_10_01_archive.html
+.. _Wroclaw (February 2009): https://morepypy.blogspot.com/2009/02/wroclaw-2009-sprint-progress-report.html
+.. _Leysin (April 2009): https://morepypy.blogspot.com/2009/04/leysin-sprint-report.html
+.. _Göteborg (August 2009): https://morepypy.blogspot.com/2009/08/gothenburg-jit-sprint-report.html
+.. _Düsseldorf (November 2009): https://morepypy.blogspot.com/2009/11/dusseldorf-sprint-report.html
+.. _CERN (July 2010): https://morepypy.blogspot.com/2010/07/cern-sprint-report-wrapping-c-libraries.html
+.. _Düsseldorf (October 2010): https://morepypy.blogspot.com/2010/10/dusseldorf-sprint-report-2010.html
diff --git a/pypy/doc/stackless.rst b/pypy/doc/stackless.rst
index e22efc73dc..ae855720e6 100644
--- a/pypy/doc/stackless.rst
+++ b/pypy/doc/stackless.rst
@@ -28,7 +28,7 @@ only available (so far) on x86 and x86-64 CPUs; for other CPUs you need
 to add a short page of custom assembler to
 :source:`rpython/translator/c/src/stacklet/`.
 
-.. _Stackless Python: http://www.stackless.com
+.. _Stackless Python: https://www.stackless.com
 
 
 Theory
diff --git a/pypy/doc/stm.rst b/pypy/doc/stm.rst
index 610594157e..734269aaab 100644
--- a/pypy/doc/stm.rst
+++ b/pypy/doc/stm.rst
@@ -21,8 +21,8 @@ This work was done by Remi Meier and Armin Rigo.  Thanks to all donors
 for crowd-funding the work so far!  Please have a look at the `2nd call
 for donation`_.
 
-.. _`Transactional Memory`: http://en.wikipedia.org/wiki/Transactional_memory
-.. _`2nd call for donation`: http://pypy.org/tmdonate2.html
+.. _`Transactional Memory`: https://en.wikipedia.org/wiki/Transactional_memory
+.. _`2nd call for donation`: https://pypy.org/tmdonate2.html
 
 
 What pypy-stm is for
@@ -257,7 +257,7 @@ it only requires that the end programmer identifies where this
 parallelism is likely to be found, and communicates it to the system
 using a simple API.
 
-.. _OpenMP: http://en.wikipedia.org/wiki/OpenMP
+.. _OpenMP: https://en.wikipedia.org/wiki/OpenMP
 
 
 Drop-in replacement
@@ -691,8 +691,8 @@ STMGC-C7 is described in detail in a `technical report`__.
 A separate `position paper`__ gives an overview of our position about
 STM in general.
 
-.. __: http://bitbucket.org/pypy/extradoc/src/extradoc/talk/dls2014/paper/paper.pdf
-.. __: http://bitbucket.org/pypy/extradoc/src/extradoc/talk/icooolps2014/
+.. __: https://bitbucket.org/pypy/extradoc/src/extradoc/talk/dls2014/paper/paper.pdf
+.. __: https://bitbucket.org/pypy/extradoc/src/extradoc/talk/icooolps2014/
 
 
 Reference to implementation details
diff --git a/pypy/doc/video-index.rst b/pypy/doc/video-index.rst
index d0ec691b33..833115e02b 100644
--- a/pypy/doc/video-index.rst
+++ b/pypy/doc/video-index.rst
@@ -19,7 +19,7 @@ sprints, talks and everywhere else.
 .. raw:: html
 
    <iframe width="420" height="315"
-   src="http://www.youtube.com/embed/WfGszrRUdtc?rel=0"
+   src="https://www.youtube.com/embed/WfGszrRUdtc?rel=0"
    frameborder="0" allowfullscreen></iframe>
 
 
@@ -36,7 +36,7 @@ never been possible in the US.
 .. raw:: html
 
    <iframe width="420" height="315"
-   src="http://www.youtube.com/embed/1wAOy88WxmY?rel=0"
+   src="https://www.youtube.com/embed/1wAOy88WxmY?rel=0"
    frameborder="0" allowfullscreen></iframe>
 
 
@@ -53,7 +53,7 @@ project.
 .. raw:: html
 
    <iframe width="420" height="315"
-   src="http://www.youtube.com/embed/c5rq4Q03zgg?rel=0"
+   src="https://www.youtube.com/embed/c5rq4Q03zgg?rel=0"
    frameborder="0" allowfullscreen></iframe>
 
 
@@ -71,7 +71,7 @@ and Greenlets in PyPy.
 .. raw:: html
 
    <iframe width="420" height="315"
-   src="http://www.youtube.com/embed/AWUhXW2pLDE?rel=0"
+   src="https://www.youtube.com/embed/AWUhXW2pLDE?rel=0"
    frameborder="0" allowfullscreen></iframe>
 
 
@@ -90,7 +90,7 @@ the formalities required for EU funding.
 .. raw:: html
 
    <iframe width="420" height="315"
-   src="http://www.youtube.com/embed/ed-zAxZtGlY?rel=0"
+   src="https://www.youtube.com/embed/ed-zAxZtGlY?rel=0"
    frameborder="0" allowfullscreen></iframe>
 
 
@@ -108,7 +108,7 @@ basis, and pays special attention to flow graphs.
 .. raw:: html
 
    <iframe width="420" height="315"
-   src="http://www.youtube.com/embed/7opXGaQUUA4?rel=0"
+   src="https://www.youtube.com/embed/7opXGaQUUA4?rel=0"
    frameborder="0" allowfullscreen></iframe>
 
 
@@ -125,7 +125,7 @@ architecture of PyPy, especially the RPython translation toolchain.
 .. raw:: html
 
    <iframe width="420" height="315"
-   src="http://www.youtube.com/embed/1YV7J74xrMI?rel=0"
+   src="https://www.youtube.com/embed/1YV7J74xrMI?rel=0"
    frameborder="0" allowfullscreen></iframe>
 
 
@@ -141,7 +141,7 @@ layout, the new-style instance and gives a CLS interop demo.
 .. raw:: html
 
    <iframe width="420" height="315"
-   src="http://www.youtube.com/embed/bq9ZGN3-o80?rel=0"
+   src="https://www.youtube.com/embed/bq9ZGN3-o80?rel=0"
    frameborder="0" allowfullscreen></iframe>
 
 
@@ -153,7 +153,7 @@ Bram Cohen is interviewed by Steve Holden at the PyCon 2006, Dallas, US.
 .. raw:: html
 
    <iframe width="420" height="315"
-   src="http://www.youtube.com/embed/EopmJWrLmWI?rel=0"
+   src="https://www.youtube.com/embed/EopmJWrLmWI?rel=0"
    frameborder="0" allowfullscreen></iframe>
 
 
@@ -166,7 +166,7 @@ Dallas, US.
 .. raw:: html
 
    <iframe width="420" height="315"
-   src="http://www.youtube.com/embed/RR2sX8tFGsI?rel=0"
+   src="https://www.youtube.com/embed/RR2sX8tFGsI?rel=0"
    frameborder="0" allowfullscreen></iframe>
 
 
@@ -180,7 +180,7 @@ everything else.
 .. raw:: html
 
    <iframe width="420" height="315"
-   src="http://www.youtube.com/embed/swsnRfj_cek?rel=0"
+   src="https://www.youtube.com/embed/swsnRfj_cek?rel=0"
    frameborder="0" allowfullscreen></iframe>
 
 
@@ -193,7 +193,7 @@ sprint at the University of Palma de Mallorca, Spain. 27.1.2006
 .. raw:: html
 
    <iframe width="420" height="315"
-   src="http://www.youtube.com/embed/H_IgK9qmEss?rel=0"
+   src="https://www.youtube.com/embed/H_IgK9qmEss?rel=0"
    frameborder="0" allowfullscreen></iframe>
 
 
@@ -209,5 +209,5 @@ translation toolchain and the just-in-time compiler.
 .. raw:: html
 
    <iframe width="420" height="315"
-   src="http://www.youtube.com/embed/6dnUzVQaSlg?rel=0"
+   src="https://www.youtube.com/embed/6dnUzVQaSlg?rel=0"
    frameborder="0" allowfullscreen></iframe>
diff --git a/pypy/doc/whatsnew-2.0.0-beta1.rst b/pypy/doc/whatsnew-2.0.0-beta1.rst
index 8fc0381386..a7022f2998 100644
--- a/pypy/doc/whatsnew-2.0.0-beta1.rst
+++ b/pypy/doc/whatsnew-2.0.0-beta1.rst
@@ -59,7 +59,7 @@ Start to clean up a bit the flow object space.
 
 .. branch: ffi-backend
 
-Support CFFI.  http://morepypy.blogspot.ch/2012/08/cffi-release-03.html
+Support CFFI.  https://morepypy.blogspot.ch/2012/08/cffi-release-03.html
 
 .. branch: speedup-unpackiterable
 
diff --git a/pypy/doc/whatsnew-5.0.0.rst b/pypy/doc/whatsnew-5.0.0.rst
index cf6e796460..0664c78644 100644
--- a/pypy/doc/whatsnew-5.0.0.rst
+++ b/pypy/doc/whatsnew-5.0.0.rst
@@ -122,7 +122,7 @@ Optimize global lookups.
 .. branch: cffi-static-callback-embedding
 
 Updated to CFFI 1.5, which supports a new way to do embedding.
-Deprecates http://pypy.readthedocs.org/en/latest/embedding.html.
+Deprecates https://pypy.readthedocs.org/en/latest/embedding.html.
 
 .. branch: fix-cpython-ssl-tests-2.7
 
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
index 2f1487d5db..b3cd90b274 100644
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -5,3 +5,7 @@ What's new in PyPy2.7 7.3.2+
 .. this is a revision shortly after release-pypy-7.3.2
 .. startrev: c136fdb316e4
 
+
+.. branch: cross_compilation_fixes
+
+Respect PKG_CONFIG and CC in more places to allow cross-compilation
diff --git a/pypy/doc/whatsnew-pypy2-5.4.0.rst b/pypy/doc/whatsnew-pypy2-5.4.0.rst
index 654a95f581..19c9f4e17e 100644
--- a/pypy/doc/whatsnew-pypy2-5.4.0.rst
+++ b/pypy/doc/whatsnew-pypy2-5.4.0.rst
@@ -8,7 +8,7 @@ What's new in PyPy2.7 5.4
 .. 418b05f95db5
 
 Improve CPython compatibility for ``is``. Now code like ``if x is ():``
-works the same way as it does on CPython.  See http://pypy.readthedocs.io/en/latest/cpython_differences.html#object-identity-of-primitive-values-is-and-id .
+works the same way as it does on CPython.  See https://pypy.readthedocs.io/en/latest/cpython_differences.html#object-identity-of-primitive-values-is-and-id .
 
 .. pull request #455
 
diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst
index 53bbbaf1b2..a307516c46 100644
--- a/pypy/doc/windows.rst
+++ b/pypy/doc/windows.rst
@@ -18,7 +18,7 @@ on your architecture, between two and three times as long. So head to
 Microsoft Visual Studio is preferred as a compiler, but there are reports
 of success with the mingw32 port of gcc.
 
-.. _our downloads: http://pypy.org/download.html
+.. _our downloads: https://www.pypy.org/download.html
 
 
 What Compiler to use and How to find it?
@@ -73,9 +73,8 @@ and build them.
 
 Please see the :doc:`non-windows instructions <build>` for more information, especially note
 that translation is RAM-hungry. A standard translation requires around 4GB, so
-special preparations are necessary, or you may want to use the method in the
-notes of the `build instructions`_ to reduce memory usage at the price of a
-slower translation::
+special preparations are necessary, or you may want to use the following method
+to reduce memory usage at the price of a slower translation::
 
     set PYPY_GC_MAX_DELTA=200MB
     pypy --jit loop_longevity=300 ../../rpython/bin/rpython -Ojit targetpypystandalone
@@ -83,21 +82,13 @@ slower translation::
     # This is done as part of translation
     PYTHONPATH=../.. ./pypy-c ../../lib_pypy/pypy_tools/build_cffi_imports.py
 
-.. _build instructions: http://pypy.org/download.html#building-from-source
-
 Preparing Windows for the large build
 -------------------------------------
 
 Normally 32bit programs are limited to 2GB of memory on Windows. It is
-possible to raise this limit, to 3GB on Windows 32bit, and almost 4GB
-on Windows 64bit.
-
-On Windows 32bit, it is necessary to modify the system: follow
-http://usa.autodesk.com/adsk/servlet/ps/dl/item?siteID=123112&id=9583842&linkID=9240617
-to enable the "3GB" feature, and reboot. This step is not necessary on
-Windows 64bit.
+possible to raise this limit to almost 4GB on Windows 64bit.
 
-Then you need to execute::
+You need to execute::
 
     <path-to-visual>\vc\vcvars.bat
     editbin /largeaddressaware translator.exe
@@ -117,7 +108,7 @@ file on how to replicate, and a branch for each supported platform. You may run
 the `get_externals.py` utility to checkout the proper branch for your platform
 and PyPy version.
 
-.. _subrepository:  https://bitbucket.org/pypy/externals
+.. _subrepository: https://foss.heptapod.net/pypy/externals
 
 Using the mingw compiler
 ------------------------
@@ -175,10 +166,10 @@ the mingw compiler when hacking (as opposed to translating). As of
 March 2012, --cc is not a valid option for pytest.py. However if you set an
 environment variable CC to the compiler exe, testing will use it.
 
-.. _mingw32 build: http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Automated%20Builds
-.. _mingw64 build: http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Automated%20Builds
-.. _msys for mingw: http://sourceforge.net/projects/mingw-w64/files/External%20binary%20packages%20%28Win64%20hosted%29/MSYS%20%2832-bit%29
-.. _libffi source files: http://sourceware.org/libffi/
+.. _mingw32 build: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Automated%20Builds
+.. _mingw64 build: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Automated%20Builds
+.. _msys for mingw: https://sourceforge.net/projects/mingw-w64/files/External%20binary%20packages%20(Win64%20hosted)/MSYS%20(32-bit)/
+.. _libffi source files: https://sourceware.org/libffi/
 
 
 What is missing for a full 64-bit translation
diff --git a/pypy/module/_cffi_backend/test/test_recompiler.py b/pypy/module/_cffi_backend/test/test_recompiler.py
index 30ab44f229..ac0d4193e2 100644
--- a/pypy/module/_cffi_backend/test/test_recompiler.py
+++ b/pypy/module/_cffi_backend/test/test_recompiler.py
@@ -1,4 +1,4 @@
-import os, py
+import os, pytest
 
 from rpython.tool.udir import udir
 from pypy.interpreter.gateway import unwrap_spec, interp2app
@@ -28,13 +28,13 @@ def prepare(space, cdef, module_name, source, w_includes=None,
         from cffi import recompiler     # needs to be at least cffi 1.0.4
         from cffi import ffiplatform
     except ImportError:
-        py.test.skip("system cffi module not found or older than 1.0.0")
+        pytest.skip("system cffi module not found or older than 1.0.0")
     if w_min_version is None:
         min_version = (1, 4, 0)
     else:
         min_version = tuple(space.unwrap(w_min_version))
     if cffi.__version_info__ < min_version:
-        py.test.skip("system cffi module needs to be at least %s, got %s" % (
+        pytest.skip("system cffi module needs to be at least %s, got %s" % (
             min_version, cffi.__version_info__))
     space.appexec([], """():
         import _cffi_backend     # force it to be initialized
@@ -105,7 +105,7 @@ class AppTestRecompiler:
 
     def setup_class(cls):
         if cls.runappdirect:
-            py.test.skip("not a test for -A")
+            pytest.skip("not a test for -A")
         cls.w_prepare = cls.space.wrap(interp2app(prepare))
         cls.w_udir = cls.space.wrap(str(udir))
         cls.w_os_sep = cls.space.wrap(os.sep)
@@ -1683,6 +1683,7 @@ class AppTestRecompiler:
         raises(TypeError, ffi.def_extern(name='bar', onerror=42),
                        lambda x: x)
 
+    @pytest.mark.skipif("not config.option.runappdirect")
     def test_extern_python_stdcall(self):
         ffi, lib = self.prepare("""
             extern "Python" int __stdcall foo(int);
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
index b240b1b2f3..8ea3a23808 100644
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/api.py
@@ -135,7 +135,7 @@ METH_COEXIST METH_STATIC METH_CLASS Py_TPFLAGS_BASETYPE Py_MAX_FMT
 METH_NOARGS METH_VARARGS METH_KEYWORDS METH_O Py_TPFLAGS_HAVE_INPLACEOPS
 Py_TPFLAGS_HEAPTYPE Py_TPFLAGS_HAVE_CLASS Py_TPFLAGS_HAVE_NEWBUFFER
 Py_LT Py_LE Py_EQ Py_NE Py_GT Py_GE Py_TPFLAGS_CHECKTYPES Py_MAX_NDIMS
-PyBUF_FORMAT PyBUF_ND PyBUF_STRIDES PyBUF_WRITABLE
+PyBUF_FORMAT PyBUF_ND PyBUF_STRIDES PyBUF_WRITABLE PyBUF_READ PyBUF_WRITE
 """.split()
 
 for name in ('INT', 'LONG', 'LIST', 'TUPLE', 'UNICODE', 'DICT', 'BASE_EXC',
diff --git a/pypy/module/cpyext/memoryobject.py b/pypy/module/cpyext/memoryobject.py
index 2977720440..5cae2d920e 100644
--- a/pypy/module/cpyext/memoryobject.py
+++ b/pypy/module/cpyext/memoryobject.py
@@ -1,11 +1,13 @@
 from pypy.module.cpyext.api import (
     cpython_api, CANNOT_FAIL, Py_MAX_FMT, Py_MAX_NDIMS, build_type_checkers,
-    Py_ssize_tP, cts, parse_dir, bootstrap_function, Py_bufferP, slot_function)
+    Py_ssize_tP, cts, parse_dir, bootstrap_function, Py_bufferP, slot_function,
+    PyBUF_READ, PyBUF_WRITE)
 from pypy.module.cpyext.pyobject import (
     PyObject, make_ref, decref, from_ref, make_typedescr,
     get_typedescr, track_reference)
 from rpython.rtyper.lltypesystem import lltype, rffi
 from rpython.rlib.rarithmetic import widen
+from pypy.interpreter.error import oefmt
 from pypy.objspace.std.memoryobject import W_MemoryView
 from pypy.module.cpyext.object import _dealloc
 from pypy.module.cpyext.import_ import PyImport_Import
@@ -44,7 +46,8 @@ def memory_attach(space, py_obj, w_obj, w_userdata=None):
         # not used in PyPy to keep something alive,
         # but some c-extensions check the type without checking for NULL
         view.c_obj = make_ref(space, space.w_None)
-        rffi.setintfield(view, 'c_readonly', w_obj.view.readonly)
+        rffi.setintfield(view, 'c_readonly',
+                         rffi.cast(rffi.INT_real, w_obj.view.readonly))
     except ValueError:
         w_s = w_obj.descr_tobytes(space)
         view.c_obj = make_ref(space, w_s)
@@ -219,3 +222,68 @@ def PyMemoryView_FromBuffer(space, view):
         py_mem.c_view.c_shape = view.c_shape
     # XXX ignore suboffsets?
     return py_obj
+
+def memory_from_contiguous_copy(space, src, order):
+    """
+    Return a memoryview that is based on a contiguous copy of src.
+    Assumptions: src has PyBUF_FULL_RO information, src->ndim > 0.
+ 
+    Ownership rules:
+      1) As usual, the returned memoryview has a private copy
+         of src->shape, src->strides and src->suboffsets.
+      2) src->format is copied to the master buffer and released
+         in mbuf_dealloc(). The releasebufferproc of the bytes
+         object is NULL, so it does not matter that mbuf_release()
+         passes the altered format pointer to PyBuffer_Release().
+    """
+    raise oefmt(space.w_NotImplementedError,
+                "creating contiguous readonly buffer from non-contiguous "
+                "not implemented yet") 
+
+
+@cpython_api([PyObject, rffi.INT_real, lltype.Char], PyObject)
+def PyMemoryView_GetContiguous(space, w_obj, buffertype, order):
+    """
+    Return a new memoryview object based on a contiguous exporter with
+    buffertype={PyBUF_READ, PyBUF_WRITE} and order={'C', 'F'ortran, or 'A'ny}.
+    The logical structure of the input and output buffers is the same
+    (i.e. tolist(input) == tolist(output)), but the physical layout in
+    memory can be explicitly chosen.
+
+    As usual, if buffertype=PyBUF_WRITE, the exporter's buffer must be writable,
+    otherwise it may be writable or read-only.
+
+    If the exporter is already contiguous with the desired target order,
+    the memoryview will be directly based on the exporter.
+
+    Otherwise, if the buffertype is PyBUF_READ, the memoryview will be
+    based on a new bytes object. If order={'C', 'A'ny}, use 'C' order,
+    'F'ortran order otherwise.
+    """
+
+    buffertype = widen(buffertype)
+    if buffertype != PyBUF_READ and buffertype != PyBUF_WRITE:
+        raise oefmt(space.w_ValueError,
+                    "buffertype must be PyBUF_READ or PyBUF_WRITE")
+
+    if order != 'C' and order != 'F' and order != 'A':
+        raise oefmt(space.w_ValueError,
+                    "order must be in ('C', 'F', 'A')")
+
+    w_mv = space.call_method(space.builtin, "memoryview", w_obj)
+    mv = make_ref(space, w_mv)
+    mv = rffi.cast(PyMemoryViewObject, mv)
+    view = mv.c_view
+    if buffertype == PyBUF_WRITE and widen(view.c_readonly):
+        raise oefmt(space.w_BufferError,
+                    "underlying buffer is not writable")
+
+    if PyBuffer_IsContiguous(space, view, order):
+        return w_mv
+
+    if buffertype == PyBUF_WRITE:
+        raise oefmt(space.w_BufferError,
+                    "writable contiguous buffer requested "
+                    "for a non-contiguous object.")
+
+    return memory_from_contiguous_copy(space, view, order)
diff --git a/pypy/module/cpyext/number.py b/pypy/module/cpyext/number.py
index d2e72e9c12..3bd8fad597 100644
--- a/pypy/module/cpyext/number.py
+++ b/pypy/module/cpyext/number.py
@@ -2,8 +2,10 @@ from pypy.interpreter.error import OperationError, oefmt
 from pypy.module.cpyext.api import cpython_api, CANNOT_FAIL, Py_ssize_t
 from pypy.module.cpyext.pyobject import PyObject, PyObjectP, from_ref, make_ref
 from rpython.rtyper.lltypesystem import rffi, lltype
+from rpython.rlib.rarithmetic import widen
 from rpython.tool.sourcetools import func_with_new_name
 from pypy.module.cpyext.state import State
+from pypy.objspace.std import newformat
 
 @cpython_api([PyObject], rffi.INT_real, error=CANNOT_FAIL)
 def PyIndex_Check(space, w_obj):
@@ -59,6 +61,28 @@ def PyNumber_Index(space, w_obj):
     """
     return space.index(w_obj)
 
+@cpython_api([PyObject, rffi.INT_real], PyObject)
+def PyNumber_ToBase(space, w_obj, base):
+    """Returns the integer n converted to base as a string with a base
+    marker of '0b', '0o', or '0x' if applicable.  When
+    base is not 2, 8, 10, or 16, the format is 'x#num' where x is the
+    base. If n is not an int object, it is converted with
+    PyNumber_Index() first.
+    """
+    base = widen(base)
+    if not (base == 2 or base == 8 or base == 10 or base ==16):
+        # In Python3.7 this becomes a SystemError. Before that, CPython would
+        # assert in debug or segfault in release. bpo 38643
+        raise oefmt(space.w_ValueError,
+                    "PyNumber_ToBase: base must be 2, 8, 10 or 16")
+    w_index = space.index(w_obj)
+    # A slight hack to call the internal _int_to_base method, which
+    # accepts an int base rather than a str spec
+    formatter = newformat.str_formatter(space, '')
+    value = space.int_w(w_index)
+    return space.newtext(formatter._int_to_base(base, value))
+    
+
 @cpython_api([PyObjectP, PyObjectP], rffi.INT_real, error=CANNOT_FAIL)
 def PyNumber_CoerceEx(space, pp1, pp2):
     """This function is similar to PyNumber_Coerce(), except that it returns
diff --git a/pypy/module/cpyext/structmember.py b/pypy/module/cpyext/structmember.py
index 257983b668..2541c6f7dd 100644
--- a/pypy/module/cpyext/structmember.py
+++ b/pypy/module/cpyext/structmember.py
@@ -2,7 +2,7 @@ from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.typedef import TypeDef, GetSetProperty
 from rpython.rtyper.lltypesystem import rffi, lltype
 from pypy.module.cpyext.structmemberdefs import *
-from pypy.module.cpyext.api import ADDR, PyObjectP, cpython_api, CONST_STRING
+from pypy.module.cpyext.api import PyObjectP, cpython_api, CONST_STRING
 from pypy.module.cpyext.intobject import PyInt_AsLong, PyInt_AsUnsignedLong
 from pypy.module.cpyext.pyerrors import PyErr_Occurred
 from pypy.module.cpyext.pyobject import PyObject, decref, from_ref, make_ref
@@ -36,9 +36,7 @@ _HEADER = 'pypy_structmember_decl.h'
 
 @cpython_api([CONST_STRING, lltype.Ptr(PyMemberDef)], PyObject, header=_HEADER)
 def PyMember_GetOne(space, obj, w_member):
-    addr = rffi.cast(ADDR, obj)
-    addr += w_member.c_offset
-
+    addr = rffi.ptradd(obj, w_member.c_offset)
     member_type = rffi.cast(lltype.Signed, w_member.c_type)
     for converter in integer_converters:
         typ, lltyp, _ = converter
@@ -89,8 +87,7 @@ def PyMember_GetOne(space, obj, w_member):
 @cpython_api([rffi.CCHARP, lltype.Ptr(PyMemberDef), PyObject], rffi.INT_real,
              error=-1, header=_HEADER)
 def PyMember_SetOne(space, obj, w_member, w_value):
-    addr = rffi.cast(ADDR, obj)
-    addr += w_member.c_offset
+    addr = rffi.ptradd(obj, w_member.c_offset)
     member_type = rffi.cast(lltype.Signed, w_member.c_type)
     flags = rffi.cast(lltype.Signed, w_member.c_flags)
 
diff --git a/pypy/module/cpyext/stubs.py b/pypy/module/cpyext/stubs.py
index 988a6737cc..3dba4ffa8a 100644
--- a/pypy/module/cpyext/stubs.py
+++ b/pypy/module/cpyext/stubs.py
@@ -20,15 +20,6 @@ def PyBuffer_FillContiguousStrides(space, ndim, shape, strides, itemsize, fortra
     given shape with the given number of bytes per element."""
     raise NotImplementedError
 
-@cpython_api([PyObject, rffi.INT_real, lltype.Char], PyObject)
-def PyMemoryView_GetContiguous(space, obj, buffertype, order):
-    """Create a memoryview object to a contiguous chunk of memory (in either
-    'C' or 'F'ortran order) from an object that defines the buffer
-    interface. If memory is contiguous, the memoryview object points to the
-    original memory. Otherwise copy is made and the memoryview points to a
-    new bytes object."""
-    raise NotImplementedError
-
 @cpython_api([PyObject], rffi.INT_real, error=CANNOT_FAIL)
 def PyCell_Check(space, ob):
     """Return true if ob is a cell object; ob must not be NULL."""
@@ -1241,16 +1232,6 @@ def PyModule_AddStringMacro(space, module, macro):
     """
     raise NotImplementedError
 
-@cpython_api([PyObject, rffi.INT_real], PyObject)
-def PyNumber_ToBase(space, n, base):
-    """Returns the integer n converted to base as a string with a base
-    marker of '0b', '0o', or '0x' if applicable.  When
-    base is not 2, 8, 10, or 16, the format is 'x#num' where x is the
-    base. If n is not an int object, it is converted with
-    PyNumber_Index() first.
-    """
-    raise NotImplementedError
-
 @cpython_api([PyObject], PyObject)
 def PyObject_Bytes(space, o):
     """Compute a bytes representation of object o.  In 2.x, this is just a alias
diff --git a/pypy/module/cpyext/test/test_memoryobject.py b/pypy/module/cpyext/test/test_memoryobject.py
index e15da8874a..026a363e92 100644
--- a/pypy/module/cpyext/test/test_memoryobject.py
+++ b/pypy/module/cpyext/test/test_memoryobject.py
@@ -161,6 +161,10 @@ class AppTestBufferProtocol(AppTestCpythonExtensionBase):
                     return NULL;
                  Py_RETURN_NONE;
              """),
+            ("get_contiguous", "METH_O",
+             """
+               return PyMemoryView_GetContiguous(args, PyBUF_READ, 'C');
+            """)
             ])
         module = self.import_module(name='buffer_test')
         arr = module.PyMyArray(10)
@@ -171,6 +175,17 @@ class AppTestBufferProtocol(AppTestCpythonExtensionBase):
         ten = foo.test_buffer(arr)
         assert ten == 10
         foo.test_contiguous(arr)
+        contig = foo.get_contiguous(arr)
+        foo.test_contiguous(contig)
+        try:
+            from _numpypy import multiarray as np
+        except ImportError:
+            skip('pypy built without _numpypy')
+        a = np.arange(20)[::2]
+        skip('not implemented yet')
+        contig = foo.get_contiguous(a)
+        foo.test_contiguous(contig)
+
 
     def test_releasebuffer(self):
         module = self.import_extension('foo', [
diff --git a/pypy/module/cpyext/test/test_number.py b/pypy/module/cpyext/test/test_number.py
index 902f4b5844..29adca8a53 100644
--- a/pypy/module/cpyext/test/test_number.py
+++ b/pypy/module/cpyext/test/test_number.py
@@ -169,3 +169,45 @@ class AppTestCNumber(AppTestCpythonExtensionBase):
             ''')])
         val = mod.test_PyNumber_Check(10)
         assert val == 1
+
+    def test_number_tobase(self):
+        import sys
+        mod = self.import_extension('foo', [
+            ("pynumber_tobase", "METH_VARARGS",
+            """
+                PyObject *obj;
+                int base;
+                if (!PyArg_ParseTuple(args, "Oi:pynumber_tobase",
+                                      &obj, &base)) {
+                    return NULL;
+                }
+                return PyNumber_ToBase(obj, base);
+            """)])
+        assert mod.pynumber_tobase(123, 2) == '0b1111011'
+        assert mod.pynumber_tobase(123, 8) == '0o173'
+        assert mod.pynumber_tobase(123, 10) == '123'
+        assert mod.pynumber_tobase(123, 16) == '0x7b'
+        assert mod.pynumber_tobase(-123, 2) == '-0b1111011'
+        assert mod.pynumber_tobase(-123, 8) == '-0o173'
+        assert mod.pynumber_tobase(-123, 10) == '-123'
+        assert mod.pynumber_tobase(-123, 16) == '-0x7b'
+        try:
+            mod.pynumber_tobase(123.0, 10)
+        except TypeError:
+            pass
+        else:
+            assert False, 'expected TypeError'
+        try:
+            mod.pynumber_tobase('123', 10)
+        except TypeError:
+            pass
+        else:
+            assert False, 'expected TypeError'
+        if 'PyPy' in sys.version or sys.version_info >= (3,7):
+            # bpo 38643
+            try:
+                mod.pynumber_tobase(123, 0)
+            except ValueError:
+                pass
+            else:
+                assert False, 'expected TypeError'
diff --git a/pypy/tool/release/force-builds.py b/pypy/tool/release/force-builds.py
index bac06cf8e9..c864c94096 100755
--- a/pypy/tool/release/force-builds.py
+++ b/pypy/tool/release/force-builds.py
@@ -54,7 +54,7 @@ def get_user():
         import pwd
         return pwd.getpwuid(os.getuid())[0]
 
-def main(branch, server, user, minimal=False):
+def main(options):
     #XXX: handle release tags
     #XXX: handle validity checks
     lock = defer.DeferredLock()
@@ -64,20 +64,20 @@ def main(branch, server, user, minimal=False):
             return None
         log.err(err, "Build force failure")
 
-    if minimal:
+    if options.minimal:
         builders = JIT_BUILDERS
     else:
         builders = RPYTHON_BUILDERS + OWN_BUILDERS + JIT_BUILDERS
 
     for builder in builders:
         print('Forcing', builder, '...')
-        url = "http://" + server + "/builders/" + builder + "/force"
+        url = "http://" + options.server + "/builders/" + builder + "/force"
         args = [
-            ('username', user),
+            ('username', options.user),
             ('revision', ''),
             ('forcescheduler', 'Force Build'),
-            ('branch', branch),
-            ('reason', "Forced by command line script")]
+            ('branch', options.branch),
+            ('reason', options.reason)]
         url = url + '?' + '&'.join([k + '=' + quote(v) for (k, v) in args])
         requests.append(
             lock.run(client.getPage, url.encode('utf-8'), followRedirect=False).addErrback(ebList))
@@ -97,6 +97,8 @@ if __name__ == '__main__':
     parser.add_option("-u", "--user", help="user name to report", default=get_user())
     parser.add_option("-m", "--minimal", action="store_true", default=False,
                       help="minimal: trigger pypy-c-jit only")
+    parser.add_option("-r", "--reason", help="reason for force",
+                      default='Forced by command line script')
     (options, args) = parser.parse_args()
     if  not options.branch:
         parser.error("branch option required")
@@ -108,4 +110,4 @@ if __name__ == '__main__':
     if options.branch.startswith('release') and not '-v' in options.branch:
         print('release branches must be of the form "release.*-v.*')
         sys.exit(-1) 
-    main(options.branch, options.server, user=options.user, minimal=options.minimal)
+    main(options)