diff options
| author | Chris McDonough <chrism@plope.com> | 2012-08-15 00:30:41 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-08-15 00:30:41 -0400 |
| commit | f036f97f00781cf81f8905b6725071f79b31f6c5 (patch) | |
| tree | 253ebda0c7be3b1f9e12a6a072da25082453323f /docs | |
| parent | 735abf49f936cedc845907516a3922cdffa83665 (diff) | |
| parent | 27a2084bbecef4da869da68f0125627355eb3ad1 (diff) | |
| download | pyramid-f036f97f00781cf81f8905b6725071f79b31f6c5.tar.gz pyramid-f036f97f00781cf81f8905b6725071f79b31f6c5.tar.bz2 pyramid-f036f97f00781cf81f8905b6725071f79b31f6c5.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/narr/commandline.rst | 4 | ||||
| -rw-r--r-- | docs/narr/introduction.rst | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst index af53c1f78..3bdf8c5cd 100644 --- a/docs/narr/commandline.rst +++ b/docs/narr/commandline.rst @@ -349,7 +349,7 @@ setting) orderings using the ``ptweens`` command. Tween factories will show up represented by their standard Python dotted name in the ``ptweens`` output. -For example, here's the ``pwteens`` command run against a system +For example, here's the ``ptweens`` command run against a system configured without any explicit tweens: .. code-block:: text @@ -367,7 +367,7 @@ configured without any explicit tweens: 1 pyramid.tweens.excview_tween_factory excview - - MAIN -Here's the ``pwteens`` command run against a system configured *with* +Here's the ``ptweens`` command run against a system configured *with* explicit tweens defined in its ``development.ini`` file: .. code-block:: text 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 |