summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Buxton <david@gasmark6.com>2010-07-20 18:57:25 +0800
committerMarcel Hellkamp <marc@gsites.de>2010-07-21 01:56:29 +0200
commitd504251f248f30beee2cb338a4d4d38140af76f8 (patch)
treee947124eff5918969ef7a98330dd0f6d775c9754
parentae9da6b27bd2c083aa009d4b2fe247aa72e5178c (diff)
downloadbottle-d504251f248f30beee2cb338a4d4d38140af76f8.tar.gz
Fixed spelling of "recipes", other typos in docs.
Moved "apidoc/recieps.rst" to "apidoc/recipes.rst".
-rwxr-xr-xapidoc/index.rst6
-rw-r--r--apidoc/recipes.rst (renamed from apidoc/recieps.rst)14
2 files changed, 10 insertions, 10 deletions
diff --git a/apidoc/index.rst b/apidoc/index.rst
index 2ed011e..2775920 100755
--- a/apidoc/index.rst
+++ b/apidoc/index.rst
@@ -24,9 +24,9 @@ Bottle is a fast, simple and lightweight WSGI_ micro web-framework for Python_.
.. rubric:: Core Features
* **Routing:** Requests to function-call mapping with support for clean and dynamic URLs.
-* **Templates:** Fast and pythonic :ref:`build-in template engine <tutorial-templates>` and support for mako_, jinja2_ and cheetah_ templates.
+* **Templates:** Fast and pythonic :ref:`built-in template engine <tutorial-templates>` and support for mako_, jinja2_ and cheetah_ templates.
* **Utilities:** Convenient access to form data, file uploads, cookies, headers and other HTTP related metadata.
-* **Server:** Build-in HTTP development server and support for paste_, fapws3_, `Google App Engine <http://code.google.com/intl/en-US/appengine/>`_, cherrypy_ or any other WSGI_ capable HTTP server.
+* **Server:** Built-in HTTP development server and support for paste_, fapws3_, `Google App Engine <http://code.google.com/intl/en-US/appengine/>`_, cherrypy_ or any other WSGI_ capable HTTP server.
.. rubric:: Example: "Hello World" in a bottle
@@ -75,7 +75,7 @@ Tutorials and Resources
:maxdepth: 2
tutorial_app
- recieps
+ recipes
Development and Contribution
============================
diff --git a/apidoc/recieps.rst b/apidoc/recipes.rst
index 93fbf6f..47a7ad4 100644
--- a/apidoc/recieps.rst
+++ b/apidoc/recipes.rst
@@ -7,7 +7,7 @@
.. _paste: http://pythonpaste.org/modules/evalexception.html
.. _pylons: http://pylonshq.com/
-Recieps
+Recipes
=============
This is a collection of code snippets and examples for common use cases.
@@ -15,7 +15,7 @@ This is a collection of code snippets and examples for common use cases.
Keeping track of Sessions
----------------------------
-There is no build in support for sessions because there is no *right* way to do it (in a micro framework). Depending on requirements and environment you could use beaker_ middleware with a fitting backend or implement it yourself. Here is an example for beaker sessions with a file-based backend::
+There is no built-in support for sessions because there is no *right* way to do it (in a micro framework). Depending on requirements and environment you could use beaker_ middleware with a fitting backend or implement it yourself. Here is an example for beaker sessions with a file-based backend::
import bottle
from beaker.middleware import SessionMiddleware
@@ -40,7 +40,7 @@ There is no build in support for sessions because there is no *right* way to do
Debugging with Style: Debugging Middleware
--------------------------------------------------------------------------------
-Bottle catches all Exceptions raised in your app code to prevent your WSGI server from crashing. If the build-in :func:`debug` mode is not enough and you need exceptions to propagate to a debugging middleware, you can turn off this behaviour::
+Bottle catches all Exceptions raised in your app code to prevent your WSGI server from crashing. If the built-in :func:`debug` mode is not enough and you need exceptions to propagate to a debugging middleware, you can turn off this behaviour::
import bottle
app = bottle.app()
@@ -70,21 +70,21 @@ This is not the recommend way (you should use a middleware in front of bottle to
response.status = int(status.split()[0])
for key, value in headerlist:
response.add_header(key, value)
- return app(new_environ, start_response)
+ return app(new_environ, start_response)
Again, this is not the recommend way to implement subprojects. It is only here because many people asked for this and to show how bottle maps to WSGI.
-Ignore tailing slashes
+Ignore trailing slashes
--------------------------------------------------------------------------------
-For Bottle, ``/example`` and ``/example/`` are two different routes. To threat both URLs the same you can add two ``@route`` decorators::
+For Bottle, ``/example`` and ``/example/`` are two different routes. To treat both URLs the same you can add two ``@route`` decorators::
@route('/test')
@route('/test/')
def test(): return 'Slash? no?'
-or add a WSGI middleware that strips tailing slashes from all URLs::
+or add a WSGI middleware that strips trailing slashes from all URLs::
class StripPathMiddleware(object):
def __init__(self, app):