diff --git a/conf.py b/conf.py index 11d651976ff..2c7f82fe198 100644 --- a/conf.py +++ b/conf.py @@ -259,6 +259,8 @@ def calculate_tx_slug(filepath): # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ + ('docs/about/index', 'aboutQGIS.tex', + f'About QGIS {version}', u'QGIS Project', 'manual'), ('docs/user_manual/index', 'DesktopUserGuide.tex', f'QGIS Desktop {version} User Guide', u'QGIS Project', 'manual'), ('docs/server_manual/index', 'ServerUserGuide.tex', diff --git a/docs/user_manual/preamble/contributors.rst b/docs/about/contributors.rst similarity index 100% rename from docs/user_manual/preamble/contributors.rst rename to docs/about/contributors.rst diff --git a/docs/user_manual/preamble/conventions.rst b/docs/about/conventions.rst similarity index 100% rename from docs/user_manual/preamble/conventions.rst rename to docs/about/conventions.rst diff --git a/docs/user_manual/preamble/features.rst b/docs/about/features.rst similarity index 100% rename from docs/user_manual/preamble/features.rst rename to docs/about/features.rst diff --git a/docs/user_manual/preamble/foreword.rst b/docs/about/foreword.rst similarity index 100% rename from docs/user_manual/preamble/foreword.rst rename to docs/about/foreword.rst diff --git a/docs/user_manual/preamble/help_and_support.rst b/docs/about/help_and_support.rst similarity index 100% rename from docs/user_manual/preamble/help_and_support.rst rename to docs/about/help_and_support.rst diff --git a/docs/user_manual/appendices/GNU_FDL.rst b/docs/about/license/GNU_FDL.rst similarity index 100% rename from docs/user_manual/appendices/GNU_FDL.rst rename to docs/about/license/GNU_FDL.rst diff --git a/docs/user_manual/appendices/GNU_GPL.rst b/docs/about/license/GNU_GPL.rst similarity index 100% rename from docs/user_manual/appendices/GNU_GPL.rst rename to docs/about/license/GNU_GPL.rst diff --git a/docs/about/license/index.rst b/docs/about/license/index.rst new file mode 100644 index 00000000000..4d0a35894c7 --- /dev/null +++ b/docs/about/license/index.rst @@ -0,0 +1,15 @@ + +********************************** + Complying with Licenses +********************************** + +.. toctree:: + :maxdepth: 1 + + GNU_GPL + GNU_FDL + + +QGIS is created and distributed under the :ref:`GNU General Public License (GPL) ` +and the current documentation is provided under the :ref:`GNU Free Documentation License `, +Version 1.3 or any later version. diff --git a/docs/user_manual/preamble/preamble.rst b/docs/about/preamble.rst similarity index 88% rename from docs/user_manual/preamble/preamble.rst rename to docs/about/preamble.rst index 27917d89757..aa4e5be0392 100644 --- a/docs/user_manual/preamble/preamble.rst +++ b/docs/about/preamble.rst @@ -4,11 +4,10 @@ Preamble ******** -This is the user guide for the geographical information system (GIS) +Welcome to the documentation of the geographical information system (GIS) software QGIS. -QGIS is subject to the GNU General Public License. -More information is available on the QGIS homepage, -https://www.qgis.org. +QGIS is subject to the GNU General Public License version 2, or any later version. +More information is available on the `QGIS website `_. The contents of this document have been written and verified to the best of the knowledge of the authors and editors. @@ -41,7 +40,7 @@ The list of the persons who have contributed with writing, reviewing and translating the following documentation is available at :ref:`doc_contributors`. -Copyright (c) 2004 - 2020 QGIS Development Team +Copyright (c) 2004 - 2025 QGIS Development Team **Internet:** https://www.qgis.org diff --git a/docs/user_manual/preamble/translation_stats.rst b/docs/about/translation_stats.rst similarity index 100% rename from docs/user_manual/preamble/translation_stats.rst rename to docs/about/translation_stats.rst diff --git a/docs/index.rst b/docs/index.rst index 74d818228a2..299527c613a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -74,6 +74,18 @@ you can download for offline reading. They are accessible from the Please have a look into one of the documents below. +.. toctree:: + :maxdepth: 1 + :caption: About QGIS + + about/preamble + about/foreword + about/conventions + about/features + about/help_and_support + about/contributors + about/license/index + .. toctree:: :maxdepth: 2 :caption: For Users diff --git a/docs/user_manual/appendices/index.rst b/docs/user_manual/appendices/index.rst index 6d4db53a736..8ac643c8705 100644 --- a/docs/user_manual/appendices/index.rst +++ b/docs/user_manual/appendices/index.rst @@ -7,8 +7,6 @@ .. toctree:: :maxdepth: 2 - GNU_GPL - GNU_FDL qgis_file_formats qgis_r_syntax qgis_desktop_network_connections diff --git a/docs/user_manual/index.rst b/docs/user_manual/index.rst index d82d2b8ba75..534ef18bbef 100644 --- a/docs/user_manual/index.rst +++ b/docs/user_manual/index.rst @@ -8,10 +8,6 @@ QGIS User Guide :maxdepth: 2 :numbered: 4 - preamble/preamble - preamble/foreword - preamble/conventions - preamble/features introduction/getting_started introduction/project_files introduction/qgis_gui @@ -37,7 +33,5 @@ QGIS User Guide processing/index processing_algs/index plugins/index - preamble/help_and_support - preamble/contributors appendices/index literature_web/literature_and_web_references diff --git a/redirects.txt b/redirects.txt index 32ed8d46d8d..b1029f1d0fa 100644 --- a/redirects.txt +++ b/redirects.txt @@ -21,6 +21,8 @@ docs/training_manual/introduction/preparation.rst docs/training_manual/basic_map # User manual docs/user_manual/appendices/appendices.rst docs/user_manual/appendices/index.rst +docs/user_manual/appendices/GNU_FDL.rst docs/about/license/GNU_FDL.rst +docs/user_manual/appendices/GNU_GPL.rst docs/about/license/GNU_GPL.rst docs/user_manual/plugins/core_plugins.rst docs/user_manual/plugins/core_plugins/index.rst docs/user_manual/plugins/core_plugins/plugins_georeferencer.rst docs/user_manual/working_with_raster/georeferencer.rst docs/user_manual/plugins/plugins_db_manager.rst docs/user_manual/plugins/core_plugins/plugins_db_manager.rst @@ -39,6 +41,11 @@ docs/user_manual/plugins/plugins_spatial_query.rst docs/user_manual/processing_a docs/user_manual/plugins/plugins_spit.rst docs/user_manual/plugins/core_plugins/plugins_db_manager.rst docs/user_manual/plugins/plugins_topology_checker.rst docs/user_manual/plugins/core_plugins/plugins_topology_checker.rst +docs/user_manual/preamble/conventions.rst docs/about/conventions.rst +docs/user_manual/preamble/features.rst docs/about/features.rst +docs/user_manual/preamble/foreword.rst docs/about/foreword.rst +docs/user_manual/preamble/help_and_support.rst docs/about/help_and_support.rst +docs/user_manual/preamble/preamble.rst docs/about/preamble.rst docs/user_manual/preamble/whats_new.rst docs/user_manual/preamble/preamble.rst docs/user_manual/processing_algs/qgis/qgis_algs_include.rst docs/user_manual/processing_algs/algs_include.rst docs/user_manual/qgis_browser/qgis_browser.rst docs/user_manual/introduction/browser.rst