summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki/index.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-06-05 14:06:02 -0400
committerChris McDonough <chrism@plope.com>2015-06-05 14:06:02 -0400
commitf3c67a4217504bc7f2862ec1616342240738efae (patch)
tree9e7452b3ffdc8d4f30739cfc9d898169d6719206 /docs/tutorials/wiki/index.rst
parent7b4ed3088af03de473ad164c314062c283afce39 (diff)
parentc1dbb5092d486df5d7fbad8e52cd1dbcc2c834d9 (diff)
downloadpyramid-f3c67a4217504bc7f2862ec1616342240738efae.tar.gz
pyramid-f3c67a4217504bc7f2862ec1616342240738efae.tar.bz2
pyramid-f3c67a4217504bc7f2862ec1616342240738efae.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/tutorials/wiki/index.rst')
-rw-r--r--docs/tutorials/wiki/index.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/tutorials/wiki/index.rst b/docs/tutorials/wiki/index.rst
index 981d135c7..89c026dac 100644
--- a/docs/tutorials/wiki/index.rst
+++ b/docs/tutorials/wiki/index.rst
@@ -3,10 +3,10 @@
ZODB + Traversal Wiki Tutorial
==============================
-This tutorial introduces a :term:`traversal` -based :app:`Pyramid`
-application to a developer familiar with Python. It will be most familiar to
-developers with previous :term:`Zope` experience. When we're done with the
-tutorial, the developer will have created a basic Wiki application with
+This tutorial introduces a :term:`ZODB` and :term:`traversal`-based
+:app:`Pyramid` application to a developer familiar with Python. It will be
+most familiar to developers with previous :term:`Zope` experience. When the
+is finished, the developer will have created a basic Wiki application with
authentication.
For cut and paste purposes, the source code for all stages of this