summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2015-05-22 02:34:47 -0700
committerSteve Piercy <web@stevepiercy.com>2015-05-22 02:34:47 -0700
commitcdc3246899e833f721628ebe6dc87fab8dfead44 (patch)
treeb9dfa4fccbda65cada874f81ab6072040db519e9
parent8557eb0d3514f82220d58c629188afae03de9b11 (diff)
parent5cef2824260103212eb96d7d372c72cdc45c4deb (diff)
downloadpyramid-cdc3246899e833f721628ebe6dc87fab8dfead44.tar.gz
pyramid-cdc3246899e833f721628ebe6dc87fab8dfead44.tar.bz2
pyramid-cdc3246899e833f721628ebe6dc87fab8dfead44.zip
Merge pull request #1716 from stevepiercy/master
spelling; correct title tag
-rw-r--r--docs/quick_tutorial/jinja2.rst2
-rw-r--r--docs/quick_tutorial/jinja2/tutorial/home.jinja24
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/quick_tutorial/jinja2.rst b/docs/quick_tutorial/jinja2.rst
index 613542349..2121803f9 100644
--- a/docs/quick_tutorial/jinja2.rst
+++ b/docs/quick_tutorial/jinja2.rst
@@ -6,7 +6,7 @@
We just said Pyramid doesn't prefer one templating language over
another. Time to prove it. Jinja2 is a popular templating system,
-used in Flask and modelled after Django's templates. Let's add
+used in Flask and modeled after Django's templates. Let's add
``pyramid_jinja2``, a Pyramid :term:`add-on` which enables Jinja2 as a
:term:`renderer` in our Pyramid applications.
diff --git a/docs/quick_tutorial/jinja2/tutorial/home.jinja2 b/docs/quick_tutorial/jinja2/tutorial/home.jinja2
index 975323169..20d33b733 100644
--- a/docs/quick_tutorial/jinja2/tutorial/home.jinja2
+++ b/docs/quick_tutorial/jinja2/tutorial/home.jinja2
@@ -1,9 +1,9 @@
<!DOCTYPE html>
<html lang="en">
<head>
- <title>Quick Tour: {{ name }}</title>
+ <title>Quick Tutorial: {{ name }}</title>
</head>
<body>
<h1>Hi {{ name }}</h1>
</body>
-</html> \ No newline at end of file
+</html>