summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-08-15 13:50:27 -0400
committerChris McDonough <chrism@plope.com>2012-08-15 13:50:27 -0400
commit1431f5a99812ac03c74767fe648cbe338bc86133 (patch)
tree875a2a015f9c7f81ce5c8f033cd91352290d1c1d /docs
parent32178572428cafec64f73dc06cad5c02feaceba8 (diff)
parentcdcea948c3f6f3abbd1772500029066e80825082 (diff)
downloadpyramid-1431f5a99812ac03c74767fe648cbe338bc86133.tar.gz
pyramid-1431f5a99812ac03c74767fe648cbe338bc86133.tar.bz2
pyramid-1431f5a99812ac03c74767fe648cbe338bc86133.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/commandline.rst4
1 files changed, 2 insertions, 2 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