diff options
| author | Chris McDonough <chrism@plope.com> | 2013-05-09 19:45:28 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-05-09 19:45:28 -0400 |
| commit | dbdfb2fea3851e31e272ebbba4297a138d74e970 (patch) | |
| tree | e4843670bbf5a681b398a5bfb4bd36fd5a1f22f4 /docs | |
| parent | 100024533b6bf297228ffccf7230fcaad136edb9 (diff) | |
| parent | a0f84bd416be91b7e861d3b5ba8aa7468ad3c4be (diff) | |
| download | pyramid-dbdfb2fea3851e31e272ebbba4297a138d74e970.tar.gz pyramid-dbdfb2fea3851e31e272ebbba4297a138d74e970.tar.bz2 pyramid-dbdfb2fea3851e31e272ebbba4297a138d74e970.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | docs/glossary.rst | 2 | ||||
| -rw-r--r-- | docs/tutorials/wiki/src/models/tutorial/tests.py | 2 |
3 files changed, 3 insertions, 3 deletions
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): |