Merge branch 'master' of github.com:Pylons/pyramid

1 files changed, 28 insertions, 2 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 7c8a9080a..8b63cf847 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,19 @@
 1.6 (2015-04-14)
 ================
 
+Backward Incompatibilities
+--------------------------
+
+- IPython and BPython support have been removed from pshell in the core.
+  To continue using them on Pyramid 1.6+ you must install the binding
+  packages explicitly::
+
+    $ pip install pyramid_ipython
+
+    or
+
+    $ pip install pyramid_bpython
+
 Features
 --------
 
@@ -134,6 +147,14 @@ Features
   that as the response class instead of the default ``HTTPFound``.  See
   https://github.com/Pylons/pyramid/pull/1610
 
+- Additional shells for ``pshell`` can now be registered as entrypoints. See
+  https://github.com/Pylons/pyramid/pull/1891 and
+  https://github.com/Pylons/pyramid/pull/2012
+
+- The variables injected into ``pshell`` are now displayed with their
+  docstrings instead of the default ``str(obj)`` when possible.
+  See https://github.com/Pylons/pyramid/pull/1929
+
 Bug Fixes
 ---------
 
@@ -206,6 +227,11 @@ Bug Fixes
   WebOb 1.5.
   See https://github.com/Pylons/pyramid/pull/1865
 
+- ``pshell`` will now preserve the capitalization of variables in the
+  ``[pshell]`` section of the INI file. This makes exposing classes to the
+  shell a little more straightfoward.
+  See https://github.com/Pylons/pyramid/pull/1883
+
 Deprecations
 ------------
 
@@ -215,8 +241,8 @@ Deprecations
 
   Please use a real process manager in the future instead of relying on the
   ``pserve`` to daemonize itself. Many options exist including your Operating
-  System's services such as systemd or upstart, as well as the excellent
-  and simple supervisord.
+  System's services such as Systemd or Upstart, as well as Python-based
+  solutions like Circus and Supervisor.
 
   See https://github.com/Pylons/pyramid/pull/1641