Merge branch 'main' into release_1.0rc1

docs/source/conf.py

@@ -12,7 +12,6 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
-# import os
 # import sys
 # sys.path.insert(0, os.path.abspath("."))
 import os

docs/source/int_started.rst

@@ -140,7 +140,7 @@ encountered. To list all options, run:
 
    python novelWriter.py --help
 
-There are also a couple of install scripts in the assets folder which will assist in setting up a
+There are also a couple of install scripts in the setup folder which will assist in setting up a
 launch icon and the novelWriter project file mimetype for Gnome desktops on Linux. Currently,
 there's one script for Debian and one for Ubuntu.