Merge branch 'mendix:development' into ufc/max-retrieve-size-runtime-setting

Author: WimJongeneel

content/en/docs/apidocs-mxsdk/apidocs/deployment/deploy-api-1.md

@@ -399,11 +399,11 @@ An object with the following key-value pairs:
 
 | HTTP Status | Error code | Description |
 | --- | --- | --- |
+| 200 | ALREADY_STARTED | Cannot start app. App is already running. |
 | 400 | INVALID_APPID | Invalid AppId |
 | 404 | APP_NOT_FOUND | App not found |
 | 500 | NO_MDA_HAS_BEEN_DEPLOYED | Cannot start app. There is no MDA deployed. |
 | 500 | APP_ALREADY_HAS_A_STARTING_JOB | Cannot start app. There is already a starting job id found. |
-| 500 | ALREADY_STARTED | Cannot start app. App is already running. |
 
 ##### Example Output
 

content/en/docs/apidocs-mxsdk/mxsdk/sdk-howtos/creating-the-domain-model.md

@@ -68,7 +68,7 @@ invoice.location = { x: 400, y: 100 };
 
 *Studio Pro Guide*
 
-* [Domain Model](/refguide/domain-model/)
+* [Data in the Domain Model](/refguide/domain-model/)
 * [Entities](/refguide/entities/)
 
 Metamodel reference guide

content/en/docs/appstore/use-content/platform-supported-content/modules/SAML/_index.md

@@ -1,6 +1,7 @@
 ---
 title: "Advanced configuration for SAML"
 url: /appstore/modules/saml/advanced-configuration
+linktitle: "SAML Advanced Configuration"
 weight: 20
 description: "Describes the advanced configuration for the SAML module"
 #If moving or renaming this doc file, implement a temporary redirect and let the respective team know they should update the URL in the product. See Mapping to Products for more details.
@@ -10,39 +11,41 @@ description: "Describes the advanced configuration for the SAML module"
 
 This document outlines the advanced configurations for the SAML module. For basic configuration and usage, refer to the [SAML](/appstore/modules/saml/) documentation.
 
-### Multi-tenant Behavior
+### Multitenant Behavior
 
 The resource folder contains a file called *SAMLConfig.properties*. In this file, you can optionally override advanced settings from the SAML module. Usage of this file is optional. When the file does not exist or you do not specify a setting, the module will use its default behavior.
 This file contains the documented properties, and example lines show the default values of these options.
-With these settings, you can configure the behavior of this module and improve the multi-tenant behavior of your application. For plain SAML authentication, it is best to leave this file unchanged.
+With these settings, you can configure the behavior of this module and improve the multitenant behavior of your application. For plain SAML authentication, it is best to leave this file unchanged.
+
+If you are using a custom URL, see [How Do I Get my SAML Metadata or CommunityCommons.GetApplicationUrl to Use the Custom URL?](/developerportal/deploy/custom-domains/#use-custom-url) in the *Custom Domains* documentation.
 
 ### Use a Certificate Issued by a Certificate Authority {#use-ca}
 
-By default the SAML SSO module will use self-signed certificates. It is, however, also possible to use certificates issued by a certificate authority (CA).
+By default, the SAML SSO module will use self-signed certificates. It is, however, also possible to use certificates issued by a certificate authority (CA).
 
 SAML SSO supports 2 file formats:
 
-* a PKCS 12 file, which typically has extension .pfx or .p12.
+* a PKCS 12 file, which typically has an extension .pfx or .p12.
 * a jks file.
 
-To use a CA-certificate, upload it as your key store file as described in [Managing the Keys and Key Store](/appstore/modules/saml/idp-attributes/#keystore).
+To use a CA certificate, upload it as your key store file as described in [Managing the Keys and Key Store](/appstore/modules/saml/idp-attributes/#keystore).
 Remember to do the following:
 
-* set the certificate password in the `KeystorePassword` constant of your app to be able to read the contents of the uploaded key store.
-* use an alias for the certificate — this must be the name parameter that is provided when creating the certificate you are uploading. If the values do not match, the SAML module will fall back to using a self-signed certificate instead.
-* the value of the configured SP EntityID must match the alias that is included in the uploaded key store.
+* Set the certificate password in the `KeystorePassword` constant of your app to be able to read the contents of the uploaded key store.
+* Use an alias for the certificate — this must be the name parameter that is provided when creating the certificate you are uploading. If the values do not match, the SAML module will fall back to using a self-signed certificate instead.
+* The value of the configured SP EntityID must match the alias that is included in the uploaded key store.
 
 ### Customizing the Login Page
 
-Mendix runtime/system module comes with a default login page. When using SAML with a single IdP, this page is not required.
+The Mendix runtime/system module comes with a default login page. When using SAML with a single IdP, this page is not required.
 You need to customize this login page when end-users have different ways of login:
 
 1. If you want to use both Mendix (local) login and SSO login:
 
     1. Go to the **App** > **Show App Directory in Explorer** > **theme/web** folder (for Mendix versions below 9.0.0, this is the **theme** folder).
     2. Rename `login.html` to `login-without-sso.html`.
     3. Rename `login-with-mendixsso-button.html` to `login.html`.
-    4. Open login.html, update the **href** to `/SSO`, and give a button name
+    4. Open login.html, update the **href** to `/SSO`, and give a button name.
 
     Your app is now configured to use Mendix SSO login.
 2. If you want to connect your app with multiple IdPs and the end-user of your app needs to select the IdP to use for login.
@@ -53,11 +56,11 @@ You need to customize this login page when end-users have different ways of logi
 
 ### Custom Settings
 
-The resources folder contains the *SAMLConfig.properties* file, and through this file, advanced settings can be configured for the module. This file contains the settings along with documentation on the settings. Through this file, it is possible to alter the URLs used as well as how the application behaves in a multi-tenant environment. The file also specifies all the default values and behavior in more detail.
+The resources folder contains the *SAMLConfig.properties* file, and through this file, advanced settings can be configured for the module. This file contains the settings along with documentation on the settings. Through this file, it is possible to alter the URLs used as well as how the application behaves in a multitenant environment. The file also specifies all the default values and behavior in more detail.
 
 If you are using a custom URL, see [How Do I Get my SAML Metadata or CommunityCommons.GetApplicationUrl to Use the Custom URL?](/developerportal/deploy/custom-domains/#use-custom-url) in the *Custom Domains* documentation.
 
 ## Read More
 
 * [OIDC SSO](/appstore/modules/oidc/)
-* [Reference Guide for SAML IdP Configuration](/appstore/modules/saml/idp-attributes/)
+* [Reference Guide for SAML IdP Configuration](/appstore/modules/saml/idp-attributes/)