From f29630d05375ac9bf2a46d6930a93379c542d871 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Mon, 30 Apr 2018 08:57:47 -0400 Subject: [PATCH] remove redundant information from release notes build The release notes build was configured with two pages that scan the master branch. Now that reno adds consistent anchors to sections, that means we have two pages with the same anchors and sphinx will complain. This patch removes the "mainline" page and changes the title of the "unreleased" page to show the mainline title. We need to keep the page called "unreleased" so that the release automation that creates the stable branches can figure out where to insert the next series-specific page in the sequence in index.rst. Change-Id: Ie6ed41a8fadb73a2b9b78426499a41ed30bfcd4d Signed-off-by: Doug Hellmann --- releasenotes/source/index.rst | 1 - releasenotes/source/mainline.rst | 5 ----- releasenotes/source/unreleased.rst | 12 +++--------- 3 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 releasenotes/source/mainline.rst diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 7467447f6..49fba1e47 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -5,7 +5,6 @@ .. toctree:: :maxdepth: 1 - mainline unreleased queens pike diff --git a/releasenotes/source/mainline.rst b/releasenotes/source/mainline.rst deleted file mode 100644 index 065da7150..000000000 --- a/releasenotes/source/mainline.rst +++ /dev/null @@ -1,5 +0,0 @@ -========================= - Mainline Release Series -========================= - -.. release-notes:: diff --git a/releasenotes/source/unreleased.rst b/releasenotes/source/unreleased.rst index abed3d2e3..065da7150 100644 --- a/releasenotes/source/unreleased.rst +++ b/releasenotes/source/unreleased.rst @@ -1,11 +1,5 @@ -===================== - Unreleased Versions -===================== - -.. NOTE(dhellmann): The earliest-version field is set to avoid - duplicating *all* of the history on this page. When we start - creating stable branches the history should be truncated - automatically and we can remove the setting. +========================= + Mainline Release Series +========================= .. release-notes:: - :earliest-version: 1.17.0