summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDavid Lord <davidism@gmail.com>2021-05-11 16:22:14 -0700
committerDavid Lord <davidism@gmail.com>2021-05-11 16:24:15 -0700
commit9b86bbce631f31a6b5cb0d4aa7dbaba320f838b3 (patch)
treebc68fbfe4eb03d91f4f7f73f09d59bab0fc5d198 /docs
parente7dce0b3b1dfdae6438cab655285872a7a5c234c (diff)
downloadjinja2-9b86bbce631f31a6b5cb0d4aa7dbaba320f838b3.tar.gz
rename default branch in files
Diffstat (limited to 'docs')
-rw-r--r--docs/templates.rst4
-rw-r--r--docs/tricks.rst8
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/templates.rst b/docs/templates.rst
index 0762e4d..6bdd6fc 100644
--- a/docs/templates.rst
+++ b/docs/templates.rst
@@ -427,7 +427,7 @@ this template "extends" another template. When the template system evaluates
this template, it first locates the parent. The extends tag should be the
first tag in the template. Everything before it is printed out normally and
may cause confusion. For details about this behavior and how to take
-advantage of it, see :ref:`null-master-fallback`. Also a block will always be
+advantage of it, see :ref:`null-default-fallback`. Also a block will always be
filled in regardless of whether the surrounding condition is evaluated to be true
or false.
@@ -1430,7 +1430,7 @@ It is also possible to use inline `if` expressions. These are useful in some
situations. For example, you can use this to extend from one template if a
variable is defined, otherwise from the default layout template::
- {% extends layout_template if layout_template is defined else 'master.html' %}
+ {% extends layout_template if layout_template is defined else 'default.html' %}
The general syntax is ``<do something> if <something is true> else <do
something else>``.
diff --git a/docs/tricks.rst b/docs/tricks.rst
index 7aaaaa0..762a69c 100644
--- a/docs/tricks.rst
+++ b/docs/tricks.rst
@@ -7,10 +7,10 @@ This part of the documentation shows some tips and tricks for Jinja
templates.
-.. _null-master-fallback:
+.. _null-default-fallback:
-Null-Master Fallback
---------------------
+Null-Default Fallback
+---------------------
Jinja supports dynamic inheritance and does not distinguish between parent
and child template as long as no `extends` tag is visited. While this leads
@@ -25,7 +25,7 @@ to false which it does per default if it's not defined. Additionally a very
basic skeleton is added to the file so that if it's indeed rendered with
`standalone` set to `True` a very basic HTML skeleton is added::
- {% if not standalone %}{% extends 'master.html' %}{% endif -%}
+ {% if not standalone %}{% extends 'default.html' %}{% endif -%}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<title>{% block title %}The Page Title{% endblock %}</title>
<link rel="stylesheet" href="style.css" type="text/css">