diff -r 31dded3eeae0 index.rst
--- a/index.rst	Thu Jun 26 10:57:49 2014 -0700
+++ b/index.rst	Wed Jul 02 14:20:49 2014 -0500
@@ -18,17 +18,14 @@
 
       hg clone http://hg.python.org/cpython
 
-2. :ref:`Build Python <compiling>`.  On :ref:`UNIX <unix-compiling>`::
+2. :ref:`Build Python <compiling>`.  On all platforms, install build
+   dependencies (such as compilers), then on :ref:`UNIX <unix-compiling>`::
 
       ./configure --with-pydebug && make -j2
 
-   On :ref:`Windows <windows-compiling>`, open the solution file
-   :file:`PCbuild\\pcbuild.sln` in Visual Studio, select :menuselection:`Debug`,
-   and :menuselection:`Build --> Build Solution`. Run
-   :file:`Tools\\buildbot\\external.bat` or
-   :file:`Tools\\buildbot\\external-amd64.bat` to download and compile 3rd
-   party libraries.  Note: Visual Studio may throw errors, but Python will
-   be built.
+   On :ref:`Windows <windows-compiling>`::
+
+      PCbuild\build.bat -e -d
 
 3. :doc:`Run the tests <runtests>`::
 
diff -r 31dded3eeae0 setup.rst
--- a/setup.rst	Thu Jun 26 10:57:49 2014 -0700
+++ b/setup.rst	Wed Jul 02 14:20:49 2014 -0500
@@ -25,7 +25,8 @@
 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.
+`TortoiseHg <http://tortoisehg.org/>`_ graphical client, but the build system
+still prefers :file:`hg.exe` to be on your PATH.
 
 
 .. _checkout:
@@ -221,8 +222,9 @@
 Windows
 '''''''
 
-The readme included in the solution has more details, especially on the
-software needed to resolve the below mentioned build errors.
+The `readme <http://hg.python.org/cpython/file/default/PCbuild/readme.txt>`_
+included in the solution has more details, especially on what additional
+software is required to build which parts of Python.
 
 **Python 3.3** and later use Microsoft Visual Studio 2010.  You can
 download Microsoft Visual C++ 2010 Express `from Microsoft's site
@@ -261,9 +263,8 @@
 to build.  If you prefer, you can exclude the offending projects from
 the build process by unchecking them inside the
 :menuselection:`Build --> Configuration Manager...` settings. You can
-also use the script :file:`Tools\\buildbot\\external.bat` or
-:file:`Tools\\buildbot\\external-amd64.bat` (as applicable) to download and
-compile missing dependencies.
+also use the script :file:`PCbuild\\get_externals.bat` to download missing
+dependencies.
 
 Once built you might want to set Python as a startup project. Pressing F5 in
 Visual Studio, or choosing Start Debugging from the Debug menu, will launch
@@ -276,6 +277,8 @@
 have to invoke ``PCBuild\python_d.exe``, for a 64-bit build in debug mode,
 ``PCBuild\amd64\python_d.exe``.  If you are compiling in release mode (which
 you shouldn't, in general), replace ``python_d.exe`` with ``python.exe``.
+You can also invoke the most recently built interpreter using ``python.bat``
+in the root of the source tree.
 
 .. _build_troubleshooting: