diff options
| author | Chris McDonough <chrism@plope.com> | 2013-11-16 05:02:38 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-11-16 05:02:38 -0500 |
| commit | 4aafb2bc4289ff4a113e547bea8ba301756e965e (patch) | |
| tree | 10a85980c72f20d1baa67b9b40cf6a46a8cac2b8 | |
| parent | a5cfb685eed6a32a3ae5aa2af91f1590cd77bc89 (diff) | |
| parent | 6eec4385e41ccb21317e6d2807678f93987c5036 (diff) | |
| download | pyramid-4aafb2bc4289ff4a113e547bea8ba301756e965e.tar.gz pyramid-4aafb2bc4289ff4a113e547bea8ba301756e965e.tar.bz2 pyramid-4aafb2bc4289ff4a113e547bea8ba301756e965e.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | docs/narr/paste.rst | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 9d4324ff8..bc82c8faf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ python: - 2.7 - pypy - 3.2 + - 3.3 script: python setup.py test -q diff --git a/docs/narr/paste.rst b/docs/narr/paste.rst index 3427b6d53..f1fb70869 100644 --- a/docs/narr/paste.rst +++ b/docs/narr/paste.rst @@ -87,7 +87,7 @@ configuration object and *returns* an instance of our application. .. _defaults_section_of_pastedeploy_file: -``[DEFAULTS]`` Section of a PasteDeploy ``.ini`` File +``[DEFAULT]`` Section of a PasteDeploy ``.ini`` File ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ You can add a ``[DEFAULT]`` section to your PasteDeploy ``.ini`` file. Such |