From 348f1adca4f7a6c5e4a9484365681c46ee1517b7 Mon Sep 17 00:00:00 2001 From: Daniel Baston Date: Tue, 27 Aug 2024 16:37:09 -0400 Subject: [PATCH] Doc: Fix duplicate substitution error --- doc/source/about_no_title.rst | 2 -- doc/source/conf.py | 6 +++++- doc/source/development/building_from_source.rst | 2 -- doc/source/development/dev_documentation.rst | 2 -- doc/source/development/dev_environment.rst | 2 -- doc/source/development/dev_practices.rst | 2 -- doc/source/development/testing.rst | 2 -- doc/source/license.rst | 4 +--- doc/source/user/vector_data_model.rst | 2 -- 9 files changed, 6 insertions(+), 18 deletions(-) diff --git a/doc/source/about_no_title.rst b/doc/source/about_no_title.rst index 846f9ad35159..5d0121ad1fb5 100644 --- a/doc/source/about_no_title.rst +++ b/doc/source/about_no_title.rst @@ -1,5 +1,3 @@ -.. include:: ./substitutions.rst - GDAL is a translator library for raster and vector geospatial data formats that is released under an MIT style Open Source :ref:`license` by the `Open Source Geospatial Foundation`_. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line utilities for data translation and processing. The `NEWS`_ page describes the April 2024 GDAL/OGR 3.8.5 release. .. only:: html diff --git a/doc/source/conf.py b/doc/source/conf.py index 471b45325244..c8c3b0f65958 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -43,7 +43,11 @@ # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. # This pattern also affects html_static_path and html_extra_path. -exclude_patterns = ["programs/options/*.rst", "api/python/modules.rst"] +exclude_patterns = [ + "substitutions.rst", + "programs/options/*.rst", + "api/python/modules.rst", +] # Prevents double hyphen (--) to be replaced by Unicode long dash character # Cf https://stackoverflow.com/questions/15258831/how-to-handle-two-dashes-in-rest diff --git a/doc/source/development/building_from_source.rst b/doc/source/development/building_from_source.rst index af4eaa44fef6..90bfc9b5a59c 100644 --- a/doc/source/development/building_from_source.rst +++ b/doc/source/development/building_from_source.rst @@ -1,5 +1,3 @@ -.. include:: ../substitutions.rst - .. _building_from_source: ================================================================================ diff --git a/doc/source/development/dev_documentation.rst b/doc/source/development/dev_documentation.rst index e23d8965d7bf..c0c3292305b6 100644 --- a/doc/source/development/dev_documentation.rst +++ b/doc/source/development/dev_documentation.rst @@ -1,5 +1,3 @@ -.. include:: ../substitutions.rst - .. _dev_documentation: ================================================================================ diff --git a/doc/source/development/dev_environment.rst b/doc/source/development/dev_environment.rst index 2baaa7d90622..b47b934f08b8 100644 --- a/doc/source/development/dev_environment.rst +++ b/doc/source/development/dev_environment.rst @@ -1,5 +1,3 @@ -.. include:: ../substitutions.rst - .. _dev_environment: ================================================================================ diff --git a/doc/source/development/dev_practices.rst b/doc/source/development/dev_practices.rst index a0664dadec50..4bf9ad5af4cc 100644 --- a/doc/source/development/dev_practices.rst +++ b/doc/source/development/dev_practices.rst @@ -4,8 +4,6 @@ Development practices ================================================================================ -.. include:: ../substitutions.rst - Making changes to GDAL ---------------------- diff --git a/doc/source/development/testing.rst b/doc/source/development/testing.rst index 7377dbc86ddc..7921d0ebe1a1 100644 --- a/doc/source/development/testing.rst +++ b/doc/source/development/testing.rst @@ -1,7 +1,5 @@ .. _testing: -.. include:: ../substitutions.rst - ================================================================================ Automated testing ================================================================================ diff --git a/doc/source/license.rst b/doc/source/license.rst index b4a083375072..6fd131833a8c 100644 --- a/doc/source/license.rst +++ b/doc/source/license.rst @@ -4,12 +4,10 @@ License ================================================================================ -.. include:: ./substitutions.rst - License -------------------------------------------------------------------------------- -In general GDAL/OGR is licensed under an MIT style license with the +In general GDAL/OGR is licensed under an MIT style license with the following terms: Permission is hereby granted, free of charge, to any person obtaining a diff --git a/doc/source/user/vector_data_model.rst b/doc/source/user/vector_data_model.rst index 29dee957d410..746ac89e45ca 100644 --- a/doc/source/user/vector_data_model.rst +++ b/doc/source/user/vector_data_model.rst @@ -1,5 +1,3 @@ -.. include:: ../substitutions.rst - .. _vector_data_model: ================================================================================