summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Everitt <paul@agendaless.com>2013-08-03 11:34:05 -0400
committerPaul Everitt <paul@agendaless.com>2013-08-03 11:34:05 -0400
commitefcf8f1c8b1e1140a5e9d9bb6fea558150ae7c29 (patch)
tree614caba84bfc80d86aa2c4e1d6caa292211f832e
parent83fefbf3f92183d1d899c8449a03546dd3c022a3 (diff)
downloadpyramid-efcf8f1c8b1e1140a5e9d9bb6fea558150ae7c29.tar.gz
pyramid-efcf8f1c8b1e1140a5e9d9bb6fea558150ae7c29.tar.bz2
pyramid-efcf8f1c8b1e1140a5e9d9bb6fea558150ae7c29.zip
Some more occurrences of "application framework".
-rw-r--r--docs/authorintro.rst2
-rw-r--r--docs/index.rst4
-rw-r--r--docs/latexindex.rst2
-rw-r--r--docs/narr/templates.rst2
4 files changed, 5 insertions, 5 deletions
diff --git a/docs/authorintro.rst b/docs/authorintro.rst
index f1a9d1484..1fc4c8513 100644
--- a/docs/authorintro.rst
+++ b/docs/authorintro.rst
@@ -2,7 +2,7 @@
Author Introduction
=====================
-Welcome to "The :app:`Pyramid` Web Application Framework". In this
+Welcome to "The :app:`Pyramid` Web Framework". In this
introduction, I'll describe the audience for this book, I'll describe
the book content, I'll provide some context regarding the genesis of
:app:`Pyramid`, and I'll thank some important people.
diff --git a/docs/index.rst b/docs/index.rst
index 4bbd2fd93..09bbb5a9a 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -4,8 +4,8 @@
The Pyramid Web Framework
=================================================
-:app:`Pyramid` is a small, fast, down-to-earth Python web application
-development framework. It is developed as part of the `Pylons Project
+:app:`Pyramid` is a small, fast, down-to-earth Python web framework. It
+is developed as part of the `Pylons Project
<http://docs.pylonsproject.org/>`_. It is licensed under a `BSD-like license
<http://repoze.org/license.html>`_.
diff --git a/docs/latexindex.rst b/docs/latexindex.rst
index 6bb875f73..e2266d741 100644
--- a/docs/latexindex.rst
+++ b/docs/latexindex.rst
@@ -1,7 +1,7 @@
.. _latexindex:
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-The :app:`Pyramid` Web Application Framework
+The :app:`Pyramid` Web Framework
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
.. frontmatter::
diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index d4cf20b93..f1e1634b8 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -711,7 +711,7 @@ look like:
<h1 class="title">Welcome to <code>${project}</code>, an
application generated by the <a
href="http://docs.pylonsproject.org/projects/pyramid/current/"
- >pyramid</a> web application framework.</h1>
+ >pyramid</a> web framework.</h1>
</body>
</html>