diff options
| author | Armin Ronacher <armin.ronacher@active-4.com> | 2013-05-18 12:11:05 +0100 |
|---|---|---|
| committer | Armin Ronacher <armin.ronacher@active-4.com> | 2013-05-18 12:11:05 +0100 |
| commit | 4cd6e9a8099e3587c736186ba1cb1d33c6101243 (patch) | |
| tree | 2588c0e644aa00c694e869ba4169b7ddfe28cbad /docs | |
| parent | e2fc8749bcb4f9fdc8e26a00bc91ab801166d2af (diff) | |
| parent | b9c76fb845ba3bb5ec0a1bd462097ceb626e7138 (diff) | |
| download | jinja2-4cd6e9a8099e3587c736186ba1cb1d33c6101243.tar.gz | |
Merge branch 'master' into sprint-branch
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/faq.rst | 2 | ||||
| -rw-r--r-- | docs/templates.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/faq.rst b/docs/faq.rst index d066bff..5c80d33 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -174,7 +174,7 @@ harder to maintain the code for older Python versions. If you really need Python 2.3 support you either have to use `Jinja 1`_ or other templating engines that still support 2.3. -My Macros are overriden by something +My Macros are overridden by something ------------------------------------ In some situations the Jinja scoping appears arbitrary: diff --git a/docs/templates.rst b/docs/templates.rst index 790b95e..e121033 100644 --- a/docs/templates.rst +++ b/docs/templates.rst @@ -862,7 +862,7 @@ namespace:: </dl> <p>{{ textarea('comment') }}</p> -Macros and variables starting with one ore more underscores are private and +Macros and variables starting with one or more underscores are private and cannot be imported. .. versionchanged:: 2.4 |