Permalink
Browse files

Merge pull request #332 from pengkui/master

Minor fixes.
  • Loading branch information...
2 parents fcf806d + 83a9946 commit 7d6071a71015e78c71576da7157dde2d4376851f @kennethreitz committed Jan 8, 2014
Showing with 8 additions and 7 deletions.
  1. +2 −2 docs/starting/install/win.rst
  2. +5 −4 docs/starting/which-python.rst
  3. +1 −1 docs/writing/structure.rst
View
4 docs/starting/install/win.rst
@@ -3,7 +3,7 @@
Installing Python on Windows
============================
-First, download the `latest version <http://python.org/ftp/python/2.7.4/python-2.7.4.msi>`_
+First, download the `latest version <http://python.org/ftp/python/2.7.6/python-2.7.6.msi>`_
of Python 2.7 from the official Website. If you want to be sure you are installing a fully
up-to-date version then use the "Windows Installer" link from the home page of the
`Python.org web site <http://python.org>`_ .
@@ -80,7 +80,7 @@ project. This is particularly important for Web development, where each
framework and application will have many dependencies.
-To set up a new Python environment, change the working directory to where ever
+To set up a new Python environment, change the working directory to wherever
you want to store the environment, and run the virtualenv utility in your
project's directory
View
9 docs/starting/which-python.rst
@@ -47,11 +47,11 @@ level of compatibility with Python packages and C extension modules.
If you are writing open-source Python code and want to reach the widest possible
audience, targeting CPython is your best bet. If you need to use any packages
-that rely on C extensions for their functionality (e.g. numpy) then CPython
+that rely on C extensions for their functionality (e.g., numpy) then CPython
is your only choice.
Being the reference implementation, all versions of the Python language are
-available as CPython. Python 3 is only available as a CPython implementation.
+available as CPython.
PyPy
----
@@ -67,13 +67,14 @@ If you are looking to squeeze more performance out of your Python code, it's
worth giving PyPy a try. On a suite of benchmarks, it's currently `over 5 times
faster than CPython <http://speed.pypy.org/>`_.
-Currently PyPy supports Python 2.7. [#pypy_ver]_
+Currently PyPy supports Python 2.7. PyPy3 which targets Python 3 was recently
+available as a beta release. [#pypy_ver]_
Jython
------
`Jython <http://www.jython.org/>`_ is a Python implementation that compiles
-Python code to Java byte code that is then executed in a JVM. It has the additional
+Python code to Java bytecode that is then executed in a JVM. It has the additional
advantage of being able to import and use any Java class like a Python
module.
View
2 docs/writing/structure.rst
@@ -14,7 +14,7 @@ isolated? By answering questions like these you can begin to plan, in
a broad sense, what your finished product will look like.
In this section we take a closer look at Python's module and import
-systems as they are the central element to enforcing structure in your
+systems as they are the central elements to enforcing structure in your
project. We then discuss various perspectives on how to build code which
can be extended and tested reliably.

0 comments on commit 7d6071a

Please sign in to comment.