summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt8
-rw-r--r--docs/tutorials/wiki2/authorization.rst4
2 files changed, 10 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 1b85d39be..117204e11 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,11 @@
+Next release
+============
+
+Documentation
+-------------
+
+- Fixed two typos in wiki2 (SQLA + URL Dispatch) tutorial.
+
1.1b4 (2011-07-18)
==================
diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index 76ce4b83f..df5e228fd 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -54,7 +54,7 @@ inside our ``models.py`` file. Add the following statements to your
``models.py`` file:
.. literalinclude:: src/authorization/tutorial/models.py
- :lines: 3-4,45-49
+ :lines: 3-4,45-50
:linenos:
:language: python
@@ -228,7 +228,7 @@ We'll then change the return value of these views to pass the `resulting
.. code-block:: python
:linenos:
- return dict(page = context,
+ return dict(page = page,
content = content,
logged_in = logged_in,
edit_url = edit_url)