summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandy Barlow <randy@electronsweatshop.com>2016-10-05 15:07:57 -0400
committerRandy Barlow <randy@electronsweatshop.com>2016-10-05 15:07:57 -0400
commitdf4639ab717273490b17085d5cdb240eef3cf0c0 (patch)
tree281716138d4d689281688391a8216cda23245971
parent09b685b24b19636e11169c181b45333f9739ca35 (diff)
downloadsqlalchemy-pr/310.tar.gz
Minor grammatical improvements in doc/build/intro.rst.pr/310
-rw-r--r--doc/build/intro.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/build/intro.rst b/doc/build/intro.rst
index ca5662f03..1b8991f28 100644
--- a/doc/build/intro.rst
+++ b/doc/build/intro.rst
@@ -9,7 +9,7 @@ The SQLAlchemy SQL Toolkit and Object Relational Mapper
is a comprehensive set of tools for working with
databases and Python. It has several distinct areas of
functionality which can be used individually or combined
-together. Its major components are illustrated in below,
+together. Its major components are illustrated below,
with component dependencies organized into layers:
.. image:: sqla_arch_small.png
@@ -77,7 +77,7 @@ SQLAlchemy has been tested against the following platforms:
.. versionchanged:: 0.9
Python 2.6 is now the minimum Python version supported.
-Platforms that don't currently have support include Jython, IronPython.
+Platforms that don't currently have support include Jython and IronPython.
Jython has been supported in the past and may be supported in future
releases as well, depending on the state of Jython itself.
@@ -130,9 +130,9 @@ dealing with result sets. The extensions are supported on both the 2.xx
and 3.xx series of cPython.
``setup.py`` will automatically build the extensions if an appropriate platform is
-detected. If the build of the C extensions fails, due to missing compiler or
-other issue, the setup process will output a warning message, and re-run the
-build without the C extensions, upon completion reporting final status.
+detected. If the build of the C extensions fails due to a missing compiler or
+other issue, the setup process will output a warning message and re-run the
+build without the C extensions upon completion, reporting final status.
To run the build/install without even attempting to compile the C extensions,
the ``DISABLE_SQLALCHEMY_CEXT`` environment variable may be specified. The