diff options
| author | Chris McDonough <chrism@plope.com> | 2015-04-14 21:53:56 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-04-14 21:53:56 -0400 |
| commit | 4d83ea47111a6661f0f7af7c2de8b85773df75d0 (patch) | |
| tree | b10a40c63c8903a300751c2e2bcf8b64ffaaf068 | |
| parent | 454e4380432f5607e5f365450e29d2cbd92bf68e (diff) | |
| parent | 9295929fc84008cdadd1c1625bedfe8384fbd044 (diff) | |
| download | pyramid-4d83ea47111a6661f0f7af7c2de8b85773df75d0.tar.gz pyramid-4d83ea47111a6661f0f7af7c2de8b85773df75d0.tar.bz2 pyramid-4d83ea47111a6661f0f7af7c2de8b85773df75d0.zip | |
Merge branch 'master' into 1.6-branch
| -rw-r--r-- | HACKING.txt | 2 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/authorization.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/HACKING.txt b/HACKING.txt index 9a7df8679..e31dd8714 100644 --- a/HACKING.txt +++ b/HACKING.txt @@ -238,7 +238,7 @@ or adds the feature. To build and review docs, use the following steps. $ ./builddocs -5. Open the ``.tox/_build/html/index.html`` file to see the resulting HTML +4. Open the ``.tox/_build/html/index.html`` file to see the resulting HTML rendering. Change Log diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst index 2e35574fd..90a89d63e 100644 --- a/docs/tutorials/wiki2/authorization.rst +++ b/docs/tutorials/wiki2/authorization.rst @@ -211,7 +211,7 @@ routes: ``view_page`` route definition: .. literalinclude:: src/authorization/tutorial/__init__.py - :lines: 32 + :lines: 33 :linenos: :language: python |