Merge branch 'release-1.1'

Author: BWibo

docs/3dcitydb/index.md

@@ -83,7 +83,7 @@ Singapore, Zurich, and is also being used in a number of research projects.
 With the release of 3DCityDB `v5`, we expect that most users of `v4` will
 migrate to the new version in the future.
 
-The companies [Virtual City Systems](../partners/vcs.md) and [M.O.S.S.](../partners/moss.md),
+The companies [Virtual City Systems](../contributors/vcs.md) and [M.O.S.S.](../contributors/moss.md),
 who are also partners in development, use the 3DCityDB at the core of their
 commercial products and services to create, maintain, visualize, transform, and export
 virtual 3D city models. Furthermore, the state mapping agencies of the federal states in Germany

docs/citydb-tool/delete-config.md

@@ -18,6 +18,7 @@ The configuration settings for the `delete` command are shown below.
   "deleteOptions": {
     "mode": "terminate",
     "terminateWithSubFeatures": true,
+    "indexMode": "dropCreate",
     "terminationDate": "2018-07-01T00:00:00",
     "lineage": "myLineage",
     "updatingPerson": "myUpdatingPerson",
@@ -34,6 +35,7 @@ The configuration settings for the `delete` command are shown below.
 |-----------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------|---------------|
 | [`"mode"`](delete.md#delete-mode)                                     | Delete mode: `delete`, `terminate`.                                                                                     | `terminate`   |
 | [<code>"terminateWithSub<br/>Features"</code>](delete.md#delete-mode) | Also terminate sub-features.                                                                                            | `true`        |
+| [`"indexMode"`](delete.md#managing-indexes-during-deletion)           | Index mode: `keep`, `drop`, `dropCreate`.                                                                               | `keep`        |
 | [`"terminationDate"`](delete.md#defining-termination-metadata)        | Time in `<YYYY-MM-DD>` or <code>&lt;YYYY-MM-DDThh&#58;mm:ss[(+&#124;-)hh:mm]></code> format to use as termination date. | `now`         |
 | [`"lineage"`](delete.md#defining-termination-metadata)                | Lineage to use for the features.                                                                                        |               |
 | [`"updatingPerson"`](delete.md#defining-termination-metadata)         | Name of the user responsible for the delete                                                                             | database user |

docs/citydb-tool/import-config.md

@@ -22,6 +22,8 @@ The example below illustrates the JSON structure for the import options.
 {
   "importOptions": {
     "mode": "importAll",
+    "indexMode": "keep",
+    "failFast": false,
     "numberOfThreads": 4,
     "batchSize": 20,
     "tempDirectory": "/my/path/to/temp",
@@ -39,6 +41,8 @@ The example below illustrates the JSON structure for the import options.
 | <div style="width:130px;">Property</div>                        | Description                                                                                                                                                             | Default value |
 |-----------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
 | [`"mode"`](import.md#import-modes-and-duplicate-features)       | Import mode: `importAll`, `skipExisting`, `deleteExisting`, `terminateExisting`.                                                                                        | `importAll`   |
+| [`"indexMode"`](import.md#managing-indexes-during-import)       | Index mode: `keep`, `drop`, `dropCreate`.                                                                                                                               | `keep`        |
+| [`"failFast"`](import.md#controlling-the-import-process)        | Fail fast on errors.                                                                                                                                                    | `false`       |
 | [`"numberOfThreads"`](import.md#controlling-the-import-process) | Number of threads to use for parallel processing.                                                                                                                       |               |
 | `"batchSize"`                                                   | Number of top-level features that are committed to the database in a single transaction. A higher batch size might improve import performance but requires more memory. | 20            |
 | [`"tempDirectory"`](import.md#controlling-the-import-process)   | Store temporary files in this directory.                                                                                                                                |               |

docs/contributors/.pages

@@ -0,0 +1,8 @@
+nav:
+  - index.md
+  - tum-gis.md
+  - hft-stuttgart.md
+  - list-eco.md
+  - moss.md
+  - vcs.md
+  - acknowledgements.md

docs/contributors/acknowledgements.md

@@ -0,0 +1,36 @@
+---
+title: Acknowledgements
+subtitle:
+description:
+tags:
+  - contributions
+  - funding
+  - support
+---
+
+# Acknowledgements
+
+The 3D City Database project team gratefully acknowledges the funding and support that we have received from
+partners and projects, which have made possible the ongoing development and enhancement of the 3D City Database `v5`
+and its ecosystem of tools.
+
+## Funding and Projects
+
+The 3D City Database project has benefited from the financial support of research programs and projects at both the
+national and international levels.
+
+### CHEK - Change Toolkit for Digital Building Permits
+
+![CHEK](assets/CHEK-logo.png){align=left}
+The [Change Toolkit for Digital Building Permits project (CHEK)](https://chekdbp.eu/) is an innovation and research
+EU-funded Horizon Europe project that aims to provide an innovative toolkit supporting the digitalization of building
+permit issuing and automated compliance checks.
+
+![EU](assets/EU-logo.png){align=right}
+The 3DCityDB project has received co-funding from CHEK and the European Union’s Horizon Europe programme under Grant
+Agreement No.101058559.
+
+## Past funding and support
+
+Funding and support to previous versions of 3DCityDB and its tools are listed
+[here](https://3dcitydb-docs.readthedocs.io/en/latest/overview/acknowledgements.html){target="blank"}.