diff options
| author | John Anderson <sontek@gmail.com> | 2015-04-13 11:03:48 -0400 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2015-04-13 11:03:48 -0400 |
| commit | 17279b4da22af5caf23d402b29cef0f729408474 (patch) | |
| tree | 786a5290b1440dea4cc33043cb0715113e0c0451 /docs/tutorials | |
| parent | 50a8a077f403b89ff43ad745f101213c2cfeea8f (diff) | |
| parent | 46805450633291682f97e87055313fc3be477326 (diff) | |
| download | pyramid-17279b4da22af5caf23d402b29cef0f729408474.tar.gz pyramid-17279b4da22af5caf23d402b29cef0f729408474.tar.bz2 pyramid-17279b4da22af5caf23d402b29cef0f729408474.zip | |
Merge branch 'master' of https://github.com/Pylons/pyramid into start_pep8
Conflicts:
pyramid/view.py
Diffstat (limited to 'docs/tutorials')
| -rw-r--r-- | docs/tutorials/wiki/authorization.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials/wiki/authorization.rst b/docs/tutorials/wiki/authorization.rst index 93cd0c18e..6c98b6f3a 100644 --- a/docs/tutorials/wiki/authorization.rst +++ b/docs/tutorials/wiki/authorization.rst @@ -197,9 +197,9 @@ Add the following import statements to the head of ``tutorial/tutorial/views.py``: .. literalinclude:: src/authorization/tutorial/views.py - :lines: 6-13,15-17 + :lines: 6-17 :linenos: - :emphasize-lines: 3,6-9,11 + :emphasize-lines: 3,6-11 :language: python (Only the highlighted lines, with other necessary modifications, |