summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTshepang Lekhonkhobe <tshepang@gmail.com>2013-03-23 13:42:10 +0200
committerTshepang Lekhonkhobe <tshepang@gmail.com>2013-03-23 13:42:10 +0200
commit56ec242999666d750538160e3cbd0e0932940f1f (patch)
treed61d8b3c089a50b4552210474b32799d645cc2cd /doc
parent25f1487d60d2eabc20d99c1edc7e2fbc02bc8a5b (diff)
downloadsqlalchemy-56ec242999666d750538160e3cbd0e0932940f1f.tar.gz
remove mistakenly-repeated words
Diffstat (limited to 'doc')
-rw-r--r--doc/build/changelog/changelog_02.rst2
-rw-r--r--doc/build/changelog/changelog_03.rst2
-rw-r--r--doc/build/changelog/changelog_04.rst6
-rw-r--r--doc/build/changelog/changelog_06.rst4
-rw-r--r--doc/build/core/tutorial.rst2
-rw-r--r--doc/build/core/types.rst2
-rw-r--r--doc/build/intro.rst2
-rw-r--r--doc/build/orm/session.rst2
8 files changed, 11 insertions, 11 deletions
diff --git a/doc/build/changelog/changelog_02.rst b/doc/build/changelog/changelog_02.rst
index 3053659a8..600dcc6eb 100644
--- a/doc/build/changelog/changelog_02.rst
+++ b/doc/build/changelog/changelog_02.rst
@@ -678,7 +678,7 @@
modified version (works in py2.3/2.4!) that uses a threading.RLock
for a mutex. this is to fix a reported case where a ConnectionFairy's
__del__() method got called within the Queue's get() method, which
- then returns its connection to the Queue via the the put() method,
+ then returns its connection to the Queue via the put() method,
causing a reentrant hang unless threading.RLock is used.
.. change::
diff --git a/doc/build/changelog/changelog_03.rst b/doc/build/changelog/changelog_03.rst
index c1944c705..e47da340a 100644
--- a/doc/build/changelog/changelog_03.rst
+++ b/doc/build/changelog/changelog_03.rst
@@ -2092,7 +2092,7 @@
:tickets:
added a mutex to the mapper compilation step. ive been reluctant to add any
- kind of threading anything to SA but this is one spot that its its really
+ kind of threading anything to SA but this is one spot that its really
needed since mappers are typically "global", and while their state does not
change during normal operation, the initial compilation step does modify
internal state significantly, and this step usually occurs not at
diff --git a/doc/build/changelog/changelog_04.rst b/doc/build/changelog/changelog_04.rst
index 37b424df7..e1acfe4c0 100644
--- a/doc/build/changelog/changelog_04.rst
+++ b/doc/build/changelog/changelog_04.rst
@@ -2036,7 +2036,7 @@
new synonym() behavior: an attribute will be placed on the mapped
class, if one does not exist already, in all cases. if a property
already exists on the class, the synonym will decorate the property
- with the appropriate comparison operators so that it can be used in in
+ with the appropriate comparison operators so that it can be used in
column expressions just like any other mapped attribute (i.e. usable in
filter(), etc.) the "proxy=True" flag is deprecated and no longer means
anything. Additionally, the flag "map_column=True" will automatically
@@ -2872,7 +2872,7 @@
:tickets:
PG reflection, upon seeing the default schema name being used explicitly
- as the "schema" argument in a Table, will assume that this is the the
+ as the "schema" argument in a Table, will assume that this is the
user's desired convention, and will explicitly set the "schema" argument
in foreign-key-related reflected tables, thus making them match only
with Table constructors that also use the explicit "schema" argument
@@ -2929,7 +2929,7 @@
:tickets: 810
Fixed breakage with postgres and multiple two-phase transactions. Two-phase
- commits and and rollbacks didn't automatically end up with a new transaction
+ commits and rollbacks didn't automatically end up with a new transaction
as the usual dbapi commits/rollbacks do.
.. change::
diff --git a/doc/build/changelog/changelog_06.rst b/doc/build/changelog/changelog_06.rst
index 0ec7027ce..c7f4dcdea 100644
--- a/doc/build/changelog/changelog_06.rst
+++ b/doc/build/changelog/changelog_06.rst
@@ -943,7 +943,7 @@
:tickets: 1953
The cx_oracle "decimal detection" logic, which takes place
- for for result set columns with ambiguous numeric characteristics,
+ for result set columns with ambiguous numeric characteristics,
now uses the decimal point character determined by the locale/
NLS_LANG setting, using an on-first-connect detection of
this character. cx_oracle 5.0.3 or greater is also required
@@ -2851,7 +2851,7 @@
:tickets: 1071
Postgresql now reflects sequence names associated with
- SERIAL columns correctly, after the name of of the sequence
+ SERIAL columns correctly, after the name of the sequence
has been changed. Thanks to Kumar McMillan for the patch.
.. change::
diff --git a/doc/build/core/tutorial.rst b/doc/build/core/tutorial.rst
index 5e251676c..fd6c69bff 100644
--- a/doc/build/core/tutorial.rst
+++ b/doc/build/core/tutorial.rst
@@ -306,7 +306,7 @@ and use it in the "normal" way:
COMMIT
{stop}<sqlalchemy.engine.result.ResultProxy object at 0x...>
-Above, because we specified all three columns in the the ``execute()`` method,
+Above, because we specified all three columns in the ``execute()`` method,
the compiled :class:`~.expression.Insert` included all three
columns. The :class:`~.expression.Insert` statement is compiled
at execution time based on the parameters we specified; if we specified fewer
diff --git a/doc/build/core/types.rst b/doc/build/core/types.rst
index e59c81fc0..131e8e64d 100644
--- a/doc/build/core/types.rst
+++ b/doc/build/core/types.rst
@@ -672,7 +672,7 @@ Usage::
The implementation for :meth:`.ColumnOperators.__add__` is consulted
by an owning SQL expression, by instantiating the :class:`.TypeEngine.Comparator` with
-itself as as the ``expr`` attribute. The mechanics of the expression
+itself as the ``expr`` attribute. The mechanics of the expression
system are such that operations continue recursively until an
expression object produces a new SQL expression construct. Above, we
could just as well have said ``self.expr.op("goofy")(other)`` instead
diff --git a/doc/build/intro.rst b/doc/build/intro.rst
index fc7e1142e..c5e7f7425 100644
--- a/doc/build/intro.rst
+++ b/doc/build/intro.rst
@@ -94,7 +94,7 @@ SQLAlchemy supports installation using standard Python "distutils" or
* **Standard Setuptools** - When using `setuptools <http://pypi.python.org/pypi/setuptools/>`_,
SQLAlchemy can be installed via ``setup.py`` or ``easy_install``, and the C
extensions are supported. setuptools is not supported on Python 3 at the time
- of of this writing.
+ of this writing.
* **Distribute** - With `distribute <http://pypi.python.org/pypi/distribute/>`_,
SQLAlchemy can be installed via ``setup.py`` or ``easy_install``, and the C
extensions as well as Python 3 builds are supported.
diff --git a/doc/build/orm/session.rst b/doc/build/orm/session.rst
index 97d6f15a0..6774af2d9 100644
--- a/doc/build/orm/session.rst
+++ b/doc/build/orm/session.rst
@@ -1372,7 +1372,7 @@ Using Subtransactions with Autocommit
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
A subtransaction indicates usage of the :meth:`.Session.begin` method in conjunction with
-the ``subtransactions=True`` flag. This produces a a non-transactional, delimiting construct that
+the ``subtransactions=True`` flag. This produces a non-transactional, delimiting construct that
allows nesting of calls to :meth:`~.Session.begin` and :meth:`~.Session.commit`.
It's purpose is to allow the construction of code that can function within a transaction
both independently of any external code that starts a transaction,