summaryrefslogtreecommitdiff
path: root/docs/narr/introduction.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/narr/introduction.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/narr/introduction.rst')
-rw-r--r--docs/narr/introduction.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 2387db6a7..7c6ad00f3 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -219,7 +219,7 @@ that the Pyramid core doesn't. Add-on packages already exist which let you
easily send email, let you use the Jinja2 templating system, let you use
XML-RPC or JSON-RPC, let you integrate with jQuery Mobile, etc.
-Examples: https://docs.pylonsproject.org/docs/pyramid.html#pyramid-add-on-documentation
+Examples: http://docs.pylonsproject.org/docs/pyramid.html#pyramid-add-on-documentation
Class-based and function-based views
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -842,7 +842,7 @@ official narrative docs. In any case, the Pyramid documentation is
comprehensive.
Example: The rest of this documentation and the cookbook at
-https://docs.pylonsproject.org/projects/pyramid_cookbook/dev/ .
+http://docs.pylonsproject.org/projects/pyramid_cookbook/dev/ .
.. index::
single: Pylons Project