From c1c552298ceda1b5c2e648f53a12df6b6cfdfb2e Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 11 Nov 2023 18:56:30 +0100 Subject: [PATCH] Update the documentation page in the About section --- source/about/docs.rst | 20 ++++++--------- .../{download => about}/novelWriter-1.6.pdf | Bin .../{download => about}/novelWriter-2.0.pdf | Bin .../{download => about}/novelWriter-2.1.pdf | Bin 2060599 -> 2060605 bytes source/docs/index.rst | 4 +-- source/download/index.rst | 6 ----- source/download/pdf_docs.rst | 11 --------- templates/about_docs.rst | 13 ++++++++++ tools/docs.py | 23 ++++++------------ 9 files changed, 29 insertions(+), 48 deletions(-) rename source/{download => about}/novelWriter-1.6.pdf (100%) rename source/{download => about}/novelWriter-2.0.pdf (100%) rename source/{download => about}/novelWriter-2.1.pdf (99%) delete mode 100644 source/download/pdf_docs.rst create mode 100644 templates/about_docs.rst diff --git a/source/about/docs.rst b/source/about/docs.rst index 7a71b82..74b1ffe 100644 --- a/source/about/docs.rst +++ b/source/about/docs.rst @@ -5,19 +5,13 @@ Documentation ************* This website includes the :ref:`documentation ` for the latest full release of -novelWriter as a convenience. However, the main documentation page is hosted on ReadTheDocs. The -version hosted there has documentation available for multiple releases of novelWriter, including -for the current development efforts. +novelWriter. This is the main and updated source of documentation. -The "Stable" version of the documentation always points to the latest release, and should be the -same documentation as available on this website. +PDF Manuals +=========== -The "Latest" version is the documentation for the next release (minor or major) of novelWriter, and -may include information that does not match with the version you have installed. +A selection of PDF manuals are available here for download, including for earlier versions of novelWriter: -At the bottom of the left hand menu of the documentation, you can find a small box to change which -version of the documentation to display. As a general rule the last 10 patched releases should be -available in the list. - -| :octicon:`book` `ReadTheDocs: Stable novelWriter Documentation `__ -| :octicon:`book` `ReadTheDocs: Latest novelWriter Documentation `__ +| :download:`novelWriter-2.1.pdf` +| :download:`novelWriter-2.0.pdf` +| :download:`novelWriter-1.6.pdf` diff --git a/source/download/novelWriter-1.6.pdf b/source/about/novelWriter-1.6.pdf similarity index 100% rename from source/download/novelWriter-1.6.pdf rename to source/about/novelWriter-1.6.pdf diff --git a/source/download/novelWriter-2.0.pdf b/source/about/novelWriter-2.0.pdf similarity index 100% rename from source/download/novelWriter-2.0.pdf rename to source/about/novelWriter-2.0.pdf diff --git a/source/download/novelWriter-2.1.pdf b/source/about/novelWriter-2.1.pdf similarity index 99% rename from source/download/novelWriter-2.1.pdf rename to source/about/novelWriter-2.1.pdf index dff0ee0cdc8ff32ba376005403f5ddb33e4b3874..884cc882b6ed88d3b48b8b7c2c5556b5cf42d591 100644 GIT binary patch delta 5697 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 H^}zoFK!3YD diff --git a/source/docs/index.rst b/source/docs/index.rst index 64b8230..50a5dd1 100644 --- a/source/docs/index.rst +++ b/source/docs/index.rst @@ -6,9 +6,9 @@ Documentation | **Release Version:** 2.1.1 | **Release Date:** Sunday, 5 November 2023 -| **Docs Updated:** Sunday, 5 November 2023 +| **Docs Updated:** Saturday, 11 November 2023 -**PDF:** :download:`novelWriter-2.1.pdf <../download/novelWriter-2.1.pdf>` [ :ref:`Older Versions ` ] +**PDF:** :download:`novelWriter-2.1.pdf <../about/novelWriter-2.1.pdf>` [ :ref:`Older Versions ` ] novelWriter is an open source plain text editor designed for writing novels assembled from many smaller text documents. It uses a minimal formatting syntax inspired by Markdown, and adds a meta diff --git a/source/download/index.rst b/source/download/index.rst index 9085124..b6f444c 100644 --- a/source/download/index.rst +++ b/source/download/index.rst @@ -10,12 +10,6 @@ Downloads help_win -.. toctree:: - :caption: Documentation PDFs - :hidden: - - pdf_docs - This page includes all available packages for the latest release. When pre-release packages for the next version of novelWriter are available, these release packages diff --git a/source/download/pdf_docs.rst b/source/download/pdf_docs.rst deleted file mode 100644 index 9627975..0000000 --- a/source/download/pdf_docs.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. _main_download_pdfs: - -****************** -Documentation PDFs -****************** - -The current documentation for the latest version is available on the :ref:`main_documentation` page. This page contains PDFs for the current and earlier versions. - -| :download:`novelWriter-2.1.pdf` -| :download:`novelWriter-2.0.pdf` -| :download:`novelWriter-1.6.pdf` diff --git a/templates/about_docs.rst b/templates/about_docs.rst new file mode 100644 index 0000000..f9e8c41 --- /dev/null +++ b/templates/about_docs.rst @@ -0,0 +1,13 @@ +.. _main_about_docs: + +************* +Documentation +************* + +This website includes the :ref:`documentation ` for the latest full release of +novelWriter. This is the main and updated source of documentation. + +PDF Manuals +=========== + +A selection of PDF manuals are available here for download, including for earlier versions of novelWriter: diff --git a/tools/docs.py b/tools/docs.py index 9a4b817..f889be6 100644 --- a/tools/docs.py +++ b/tools/docs.py @@ -21,8 +21,9 @@ def __init__(self, target: str, isBranch=False): self._tempDir = ROOT_DIR / "_temp" self._extPath = self._tempDir / "novelWriter" + self._tplPath = ROOT_DIR / "templates" self._dstPath = ROOT_DIR / "source" / "docs" - self._pdfPath = ROOT_DIR / "source" / "download" + self._pdfPath = ROOT_DIR / "source" / "about" self._nwRelease = "Unknown" self._nwDate = "1970-01-01" @@ -136,19 +137,9 @@ def _createPdfPage(self): key = f"{int(bits[0]):02d}.{int(bits[1]):03d}" pdfs.append((key, item.name)) - with open(self._pdfPath / "pdf_docs.rst", mode="w", encoding="utf-8") as of: - of.write( - ".. _main_download_pdfs:\n" - "\n" - "******************\n" - "Documentation PDFs\n" - "******************\n" - "\n" - "The current documentation for the latest version is available on the " - ":ref:`main_documentation` page. This page contains PDFs for the current and " - "earlier versions.\n" - "\n" - ) + with open(self._pdfPath / "docs.rst", mode="w", encoding="utf-8") as of: + of.write((self._tplPath / "about_docs.rst").read_text(encoding="utf-8")) + of.write("\n") for _, pdf in sorted(pdfs, key=lambda x: x[0], reverse=True): of.write(f"| :download:`{pdf}`\n") return @@ -184,8 +175,8 @@ def _rewriteIndex(self, indexFile: Path): "", ( f"**PDF:** :download:`novelWriter-{self._nwMajor}.{self._nwMinor}.pdf " - f"<../download/novelWriter-{self._nwMajor}.{self._nwMinor}.pdf>` " - "[ :ref:`Older Versions ` ]" + f"<../about/novelWriter-{self._nwMajor}.{self._nwMinor}.pdf>` " + "[ :ref:`Older Versions ` ]" ), "", ]