summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvain Hellegouarch <sh@defuze.org>2015-10-30 21:35:59 +0100
committerSylvain Hellegouarch <sh@defuze.org>2015-10-30 21:35:59 +0100
commitb527cb6ec108a89e6b3bf66ddbc360e2f6495ce4 (patch)
treebd1edaefc1ae8e51f2c5fad962bc6494c2e9b34a
parent2f7cb95126b7e5482167b2a506a8c01a59510c1e (diff)
parentdfe642a3010f8e9eb892f3128885254086c7ca7b (diff)
downloadcherrypy-b527cb6ec108a89e6b3bf66ddbc360e2f6495ce4.tar.gz
Merged in amosshapira/cherrypy-1/amosshapira/tutorial-3-replaced-password-by-generate-1446115482410 (pull request #108)
Tutorial 3: replaced "/password" by "/generate", I think that's what it was meant .
-rw-r--r--docs/tutorials.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials.rst b/docs/tutorials.rst
index 9cf75f83..a60a2806 100644
--- a/docs/tutorials.rst
+++ b/docs/tutorials.rst
@@ -306,7 +306,7 @@ sessions in the process's memory. It supports more persistent
Tutorial 6: What about my javascripts, CSS and images?
######################################################
-Web application are usually also made of static content such
+Web applications are usually also made of static content such
as javascript, CSS files or images. CherryPy provides support
to serve static content to end-users.
@@ -386,7 +386,7 @@ directory structure. Most of the time, this is what you'll end
up doing so this is what the code above demonstrates. First, we
indicate the `root` directory of all of our static content. This
must be an absolute path for security reason. CherryPy will
-complain if you provide only non-absolute paths when looking for a
+complain if you provide only relative paths when looking for a
match to your URLs.
Then we indicate that all URLs which path segment starts with `/static`