summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-03-12 13:53:14 -0700
committerMichael Merickel <michael@merickel.org>2013-03-12 13:53:14 -0700
commit38ba7f4135c83872d661ea67ea6c7e98700b2e62 (patch)
tree5a09dcd98fe75b47c120d5eadf1dc1d5b46fb2a1 /docs/glossary.rst
parent5fb6de8426aeaca7ecfd5babb7ba0372dbeab020 (diff)
parent2d29f10e02d239745d04bf765b1c33f533c3c9b5 (diff)
downloadpyramid-38ba7f4135c83872d661ea67ea6c7e98700b2e62.tar.gz
pyramid-38ba7f4135c83872d661ea67ea6c7e98700b2e62.tar.bz2
pyramid-38ba7f4135c83872d661ea67ea6c7e98700b2e62.zip
Merge pull request #885 from tshepang/hyperlinks
fix/update hyperlinks
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst15
1 files changed, 7 insertions, 8 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index d6adaa787..0b802ab51 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -324,8 +324,8 @@ Glossary
`A full-featured Python web framework <http://djangoproject.com>`_.
Pylons
- `A lightweight Python web framework <http://pylonshq.com>`_ and a
- predecessor of Pyramid.
+ `A lightweight Python web framework <http://docs.pylonsproject.org/projects/pylons-webframework/en/latest/>`_
+ and a predecessor of Pyramid.
ZODB
`Zope Object Database <http://zodb.org>`_, a
@@ -342,7 +342,7 @@ Glossary
library created by Ian Bicking.
PasteDeploy
- `PasteDeploy <http://pythonpaste.org>`_ is a library used by
+ `PasteDeploy <http://pythonpaste.org/deploy/>`_ is a library used by
:app:`Pyramid` which makes it possible to configure
:term:`WSGI` components together declaratively within an ``.ini``
file. It was developed by Ian Bicking.
@@ -654,10 +654,9 @@ Glossary
<http://en.wikipedia.org/wiki/Thread_(computer_science)>`_ used by the
application may have a different value for this same "global" variable.
:app:`Pyramid` uses a small number of thread local variables, as
- described in :ref:`threadlocals_chapter`. See also the `threading.local
- documentation
- <http://docs.python.org/library/threading.html#threading.local>`_ for
- more information.
+ described in :ref:`threadlocals_chapter`.
+ See also the :class:`stdlib documentation <threading.local>`
+ for more information.
multidict
An ordered dictionary that can have multiple values for each key. Adds
@@ -685,7 +684,7 @@ Glossary
The C implementation of the Python language. This is the
reference implementation that most people refer to as simply
"Python"; :term:`Jython`, Google's App Engine, and `PyPy
- <http://codespeak.net/pypy/dist/pypy/doc/>`_ are examples of
+ <http://doc.pypy.org/en/latest/>`_ are examples of
non-C based Python implementations.
View Lookup