summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTshepang Lekhonkhobe <tshepang@gmail.com>2013-01-02 23:09:40 +0200
committerTshepang Lekhonkhobe <tshepang@gmail.com>2013-01-04 02:00:35 +0200
commitf65e191ed7da0ff97638879cf854c0b1cb505aaa (patch)
tree0a969eeeb6fb2faa0afdacdd8eb757e9da129ead /docs
parent510c741078825710db718065638bdd5bda6f2a9e (diff)
downloadpyramid-f65e191ed7da0ff97638879cf854c0b1cb505aaa.tar.gz
pyramid-f65e191ed7da0ff97638879cf854c0b1cb505aaa.tar.bz2
pyramid-f65e191ed7da0ff97638879cf854c0b1cb505aaa.zip
typos
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst2
-rw-r--r--docs/narr/introduction.rst2
-rw-r--r--docs/tutorials/wiki2/basiclayout.rst2
-rw-r--r--docs/tutorials/wiki2/installation.rst2
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 6620552f1..5b165db0a 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -921,7 +921,7 @@ Glossary
PyPy
PyPy is an "alternative implementation of the Python
- language":http://pypy.org/
+ language": http://pypy.org/
tween
A bit of code that sits between the Pyramid router's main request
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index b35c61720..956d7a177 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -101,7 +101,7 @@ frameworks for small and large applications is just false; a well-designed
framework should be able to be good at both. Pyramid strives to be that kind
of framework.
-To this end, Pyramid provides a set of features, that, combined, are unique
+To this end, Pyramid provides a set of features that, combined, are unique
amongst Python web frameworks. Lots of other frameworks contain some
combination of these features; Pyramid of course actually stole many of them
from those other frameworks. But Pyramid is the only one that has all of
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 763deaa32..e8874784c 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -97,7 +97,7 @@ with the prefix ``/static`` (by virtue of the first argument to
``add_static_view``). This will serve up static resources for us from within
the ``static`` directory of our ``tutorial`` package, in this case, via
``http://localhost:6543/static/`` and below (by virtue of the second argument
-to add_static_view). With this declaration, we're saying that any URL that
+to ``add_static_view``). With this declaration, we're saying that any URL that
starts with ``/static`` should go to the static view; any remainder of its
path (e.g. the ``/foo`` in ``/static/foo``) will be used to compose a path to
a static file resource, such as a CSS file.
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 572bffcab..1e47e18c3 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -159,7 +159,7 @@ On Windows:
.. code-block:: text
- c:\pyramidtut\tutorial> ..\Scripts\nosetests --cover-package=tutorial ^
+ c:\pyramidtut\tutorial> ..\Scripts\nosetests --cover-package=tutorial \
--cover-erase --with-coverage
If successful, you will see output something like this::