Merge branch 'mendix:development' into development

Author: ahmed-negm

content/en/docs/control-center/company/company-brand.md

@@ -3,7 +3,7 @@ title: "Company Brand"
 linktitle: "Brand"
 url: /control-center/company-brand/
 description: "Describes the Brand page in the Mendix Control Center."
-weight: 30
+weight: 40
 ---
 
 ## Introduction

content/en/docs/control-center/company/company-onboarding.md

@@ -2,7 +2,7 @@
 title: "Company Onboarding"
 url: /control-center/company-onboarding/
 description: "Describes the Company Onboarding page in the Mendix Control Center."
-weight: 40
+weight: 50
 ---
 
 ## Introduction

content/en/docs/control-center/company/company-settings.md

@@ -8,17 +8,13 @@ no_list: list
 
 ## Introduction
 
-The **Company Settings** page in Control Center allows you to change company details, company email domains, and security contact. Moreover, you can view and add Mendix Admins of your company.
+The **Company Settings** page in Control Center allows you to change company details, company email domains, and security contact.
 
-## General Settings
-
-On the **General Settings** tab of this page, you can manage your company details, company email domains, and security contact.
-
-### Company Details
+## Company Details
 
 Under **Company Details**, you can edit your **Company Name** and **Description**.
 
-### Company Email Domains {#company-email-domains}
+## Company Email Domains {#company-email-domains}
 
 {{% alert color="warning" %}}Once you add an email domain, it is permanently added to your company and cannot be removed anymore. This comes into effect as soon as a user creates a Mendix account with this email domain, whether the Mendix account is active or not.{{% /alert %}}
 
@@ -30,14 +26,14 @@ To export all the email domains, use the **Export to Excel** button.
 
 {{< figure src="/attachments/control-center/company/company-settings/company-email-domains.png" width="650px" class="no-border" >}}
 
-#### Merging Companies
+### Merging Companies
 
 In certain scenarios, you may want to ask Mendix to merge two companies into one on the Mendix Platform, such as when your company purchases another company which also uses the Mendix Platform. This can be done, but the action is irreversible. After the companies are merged, all users and their applications from both companies are consolidated under the same company.
 
 Once user accounts are transferred to the new company, users retain access to private Marketplace content, as this content is also transferred. They can still download previously published private components after the transfer.    
 However, content is removed from the original organization’s content groups. Users need to recreate these content groups within the new organization to manage the content as before.
 
-### Security Contact {#security-contact}
+## Security Contact {#security-contact}
 
 Under **Security Contact**, you can provide a specific security contact who is informed if there are critical security issues with the Mendix Platform and platform-supported Marketplace components. Mendix strongly recommends applying a team email address or a functional mailbox instead of a personal individual email address.
 
@@ -52,17 +48,3 @@ Click **Edit** to edit the Security Contact's **Name**.
 Click **Delete** to delete the existing Security Contact. This is the first step in changing a validated Security Contact. After you make the deletion, you can add the new Security Contact.
 
 For more information on security issues, see [Security Advisories](/releasenotes/security-advisories/).
-
-## Mendix Admins{#mendix-admins}
-
-The **Mendix Admins** tab lists all the current Mendix Admins in your company. A Mendix Admin will normally be someone in the IT department of your company, and they will have full access to Control Center to perform all available tasks. 
-
-To add a new admin, click **Add Mendix Admin**. To remove an admin, hover over their name in the list and click **Remove**.
-
-{{< figure src="/attachments/control-center/company/company-settings/admin.jpg" class="no-border" >}}
-
-{{% alert color="info" %}}
-It is not possible to remove yourself as a Mendix Admin.
-{{% /alert %}}
-
-If the **Add Mendix Admin** button is not shown, your company is using a user group in your IdP to assign Mendix Admins. For more information, see [IdP-managed Mendix Admins](/control-center/security-settings/#idp-managed-mendix-admins).

content/en/docs/control-center/company/mendix-admins.md

@@ -0,0 +1,23 @@
+---
+title: "Mendix Admins"
+url: /control-center/mendix-admins-page/
+description: "Describes the Mendix Admins page in the Mendix Control Center."
+weight: 30
+aliases:
+    - /control-center/company-settings/#mendix-admins
+---
+
+## Introduction
+
+The **Mendix Admins** page lists all the current Mendix Admins in your company. A Mendix Admin is normally someone in the IT department of your company, and they have full access to Control Center to perform all available tasks. 
+
+To add a new admin, click **Add Mendix Admin**.     
+To remove an admin, hover over their name in the list, then click **Remove**.
+
+{{< figure src="/attachments/control-center/company/mendix-admins/mendix-admins.png" >}}
+
+{{% alert color="info" %}}
+It is not possible to remove yourself as a Mendix Admin.
+{{% /alert %}}
+
+If the **Add Mendix Admin** button is not displayed, your company is using a user group in your IdP to assign Mendix Admins. For more information, refer to [IdP-managed Mendix Admins](/control-center/security-settings/#idp-managed-mendix-admins).

content/en/docs/control-center/entitlements/cloud-tokens.md

@@ -92,7 +92,7 @@ These tables show how many Mendix Cloud Tokens each CRP requires:
 {{% alert color="info" %}} 
 
 * You can no longer purchase legacy CRPs. You can now only purchase and provision Standard, Premium, and Premium Plus CRPs. Any legacy CRPs that you have already purchased will be converted into Mendix Cloud Tokens if they are deprovisioned. This will use the rate specified in the previous tables, and the Mendix Cloud Tokens will be added to your Token pool.
-* Self-service cloud consumption capabilities are exclusively available for Standard, Premium, and Premium Plus CRPs. If you are using a legacy CRP, you may experience consumption inaccuracies in the self-service tool. For access to the latest capabilities, Mendix recommends contacting your customer success manager to transition to a Standard, Premium, or Premium Plus CRP.
+* Self-service cloud consumption capabilities are exclusively available for Standard, Premium, and Premium Plus CRPs. If you are using a legacy CRP in combination with fallback, you may experience consumption inaccuracies in the self-service tool. For access to the latest capabilities, Mendix recommends contacting your customer success manager to transition to a Standard, Premium, or Premium Plus CRP.
 
 {{% /alert %}}
 
@@ -103,4 +103,4 @@ These tables show how many Mendix Cloud Tokens each CRP requires:
 * You buy Tokens in advance, and can use them to obtain CRPs.
 * If you no longer need those resources, you can reuse the Token to obtain other CRPs, or keep it to be used later.
 * Mendix Cloud Tokens expire on the end date of their associated contract. To ensure continued access, please renew your contract before it expires.
-* Mendix Cloud Token balances might be incorrect if you still use a legacy CRP.
+* Mendix Cloud Token balances might be incorrect if you still use a legacy CRP with fallback.

content/en/docs/control-center/people/members.md

@@ -32,7 +32,7 @@ When you select members in the list on this tab, a context menu is displayed, pr
 As a Mendix Admin:    
 
 * You cannot deactivate yourself.
-* You can remove Mendix Admins from the **Mendix Admins** tab of the Control Center [Company Settings](/control-center/company-settings/#mendix-admins) window.    
+* You can remove Mendix Admins from the [Mendix Admins](/control-center/mendix-admins-page/) page in the Control Center.    
   You cannot remove yourself as a Mendix Admin.
 * You can deactivate other users, but you cannot delete them.    
   A user can delete their own account from the [User Settings](/mendix-profile/user-settings/#deleting-an-account) window of their Mendix profile.

content/en/docs/control-center/security/security.md

@@ -92,7 +92,7 @@ Note that enabling this feature on the Mendix platform may affect your existing
 * If a user logs in and is not a member of the Mendix-admin group in your IdP, Mendix will revoke their Mendix Admin role.
 * If a user logs in and is a member of the Mendix-admin group in your IdP, Mendix will either assign the Mendix Admin role or retain the existing assignment.
 
-As a result, the overview of [Mendix Admins](/control-center/company-settings/#mendix-admins) will gradually synchronize with the Mendix-admin group in your IdP.
+As a result, the overview of [Mendix Admins](/control-center/mendix-admins-page/) will gradually synchronize with the Mendix-admin group in your IdP.
 
 #### Onboarding Prerequisites
 

content/en/docs/deployment/general/salt.md

@@ -3,6 +3,8 @@ title: "Siemens Advanced License Technology"
 url: /developerportal/deploy/salt/
 weight: 90
 description: "This guide explains how to use Siemens Advaned License Technology (SALT) with Mendix"
+aliases:
+    - /deployment/salt/
 #To update these screenshots, you can log in with credentials detailed in How to Update Screenshots Using Team Apps.
 ---
 
@@ -14,23 +16,39 @@ SALT-based licenses are issued only to selected customers. If you received an em
 
 Siemens Advanced License Technology (SALT) is a Siemens service used to validate software licenses. This guide outlines the steps to deploy a Mendix application using a SALT-based license.
 
-## Obtaining the SALT-based License
+## Limitations
+
+This section explains the limitations for using SALT-based licenses.
+
+### Version Compatibility
+
+SALT Licenses can only be used with the following Mendix versions:
+
+* **Mendix 10**: 10.24.4 and above
+* **Mendix 11**: 11.2.0 and above
 
-Upon purchase, your SALT-based license file is sent to you by email. Keep in mind the following limitations when using a SALT-based license:
+Each SALT license is bound to a specific major version of Mendix and cannot be used in newer major versions.
 
-* Version compatibility - SALT licenses are supported only for Mendix version 10.24 and newer.
-* Version binding - Each SALT license is bound to a specific major version of Mendix and cannot be used in newer major versions.
-* Cloud restrictions - SALT licenses are not supported for Mendix Cloud environments.
+### Deployment Restrictions
+
+Mendix applications using a SALT License cannot be deployed to the Mendix Public Cloud.
+
+## Obtaining the SALT-based License
+
+Upon purchase, your SALT-based license file is sent to you by email.
 
 ## Installing the Siemens License Server
 
-The Siemens License Server (SLS) is required to validate SALT-based licenses. This server must be installed within the same environment where your Mendix applications are deployed. All Mendix applications which use a SALT license must be able to access the license server. The license server must also have access to your SALT license file, which is used to validate the Mendix application licenses at runtime.
+The Siemens License Server (SLS) is required to validate SALT-based licenses. For proper license validation, ensure you meet the following requirements:
+
+* The SLS must be installed within the same environment as your deployed Mendix applications
+* All Mendix applications using a SALT license must be able to access the SLS
+* The license server must have access to your SALT license file in order to validate the Mendix application licenses at runtime.
 
-To install the Siemens License Server, perform the following steps:
+For detailed instructions on how to install the Siemens License Server and configure your license file, refer to the following Siemens support resources:
 
-1. Download the Siemens License Server from the [Siemens Support Portal](https://support.sw.siemens.com/en-US/product/1586485382).
-2. To install the Siemens License Server, follow the process outlined in [this video](https://support.sw.siemens.com/en-US/knowledge-base/MG616411).
-3. When prompted, provide your license file. To download the license file, follow this [guide from Siemens](https://support.sw.siemens.com/en-US/product/1586485382/knowledge-base/MG612613).
+* [Siemens License Server](https://support.sw.siemens.com/en-US/product/1586485382)
+* [Getting Started with Siemens Advanced Licensing Technology (SALT) and the Siemens License Server (SLS)](https://support.sw.siemens.com/en-US/product/1586485382/knowledge-base/MG612613)
 
 ## Configuring your Mendix Application
 
@@ -43,4 +61,4 @@ License.SaltLicenseLocation = port@host
 * `port`: The port number specified during the license server installation.
 * `host`: The hostname or IP address of the machine running the license server.
 
-After you configure the runtime setting and starting the Mendix application, the application connects to the Siemens License Server to validate the SALT license.
+After you configure the runtime setting and start the Mendix application, the application connects to the Siemens License Server to validate the SALT license.

content/en/docs/deployment/mendix-cloud-deploy/behavior-of-app.md

@@ -47,3 +47,10 @@ Apps running in Mendix Cloud are subject to certain limitations. These behaviors
 ## Instance Restarts
 
 * The platform automatically restarts application instances during routine platform updates, which can occur several times a week. If your application logs indicate a series of instance restarts for no apparent reason, the restarts are probably due to platform updates. This is normal and OK! The platform usually starts a new instance of your application before stopping the old one, thus ensuring that there is no downtime. You can verify this in your application logs.
+
+## WebSocket Connections
+
+* Mendix Cloud supports long-running WebSocket connections. However, multiple network components are involved in the WebSocket connections between your Mendix Cloud application and the client. These components can time out or the networks can fail, causing connections to drop.
+Therefore, do not assume that an established WebSocket connection will remain open indefinitely. To ensure connection stability and prevent unexpected disconnections:
+    * Enable periodic keepalive checks (for example, every 25–30 seconds). This ensures the connection remains active and prevents Network Address Translators (NATs) and firewalls from dropping long-idle tunnels.
+    * Implement robust reconnection logic to gracefully handle connectivity loss and automatically reestablish dropped connections.

content/en/docs/deployment/mendix-cloud-deploy/change-plan.md

@@ -58,7 +58,7 @@ To change an environment's plan, follow these steps:
     * To compare plans, click **Show Comparison**. This opens a comparison page where the Technical Contact can evaluate the current plan against other available options. The last selected comparison will populate the form. Alternatively, select a new plan directly from the **Plan** dropdown without comparing.
     * Enter a reason for plan change.
 
-9. All submitted plan change requests appear in the [Control Center](/control-center/approval-requests/) for the [Mendix Admin](/control-center/company-settings/#mendix-admins) review. To view the list of approvers, click **Mendix Admin** at the bottom of the **New Plan** form. When ready, click **Submit Request** to submit your plan change request. 
+9. All submitted plan change requests appear in the [Control Center](/control-center/approval-requests/) for the [Mendix Admin](/control-center/mendix-admins-page/) review. To view the list of approvers, click **Mendix Admin** at the bottom of the **New Plan** form. When ready, click **Submit Request** to submit your plan change request. 
 
     {{% alert color="info" %}}Approval from a Mendix Admin only authorizes the plan change but does not immediately apply it. As a result, the environment will remain on its current plan until the new plan is [approved](/control-center/approval-requests/#approving-a-request), [scheduled](#scheduling-a-plan-change) and [successfully applied](#after-schedule).
     {{% /alert %}}