summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki
diff options
context:
space:
mode:
Diffstat (limited to 'docs/tutorials/wiki')
-rw-r--r--docs/tutorials/wiki/authorization.rst4
-rw-r--r--docs/tutorials/wiki/design.rst4
-rw-r--r--docs/tutorials/wiki/installation.rst4
-rw-r--r--docs/tutorials/wiki/src/views/tutorial/templates/view.pt2
4 files changed, 7 insertions, 7 deletions
diff --git a/docs/tutorials/wiki/authorization.rst b/docs/tutorials/wiki/authorization.rst
index b0a8c155d..c6f551b42 100644
--- a/docs/tutorials/wiki/authorization.rst
+++ b/docs/tutorials/wiki/authorization.rst
@@ -248,7 +248,7 @@ Return a ``logged_in`` flag to the renderer
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Open ``tutorial/tutorial/views.py`` again. Add a ``logged_in`` parameter to
-the return value of ``view_page()``, ``edit_page()``, and ``add_page()`` as
+the return value of ``view_page()``, ``add_page()``, and ``edit_page()`` as
follows:
.. literalinclude:: src/authorization/tutorial/views.py
@@ -262,7 +262,7 @@ follows:
:language: python
.. literalinclude:: src/authorization/tutorial/views.py
- :lines: 75-77
+ :lines: 78-80
:emphasize-lines: 2-3
:language: python
diff --git a/docs/tutorials/wiki/design.rst b/docs/tutorials/wiki/design.rst
index 49c30d29a..46c2a2f30 100644
--- a/docs/tutorials/wiki/design.rst
+++ b/docs/tutorials/wiki/design.rst
@@ -1,6 +1,6 @@
-==========
+======
Design
-==========
+======
Following is a quick overview of the design of our wiki application, to help
us understand the changes that we will be making as we work through the
diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
index 20df389c6..ff5cac4c9 100644
--- a/docs/tutorials/wiki/installation.rst
+++ b/docs/tutorials/wiki/installation.rst
@@ -65,11 +65,11 @@ Python 2.7:
c:\> c:\Python27\Scripts\virtualenv %VENV%
-Python 3.2:
+Python 3.3:
.. code-block:: text
- c:\> c:\Python32\Scripts\virtualenv %VENV%
+ c:\> c:\Python33\Scripts\virtualenv %VENV%
Install Pyramid and tutorial dependencies into the virtual Python environment
-----------------------------------------------------------------------------
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
index e7b0dc23e..93580658b 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
@@ -8,7 +8,7 @@
<meta name="author" content="Pylons Project">
<link rel="shortcut icon" href="${request.static_url('tutorial:static/pyramid-16x16.png')}">
- <title>${page.name} - Pyramid tutorial wiki (based on
+ <title>${page.__name__} - Pyramid tutorial wiki (based on
TurboGears 20-Minute Wiki)</title>
<!-- Bootstrap core CSS -->