summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-01-04 18:57:45 -0500
committerChris McDonough <chrism@plope.com>2012-01-04 18:57:45 -0500
commit48c6b0062666a2ed95493790f4f288276b2b06fd (patch)
treeb4e73842b1e310a2e288ac0e690b1f0a25070132 /docs
parent52a948e65ef923340a9c172fe6d258f2832f8799 (diff)
parenta21278872884809cfec7d5de8c64518c404f2b02 (diff)
downloadpyramid-48c6b0062666a2ed95493790f4f288276b2b06fd.tar.gz
pyramid-48c6b0062666a2ed95493790f4f288276b2b06fd.tar.bz2
pyramid-48c6b0062666a2ed95493790f4f288276b2b06fd.zip
merge from master
Diffstat (limited to 'docs')
-rw-r--r--docs/copyright.rst2
-rw-r--r--docs/narr/commandline.rst6
-rw-r--r--docs/tutorials/wiki2/basiclayout.rst2
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/copyright.rst b/docs/copyright.rst
index 9366bdf47..8f3a5f5e7 100644
--- a/docs/copyright.rst
+++ b/docs/copyright.rst
@@ -59,7 +59,7 @@ Contributors:
Merickel, Eric Ongerth, Niall O'Higgins, Christoph Zwerschke, John
Anderson, Atsushi Odagiri, Kirk Strauser, JD Navarro, Joe Dallago,
Savoir-Faire Linux, Ɓukasz Fidosz, Christopher Lambacher, Claus Conrad,
- Chris Beelby, Phil Jenvey and a number of people with only psuedonyms on
+ Chris Beelby, Phil Jenvey and a number of people with only pseudonyms on
GitHub.
Cover Designer:
diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index b42a7ae9e..a1fcf12f5 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -670,9 +670,9 @@ script is installed. Because it's installed into the ``bin`` directory of a
virtualenv when the distribution is installed, it's a convenient way to
package and distribute functionality that you can call from the command-line.
It's often more convenient to create a console script than it is to create a
-``.py`` script and instruct people to call it with "the right Python
-interpreter": because it generates a file that lives in ``bin``, when it's
-invoked, it will always use "the right" Python environment, which means it
+``.py`` script and instruct people to call it with the "right" Python
+interpreter. A console script generates a file that lives in ``bin``, and when it's
+invoked it will always use the "right" Python environment, which means it
will always be invoked in an environment where all the libraries it needs
(such as Pyramid) are available.
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 77658970d..e4200ae0f 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -145,7 +145,7 @@ package.
As the result of this view configuration, when the pattern associated with
the view named ``home`` is matched during a request, the function named
-``my_view`` will be executed. The the function named ``my_view`` returns a
+``my_view`` will be executed. The function named ``my_view`` returns a
dictionary; the renderer will use the ``templates/mytemplate.pt`` template to
create a response based on the values in the dictionary.