From d6e0517209470b267e7acc63332de8442e11c824 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Tue, 17 Oct 2023 16:21:40 +0200
Subject: [PATCH] Update changelog and release notes

---
 CHANGELOG.md                              | 48 ++++++++++++++++++++++-
 novelwriter/assets/text/release_notes.htm | 31 +++++++++++----
 sample/nwProject.nwx                      |  4 +-
 3 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f83421a2..1bbbfd74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,54 @@
 
 ### Release Notes
 
+The primary focus of this release has been a complete redesign of the Build Tool, that is, the tool
+that assembles your project into a manuscript document. The new tool, called the "Manuscript Build
+Tool" allows you to define multiple build definitions for your project. The build definitions are
+edited in a new Manuscript Build Settings dialog, with a lot more options than the old tool.
+
+The reason for this redesign is a long list of feature requests that could not easily be
+accommodated in the old, much simpler tool. Far from all the features have been added yet, but now
+that the new tool is in place, they will be gradually added in the coming releases.
+
+The key feature added in this release is the extended control you now have for selecting exactly
+what part of your project is included in a given build definition. You have the same filters for
+selecting documents and notes, and turning on or off root folders as before, but you can now easily
+override on a per-document basis what is included or excluded in addition to the filter.
+
+A second major improvement is a better tool to format your manuscript headings. You no longer have
+to look up formatting codes and add them manually. Instead, there is now a heading format editor in
+the Build Settings dialog for creating the header format, with syntax highlighting included.
+
+#### Other Changes
+
+Among other features is a new option to duplicate documents and folders in the project tree. The
+duplicate feature is available from the right-click menu. A proper light colour theme has also been
+added. In most cases it will be the same as the default theme, depending on your platform.
+
+There are other, minor improvements as well, and a lot of code improvements under the hood. For a
+full list of changes, see the detailed changelogs.
+
+_These Release Notes also include the changes from the 2.1 Beta 1 and 2.1 RC 1 releases._
+
 ### Detailed Changelog
 
+**Usability**
+
+* A widget has been added to the Build Manuscript tool main window to show some select build
+  settings for the selected build definition. This should make it a little easier to find the
+  wanted build definition if there are many available. PR #1516.
+* All columns on the Writing Stats tool now uses the same fixed width font. Issue #1442, PR #1518.
+
+**Documentation**
+
+* The documentation has received significant updates for the 2.1 release. PR #1531.
+
+**Packaging and Installation**
+
+* Python 3.7 support has officially been dropped. Python 3.7 has reached end of life, and dropping
+  it relaxes some restrictions on development. PR #1515.
+* MacOS and Windows is now tested against Python 3.11, and 3.12 has been added to Linux. PR #1515.
+
 ----
 
 ## Version 2.1 RC 1 [2023-08-31]
@@ -168,7 +214,7 @@ such a document. In addition, the "Change Label" context menu entry has been cha
   underscores. The spell checker relies on RegEx for splitting words, and RegEx considers the
   underscore a word character. Issue #1415. PR #1417.
 * Fixed an issue where escaped markup characters were not being cleaned up when building HTML and
-    ODT outputs. Issue #1412. PR #1418.
+  ODT outputs. Issue #1412. PR #1418.
 
 **Usability Fixes**
 
diff --git a/novelwriter/assets/text/release_notes.htm b/novelwriter/assets/text/release_notes.htm
index f1f71c6b..521a5f6d 100644
--- a/novelwriter/assets/text/release_notes.htm
+++ b/novelwriter/assets/text/release_notes.htm
@@ -2,14 +2,31 @@
 <html>
 <body>
 
-<h2>Release Notes for 2.1 RC 1</h2>
-<p><i>Released on 31 August 2023</i></p>
+<h2>Release Notes for 2.1</h2>
+<p><i>Released on 17 October 2023</i></p>
 
-<p>This is a release candidate of the next release version, and is intended for testing purposes.
-Please be careful when using this version on live writing projects, and make sure you take frequent
-backups.</p>
-<p>Please check the changelog for an overview of changes. The full release notes will be added to
-the final release.</p>
+<p>The primary focus of this release has been a complete redesign of the Build Tool, that is, the
+tool that assembles your project into a manuscript document. The new tool, called the "Manuscript
+Build Tool" allows you to define multiple build definitions for your project. The build definitions
+are edited in a new Manuscript Build Settings dialog, with a lot more options than the old tool.</p>
+<p>The reason for this redesign is a long list of feature requests that could not easily be
+accommodated in the old, much simpler tool. Far from all the features have been added yet, but now
+that the new tool is in place, they will be gradually added in the coming releases.</p>
+<p>The key feature added in this release is the extended control you now have for selecting exactly
+what part of your project is included in a given build definition. You have the same filters for
+selecting documents and notes, and turning on or off root folders as before, but you can now easily
+override on a per-document basis what is included or excluded in addition to the filter.</p>
+<p>A second major improvement is a better tool to format your manuscript headings. You no longer
+have to look up formatting codes and add them manually. Instead, there is now a heading format
+editor in the Build Settings dialog for creating the header format, with syntax highlighting
+included.</p>
+
+<h3>Other Changes</h3>
+<p>Among other features is a new option to duplicate documents and folders in the project tree. The
+duplicate feature is available from the right-click menu. A proper light colour theme has also been
+added. In most cases it will be the same as the default theme, depending on your platform.</p>
+<p>There are other, minor improvements as well, and a lot of code improvements under the hood. For
+a full list of changes, see the detailed changelogs.</p>
 
 <p><i>See also the <a href="https://github.com/vkbo/novelWriter/releases">Releases</a> page.</i></p>
 
diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx
index 0d88590d..36094677 100644
--- a/sample/nwProject.nwx
+++ b/sample/nwProject.nwx
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="2.1-rc1" hexVersion="0x020100c1" fileVersion="1.5" fileRevision="1" timeStamp="2023-08-31 17:39:58">
-  <project id="e2be99af-f9bf-4403-857a-c3d1ac25abea" saveCount="1520" autoCount="237" editTime="75302">
+<novelWriterXML appVersion="2.1" hexVersion="0x020100f0" fileVersion="1.5" fileRevision="1" timeStamp="2023-10-17 14:29:29">
+  <project id="e2be99af-f9bf-4403-857a-c3d1ac25abea" saveCount="1522" autoCount="237" editTime="75308">
     <name>Sample Project</name>
     <title>Sample Project</title>
     <author>Jane Smith</author>