summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Goetz <pgoetz@mail.utexas.edu>2012-07-06 13:49:02 -0500
committerPatrick Goetz <pgoetz@mail.utexas.edu>2012-07-06 13:49:02 -0500
commit07aaa58c7bf1091ff20aafd7a796c88a753fc3dc (patch)
treea02cf0fe2cc970fb0afa9734a91809812fcec566
parent81d1c22620713cf783e243365964b294d54b6a3f (diff)
downloadbottle-07aaa58c7bf1091ff20aafd7a796c88a753fc3dc.tar.gz
A couple of minor documentation fixes
-rw-r--r--docs/routing.rst4
-rwxr-xr-xdocs/tutorial.rst2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/routing.rst b/docs/routing.rst
index f3f0898..5429f2a 100644
--- a/docs/routing.rst
+++ b/docs/routing.rst
@@ -99,8 +99,8 @@ In a second step, the request method is checked. If no exact match is found, and
Here is an example where this might bite you::
- @route('/:action/:name', method='GET')
- @route('/save/:name', method='POST')
+ @route('/<action>/<name>', method='GET')
+ @route('/save/<name>', method='POST')
The second route will never hit. Even POST requests don't arrive at the second route because the request method is checked in a separate step. The router stops at the first route which matches the request path, then checks for a valid request method, can't find one and raises a 405 error.
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index 7b1c6fd..7ada656 100755
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -176,7 +176,7 @@ You can add your own filters as well. See :doc:`Routing` for details.
.. versionchanged:: 0.10
-The new rule syntax was introduced in **Bottle 0.10** to simplify some common use cases, but the old syntax still works and you can find lot code examples still using it. The differences are best described by example:
+The new rule syntax was introduced in **Bottle 0.10** to simplify some common use cases, but the old syntax still works and you can find a lot of code examples still using it. The differences are best described by example:
=================== ====================
Old Syntax New Syntax