Resolving merge conflict

Author: v-alje

articles/application-gateway/application-gateway-web-app-overview.md

@@ -30,7 +30,7 @@ The ability to specify a host override is defined at the HTTP settings and can b
 2. The ability to derive the host name from the IP or FQDN of the back end pool members. HTTP settings also provide an option to pick the host name from a back end pool member's FQDN if configured with the option to derive host name from an individual back end pool member. When using end to end SSL, this host name is derived from the FQDN and is used in the SNI extension. This capability enables scenarios where a back end pool can have two or more multi-tenant PaaS services like Azure web apps and the request's host header to each member contains the host name derived from its FQDN.
 
 > [!NOTE]
-> In both of the preceding cases the settings only affect the live traffic behavior and not the health probe behavior. Custom probes already support the ability to specify a host header in the probe configuration. Custom probes now also support the ability to derive the host header behavior from the currently configured HTTP settings. This configuration can be specified by using the `PickHostNameFromback endAddress` parameter in the probe configuration. For end to end functionality to work, both the probe and the HTTP settings must be modified to reflect the correct configuration.
+> In both of the preceding cases the settings only affect the live traffic behavior and not the health probe behavior. Custom probes already support the ability to specify a host header in the probe configuration. Custom probes now also support the ability to derive the host header behavior from the currently configured HTTP settings. This configuration can be specified by using the `PickHostNameFromBackendHttpSettings` parameter in the probe configuration. For end to end functionality to work, both the probe and the HTTP settings must be modified to reflect the correct configuration.
 
 With this capability, customers specify the options in the HTTP settings and custom probes to the appropriate configuration. This setting is then tied to a listener and a back end pool by using a rule.
 

articles/azure-stack/azure-stack-pki-certs.md

@@ -33,6 +33,8 @@ Azure Stack has a public infrastructure network using externally accessible publ
 ## Certificate requirements
 The following list describes the certificate requirements that are needed to deploy Azure Stack: 
 - Certificates must be issued from either an internal Certificate Authority or a Public Certificate Authority. If a public certificate authority is used, it must be included in the base operating system image as part of the Microsoft Trusted Root Authority Program. You can find the full list here: https://gallery.technet.microsoft.com/Trusted-Root-Certificate-123665ca 
+- When rotating certificates, certificates must be either issued from the same internal certificate authority used to sign certificates provided at deployment or any public certificate authority from above
+- The use of self-signed certificates are not supported
 - The certificate can be a single wild card certificate covering all name spaces in the Subject Alternative Name (SAN) field. Alternatively, you can use individual certificates using wild cards for endpoints such as acs and Key Vault where they are required. 
 - The certificate signature algorithm cannot be SHA1, as it must be stronger. 
 - The certificate format must be PFX, as both the public and private keys are required for Azure Stack installation. 
@@ -42,6 +44,9 @@ The following list describes the certificate requirements that are needed to dep
 - The passwords to all certificate pfx files must be the same at the time of deployment
 - Ensure that the Subject Names and Subject Alternative Names of all certificates match the specifications described in this article to avoid failed deployments.
 
+> [!NOTE]
+> Self Signed certificates are not supported.
+
 > [!NOTE]
 > The presence of Intermediary Certificate Authorities in a certificate's chain-of-trusts IS supported. 
 

articles/sql-database/sql-database-resource-limits.md

@@ -109,7 +109,7 @@ You can increase or decrease the resources available to an elastic pool based on
 | Maximum | Value |
 | :--- | :--- |
 | Databases per server | 5000 |
-| Number of servers per subscription per region | 21 |
+| Number of servers per subscription per region | 20 |
 |||
 
 > [!IMPORTANT]