Permalink
Browse files

Merge pull request #683 from alexcouper/master

Tiny changes to docs
  • Loading branch information...
kennethreitz committed Mar 6, 2013
2 parents 8a968a9 + 1be1329 commit aa83d9132fde44d4fda5b34bea1f0872780746aa
Showing with 17 additions and 17 deletions.
  1. +9 −8 docs/patterns/templateinheritance.rst
  2. +8 −9 docs/quickstart.rst
@@ -28,14 +28,15 @@ document that you might use for a simple two-column page. It's the job of
<title>{% block title %}{% endblock %} - My Webpage</title>
{% endblock %}
</head>
- <body>
- <div id="content">{% block content %}{% endblock %}</div>
- <div id="footer">
- {% block footer %}
- &copy; Copyright 2010 by <a href="http://domain.invalid/">you</a>.
- {% endblock %}
- </div>
- </body>
+ <body>
+ <div id="content">{% block content %}{% endblock %}</div>
+ <div id="footer">
+ {% block footer %}
+ &copy; Copyright 2010 by <a href="http://domain.invalid/">you</a>.
+ {% endblock %}
+ </div>
+ </body>
+ </html>
In this example, the ``{% block %}`` tags define four blocks that child templates
can fill in. All the `block` tag does is tell the template engine that a
View
@@ -38,15 +38,14 @@ should see your hello world greeting.
So what did that code do?
1. First we imported the :class:`~flask.Flask` class. An instance of this
- class will be our WSGI application. The first argument is the name of
- the application's module. If you are using a single module (as in this
- example), you should use `__name__` because depending on if it's started as
- application or imported as module the name will be different (``'__main__'``
- versus the actual import name). For more information, have a look at the
- :class:`~flask.Flask` documentation.
-2. Next we create an instance of this class. We pass it the name of the module
- or package. This is needed so that Flask knows where to look for templates,
- static files, and so on.
+ class will be our WSGI application.
+2. Next we create an instance of this class. The first argument is the name of
+ the application's module or package. If you are using a single module (as
+ in this example), you should use `__name__` because depending on if it's
+ started as application or imported as module the name will be different
+ (``'__main__'`` versus the actual import name). This is needed so that
+ Flask knows where to look for templates, static files, and so on. For more
+ information have a look at the :class:`~flask.Flask` documentation.
3. We then use the :meth:`~flask.Flask.route` decorator to tell Flask what URL
should trigger our function.
4. The function is given a name which is also used to generate URLs for that

0 comments on commit aa83d91

Please sign in to comment.