Merge branch 'master' into dialog_options

docs/source/interface.txt

@@ -37,9 +37,9 @@ The editor also has a minimal set of keywords used for setting tags and referenc
    "``## Title``",        "Heading level two. The space after the # is mandatory."
    "``### Title``",       "Heading level three. The space after the # is mandatory."
    "``#### Title``",      "Heading level four. The space after the # is mandatory."
-   "``**text**``",        "The text is renderred as bold text."
-   "``_text_``",          "The text is renderred as italics text."
-   "``__text__``",        "The text is renderred as underlined text."
+   "``**text**``",        "The text is rendered as bold text."
+   "``_text_``",          "The text is rendered as italicized text."
+   "``__text__``",        "The text is rendered as underlined text."
    "``% text...``",       "A comment. The text is not exported, seen in viewer, or counted towards word counts."
    "``@keyword: value``", "A keyword argument followed by a value, or a comma separated list of values."
 

docs/source/projects.txt

@@ -22,7 +22,7 @@ These other root folder types are intended for your notes on the various element
 Using these is of course entirely optional.
 A new project will not have all of the root folders present, but you can add the ones you want from :menuselection:`Project --> Create Root Folder`.
 
-The root folders are intended for the follwing use, but aside from the Novel folder, not restrictions apply.
+The root folders are intended for the following use, but aside from the Novel folder, no restrictions apply.
 
 * **Novel:** The root folder of all text that goes into the final novel.
   This class of files have other rules and features than other files in the project.
@@ -44,7 +44,7 @@ Orphaned Documents
 ------------------
 
 In the event the editor crashes or otherwise exits without saving the project state, files that have been added to the project tree and are saved to disk will appear in a special "Orphaned Items" root folder next time the application is started.
-These orphaned files will not have any meta data associated with them, so the label and other information has to be set again, and the files moved back to the correct location in the project.
+These orphaned files will not have any meta data associated with them, so the label and other information will have to be set again, and the files moved back to the correct location in the project.
 
 Using Folders in the Project Tree
 ---------------------------------

docs/source/started.txt

@@ -6,8 +6,8 @@ You can download novelWriter from https://github.com/vkbo/novelWriter/releases
 
 Latest version is |version|:
 
-* ZIP file: https://github.com/vkbo/novelWriter/archive/v0.3.2.zip
-* TAR file: https://github.com/vkbo/novelWriter/archive/v0.3.2.tar.gz
+* ZIP file: https://github.com/vkbo/novelWriter/archive/v0.4.5.zip
+* TAR file: https://github.com/vkbo/novelWriter/archive/v0.4.5.tar.gz
 
 Extract the archive to a location of your choice.
 

docs/source/technical.txt

@@ -28,7 +28,7 @@ The project XML file is suitable for diff tools and version control, although a
 Project Documents
 -----------------
 
-The project documents are saved in folders staring with ``data_``.
+The project documents are saved in folders starting with ``data_``.
 Each document has a file handle taken from the first 13 characters of a SHA256 hash of the system time when the file was first created.
 The documents are saved with a folder and filename derived from this hash.
 If you wish to find the physical location of a file in the project, you can either look it up in the project XML file, or select :menuselection:`Document --> Show File Details` in the menu when having the document open.

install.py

@@ -63,8 +63,8 @@ else:
 instOpt = [
     "--name=novelWriter",
     "--onefile",
-    "--add-data=%s%s%s" % (os.path.join("nw", "themes"),  dotDot,"themes"),
-    "--add-data=%s%s%s" % (os.path.join("nw", "graphics"),dotDot,"graphics"),
+    "--add-data=%s%s%s" % (os.path.join("nw", "assets", "themes"),   dotDot,"themes"),
+    "--add-data=%s%s%s" % (os.path.join("nw", "assets", "graphics"), dotDot,"graphics"),
     "--icon=%s" % os.path.join("nw", "assets", "icons", "novelWriter.ico"),
 ]
 if buildWindowed: