From 4f0f36aa95df8b168b8dd20c1133577c9b95f6d9 Mon Sep 17 00:00:00 2001 From: Count Jocular Date: Tue, 18 Feb 2020 09:23:22 +0000 Subject: [PATCH 1/5] Update started.txt with correct download links Update Getting Started to point to the correct source archives (.zip and .tar.gz) for 0.4.5 release. --- docs/source/started.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/started.txt b/docs/source/started.txt index aa6977a8..93e75940 100644 --- a/docs/source/started.txt +++ b/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. From 4eaaf97af200a3f26b650eb02b6a7d6f9f925b44 Mon Sep 17 00:00:00 2001 From: Count Jocular Date: Tue, 18 Feb 2020 09:53:22 +0000 Subject: [PATCH 2/5] Update install.py with correct paths Update install.py with correct joined paths for the `themes` folder and the `graphics` folder. This bug prevented pyInstaller from building successfully under Windows. --- install.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.py b/install.py index 14356f23..2d05835d 100755 --- a/install.py +++ b/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: From 64b02947c09425a997e83b3445fb35795b0fb02a Mon Sep 17 00:00:00 2001 From: Count Jocular Date: Tue, 18 Feb 2020 11:07:21 +0000 Subject: [PATCH 3/5] Correct spelling mistake in interface help s/renderred/rendered/g --- docs/source/interface.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/interface.txt b/docs/source/interface.txt index 3703bf22..994f5571 100644 --- a/docs/source/interface.txt +++ b/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." From 6d69370ce111b5ad6021be18549cc5b14e0e5a01 Mon Sep 17 00:00:00 2001 From: Count Jocular Date: Tue, 18 Feb 2020 11:14:00 +0000 Subject: [PATCH 4/5] Fix typos in projects help Just a couple of typos. --- docs/source/projects.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/projects.txt b/docs/source/projects.txt index be2a75ae..2ece4f4b 100644 --- a/docs/source/projects.txt +++ b/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 --------------------------------- From a1f53980032106914c16c587238dee98d718c6b7 Mon Sep 17 00:00:00 2001 From: Count Jocular Date: Tue, 18 Feb 2020 11:27:39 +0000 Subject: [PATCH 5/5] Fix typo in technical help Fix a 1-character typo --- docs/source/technical.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/technical.txt b/docs/source/technical.txt index 9c81d7c9..afee5551 100644 --- a/docs/source/technical.txt +++ b/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.