summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-25 02:23:59 -0400
committerChris McDonough <chrism@plope.com>2011-08-25 02:23:59 -0400
commit0e9fe538b53ca62b8e9400f624e25ddd9bb7d07e (patch)
tree32353078e9b85cf43c92a65c530fbf35d36ef59b /docs/glossary.rst
parenta6035f3ccdd770fd463a67e216fa5c6aab9ced5c (diff)
parentd73be153fa9544f453510524f34d55a7602e0896 (diff)
downloadpyramid-0e9fe538b53ca62b8e9400f624e25ddd9bb7d07e.tar.gz
pyramid-0e9fe538b53ca62b8e9400f624e25ddd9bb7d07e.tar.bz2
pyramid-0e9fe538b53ca62b8e9400f624e25ddd9bb7d07e.zip
Merge branch 'djay-master'
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 911fbff1a..332006d9d 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -945,3 +945,4 @@ Glossary
log to a file, to UNIX syslog, to the Windows Event Log, or even to
email. See its `documentation
<https://docs.pylonsproject.org/projects/pyramid_exclog/dev/>`_.
+