From: Randy Barlow Date: Wed, 5 Oct 2016 19:07:57 +0000 (-0400) Subject: Minor grammatical improvements in doc/build/intro.rst. X-Git-Tag: rel_1_0_16~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e8b12e07b0f2d154a4e7d78da8f253cf00c0b39;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Minor grammatical improvements in doc/build/intro.rst. (cherry picked from commit df4639ab717273490b17085d5cdb240eef3cf0c0) --- diff --git a/doc/build/intro.rst b/doc/build/intro.rst index 3231bfe9c0..19b1d467f4 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. @@ -136,9 +136,9 @@ and 3.xx series of cPython. The C extensions now compile on Python 3 as well as Python 2. ``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