Merge release-2018 into release-2019

Change-Id: Ifb898eb777bc2986d600cdbf190203dda3f441ec

diff --cc docs/CMakeLists.txt
index dff9e6cd2e053c3e096b34f1ff59934fd9a6b62b,0fadd5ab54f0e831b5f301ceb2bfa9d80323e53b..c0d29b9794421376a221458ed2b8edfac0556329
--- 1/docs/CMakeLists.txt
--- 2/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@@ -360,23 -123,9 +360,24 @@@ if (SPHINX_FOUND
          dev-manual/tools.rst
          dev-manual/uncrustify.rst
          fragments/doxygen-links.rst
 +        how-to/index.rst
 +        how-to/beginners.rst
 +        how-to/topology.rst
 +        how-to/special.rst
 +        how-to/visualize.rst
          install-guide/index.rst
          release-notes/index.rst
 +        release-notes/2019/2019.1.rst
 +        release-notes/2019/major/highlights.rst
 +        release-notes/2019/major/features.rst
 +        release-notes/2019/major/performance.rst
 +        release-notes/2019/major/tools.rst
 +        release-notes/2019/major/bugs-fixed.rst
 +        release-notes/2019/major/removed-functionality.rst
 +        release-notes/2019/major/deprecated-functionality.rst
 +        release-notes/2019/major/portability.rst
 +        release-notes/2019/major/miscellaneous.rst
+         release-notes/2018/2018.6.rst
          release-notes/2018/2018.5.rst
          release-notes/2018/2018.4.rst
          release-notes/2018/2018.3.rst

diff --cc docs/release-notes/index.rst
Simple merge