Fix typos in QGIS Server service_url docs

qgis · Dec 9, 2022 · 79bd12c · 79bd12c
1 parent 3455982
commit 79bd12c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/python/server/auto_generated/qgsserverprojectutils.sip.in b/python/server/auto_generated/qgsserverprojectutils.sip.in
@@ -509,17 +509,17 @@ The URL defined in the project or if not defined the URL from serviceUrl.
   QString serviceUrl( const QString &service, const QgsServerRequest &request, const QgsServerSettings &settings );
 %Docstring
 Returns the service url defined in the environment variable or with HTTP header.
-The is calculated from, in the order:
-
-- Value defined in the project per service.
-- The ``<service>_SERVICE_URL`` environment variable.
-- The ``SERVICE_URL`` environment variable.
-- The custom ``X-Qgis-<service>-Servcie-Url`` header.
-- The custom ``X-Qgis-Service-Url`` header.
-- Build form the standard ``Forwarded`` header.
-- Build form the pseudo standard ``X-Forwarded-Host`` and ``X-Forwarded-Proto`` headers.
-- Build form the standard ``Host`` header and the server protocol.
-- Build form the server name and the server protocol.
+This is calculated from (in order of precedence):
+
+- Value defined in the project per service
+- The ``QGIS_SERVER_<service>_SERVICE_URL`` environment variable
+- The ``QGIS_SERVER_SERVICE_URL`` environment variable
+- The custom ``X-Qgis-<service>-Service-Url`` header
+- The custom ``X-Qgis-Service-Url`` header
+- Build from the standard ``Forwarded`` header
+- Build from the pseudo standard ``X-Forwarded-Host`` and ``X-Forwarded-Proto`` headers
+- Build from the standard ``Host`` header and the server protocol
+- Build from the server name and the server protocol.
 
 :param request: the request
 :param service: the used service

diff --git a/src/server/qgsserverprojectutils.h b/src/server/qgsserverprojectutils.h
@@ -447,17 +447,17 @@ namespace QgsServerProjectUtils
 
   /**
    * Returns the service url defined in the environment variable or with HTTP header.
-   * The is calculated from, in the order:
+   * This is calculated from (in order of precedence):
    *
-   * - Value defined in the project per service.
-   * - The ``<service>_SERVICE_URL`` environment variable.
-   * - The ``SERVICE_URL`` environment variable.
-   * - The custom ``X-Qgis-<service>-Servcie-Url`` header.
-   * - The custom ``X-Qgis-Service-Url`` header.
-   * - Build form the standard ``Forwarded`` header.
-   * - Build form the pseudo standard ``X-Forwarded-Host`` and ``X-Forwarded-Proto`` headers.
-   * - Build form the standard ``Host`` header and the server protocol.
-   * - Build form the server name and the server protocol.
+   * - Value defined in the project per service
+   * - The ``QGIS_SERVER_<service>_SERVICE_URL`` environment variable
+   * - The ``QGIS_SERVER_SERVICE_URL`` environment variable
+   * - The custom ``X-Qgis-<service>-Service-Url`` header
+   * - The custom ``X-Qgis-Service-Url`` header
+   * - Build from the standard ``Forwarded`` header
+   * - Build from the pseudo standard ``X-Forwarded-Host`` and ``X-Forwarded-Proto`` headers
+   * - Build from the standard ``Host`` header and the server protocol
+   * - Build from the server name and the server protocol.
    *
    * \param request the request
    * \param service the used service