diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-12-30 18:23:12 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-12-30 18:23:12 -0500 |
| commit | c91de19e4125ad98c7952658cf2bac94750d3e4c (patch) | |
| tree | 2c804afa164344a1c86a978a237991f5fafad5a9 | |
| parent | d49df1aa1527da2d593023b7397e656f8c9b76af (diff) | |
| parent | 36024b49104753be648ee69278903029a1ba30b9 (diff) | |
| download | sqlalchemy-c91de19e4125ad98c7952658cf2bac94750d3e4c.tar.gz | |
Merge branch 'master' into rel_0_9
| -rw-r--r-- | doc/build/conf.py | 1 | ||||
| -rw-r--r-- | doc/build/requirements.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/build/conf.py b/doc/build/conf.py index 869ffec58..467a9c9ae 100644 --- a/doc/build/conf.py +++ b/doc/build/conf.py @@ -35,6 +35,7 @@ extensions = [ 'sphinx.ext.autodoc', 'builder.autodoc_mods', 'changelog', + 'sphinx_paramlinks', 'builder.dialect_info', 'builder.mako', 'builder.sqlformatter', diff --git a/doc/build/requirements.txt b/doc/build/requirements.txt index 554f23cb3..52f594ca5 100644 --- a/doc/build/requirements.txt +++ b/doc/build/requirements.txt @@ -1,2 +1,3 @@ mako changelog>=0.3.2 +sphinx-paramlinks>=0.1.8 |