Merge pull request #2343 from stevepiercy/1.5-branch

Steve Piercy

2016-02-08 cea0e2a13c37b409efb2b40c7067e4d6195745fb

Merge pull request #2343 from stevepiercy/1.5-branch

fix pyramid_tm url

 docs/conf.py

@@ -68,7 +68,7 @@
    'python': ('http://docs.python.org', None),
    'python3': ('http://docs.python.org/3', None),
    'sqla': ('http://docs.sqlalchemy.org/en/latest', None),
    'tm': ('http://docs.pylonsproject.org/projects/pyramid_tm/en/latest/', None),
    'tm': ('http://docs.pylonsproject.org/projects/pyramid-tm/en/latest/', None),
    'toolbar': ('http://docs.pylonsproject.org/projects/pyramid-debugtoolbar/en/latest', None),
    'tstring': ('http://docs.pylonsproject.org/projects/translationstring/en/latest', None),
    'tutorials': ('http://docs.pylonsproject.org/projects/pyramid-tutorials/en/latest/', None),