Merge branch 'master' into github

Author: zware

buildbots.rst

@@ -218,7 +218,7 @@ the ``Tools/buildbot/test.bat`` script.
 
 It is also possible to run a build on all of the custom builders at the same
 time.  Navigate to the bottom of the
-`builders page <http://buildbot.python.org/all/builders>`_, then find[#]_
+`builders page <http://buildbot.python.org/all/builders>`_, then find [#]_
 and fill out the set of fields that includes a *Repo path:* field.  Click the
 associated *Force Build* button to start the build on all available custom
 builders.

experts.rst

@@ -305,15 +305,14 @@ JVM/Java              frank.wierzbicki
 
 Miscellaneous
 -------------
-==================  ===========
+==================  ==========================================================
 Interest Area       Maintainers
-==================  ===========
+==================  ==========================================================
 algorithms
 argument clinic     larry
 ast/compiler        ncoghlan, benjamin.peterson, brett.cannon, georg.brandl, yselivanov
 autoconf/makefiles  twouters*
 bsd
-benchmarks          brett.cannon
 bug tracker         ezio.melotti
 buildbots           zach.ware
 bytecode            benjamin.peterson, georg.brandl, yselivanov
@@ -334,6 +333,7 @@ memory management   tim.peters, lemburg, twouters
 networking          giampaolo.rodola,
 object model        benjamin.peterson, twouters
 packaging           tarek, lemburg, alexis, eric.araujo, dstufft, paul.moore
+performance         brett.cannon, haypo, serhiy.storchaka, yselivanov
 pip                 ncoghlan, dstufft, paul.moore, Marcus.Smith
 py3 transition      benjamin.peterson
 release management  tarek, lemburg, benjamin.peterson, barry, loewis,
@@ -346,4 +346,4 @@ threads
 time and dates      lemburg, belopolsky
 unicode             lemburg, ezio.melotti, haypo, benjamin.peterson,
 version control     eric.araujo, georg.brandl, ezio.melotti
-==================  ===========
+==================  ==========================================================

gitdevs.rst

@@ -182,7 +182,7 @@ Bookmarks are local
 
 Mercurial bookmarks are intended for local
 development and can be deleted with ease, whereas branches cannot.
-Note that deleting a bookmark does not mean that the releated changesets
+Note that deleting a bookmark does not mean that the related changesets
 are also deleted. You must use the `strip extension`_ to do that. Bookmarks can
 be published to a remote repo to be shared, but must explicitly be pushed (see
 https://www.mercurial-scm.org/wiki/Bookmarks#Working_with_remote_repositories

index.rst

@@ -117,7 +117,7 @@ Status:
 Dates in *italic* are scheduled and can be adjusted.
 
 By default, the end-of-life is scheduled 5 years after the first release.  It
-can be adjusted by the release manager of each branch. Versions older than 2.6
+can be adjusted by the release manager of each branch. Versions older than 2.7
 have reached end-of-life.
 
 See also :ref:`Security branches <secbranch>`.

motivations.rst

@@ -141,12 +141,12 @@ participating in the CPython core development process:
    available, working on the infrastructure that supports CPython development,
    specifically the Roundup-based bug tracker and the buildbot system.
 
-   David currently does both proprietary and open source developement work,
+   David currently does both proprietary and open source development work,
    primarily in Python, through the company in which he is a partner, `Murray &
    Walker, Inc <http://www.murrayandwalker.com>`_.  He has done contract work
    focused specifically on CPython development both through the PSF (the
    kickstart of the email unicode API development) and directly funded by
-   interested corporations (additional development work on email fundeded by
+   interested corporations (additional development work on email funded by
    QNX, and work on CPython ICC support funded by Intel).  He would like to
    spend more of his (and his company's) time on open source work, and so is
    actively seeking additional such contract opportunities.

tools/pydoctheme/static/pydoctheme.css

@@ -20,7 +20,7 @@ div.related a {
 }
 
 div.related a:hover {
-    color: #0095C4;
+    color: #eee;
 }
 
 div.related:first-child {

tools/static/copybutton.js

@@ -1,6 +1,6 @@
 {% extends "!layout.html" %}
 {% block rootrellink %}
-        <li><img src="{{ pathto('_static/py.png', 1) }}" alt=""
+        <li><img src="{{ pathto('https://docs.python.org/3/_static/py.png', 1) }}" alt=""
                  style="vertical-align: middle; margin-top: -1px"/></li>
         <li><a href="https://www.python.org/">Python</a>{{ reldelim1 }}</li>
         <li>
@@ -30,8 +30,8 @@
     {%- endif %}
 {% endblock %}
 {% block extrahead %}
-    <link rel="shortcut icon" type="image/png" href="{{ pathto('_static/py.png', 1) }}" />
-    {% if not embedded %}<script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>{% endif %}
+    <link rel="shortcut icon" type="image/png" href="{{ pathto('https://docs.python.org/3/_static/py.png', 1) }}" />
+    {% if not embedded %}<script type="text/javascript" src="{{ pathto('https://docs.python.org/3/_static/copybutton.js', 1) }}"></script>{% endif %}
 
 {{ super() }}
 {% endblock %}