diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-25 22:27:07 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-25 22:27:07 -0500 |
| commit | d317166556c69e51be9dcd5d618cc0a432aa6842 (patch) | |
| tree | e4965a50cce2c1d0f77970360cb46e57a528ac7f | |
| parent | 61ae5201544f71971c31d1b2a88daa10191163c0 (diff) | |
| parent | 4c6fa2f4ef0bc7ad24759648cae1dadaab087bd1 (diff) | |
| download | pyramid-d317166556c69e51be9dcd5d618cc0a432aa6842.tar.gz pyramid-d317166556c69e51be9dcd5d618cc0a432aa6842.tar.bz2 pyramid-d317166556c69e51be9dcd5d618cc0a432aa6842.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | CHANGES.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 183c7406b..effce62b9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -60,7 +60,7 @@ Backwards Incompatibilities ``paste.httpserver`` server. Rationale: Rationale: the Paste and PasteScript packages do not run under Python 3. -- The ``pshell`` command (nee "paster pshell") no longer accepts a +- The ``pshell`` command (see "paster pshell") no longer accepts a ``--disable-ipython`` command-line argument. Instead, it accepts a ``-p`` or ``--python-shell`` argument, which can be any of the values ``python``, ``ipython`` or ``bpython``. |