summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-12 01:19:38 -0500
committerChris McDonough <chrism@plope.com>2013-01-12 01:19:38 -0500
commit3ac960c7d1a77d89d84931c34dbed5ab57cdbe66 (patch)
tree59bb15ff08231e4986b9d0f66903a894d60f11b5 /docs/glossary.rst
parent99ca9e74cc119328987fc1cd0c377b8380beccdf (diff)
parent464ddc91ea47e3d6ba8fe30b8e9381cd395bb1d9 (diff)
downloadpyramid-3ac960c7d1a77d89d84931c34dbed5ab57cdbe66.tar.gz
pyramid-3ac960c7d1a77d89d84931c34dbed5ab57cdbe66.tar.bz2
pyramid-3ac960c7d1a77d89d84931c34dbed5ab57cdbe66.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst2
1 files changed, 1 insertions, 1 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