Merge CHANGES entries

CHANGES

@@ -4,63 +4,7 @@ Release 2.0.0 beta3 (in development)
 Dependencies
 ------------
 
-Incompatible changes
---------------------
-
-Deprecated
-----------
-
-Features added
---------------
-
-Bugs fixed
-----------
-
-* #6196: py domain: unexpected prefix is generated
-
-Testing
---------
-
-Release 2.0.0 beta2 (released Mar 21, 2019)
-===========================================
-
-Incompatible changes
---------------------
-
-* texinfo: image files are copied into ``name-figure`` directory
-
-Bugs fixed
-----------
-
-* #6096: html: Anchor links are not added to figures
-* #3620: html: Defer searchindex.js rather than loading it via ajax
-* #6113: html: Table cells and list items have large margins
-* #5508: ``linenothreshold`` option for ``highlight`` directive was ignored
-* texinfo: ``make install-info`` causes syntax error
-* texinfo: ``make install-info`` fails on macOS
-* #3079: texinfo: image files are not copied on ``make install-info``
-* #5391: A cross reference in heading is rendered as literal
-* #5946: C++, fix ``cpp:alias`` problems in LaTeX (and singlehtml)
-* #6147: classes attribute of ``citation_reference`` node is lost
-* AssertionError is raised when custom ``citation_reference`` node having
-  classes attribute refers missing citation (refs: #6147)
-* #2155: Support ``code`` directive
-* C++, fix parsing of braced initializers.
-* #6172: AttributeError is raised for old styled index nodes
-* #4872: inheritance_diagram: correctly describe behavior of ``parts`` option in
-  docs, allow negative values.
-* #6178: i18n: Captions missing in translations for hidden TOCs
-
-Testing
---------
-
-* Add a helper function: ``sphinx.testing.restructuredtext.parse()``
-
-Release 2.0.0 beta1 (in development)
-====================================
-
-Dependencies
-------------
+1.8.0b1
 
 * LaTeX builder now depends on TeX Live 2015 or above.
 * LaTeX builder (with ``'pdflatex'`` :confval:`latex_engine`) will process
@@ -89,6 +33,8 @@ Dependencies
 Incompatible changes
 --------------------
 
+1.8.0b1
+
 * Drop python 2.7 and 3.4 support
 * Drop docutils 0.11 support
 * Drop features and APIs deprecated in 1.7.x
@@ -132,9 +78,15 @@ Incompatible changes
 * #4550: All tables and figures without ``align`` option are displayed to center
 * #4587: html: Output HTML5 by default
 
+1.8.0b2
+
+* texinfo: image files are copied into ``name-figure`` directory
+
 Deprecated
 ----------
 
+1.8.0b1
+
 * Support for evaluating Python 2 syntax is deprecated. This includes
   configuration files which should be converted to Python 3.
 * The arguments of ``EpubBuilder.build_mimetype()``,
@@ -222,6 +174,8 @@ For more details, see :ref:`deprecation APIs list <dev-deprecated-apis>`.
 Features added
 --------------
 
+1.8.0b1
+
 * #1618: The search results preview of generated HTML documentation is
   reader-friendlier: instead of showing the snippets as raw reStructuredText
   markup, Sphinx now renders the corresponding HTML.  This means the Sphinx
@@ -271,6 +225,8 @@ Features added
 Bugs fixed
 ----------
 
+1.8.0b1
+
 * #1682: LaTeX: writer should not translate Greek unicode, but use textgreek
   package
 * #5247: LaTeX: PDF does not build with default font config for Russian
@@ -292,11 +248,42 @@ Bugs fixed
 * HTML search: search always returns nothing when multiple search terms are
   used and one term is shorter than three characters
 
+1.8.0b2
+
+* #6096: html: Anchor links are not added to figures
+* #3620: html: Defer searchindex.js rather than loading it via ajax
+* #6113: html: Table cells and list items have large margins
+* #5508: ``linenothreshold`` option for ``highlight`` directive was ignored
+* texinfo: ``make install-info`` causes syntax error
+* texinfo: ``make install-info`` fails on macOS
+* #3079: texinfo: image files are not copied on ``make install-info``
+* #5391: A cross reference in heading is rendered as literal
+* #5946: C++, fix ``cpp:alias`` problems in LaTeX (and singlehtml)
+* #6147: classes attribute of ``citation_reference`` node is lost
+* AssertionError is raised when custom ``citation_reference`` node having
+  classes attribute refers missing citation (refs: #6147)
+* #2155: Support ``code`` directive
+* C++, fix parsing of braced initializers.
+* #6172: AttributeError is raised for old styled index nodes
+* #4872: inheritance_diagram: correctly describe behavior of ``parts`` option in
+  docs, allow negative values.
+* #6178: i18n: Captions missing in translations for hidden TOCs
+
+1.8.0 final
+
+* #6196: py domain: unexpected prefix is generated
+
 Testing
 --------
 
+1.8.0b1
+
 * Stop to use ``SPHINX_TEST_TEMPDIR`` envvar
 
+1.8.0b2
+
+* Add a helper function: ``sphinx.testing.restructuredtext.parse()``
+
 Release 1.8.6 (in development)
 
 Dependencies