From: Ville Skyttä <ville.skytta@iki.fi>
Date: Mon, 4 Apr 2016 10:46:07 +0000 (+0300)
Subject: Fix some broken links in docs
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5ba003858709aa95c76d76f8caabe7bf19e821a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Fix some broken links in docs

(cherry picked from commit b1c9b3bd384fc40e1c411abef12eaf04b574612f)
---

diff --git a/doc/build/changelog/changelog_06.rst b/doc/build/changelog/changelog_06.rst
index 67fd0f1e9d..927aae21d0 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 e782ba9386..fa952f0122 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 5b03e89c2a..604cdcb7b2 100644
--- a/lib/sqlalchemy/engine/__init__.py
+++ b/lib/sqlalchemy/engine/__init__.py
@@ -328,7 +328,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