From b6f053a34e5795058d90965ecc0777998a985fb1 Mon Sep 17 00:00:00 2001
From: stianst <stianst@gmail.com>
Date: Thu, 30 Aug 2018 08:33:25 +0200
Subject: [PATCH] Fixes to release notes

---
 release_notes/index.adoc  | 14 +++++++++++++-
 release_notes/master.adoc | 10 +++++++++-
 release_notes/topics.adoc | 29 -----------------------------
 3 files changed, 22 insertions(+), 31 deletions(-)
 delete mode 100644 release_notes/topics.adoc

diff --git a/release_notes/index.adoc b/release_notes/index.adoc
index e7333e64fa..21eba3db58 100644
--- a/release_notes/index.adoc
+++ b/release_notes/index.adoc
@@ -3,4 +3,16 @@
 :linkattrs:
 
 include::topics/templates/document-attributes-community.adoc[]
-include::topics.adoc[]
\ No newline at end of file
+
+== {project_name_full} 4.3.0.Final
+include::topics/4_3_0_final.adoc[leveloffset=2]
+
+== {project_name_full} 4.2.0.Final
+include::topics/4_2_0_final.adoc[leveloffset=2]
+
+== {project_name_full} 4.1.0.Final
+include::topics/4_1_0_final.adoc[leveloffset=2]
+
+== {project_name_full} 4.0.0.Final
+include::topics/4_0_0_final.adoc[leveloffset=2]
+include::topics/4_0_0_beta3.adoc[leveloffset=2]
\ No newline at end of file
diff --git a/release_notes/master.adoc b/release_notes/master.adoc
index 69b0a476d4..868451b2c5 100644
--- a/release_notes/master.adoc
+++ b/release_notes/master.adoc
@@ -8,4 +8,12 @@ include::topics/templates/document-attributes-product.adoc[]
 
 = {releasenotes_name}
 
-include::topics.adoc[]
+== {project_name_full} 7.3.CD03
+
+include::topics/4_3_0_final.adoc[leveloffset=2]
+include::topics/4_2_0_final.adoc[leveloffset=2]
+include::topics/4_1_0_final.adoc[leveloffset=2]
+
+== {project_name_full} 7.3.CD02
+include::topics/4_0_0_final.adoc[leveloffset=2]
+include::topics/4_0_0_beta3.adoc[leveloffset=2]
\ No newline at end of file
diff --git a/release_notes/topics.adoc b/release_notes/topics.adoc
deleted file mode 100644
index d8c1119aba..0000000000
--- a/release_notes/topics.adoc
+++ /dev/null
@@ -1,29 +0,0 @@
-ifeval::[{project_community}==true]
-== {project_name_full} 4.4.0.Final
-include::topics/4_4_0_final.adoc[leveloffset=2]
-
-== {project_name_full} 4.3.0.Final
-include::topics/4_3_0_final.adoc[leveloffset=2]
-
-== {project_name_full} 4.2.0.Final
-include::topics/4_2_0_final.adoc[leveloffset=2]
-
-== {project_name_full} 4.1.0.Final
-include::topics/4_1_0_final.adoc[leveloffset=2]
-
-== {project_name_full} 4.0.0.Final
-include::topics/4_0_0_final.adoc[leveloffset=2]
-include::topics/4_0_0_beta3.adoc[leveloffset=2]
-endif::[]
-
-ifeval::[{project_product}==true]
-== {project_name_full} CD3
-include::topics/4_3_0_final.adoc[leveloffset=2]
-include::topics/4_2_0_final.adoc[leveloffset=2]
-include::topics/4_1_0_final.adoc[leveloffset=2]
-endif::[]
-
-== {project_name_full} CD2
-include::topics/4_0_0_final.adoc[leveloffset=2]
-include::topics/4_0_0_beta3.adoc[leveloffset=2]
-endif::[]
\ No newline at end of file