summaryrefslogtreecommitdiff
path: root/docs/whatsnew-1.3.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-12-12 00:52:08 -0500
committerChris McDonough <chrism@plope.com>2011-12-12 00:52:08 -0500
commitec507ade5541e1e3949fd6020062e78d113e0ed8 (patch)
tree940dcfe1a90d88062471d013314772f94c2cd93c /docs/whatsnew-1.3.rst
parent5c8251d91d00bcba9f8f66df892bac47dd73c719 (diff)
parent99520ee274400c246ab073f598dff32acc256fa9 (diff)
downloadpyramid-ec507ade5541e1e3949fd6020062e78d113e0ed8.tar.gz
pyramid-ec507ade5541e1e3949fd6020062e78d113e0ed8.tar.bz2
pyramid-ec507ade5541e1e3949fd6020062e78d113e0ed8.zip
Merge branch '1.3-branch'
Diffstat (limited to 'docs/whatsnew-1.3.rst')
-rw-r--r--docs/whatsnew-1.3.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst
index d19935c97..f51c7977a 100644
--- a/docs/whatsnew-1.3.rst
+++ b/docs/whatsnew-1.3.rst
@@ -178,8 +178,8 @@ Backwards Incompatibilities
``paste.httpserver`` server. ``wsgiref``, unlike the server it replaced
(``paste.httpserver``) is not a production quality server. See
:ref:`alternate_wsgi_server` for information about how to use another WSGI
- server in production. Rationale: Rationale: the Paste and PasteScript
- packages do not run under Python 3.
+ server in production. Rationale: the Paste and PasteScript packages do not
+ run under Python 3.
- The ``pshell`` command (see "paster pshell") no longer accepts a
``--disable-ipython`` command-line argument. Instead, it accepts a ``-p``