Ensure API doc for make_url and resolve references

diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst
index 655c9b288b215ec24e9f99d085734c91da6f0cef..c619d31df55622334b8a03e8070e09655225a09d 100644 (file)
--- a/doc/build/changelog/changelog_07.rst
+++ b/doc/build/changelog/changelog_07.rst
@@ -11,7 +11,7 @@
         :tickets: 2851
         :versions: 0.8.3, 0.9.0
 
-        The regexp used by the :func:`~.sqlalchemy.engine.url.make_url` function now parses
+        The regexp used by the :func:`~sqlalchemy.engine.url.make_url` function now parses
         ipv6 addresses, e.g. surrounded by brackets.
 
     .. change::

diff --git a/doc/build/core/engines.rst b/doc/build/core/engines.rst
index 5b315fc39ee4cf286830ff4d1cdab185a432cc49..8d34ab5c6266b951e59fc8c62f020bbdc5e85243 100644 (file)
--- a/doc/build/core/engines.rst
+++ b/doc/build/core/engines.rst
@@ -87,6 +87,8 @@ known driver available for that backend (i.e. cx_oracle, pysqlite/sqlite3,
 psycopg2, mysqldb). For Jython connections, specify the `zxjdbc` driver, which
 is the JDBC-DBAPI bridge included with Jython.
 
+.. autofunction:: sqlalchemy.engine.url.make_url
+
 Postgresql
 ----------
 

diff --git a/lib/sqlalchemy/engine/url.py b/lib/sqlalchemy/engine/url.py
index 08b620752fc12cb38a714926d680fb024b295614..a61f4a85ca8bc1fa91a55ec1f2de2b83750a5fad 100644 (file)
--- a/lib/sqlalchemy/engine/url.py
+++ b/lib/sqlalchemy/engine/url.py
@@ -24,8 +24,8 @@ class URL(object):
     Represent the components of a URL used to connect to a database.
 
     This object is suitable to be passed directly to a
-    ``create_engine()`` call.  The fields of the URL are parsed from a
-    string by the ``module-level make_url()`` function.  the string
+    :func:`~sqlalchemy.create_engine` call.  The fields of the URL are parsed from a
+    string by the :func:`.make_url` function.  the string
     format of the URL is an RFC-1738-style string.
 
     All initialization parameters are available as public attributes.