diff --git a/docs/build.rst b/docs/build.rst
index 577c218d9..5125e39b3 100644
--- a/docs/build.rst
+++ b/docs/build.rst
@@ -7,8 +7,8 @@ Building Pillow on Windows
 This page will describe a build setup to build Pillow against the
 supported python versions in 32 and 64 bit modes, using freely
 availble Microsoft compilers.  This has been developed and tested
-against 64bit Windows 7 Professional and a bare Windows Server 2012
-64bit RTM version on Amazon EC2.
+against 64-bit Windows 7 Professional and Windows Server 2012
+64-bit version on Amazon EC2.
 
 Prerequsites
 ------------
@@ -17,25 +17,25 @@ Extra Build Helpers
 ^^^^^^^^^^^^^^^^^^^
 
 * Powershell (available by default on Windows Server)
-* Github client (provides git+bash shell)
+* GitHub client (provides git+bash shell)
 
 Optional:
-* GPG (for checking signatures)  (UNDONE -- python signature checking)
+* GPG (for checking signatures)  (UNDONE -- Python signature checking)
 
 
 Pythons
 ^^^^^^^
 
-The build routines expect Python to be installed at C:\PythonXX for 32
-bit versions or C:\PythonXXx64 for the 64 bit versions.
+The build routines expect Python to be installed at C:\PythonXX for
+32-bit versions or C:\PythonXXx64 for the 64-bit versions.
 
-Download Python 3.4.0, install it, and add it to the path. This is the
+Download Python 3.4, install it, and add it to the path. This is the
 Python that we will use to bootstrap the build process. (The download
 routines are using 3.2+ features, and installing 3.4 gives us pip and
 virtualenv as well, reducing the number of packages that we need to
 install.) 
 
-Download the rest of the pythons by opening a command window, changing
+Download the rest of the Pythons by opening a command window, changing
 to the `winbuild` directory, and running `python
 get_pythons.py`. 
 
@@ -43,7 +43,7 @@ UNDONE -- gpg verify the signatures (note that we can download from
 https)
 
 Run each installer and set the proper path to the installation. Don't
-set any of them as the default python, or add them to the path.
+set any of them as the default Python, or add them to the path.
 
 
 Compilers
@@ -70,7 +70,7 @@ a command window, change directory into `winbuild` and run `python
 build_dep.py`. 
 
 This will download libjpeg, libtiff, libz, and freetype. It will then
-compile 32 and 64 bit versions of the libraries, with both versions of
+compile 32 and 64-bit versions of the libraries, with both versions of
 the compilers. 
 
 UNDONE -- lcms fails. 
@@ -81,7 +81,7 @@ Building Pillow
 
 Once the dependencies are built, run `python build.py --clean` to
 build and install Pillow in virtualenvs for each python
-build. `build.py --dist` will build windows installers instead of
+build. `build.py --dist` will build Windows installers instead of
 installing into virtualenvs. 
  
 UNDONE -- suppressed output, what about failures.
diff --git a/setup.py b/setup.py
index d5c085552..6ee559f5b 100644
--- a/setup.py
+++ b/setup.py
@@ -467,7 +467,7 @@ class pil_build_ext(build_ext):
                 if _find_library_file(self, "lcms2"):
                     feature.lcms = "lcms2"
                 elif _find_library_file(self, "lcms2_static"):
-                    #alternate windows name.
+                    #alternate Windows name.
                     feature.lcms = "lcms2_static"
 
         if _tkinter and _find_include_file(self, "tk.h"):