Drop the 2 from QWC2

Author: manisandro

Diff for: src/QuickStart.md

@@ -1,8 +1,8 @@
 # Quick start
 
-## Running QWC2 as part of qwc-services
+## Running QWC as part of qwc-services
 
-`qwc-services` is a collection of loosely coupled micro-services for extending QWC2. The services communicate with each other via HTTP/Rest, and are mostly written in Python.
+`qwc-services` is a collection of loosely coupled micro-services for extending QWC. The services communicate with each other via HTTP/Rest, and are mostly written in Python.
 
 The easiest way to run `qwc-services` is to use the readily available docker images, using the sample setup at [qwc-docker](https://github.com/qwc-services/qwc-docker).
 
@@ -57,11 +57,11 @@ Next steps:
 - [Configuring the services](configuration/../configuration/ServiceConfiguration.md)
 - [Set resource permissions](configuration/ResourcesPermissions.md)
 
-## Running QWC2 as a standalone viewer
+## Running QWC as a standalone viewer
 
-If you don't need the advanced functionalities provided by `qwc-services` or want to integrate QWC2 in another environment, you can run QWC2 as a standalone viewer.
+If you don't need the advanced functionalities provided by `qwc-services` or want to integrate QWC in another environment, you can run QWC as a standalone viewer.
 
-To work with QWC2, you will need a minimal development environment consisting of [git](https://git-scm.com/), [node](https://nodejs.org/) and [yarn](https://yarnpkg.com). You will also need a running QGIS Server instance which serves your projects.
+To work with QWC, you will need a minimal development environment consisting of [git](https://git-scm.com/), [node](https://nodejs.org/) and [yarn](https://yarnpkg.com). You will also need a running QGIS Server instance which serves your projects.
 
 The fastest way to get started is by cloning the stock application:
 ```bash

Diff for: src/UserGuide.md

@@ -1,6 +1,6 @@
 # User guide
 
-This section contains user documentation of the QWC2 application and QWC services. It describes **some** of the available features.
+This section contains user documentation of the QWC application and QWC services. It describes **some** of the available features.
 
 *Note*: Depending on the specific viewer configuration, some functionalities might be missing or different than described in this section.
 

Diff for: src/configuration/ResourcesPermissions.md

@@ -40,7 +40,7 @@ For more detailed [CRUD](https://en.wikipedia.org/wiki/Create,_read,_update_and_
 
 The `viewer_task` resource defines viewer functionalities (e.g. printing or raster export) that can be restricted or permitted.
 Their `name` (e.g. `RasterExport`) will be matched against:
-- The `key` in `menuItems` and `toolbarItems` in the QWC2 `config.json`.
+- The `key` in `menuItems` and `toolbarItems` in the QWC `config.json`.
 - The `name` of a plugin entry in `config.json`.
 - The `task` configuration property of a `TaskButton` plugin entry in `config.json`
 
@@ -50,7 +50,7 @@ The `FeatureInfo service`, `FeatureInfo layer` and subordinate `Attribute` resou
 
 Restricted viewer task items are then removed from the menu and toolbar in the map viewer. Viewer tasks not explicitly added as resources are kept unchanged from the `config.json`.
 
-*Note*: The resource types, i.e. for custom QWC2 plugins, can be extended by inserting new types into the `qwc_config.resource_types` table.
+*Note*: The resource types, i.e. for custom QWC plugins, can be extended by inserting new types into the `qwc_config.resource_types` table.
 These can be queried, e.g. in a custom service, by using `PermissionClient::resource_permissions()` or
 `PermissionClient::resource_restrictions()` from [QWC Services Core](https://github.com/qwc-services/qwc-services-core).
 

Diff for: src/configuration/ServiceConfiguration.md

@@ -6,7 +6,7 @@ The architecture of `qwc-services` is as follows:
 
 - API-Gateway: API Gateway, forwards requests to individual services <http://localhost:8088>
 - Auth-Service: Authentication service with local user database (default users: admin:admin, demo:demo) <http://localhost:8088/auth/login>
-- Map viewer: QWC2 map viewer <http://localhost:8088>
+- Map viewer: QWC map viewer <http://localhost:8088>
 - OGC Service: Proxy for WMS/WFS requests filtered by permissions, calls QGIS Server <http://localhost:8088/ows/api>
 - Admin GUI: Admin GUI <http://localhost:8088/qwc_admin/>
 
@@ -18,24 +18,24 @@ Following is an overview of existing `qwc-services`:
 
 **Applications**:
 
-* [QWC2 Map Viewer](https://github.com/qwc-services/qwc-map-viewer): The map viewer application
+* [QWC Map Viewer](https://github.com/qwc-services/qwc-map-viewer): The map viewer application
 * [QWC Admin GUI](https://github.com/qwc-services/qwc-admin-gui): Configuration backend for managing users and permissions
 * [Registration GUI](https://github.com/qwc-services/qwc-registration-gui): GUI for registration of new users
 
 **REST services**:
 
 * [DB auth service](https://github.com/qwc-services/qwc-db-auth): Authentication service with local user database
 * [LDAP auth service](https://github.com/qwc-services/qwc-ldap-auth): LDAP Authentication service
-* [Data service](https://github.com/qwc-services/qwc-data-service): Data edit service, required for QWC2 editing functionality
+* [Data service](https://github.com/qwc-services/qwc-data-service): Data edit service, required for QWC editing functionality
 * [Document service](https://github.com/qwc-services/qwc-document-service): Service for generating Jasper reports
-* [Elevation service](https://github.com/qwc-services/qwc-elevation-service): Service for providing elevation data, required for QWC2 elevation profile
-* [Feature info service](https://github.com/qwc-services/qwc-feature-info-service): Service for providing enhanced GetFeatureInfo responses to QWC2
-* [Fulltext search service](https://github.com/qwc-services/qwc-fulltext-search-service): Fulltext search service for the QWC2 search functionality
-* [Legend service](https://github.com/qwc-services/qwc-legend-service): Service for providing enhanced legend graphics to QWC2
-* [Mapinfo service](https://github.com/qwc-services/qwc-mapinfo-service): Service for providing additional information to the QWC2 right-click map context popup
+* [Elevation service](https://github.com/qwc-services/qwc-elevation-service): Service for providing elevation data, required for QWC elevation profile
+* [Feature info service](https://github.com/qwc-services/qwc-feature-info-service): Service for providing enhanced GetFeatureInfo responses to QWC
+* [Fulltext search service](https://github.com/qwc-services/qwc-fulltext-search-service): Fulltext search service for the QWC search functionality
+* [Legend service](https://github.com/qwc-services/qwc-legend-service): Service for providing enhanced legend graphics to QWC
+* [Mapinfo service](https://github.com/qwc-services/qwc-mapinfo-service): Service for providing additional information to the QWC right-click map context popup
 * [OGC service](https://github.com/qwc-services/qwc-ogc-service): Proxy for WMS/WFS requests filtered by permissions, calls QGIS Server
-* [Permalink service](https://github.com/qwc-services/qwc-permalink-service): Service for storing compat permalinks and bookmarks generated by QWC2
-* [Print service](https://github.com/qwc-services/qwc-print-service): Service for enhancing the QWC2 GetPrint requests
+* [Permalink service](https://github.com/qwc-services/qwc-permalink-service): Service for storing compat permalinks and bookmarks generated by QWC
+* [Print service](https://github.com/qwc-services/qwc-print-service): Service for enhancing the QWC GetPrint requests
 
 **Configuration database**:
 
@@ -53,10 +53,10 @@ The layout of the `qwc-docker` tree is as follows:
 |-------------------------------|---------------------------------------------------------------------|
 |`├─ api-gateway/nginx.conf`    | API gateway configuration.                                          |
 |`├─ volumes/`                  | Contains folders which are mounted into the various containers.     |
-|`│  ├─ attachments`            | Storage of files uploaded through the QWC2 editing functionality.   |
+|`│  ├─ attachments`            | Storage of files uploaded through the QWC editing functionality.   |
 |`│  ├─ config/<tenant>/`       | Service configuration files, generated by `qwc-config-generator`.   |
 |`│  ├─ config-in/<tenant>/`    | Input configuration files, processed by the `qwc-config-generator`. |
-|`│  │  ├─ config.json`         | Master configuration for the QWC2 viewer.                           |
+|`│  │  ├─ config.json`         | Master configuration for the QWC viewer.                           |
 |`│  │  ├─ index.html`          | Viewer entry point.                                                 |
 |`│  │  ├─ themesConfig.json`   | Themes configuration.                                               |
 |`│  │  └─ tenantConfig.json`   | Master configuration file for qwc services.                         |
@@ -65,7 +65,7 @@ The layout of the `qwc-docker` tree is as follows:
 |`│  ├─ jasper-reports/`        | Jasper reports (see `qwc-document-service`).                        |
 |`│  ├─ legends/`               | Custom legend images (see `qwc-legend-service`).                    |
 |`│  ├─ qgs-resources/`         | QGIS projects and data referenced by the projects.                  |
-|`│  ├─ qwc2/`                  | QWC2 Viewer.                                                        |
+|`│  ├─ qwc2/`                  | QWC Viewer.                                                        |
 |`│  └─ solr/`                  | Fulltext search index.                                              |
 |`├─ docker-compose.yml`        | Container configuration file.                                       |
 |`├─ pg_service.conf`           | Database service definitions.                                       |

Diff for: src/configuration/ThemesConfiguration.md

@@ -5,12 +5,12 @@ A theme corresponds to a QGIS project, published as WMS and served by QGIS Serve
 The basic steps for configuring a theme are:
 
 - [Create a QGIS project and deploy it to QGIS Server](#create-qgis-project)
-- [Writing the QWC2 theme configuration](#writing-themes-configuration)
+- [Writing the QWC theme configuration](#writing-themes-configuration)
 - [Generating the themes configuration](#generating-themes-configuration)
 
 ## Creating and publishing a QGIS project<a name="create-qgis-project"></a>
 
-The first step is to prepare a QGIS project for publishing. Besides the common tasks of adding and styling layers, the following table gives an overview of settings which influence how the theme is displayed in QWC2:
+The first step is to prepare a QGIS project for publishing. Besides the common tasks of adding and styling layers, the following table gives an overview of settings which influence how the theme is displayed in QWC:
 
 | What                 | Where                                     | Description                                      |
 |----------------------|-------------------------------------------|--------------------------------------------------|
@@ -27,7 +27,7 @@ The first step is to prepare a QGIS project for publishing. Besides the common t
 | Rendering order      | Layer Order Panel or Layers Panel         | Rendering order of the layers. If layer re-ordering is enabled in `config.json`, the order from the Layer Order Panel is ignored. |
 | Print layouts        | Layout manager                            | The print layouts offered in the Print plugin.   |
 | Print layout labels  | Layout manager                            | Print layout labels with an ID will be exposed in the Print plugin. Note: a label ID starting with `__` will not be exposed. |
-| Attribute form       | Vector Layer Properties &rarr; Attributes Form | The configured attribute form will be displayed when editing in QWC2. |
+| Attribute form       | Vector Layer Properties &rarr; Attributes Form | The configured attribute form will be displayed when editing in QWC. |
 | External layers      | Layer Properties &rarr; QGIS Server &rarr; Data URL | Mark the layer as an external layer to avoid cascaded requests. See [Configuring external layers](#external-layers). |
 
 Then, store the project in the publishing directory of your QGIS Server instance. When using `qwc-docker`, store the project as `*.qgs` below `qwc-docker/volumes/qgs-resources`.
@@ -52,7 +52,7 @@ sslmode=disable
 
 ## Configuring the themes in `themesConfig.json` <a name="writing-themes-configuration"></a>
 
-The next step is to configure the theme for QWC2. There are two approaches:
+The next step is to configure the theme for QWC. There are two approaches:
 
 - [Automatic theme configuration](#automatic-theme-configuration) (only when using `qwc-docker`): Just copy the project file to the designated location and the `qwc-config-generator` will automatically generate a theme configuration using default parameters.
 - [Manual theme configuration](#manual-theme-configuration): Manually configure a theme with the full set of configuration options.
@@ -75,7 +75,7 @@ To use a custom thumbnail for an automatically configured theme, place a an imag
 
 The theme configuration file is located as follows:
 
-- Standalone viewer: `qwc2-app/static/themesConfig.json`
+- Standalone viewer: `qwc-app/static/themesConfig.json`
 - `qwc-docker`: `qwc-docker/volumes/config-in/<tentant>/themesConfig.json`
 
 *Note*: when using `qwc-docker`, the themes configuration may also be embedded as `themesConfig` directly in `qwc-docker/volumes/config-in/<tentant>/tenantConfig.json`.
@@ -198,7 +198,7 @@ The format of the theme definitions is as follows:
 | `"extraLegendParameters": "<&KEY=VALUE>",`      | Optional, [additional query parameters](https://docs.qgis.org/latest/en/docs/server_manual/services/wms.html#getlegendgraphics) to append to GetLegendGraphic request.     |
 | `"extraDxfParameters": "<&KEY=VALUE>",`         | Optional, [additional query parameters](https://docs.qgis.org/latest/en/docs/server_manual/services/wms.html?highlight=dxf#format-options) to append to DXF export request.           |
 | `"extraPrintParameters": "<&KEY=VALUE>",`       | Optional, additional query parameters to append to GetPrint request (requires QGIS Server >= 3.32.0). |
-| `"extraPrintLayers": ["<layername>", ...],`     | Optional, extra list of layers to mark as internal print layers, i.e. which are omitted from the QWC2 LayerTree. |
+| `"extraPrintLayers": ["<layername>", ...],`     | Optional, extra list of layers to mark as internal print layers, i.e. which are omitted from the QWC LayerTree. |
 | `"printLabelBlacklist": ["<LabelId>", ...]`     | Optional, list of composer label ids to not expose in the print dialog.          |
 | `"editConfig": {<editConfig>}     `             | Optional, object containing the editing configuration for the theme, see [Editing](../topics/Editing.md#edit-config). |
 | `"snapping": {...},`                            | Optional, snapping configuration, see [Snapping](../topics/Snapping.md).         |
@@ -239,7 +239,7 @@ A bare minimum theme entry might look as follows:
 
 ### External layers <a name="external-layers"></a>
 
-External layers can be used to selectively replace layers in a QGIS project with a layer from an external source, for instance in the case of a WMS layer embedded in a QGIS project, to avoid cascading WMS requests. They are handled transparently by QWC2 (they are positioned in the layer tree identically to the internal layer they replace), but the `GetMap` and `GetFeatureInfo` requests are sent directly to the specified WMS Service.
+External layers can be used to selectively replace layers in a QGIS project with a layer from an external source, for instance in the case of a WMS layer embedded in a QGIS project, to avoid cascading WMS requests. They are handled transparently by QWC (they are positioned in the layer tree identically to the internal layer they replace), but the `GetMap` and `GetFeatureInfo` requests are sent directly to the specified WMS Service.
 
 **Configuring external layers via Data Url**
 
@@ -465,11 +465,11 @@ Instead of specifiying a full background layer definition in a group, you can al
 
 ## Generating the themes configuration <a name="generating-theme-configuration"></a>
 
-The file ultimately read by the QWC2 viewer is the `themes.json` configuration, which includes the contents of `themesConfig.json` completed with additional data obtained from the QGIS Project.
+The file ultimately read by the QWC viewer is the `themes.json` configuration, which includes the contents of `themesConfig.json` completed with additional data obtained from the QGIS Project.
 
 * When using `qwc-docker`, you can generate the themes from the `qwc-admin-gui` administration backend, running on <http://localhost:8088/qwc_admin> by default. Log in as `admin` user, then press the green `Generate service configuration` button. This will invoce the`qwc-config-generator`, which will generate `mapViewerConfig.json` located below `qwc-docker/volumes/config/<tentant>`. You can then inspect the generated `themes.json` at <http://localhost:8088/themes.json>.
 
-* When using QWC2 as a standalone viewer, the `themes.json` can be generated by invoking
+* When using QWC as a standalone viewer, the `themes.json` can be generated by invoking
 ```bash
 yarn run themesconfig
 ```
@@ -499,7 +499,7 @@ You can configure `qwc-docker` to look for `qgz` project files instead of `qgs`
 
 ## Split categorized layers
 
-By default, symbol categories of a [classified](https://docs.qgis.org/latest/en/docs/training_manual/vector_classification/classification.html) layer won't be exposed via WMS and hence in QWC2.
+By default, symbol categories of a [classified](https://docs.qgis.org/latest/en/docs/training_manual/vector_classification/classification.html) layer won't be exposed via WMS and hence in QWC.
 
 To expose symbol categories as separate layers via WMS, you can use the [split_categorized](https://github.com/qwc-services/qwc-qgis-server-plugins/tree/main/split_categorized) QGIS Server plugin.