Move Erlang 17 support to 1.6.0 release

4 files changed, 1 insertions, 46 deletions

diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 42b6d19b1..7b95d0d41 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -161,7 +161,6 @@ html_files = \
     html/_sources/whatsnew/1.4.txt \
     html/_sources/whatsnew/1.5.txt \
     html/_sources/whatsnew/1.6.txt \
-    html/_sources/whatsnew/1.7.txt \
     html/_sources/whatsnew/index.txt \
     html/_sources/about.txt \
     html/_sources/contents.txt \
@@ -284,7 +283,6 @@ html_files = \
     html/whatsnew/1.4.html \
     html/whatsnew/1.5.html \
     html/whatsnew/1.6.html \
-    html/whatsnew/1.7.html \
     html/whatsnew/index.html \
     html/about.html \
     html/config-ref.html \
@@ -434,7 +432,6 @@ src_files = \
     ../src/whatsnew/1.4.rst \
     ../src/whatsnew/1.5.rst \
     ../src/whatsnew/1.6.rst \
-    ../src/whatsnew/1.7.rst \
     ../src/whatsnew/index.rst \
     ../src/about.rst \
     ../src/contents.rst \
diff --git a/share/doc/src/whatsnew/1.6.rst b/share/doc/src/whatsnew/1.6.rst
index d99bb0b41..5b971da01 100644
--- a/share/doc/src/whatsnew/1.6.rst
+++ b/share/doc/src/whatsnew/1.6.rst
@@ -38,6 +38,7 @@ in case if you had used such handler.
 Version 1.6.0
 =============
 
+* :issue:`2200`: support Erlang/OTP 17.0 :commit:`35e16032`
 * Fauxton: many improvements in our experimental new user interface, including
   switching the code editor from CodeMirror to Ace as well as better support
   for various browsers.
diff --git a/share/doc/src/whatsnew/1.7.rst b/share/doc/src/whatsnew/1.7.rst
deleted file mode 100644
index 69be11b02..000000000
--- a/share/doc/src/whatsnew/1.7.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-.. Licensed under the Apache License, Version 2.0 (the "License"); you may not
-.. use this file except in compliance with the License. You may obtain a copy of
-.. the License at
-..
-..   http://www.apache.org/licenses/LICENSE-2.0
-..
-.. Unless required by applicable law or agreed to in writing, software
-.. distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-.. WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-.. License for the specific language governing permissions and limitations under
-.. the License.
-
-
-.. _release/1.7.x:
-
-============
-1.7.x Branch
-============
-
-.. contents::
-   :depth: 1
-   :local:
-
-.. _release/1.7.x/upgrade:
-
-Upgrade Notes
-=============
-
-None.
-
-.. _release/1.7.0:
-
-Version 1.7.0
-=============
-
-.. warning::
-
-   This version is not released yet.
-
-* Build System: :issue:`2200`: support Erlang/OTP 17.0
-  :commit:`78603ad`
-
diff --git a/share/doc/src/whatsnew/index.rst b/share/doc/src/whatsnew/index.rst
index 52c93173b..800b9eee9 100644
--- a/share/doc/src/whatsnew/index.rst
+++ b/share/doc/src/whatsnew/index.rst
@@ -19,7 +19,6 @@ Release History
 .. toctree::
    :glob:
 
-   1.7
    1.6
    1.5
    1.4