diff options
| author | Chris McDonough <chrism@plope.com> | 2012-12-01 20:29:16 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-12-01 20:29:16 -0500 |
| commit | fb352fb032465bd468427fac0e1f1532cb5000e9 (patch) | |
| tree | 46675c41a81c51a760d0b4b49d452ab08034ad14 /docs | |
| parent | fb30e2cb79490f9dcafaea3d5ce2c0af140eae71 (diff) | |
| parent | ceb5c76e7c49104985d582b135e44a59d901c95e (diff) | |
| download | pyramid-fb352fb032465bd468427fac0e1f1532cb5000e9.tar.gz pyramid-fb352fb032465bd468427fac0e1f1532cb5000e9.tar.bz2 pyramid-fb352fb032465bd468427fac0e1f1532cb5000e9.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/index.rst | 2 | ||||
| -rw-r--r-- | docs/tutorials/wiki/src/authorization/setup.py | 1 | ||||
| -rw-r--r-- | docs/tutorials/wiki/src/basiclayout/setup.py | 1 | ||||
| -rw-r--r-- | docs/tutorials/wiki/src/models/setup.py | 1 | ||||
| -rw-r--r-- | docs/tutorials/wiki/src/tests/setup.py | 1 | ||||
| -rw-r--r-- | docs/tutorials/wiki/src/views/setup.py | 1 | ||||
| -rw-r--r-- | docs/tutorials/wiki/tests.rst | 2 |
7 files changed, 7 insertions, 2 deletions
diff --git a/docs/index.rst b/docs/index.rst index faf8258c1..406cc9b03 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -200,7 +200,7 @@ To check out the trunk via ``git``, use this command: To find out how to become a contributor to :app:`Pyramid`, please see the `contributor's section of the documentation -<http://docs.pylonsproject.org/index.html#contributing>`_. +<http://docs.pylonsproject.org/en/latest/#contributing>`_. Index and Glossary ================== diff --git a/docs/tutorials/wiki/src/authorization/setup.py b/docs/tutorials/wiki/src/authorization/setup.py index ac8cdf2d5..1d2d690fc 100644 --- a/docs/tutorials/wiki/src/authorization/setup.py +++ b/docs/tutorials/wiki/src/authorization/setup.py @@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() requires = [ 'pyramid', 'pyramid_zodbconn', + 'transaction', 'pyramid_tm', 'pyramid_debugtoolbar', 'ZODB3', diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py index c4a9067b6..647c3a638 100644 --- a/docs/tutorials/wiki/src/basiclayout/setup.py +++ b/docs/tutorials/wiki/src/basiclayout/setup.py @@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() requires = [ 'pyramid', 'pyramid_zodbconn', + 'transaction', 'pyramid_tm', 'pyramid_debugtoolbar', 'ZODB3', diff --git a/docs/tutorials/wiki/src/models/setup.py b/docs/tutorials/wiki/src/models/setup.py index c4a9067b6..647c3a638 100644 --- a/docs/tutorials/wiki/src/models/setup.py +++ b/docs/tutorials/wiki/src/models/setup.py @@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() requires = [ 'pyramid', 'pyramid_zodbconn', + 'transaction', 'pyramid_tm', 'pyramid_debugtoolbar', 'ZODB3', diff --git a/docs/tutorials/wiki/src/tests/setup.py b/docs/tutorials/wiki/src/tests/setup.py index b7e0a8935..a665611bd 100644 --- a/docs/tutorials/wiki/src/tests/setup.py +++ b/docs/tutorials/wiki/src/tests/setup.py @@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() requires = [ 'pyramid', 'pyramid_zodbconn', + 'transaction', 'pyramid_tm', 'pyramid_debugtoolbar', 'ZODB3', diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py index ac8cdf2d5..1d2d690fc 100644 --- a/docs/tutorials/wiki/src/views/setup.py +++ b/docs/tutorials/wiki/src/views/setup.py @@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() requires = [ 'pyramid', 'pyramid_zodbconn', + 'transaction', 'pyramid_tm', 'pyramid_debugtoolbar', 'ZODB3', diff --git a/docs/tutorials/wiki/tests.rst b/docs/tutorials/wiki/tests.rst index ebb4d93dc..46d009d0f 100644 --- a/docs/tutorials/wiki/tests.rst +++ b/docs/tutorials/wiki/tests.rst @@ -62,7 +62,7 @@ Change the ``requires`` list in ``setup.py`` to include ``WebTest``. .. literalinclude:: src/tests/setup.py :linenos: :language: python - :lines: 9-18 + :lines: 9-19 After we've added a dependency on WebTest in ``setup.py``, we need to rerun ``setup.py develop`` to get WebTest installed into our virtualenv. Assuming |