python
diff --git a/‎developers.rst
Lines changed: 3 additions & 0 deletions b/‎developers.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎index.rst
Lines changed: 2 additions & 8 deletions b/‎index.rst
Lines changed: 2 additions & 8 deletions
diff --git a/‎runtests.rst
Lines changed: 2 additions & 2 deletions b/‎runtests.rst
Lines changed: 2 additions & 2 deletions
diff --git a/‎setup.rst
Lines changed: 18 additions & 14 deletions b/‎setup.rst
Lines changed: 18 additions & 14 deletions
@@ -25,6 +25,9 @@ transliteration too.
 Permissions History
 -------------------
 
+- INADA Naoki was given push privileges on September 26, 2016 by Brett Cannon,
+  on the recommendation of Yury Selivanov.
+
 - Xavier de Gaye was given push privileges on June 3, 2016 by Brett Cannon,
   on the recommendation of Victor Stinner.
 
 
@@ -31,16 +31,10 @@ patch:
    There are different instructions for :ref:`UNIX <unix-compiling>`,
    :ref:`Mac OS <MacOS>`, and :ref:`Windows <windows-compiling>`.
 
-   The command to compile on UNIX is::
+   The command to compile on UNIX and Mac OS is::
 
-      ./configure
-      make -j2
-
-   On some Mac OS::
-
-      CPPFLAGS="-I$(brew --prefix openssl)/include" \
-      LDFLAGS="-L$(brew --prefix openssl)/lib" \
       ./configure --with-pydebug
+      make -j
 
    On Windows::
 
 
@@ -130,7 +130,7 @@ Benchmarks
 ----------
 Benchmarking is useful to test that a change does not degrade performance.
 
-`The Grand Unified Python Benchmark Suite <https://hg.python.org/benchmarks/>`_
+`The Python Benchmark Suite <https://github.com/python/performance>`_
 has a collection of benchmarks for all Python implementations. Documentation
 about running the benchmarks is in the `README.txt
-<https://hg.python.org/benchmarks/file/tip/README.txt>`_ of the benchmarks repo.
+<https://github.com/python/performance/blob/master/README.rst>`_ of the repo.
@@ -24,13 +24,18 @@ Getting Set Up
 Version Control Setup
 ---------------------
 
-CPython is developed using `Mercurial <http://hg-scm.org/>`_. The Mercurial
-command line program is named ``hg``; this is also used to refer to Mercurial
-itself. Mercurial is easily available for common Unix systems by way of the
-standard package manager; under Windows, you might want to use the
-`TortoiseHg <http://tortoisehg.org/>`_ graphical client, but the build system
-still prefers :file:`hg.exe` to be on your PATH.
-
+CPython is developed using `git <https://git-scm.com>`_. The git
+command line program is named ``git``; this is also used to refer to git
+itself. git is easily available for all common operating systems. As the
+CPython repo is hosted on GitHub, please refer to either the
+`GitHub setup instructions <https://help.github.com/articles/set-up-git/>`_
+or the `git project instructions <https://git-scm.com>`_ for step-by-step
+installation directions.
+
+You may also wish to set up an SSH key as
+described in the GitHub instructions as this will allow you to interact with
+GitHub without typing a username and password each time you execute a
+command, such as `git pull`, `git push`, or `git fetch`.
 
 .. _checkout:
 
@@ -49,13 +54,13 @@ To get a working copy of the :ref:`in-development <indevbranch>` branch of
 CPython (core developers use a different URL as outlined in :ref:`coredev`),
 run::
 
-    hg clone https://hg.python.org/cpython
+    git clone https://github.com/python/cpython
 
 If you want a working copy of an already-released version of Python,
-i.e., a version in :ref:`maintenance mode <maintbranch>`, you can update your
-working copy. For instance, to update your working copy to Python 3.5, do::
+i.e., a version in :ref:`maintenance mode <maintbranch>`, you can checkout
+a release branch. For instance, to checkout a working copy of Python 3.5, do::
 
-   hg update 3.5
+   git checkout 3.5
 
 You will need to re-compile CPython when you do such an update.
 
@@ -346,9 +351,8 @@ when trying to build an old (2.x) Python with a new (3.x) Python installed, or
 vice versa.
 
 To overcome this problem, auto-generated files are also checked into the
-Mercurial repository. So if you don't touch the auto-generation scripts, there's
-no real need to auto-generate anything. However, as Mercurial doesn't preserve
-timestamps well, a special build target ``touch`` was added (the ``touch``
+git repository. So if you don't touch the auto-generation scripts, there's
+no real need to auto-generate anything. A special build target ``touch`` was added (the ``touch``
 build target is not designed for git clones and does not support them). Run::
 
     make touch