Merge branch 'mes-4182-play-deploy-process-applications' of https://g…

…ithub.com/camunda/camunda-docs into mes-4182-play-deploy-process-applications

docs/components/modeler/bpmn/inclusive-gateways/inclusive-gateways.md

@@ -4,13 +4,7 @@ title: "Inclusive gateway"
 description: "An inclusive gateway (or OR-gateway) allows you to make multiple decisions based on data."
 ---
 
-:::note
-
-Currently, Camunda 8 only supports the diverging (i.e. splitting, forking) inclusive gateway. It does not yet support the converging (i.e. merging, joining) inclusive gateway. A combination of parallel and exclusive gateways can be used as an alternative way to merge the flows.
-
-:::
-
-The inclusive gateway (or OR-gateway) allows for making multiple decisions based on data (i.e. on process instance variables).
+The inclusive gateway (or OR-gateway) allows for making multiple decisions based on data, or process instance variables. Inclusive gateways can be diverging (a sequence flow is split into multiple paths) or converging (split paths are merged before continuing).
 
 ![A process model to prepare lunch at lunchtime can use an inclusive gateway to decide which steps to take to prepare the different lunch components, e.g. cook pasta,stir-fry steak, prepare salad, or any combination of these.](assets/inclusive-gateway.png)
 
@@ -34,6 +28,15 @@ For example: No courses selected then the default flow is taken.
 
 ![An inclusive gateway has decided to take the step to prepare salad as the default because none of the conditions were fulfilled.](assets/inclusive-gateway-default.png)
 
+A converging inclusive gateway (also known as a merging or joining inclusive gateway) merges incoming paths before the sequence flow continues. A converging gateway is completed and merges incoming sequence flows if one of the following conditions is met:
+
+- All incoming sequence flows have been taken at least once.
+- No path exists from any active flow node to the inclusive gateway (excluding incoming paths to the inclusive gateway that have already been taken).
+
+For example: Once all selected courses are complete, the table can be cleared.
+
+![An inclusive converging gateway waits until all incoming, executed sequence flows are completed before cleaning the table.](assets/inclusive-gateway-join.png)
+
 ## Conditions
 
 A `conditionExpression` defines when a flow is taken. It is a [boolean expression](/components/modeler/feel/language-guide/feel-boolean-expressions.md) that can access the process instance variables and compare them with literals or other variables. The condition is fulfilled when the expression returns `true`.

docs/components/modeler/web-modeler/launch-web-modeler.md

@@ -14,7 +14,7 @@ To launch Web Modeler, follow the steps below:
 2. Select **Create new project** to create a new project and store diagrams.
  ![web modeler empty home](img/web-modeler-new-user-home.png)
 3. Name your diagram. You can go back and change the name any time by clicking on the project name and **Edit name**.
-4. Select **Browse blueprints** to view blueprints for various use cases as a starting point for your first diagram. Open these blueprints by selecting **Use Blueprint**. Alternatively, click **Create new > BPMN diagram** to create a blank BPMN diagrams.
+4. Select **Browse blueprints** to view blueprints for various use cases as a starting point for your first diagram. Open these blueprints by selecting **Use Blueprint**. Alternatively, click **Create new > BPMN diagram** to create a blank BPMN diagram.
  ![web modeler blueprint browsing](img/web-modeler-blueprint.png)
 5. While browsing blueprints, you can also open the details of a specific blueprint by selecting **More details**. This opens a new tab in the [Camunda Marketplace](/components/modeler/web-modeler/camunda-marketplace.md). Here, you can have a closer look at the diagram, and open it in SaaS or Self-Managed.
 

docs/reference/announcements.md

@@ -118,7 +118,7 @@ The separated Ingress Helm configuration for Camunda 8 Self-Managed has been dep
 
 #### Helm chart - `global.multiregion.installationType` deprecation
 
-The `global.multiregion.installationType` option is used in failover and failback scenarios. This option in the Helm chart has been deprecated in 8.6, and will be removed from the Helm chart in 8.7. `global.multiregion.installationType` was replaced with a set of API endpoints called while following the ([dual-region operational procdure](/self-managed/operational-guides/multi-region/dual-region-ops.md))
+The `global.multiregion.installationType` option is used in failover and failback scenarios. This option in the Helm chart has been deprecated in 8.6, and will be removed from the Helm chart in 8.7. `global.multiregion.installationType` was replaced with a set of API endpoints called while following the ([dual-region operational procedure](/self-managed/operational-guides/multi-region/dual-region-ops.md))
 
 #### Helm chart - Elasticsearch nodes number
 
@@ -140,6 +140,31 @@ Starting with Camunda 8.6, the Camunda Optimize artifact has been split into two
 
 Make sure to update your Docker configurations accordingly to ensure compatibility.
 
+### New base path for Operate and Tasklist web applications
+
+We are introducing a new base path for both the Operate and Tasklist **web applications**. This change applies to both Self-Managed and SaaS environments.
+
+#### For Self-Managed
+
+- The new base path for Operate is `/operate`, and for Tasklist, it is `/tasklist`.
+- For a [Separated Ingress](/self-managed/setup/guides/ingress-setup.md?ingress=separated) configuration:
+ - for Operate, the full URL will be `{operate-host}/operate`. Any calls to `{operate-host}` will automatically be redirected to `{operate-host}/operate`
+ - for Tasklist, the full URL will be `{tasklist-host}/tasklist`. Any calls to `{tasklist-host}` will automatically be redirected to `{tasklist-host}/tasklist`.
+- For a [Combined Ingress](/self-managed/setup/guides/ingress-setup.md?ingress=combined) configuration:
+ - for Operate, the full URL will be `{common-host}/{operate-contextPath}/operate`. Any calls to `{common-host}/{operate-contextPath}` will be automatically redirected to `{common-host}/{operate-contextPath}/operate`.
+ - for Tasklist, the full URL will be `{common-host}/{tasklist-contextPath}/tasklist`. Any calls to `{common-host}/{tasklist-contextPath}` will be automatically redirected to `{common-host}/{tasklist-contextPath}/tasklist`.
+
+#### For SaaS
+
+- The full URL for Operate is now structured as `https://{region}.operate.camunda.io/{clusterId}/operate`.
+- The full URL for Tasklist is now structured as `https://{region}.tasklist.camunda.io/{clusterId}/tasklist`.
+- Any calls to `https://{region}.operate.camunda.io/{clusterId}` will be redirected to `https://{region}.operate.camunda.io/{clusterId}/operate`.
+- Any calls to `https://{region}.tasklist.camunda.io/{clusterId}` will be redirected to `https://{region}.tasklist.camunda.io/{clusterId}/tasklist`.
+
+:::note
+**API URLs** for both Operate and Tasklist remain **unchanged**.
+:::
+
 ## Camunda 8.5
 
 Release date: 9th of April 2024

docs/reference/release-notes/860.md

@@ -82,14 +82,14 @@ When creating a process for a local (non-English) region, you can design forms i
 
 Real-time feedback is added for message correlation for messages with `ttl=o`, enabling external systems to immediately determine the success or failure of message correlation. This enhancement allows external systems to take prompt and appropriate actions based on the correlation result, improving overall efficiency and reducing response times.
 
-### Public Marketplace Blueprint support for HTO & DMN <span class="badge badge--long" title="This feature affects Web Modeler">Web Modeler</span> <span class="badge badge--long" title="This feature affects Marketplace">Marketplace</span>
+### Public Marketplace blueprint support for HTO & DMN <span class="badge badge--long" title="This feature affects Web Modeler">Web Modeler</span> <span class="badge badge--long" title="This feature affects Marketplace">Marketplace</span>
 
 <!-- https://github.com/camunda/product-hub/issues/2333 -->
 
-Web Modeler now supports DMN models and Forms inside [Marketplace Blueprints](https://marketplace.camunda.com/en-US/listing?pl=3082&cat=107793&locale=en-US).
+Web Modeler now supports DMN models and Forms inside [Marketplace blueprints](https://marketplace.camunda.com/en-US/listing?pl=3082&cat=107793&locale=en-US).
 
-- These Blueprints can now showcase even more ways to implement common business processes, and illustrate best practices for process modeling and implementation.
-- To learn more about browsing Marketplace Blueprints, see [browse marketplace blueprints](/components/modeler/web-modeler/camunda-marketplace.md#browse-marketplace-blueprints).
+- These blueprints can now showcase even more ways to implement common business processes, and illustrate best practices for process modeling and implementation.
+- To learn more about browsing Marketplace blueprints, see [browse marketplace blueprints](/components/modeler/web-modeler/camunda-marketplace.md#browse-marketplace-blueprints).
 
 ### Share Connectors within the project and organization in Self-Managed <span class="badge badge--long" title="This feature affects Self-Managed">Self-Managed</span>