diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2016-04-06 09:59:35 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2016-04-06 09:59:35 -0400 |
| commit | 34be0bc78183b483444acdf34da1bd6c97ba074a (patch) | |
| tree | a5e81884157efbefd1b3f839c87c6ae7a6d349f5 | |
| parent | be7322b3da8e412bd2376c3ce836ead589d1ad31 (diff) | |
| parent | b1c9b3bd384fc40e1c411abef12eaf04b574612f (diff) | |
| download | sqlalchemy-34be0bc78183b483444acdf34da1bd6c97ba074a.tar.gz | |
Merge remote-tracking branch 'origin/pr/255'
| -rw-r--r-- | doc/build/changelog/changelog_06.rst | 2 | ||||
| -rw-r--r-- | doc/build/changelog/changelog_07.rst | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/__init__.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/build/changelog/changelog_06.rst b/doc/build/changelog/changelog_06.rst index 67fd0f1e9..927aae21d 100644 --- a/doc/build/changelog/changelog_06.rst +++ b/doc/build/changelog/changelog_06.rst @@ -3845,7 +3845,7 @@ :tickets: For the full set of feature descriptions, see - http://www.sqlalchemy.org/trac/wiki/06Migration . + http://docs.sqlalchemy.org/en/latest/changelog/migration_06.html . This document is a work in progress. .. change:: diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst index e782ba938..fa952f012 100644 --- a/doc/build/changelog/changelog_07.rst +++ b/doc/build/changelog/changelog_07.rst @@ -3220,7 +3220,7 @@ This section documents those changes from 0.7b4 to 0.7.0. For an overview of what's new in SQLAlchemy 0.7, see - http://www.sqlalchemy.org/trac/wiki/07Migration + http://docs.sqlalchemy.org/en/latest/changelog/migration_07.html .. change:: :tags: orm @@ -4125,7 +4125,7 @@ Detailed descriptions of each change below are described at: - http://www.sqlalchemy.org/trac/wiki/07Migration + http://docs.sqlalchemy.org/en/latest/changelog/migration_07.html .. change:: :tags: general diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py index adca6694e..6d092e15c 100644 --- a/lib/sqlalchemy/engine/__init__.py +++ b/lib/sqlalchemy/engine/__init__.py @@ -374,7 +374,7 @@ def create_engine(*args, **kwargs): * the ``mock`` strategy, which dispatches all statement execution to a function passed as the argument ``executor``. See `example in the FAQ - <http://www.sqlalchemy.org/trac/wiki/FAQ#HowcanIgettheCREATETABLEDROPTABLEoutputasastring>`_. + <http://docs.sqlalchemy.org/en/latest/faq/metadata_schema.html#how-can-i-get-the-create-table-drop-table-output-as-a-string>`_. :param executor=None: a function taking arguments ``(sql, *multiparams, **params)``, to which the ``mock`` strategy will |