summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/design.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-02-28 01:25:29 -0800
committerSteve Piercy <web@stevepiercy.com>2016-02-28 01:25:29 -0800
commit8c76c75e8345aac1c447f33cc223d687b84c3697 (patch)
treed81ede6be6b3415240ce9bd60f5d0bc3d3d21c4b /docs/tutorials/wiki2/design.rst
parenta6db36c984bd69f8a6aba80ad6db435cd4b1b93c (diff)
parentf99052e0790b8706161e432da0172b45a805d308 (diff)
downloadpyramid-8c76c75e8345aac1c447f33cc223d687b84c3697.tar.gz
pyramid-8c76c75e8345aac1c447f33cc223d687b84c3697.tar.bz2
pyramid-8c76c75e8345aac1c447f33cc223d687b84c3697.zip
Merge pull request #2380 from stevepiercy/feature/alchemy-scaffold-update
wiki2 authorization (done)
Diffstat (limited to 'docs/tutorials/wiki2/design.rst')
-rw-r--r--docs/tutorials/wiki2/design.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials/wiki2/design.rst b/docs/tutorials/wiki2/design.rst
index a57b318ca..ba25b0697 100644
--- a/docs/tutorials/wiki2/design.rst
+++ b/docs/tutorials/wiki2/design.rst
@@ -139,8 +139,8 @@ in the following table:
| | - If authentication | | | |
| | succeeds, | | | |
| | redirect to the | | | |
-| | page that from | | | |
-| | which we came. | | | |
+| | page from which | | | |
+| | we came. | | | |
| | | | | |
| | - If authentication | | | |
| | fails, display | | | |