diff options
| author | Richard Barrell <rchrd@brrll.co.uk> | 2011-11-07 15:42:06 -0800 |
|---|---|---|
| committer | Richard Barrell <rchrd@brrll.co.uk> | 2011-11-07 15:42:06 -0800 |
| commit | a087a7910f2dadab029ba409da9395ecc2b56dfa (patch) | |
| tree | 8489923d74211f26a3c6de02802fa51adc5dec7d | |
| parent | a9e75c453b8ad3abb2ab64f14c3d53637c8ce566 (diff) | |
| parent | 3f13ecd7bbc10ee59c4df980ef6e75aed7c767a6 (diff) | |
| download | pyramid-a087a7910f2dadab029ba409da9395ecc2b56dfa.tar.gz pyramid-a087a7910f2dadab029ba409da9395ecc2b56dfa.tar.bz2 pyramid-a087a7910f2dadab029ba409da9395ecc2b56dfa.zip | |
Merged from master, resolved conflict in CONTRIBUTORS.txt.
| -rw-r--r-- | CONTRIBUTORS.txt | 6 | ||||
| -rw-r--r-- | docs/tutorials/wiki/basiclayout.rst | 2 | ||||
| -rw-r--r-- | rtd.txt (renamed from rtd_requirements.txt) | 0 |
3 files changed, 6 insertions, 2 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index ced88a082..e1af0aab1 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -1,4 +1,4 @@ -Pylons Project Contributor Agreement + Pylons Project Contributor Agreement ==================================== The submitter agrees by adding his or her name within the section below named @@ -150,3 +150,7 @@ Contributors - Manuel Hermann, 2011/07/11 - Richard Barrell, 2011/11/07 + +- Chris Shenton, 2011/11/07 + +- Ken Manheimer, 2011/11/07 diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst index 47cac597b..311352f5b 100644 --- a/docs/tutorials/wiki/basiclayout.rst +++ b/docs/tutorials/wiki/basiclayout.rst @@ -35,7 +35,7 @@ point happens to be the ``main`` function within the file named #. *Line 12*. We construct a :term:`Configurator` with a :term:`root factory` and the settings keywords parsed by :term:`PasteDeploy`. The root - factory is named ``get_root``. + factory is named ``root_factory``. #. *Line 13*. Register a 'static view' which answers requests which start with with URL path ``/static`` using the diff --git a/rtd_requirements.txt b/rtd.txt index 9de7ff3bb..9de7ff3bb 100644 --- a/rtd_requirements.txt +++ b/rtd.txt |