Make a clarification in the changelog

CHANGELOG.md

@@ -1,14 +1,12 @@
 # novelWriter Changelog
 
-## Version 1.4 RC 1 [2021-07-12]
+## Version 1.4 [2021-07-27]
 
 ### Release Notes
 
-This is a preview release of novelWriter 1.4. It contains some new features and a lot of code
-refactoring. This release is a testing release, and may contain bugs. Please be careful when using
-this version to work on your projects.
-
-Below are the main feature changes of this release.
+This release contains some new features and a lot of code refactoring. Among the main new features
+is paragraph alignment and indentation. Regular line breaks within paragraphs are now also
+supported. The changes are described in more detail below.
 
 #### Internationalisation
 
@@ -21,11 +19,11 @@ a proper line break and will show up in the document viewer and exported documen
 break does not start a new paragraph, but forces a break inside the paragraph like a Shift + Enter
 does in most rich text editors. Two line breaks is still needed to start a new paragraph.
 
-The old syntax of adding two spaces to force a line break within a paragraph will still work as
-before, so there is no need to change your existing text if you've used this feature. However,
-there is a new highlighting feature that will show you where in the text you have redundant spaces.
-If you are used to having double spaces between sentences, you may want to switch off this
-highlighting feature in Preferences as it will also detect those.
+The old syntax of adding two spaces at the end of a line to force a line break within a paragraph
+will still work as before, so there is no need to change your existing text if you've used this
+feature. However, there is a new highlighting feature that will show you where in the text you have
+redundant spaces. If you are used to having double spaces between sentences, you may want to switch
+off this highlighting feature in Preferences as it will also detect those.
 
 A helper function has been added to the Format menu that can look through a paragraph and remove
 line breaks in case you've been using line breaks inside your existing text under the assumption
@@ -50,7 +48,7 @@ A single angle bracket will push the text away from the edge it points away from
 single `>` before the paragraph, or a single `<` after the paragraph, will add indentation on the
 respective side. It's perfectly valid to do this on both sides at the same time.
 
-A double set of angle brackets will push the text all the way towards the opposite aide. Therefore,
+A double set of angle brackets will push the text all the way towards the opposite side. Therefore,
 a double set of `>>` before the paragraph will indicate right alignment, and a double set of `<<`
 after the paragraph will force left alignment. Also here both can be used at the same time, which
 results in the paragraph being centred.
@@ -58,7 +56,31 @@ results in the paragraph being centred.
 Format menu entries and keyboard shortcuts have been added so that you don't have to memorise these
 codes.
 
-_These Release Notes also include the changes from 1.4 Beta 1._
+_These Release Notes also include the changes from 1.4 Beta 1 and RC 1._
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* The way margins are determined in the paged dialogs used many places, including Preferences, has
+  been improved. These margins would sometimes be set to zero when they shouldn't. PR #834.
+* Dialogs that are non-modal are no longer duplicated when opened multiple times. Instead, the
+  existing dialog is moved to the front. PR #834.
+
+**Internationalisation**
+
+* US English and Norwegian translations have been updated by @vkbo. PR #825.
+* French translations have been updated by @jyhelle. PR #829.
+
+----
+
+## Version 1.4 RC 1 [2021-07-12]
+
+### Release Notes
+
+This is a preview release of novelWriter 1.4. It contains some new features and a lot of code
+refactoring. This release is a testing release, and may contain bugs. Please be careful when using
+this version to work on your projects.
 
 ### Detailed Changelog
 

docs/source/conf.py

@@ -26,7 +26,7 @@ author = "Veronica Berglyd Olsen"
 # The short X.Y version
 version = "1.4"
 # The full version, including alpha/beta/rc tags
-release = "1.4-rc1"
+release = "1.4"
 
 
 # -- General configuration ---------------------------------------------------

nw/__init__.py

@@ -61,9 +61,9 @@ __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "1.4rc1"
-__hexversion__ = "0x010400c1"
-__date__       = "2021-07-12"
+__version__    = "1.4"
+__hexversion__ = "0x010400f0"
+__date__       = "2021-07-27"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 __url__        = "https://novelwriter.io"

nw/assets/text/release_notes.htm

@@ -2,13 +2,12 @@
 <html>
 <body>
 
-<h2>Release Notes for 1.4 RC 1</h2>
-<p><i>Released on 12 July 2021</i></p>
+<h2>Release Notes for 1.4</h2>
+<p><i>Released on 27 July 2021</i></p>
 
-<p>This is a preview release of novelWriter 1.4. It contains some new features and a lot of code
-refactoring. This release is a testing release, and may contain bugs. Please be careful when using
-this version to work on your projects.</p>
-<p>Below are the main feature changes of this release.</p>
+<p>This release contains some new features and a lot of code refactoring. Among the main new
+features is paragraph alignment and indentation. Regular line breaks within paragraphs are now also
+supported. The changes are described in more detail below.</p>
 
 <h3>Internationalisation</h3>
 <p>Translation files have been added for Simplified Chinese by Qianzhi Long.</p>
@@ -18,11 +17,11 @@ this version to work on your projects.</p>
 as a proper line break and will show up in the document viewer and exported documents. A single
 line break does not start a new paragraph, but forces a break inside the paragraph like a Shift +
 Enter does in most rich text editors. Two line breaks is still needed to start a new paragraph.</p>
-<p>The old syntax of adding two spaces to force a line break within a paragraph will still work
-as before, so there is no need to change your existing text if you've used this feature. However,
-there is a new highlighting feature that will show you where in the text you have redundant spaces.
-If you are used to having double spaces between sentences, you may want to switch off this
-highlighting feature in Preferences as it will also detect those.</p>
+<p>The old syntax of adding two spaces at the end of a line to force a line break within a
+paragraph will still work as before, so there is no need to change your existing text if you've
+used this feature. However, there is a new highlighting feature that will show you where in the
+text you have redundant spaces. If you are used to having double spaces between sentences, you may
+want to switch off this highlighting feature in Preferences as it will also detect those.</p>
 <p>A helper function has been added to the Format menu that can look through a paragraph and remove
 line breaks in case you've been using line breaks inside your existing text under the assumption
 that the exporter and viewer will ignore them.</p>
@@ -41,7 +40,7 @@ alignment as well as additional text margins on individual paragraphs.</p>
 <p>A single angle bracket will push the text away from the edge it points away from. Therefore, a
 single '&gt;' before the paragraph, or a single '&lt;' after the paragraph, will add indentation on
 the respective side. It's perfectly valid to do this on both sides at the same time.</p>
-<p>A double set of angle brackets will push the text all the way towards the opposite aide.
+<p>A double set of angle brackets will push the text all the way towards the opposite side.
 Therefore, a double set of '&gt;&gt;' before the paragraph will indicate right alignment, and a
 double set of '&lt;&lt;' after the paragraph will force left alignment. Also here both can be used
 at the same time, which results in the paragraph being centred.</p>

sample/nwProject.nwx

@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.4b1" hexVersion="0x010400b1" fileVersion="1.2" timeStamp="2021-06-13 19:55:59">
+<novelWriterXML appVersion="1.4" hexVersion="0x010400f0" fileVersion="1.2" timeStamp="2021-07-27 23:14:32">
   <project>
     <name>Sample Project</name>
     <title>Sample Project</title>
     <author>Jane Smith</author>
     <author>Jay Doh</author>
-    <saveCount>1108</saveCount>
+    <saveCount>1109</saveCount>
     <autoCount>189</autoCount>
-    <editTime>53069</editTime>
+    <editTime>53268</editTime>
   </project>
   <settings>
     <doBackup>False</doBackup>