summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-12-01 02:07:34 -0500
committerChris McDonough <chrism@plope.com>2011-12-01 02:07:34 -0500
commit65fb3b371d63f59fa94ec2b5a431894eb78060be (patch)
tree904cd78e577d5d79f5929ef218875a8e76d82c09 /docs/glossary.rst
parent2cab221bedf454629bf2f1e30c0f9d91cf57d455 (diff)
parent5febb767172726740f8adea6d04a19ba1cdb8b64 (diff)
downloadpyramid-65fb3b371d63f59fa94ec2b5a431894eb78060be.tar.gz
pyramid-65fb3b371d63f59fa94ec2b5a431894eb78060be.tar.bz2
pyramid-65fb3b371d63f59fa94ec2b5a431894eb78060be.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 39933cf4c..0d69fbb0d 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -921,7 +921,7 @@ Glossary
database information. :mod:`pyramid_debugtoolbar` is configured into
the ``development.ini`` of all applications which use a Pyramid
:term:`scaffold`. For more information, see
- https://docs.pylonsproject.org/projects/pyramid_debugtoolbar/dev/ .
+ http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/dev/ .
scaffold
A project template that helps users get started writing a Pyramid
@@ -934,7 +934,7 @@ Glossary
used in production applications, because the logger can be configured to
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/>`_.
+ <http://docs.pylonsproject.org/projects/pyramid_exclog/dev/>`_.
console script
A script written to the ``bin`` (on UNIX, or ``Scripts`` on Windows)