summaryrefslogtreecommitdiff
path: root/docs/narr/introduction.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-08-15 00:30:41 -0400
committerChris McDonough <chrism@plope.com>2012-08-15 00:30:41 -0400
commitf036f97f00781cf81f8905b6725071f79b31f6c5 (patch)
tree253ebda0c7be3b1f9e12a6a072da25082453323f /docs/narr/introduction.rst
parent735abf49f936cedc845907516a3922cdffa83665 (diff)
parent27a2084bbecef4da869da68f0125627355eb3ad1 (diff)
downloadpyramid-f036f97f00781cf81f8905b6725071f79b31f6c5.tar.gz
pyramid-f036f97f00781cf81f8905b6725071f79b31f6c5.tar.bz2
pyramid-f036f97f00781cf81f8905b6725071f79b31f6c5.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 b5fa6a9f7..7c0f9223f 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -803,7 +803,7 @@ within a function called when another user uses the
See also :ref:`add_directive`.
Programmatic Introspection
---------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~
If you're building a large system that other users may plug code into, it's
useful to be able to get an enumeration of what code they plugged in *at
@@ -831,7 +831,7 @@ callable:
See also :ref:`using_introspection`.
Python 3 Compatibility
-----------------------
+~~~~~~~~~~~~~~~~~~~~~~
Pyramid and most of its add-ons are Python 3 compatible. If you develop a
Pyramid application today, you won't need to worry that five years from now