From dec76a5c229fbed2b13a89686f07be1a2e301e09 2017-09-13 16:10:19
From: Thomas Kluyver <takowl@gmail.com>
Date: 2017-09-13 16:10:19
Subject: [PATCH] Backport PR #10793 on branch 5.x

Merge pull request #10793 from Carreau/wn

Consolidate What's new dev and 5.5

---

diff --git a/docs/source/whatsnew/index.rst b/docs/source/whatsnew/index.rst
index 9580e4c..7812afb 100644
--- a/docs/source/whatsnew/index.rst
+++ b/docs/source/whatsnew/index.rst
@@ -20,7 +20,6 @@ development work they do here in a user friendly format.
 .. toctree::
    :maxdepth: 1
 
-   development
    version5
    github-stats-5
    version4
diff --git a/docs/source/whatsnew/pr/env-config.rst b/docs/source/whatsnew/pr/env-config.rst
deleted file mode 100644
index 9023540..0000000
--- a/docs/source/whatsnew/pr/env-config.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-
-- IPython now looks for config files in ``{sys.prefix}/etc/ipython``
-  for environment-specific configuration.
-- Startup files can be found in ``/etc/ipython/startup`` or ``{sys.prefix}/etc/ipython/startup``
-  in addition to the profile directory, for system-wide or env-specific startup files.
diff --git a/docs/source/whatsnew/version5.rst b/docs/source/whatsnew/version5.rst
index 5c0c5c6..b3d9b27 100644
--- a/docs/source/whatsnew/version5.rst
+++ b/docs/source/whatsnew/version5.rst
@@ -8,6 +8,36 @@ IPython 5.4.1
 Released a few hours after 5.4, fix a crash when
 ``backports.shutil-get-terminal-size`` is not installed. :ghissue:`10629`
 
+IPython 5.5
+===========
+
+System Wide config
+------------------
+
+- IPython now looks for config files in ``{sys.prefix}/etc/ipython``
+  for environment-specific configuration.
+- Startup files can be found in ``/etc/ipython/startup`` or ``{sys.prefix}/etc/ipython/startup``
+  in addition to the profile directory, for system-wide or env-specific startup files.
+
+See :gh:`10644`
+
+ProgressBar
+-----------
+
+
+IPython now has built-in support for progressbars::
+
+    In[1]: from IPython.display import ProgressBar
+    ...  : pb = ProgressBar(100)
+    ...  : pb
+
+    In[2]: pb.progress = 50
+
+    # progress bar in cell 1 updates.
+
+See :gh:`10755`
+
+
 IPython 5.4
 ===========