Merge branch 'master' of github.com:Pylons/pyramid

5 files changed, 5 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index 5fa2a2ee4..8dca2069c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@
 .coverage
 .tox/
 nosetests.xml
-pyramid/coverage.xml
+coverage.xml
 tutorial.db
 build/
 dist/
diff --git a/CHANGES.txt b/CHANGES.txt
index 9d934794a..e6dd9f0cb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -77,6 +77,7 @@ Bug Fixes
   predicate mismatch error when trying to use GET or DELETE
   methods. Now the views are found and no predicate mismatch is
   raised.
+  See https://github.com/Pylons/pyramid/pull/786
 
 - Spaces and dots may now be in mako renderer template paths. This was
   broken when support for the new makodef syntax was added in 1.4a1.
diff --git a/docs/conf.py b/docs/conf.py
index 67e02471f..84b01a791 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -170,7 +170,7 @@ html_theme_path = ['_themes']
 html_theme = 'pyramid'
 html_theme_options = dict(
     github_url='https://github.com/Pylons/pyramid',
-#    in_progress='true',
+    in_progress='true',
     )
 # The style sheet to use for HTML and HTML Help pages. A file of that name
 # must exist either in Sphinx' static/ path, or in one of the custom paths
diff --git a/docs/glossary.rst b/docs/glossary.rst
index b6bd35ffe..abc37c7f8 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -698,7 +698,7 @@ Glossary
      :app:`Pyramid` runs on GAE.
 
    Venusian
-     `Venusian <http://docs.repoze.org/venusian>`_ is a library which
+     :ref:`Venusian` is a library which
      allows framework authors to defer decorator actions.  Instead of
      taking actions when a function (or class) decorator is executed
      at import time, the action usually taken by the decorator is
diff --git a/docs/tutorials/wiki/src/models/tutorial/tests.py b/docs/tutorials/wiki/src/models/tutorial/tests.py
index 9fd13a18d..0c5f99575 100644
--- a/docs/tutorials/wiki/src/models/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/models/tutorial/tests.py
@@ -45,7 +45,7 @@ class AppmakerTests(unittest.TestCase):
         app_root = object()
         root = {'app_root': app_root}
         self._callFUT(root)
-        self.failUnless(root['app_root'] is app_root)
+        self.assertTrue(root['app_root'] is app_root)
 
 class ViewTests(unittest.TestCase):
     def setUp(self):