Merge branch 'testing' into dev

README.md

@@ -140,7 +140,7 @@ space only.
 
 ### Dependencies
 
-Dependencies can be installed from PyPi with:
+Dependencies can generally be installed from PyPi with:
 ```bash
 pip install pyqt5 lxml pyenchant
 ```
@@ -175,6 +175,9 @@ Windows doesn't by default come with Python installed. If you haven't installed
 from [python.org/downloads](https://www.python.org/downloads/). Remember to select "Add Python to
 PATH" during the installation.
 
+The script `setup_windows.bat` can be used to create desktop and start menu icons for novelWriter.
+The script will also install dependencies for you from PyPi.
+
 ## Internationalisation
 
 If you install from source, you must build the translation files yourself if you want to switch to
@@ -214,7 +217,7 @@ Bundled assets have the following licenses:
   the main repo is available at
   [sdras/night-owl-vscode-theme](https://github.com/sdras/night-owl-vscode-theme).
 
-## Screenshot
+## Screenshots
 
 **novelWriter with default system theme:**
 ![Screenshot 1](https://raw.githubusercontent.com/vkbo/novelWriter/main/docs/source/images/screenshot_default.png)

docs/source/setup_linux.rst

@@ -43,8 +43,8 @@ Step 2: Install Package (Optional)
 ----------------------------------
 
 You can install novelWriter to the default location for Python packages using ``setuptools``. This
-step is optional as you can also just put the novelWriter program folder wherever you like. For
-instance to ``/opt/novelWriter`` and run Step 3 to set up icons and launcher.
+step is optional as you can also just put the novelWriter program folder wherever you like
+yourself. For instance in ``/opt/novelWriter``, and then run Step 3 to set up icons and launcher.
 
 To install novelWriter to the default location, it requires that you have ``setuptools`` installed
 on your system. If you don't have it installed, it can usually be installed from your distro's
@@ -84,7 +84,7 @@ Step 3: Create Launcher Icons
 
 Regardless of where you extract or install the source files, you can set up a standard icon and a
 launcher. To set up this desktop launcher, the needed icons, and the project file association,
-run the following from inside the novelWriter folder:
+run the following from inside the novelWriter folder at the installed or final location:
 
 .. code-block:: console