Merge branch 'main' into patch-59

Author: cwatson-cat

articles/app-service/app-service-web-configure-tls-mutual-auth.md

@@ -130,7 +130,7 @@ public class Startup
     public void ConfigureServices(IServiceCollection services)
     {
         services.AddControllersWithViews();
-        // Configure the application to use the protocol and client ip address forwared by the frontend load balancer
+        // Configure the application to use the protocol and client ip address forwarded by the frontend load balancer
         services.Configure<ForwardedHeadersOptions>(options =>
         {
             options.ForwardedHeaders =
@@ -295,7 +295,7 @@ public class Startup
 
                 if (!foundIssuerCN || !foundIssuerO) return false;
 
-                // 4. Check thumprint of certificate
+                // 4. Check thumbprint of certificate
                 if (String.Compare(certificate.Thumbprint.Trim().ToUpper(), "30757A2E831977D8BD9C8496E4C99AB26CB9622B") != 0) return false;
 
                 return true;

articles/app-service/configure-basic-auth-disable.md

@@ -53,7 +53,7 @@ az resource update --resource-group <resource-group> --name scm --namespace Micr
 
 -----
 
-To confirm that FTP access is blocked, try [connecting to your app using FTP/S](deploy-ftp.md). You should get a `401 Unauthenticted` message.
+To confirm that FTP access is blocked, try [connecting to your app using FTP/S](deploy-ftp.md). You should get a `401 Unauthenticated` message.
 
 To confirm that Git access is blocked, try [local Git deployment](deploy-local-git.md). You should get an `Authentication failed` message.
 
@@ -80,7 +80,7 @@ The following table shows how various deployment methods behave when basic authe
 
 ## Create a custom role with no permissions for basic authentication
 
-To prevent a lower-priveldged user from enabling basic authentication for any app, you can create a custom role and assign the user to the role.
+To prevent a lower-privileged user from enabling basic authentication for any app, you can create a custom role and assign the user to the role.
 
 ### [Azure portal](#tab/portal)
 

articles/app-service/configure-error-pages.md

@@ -18,7 +18,7 @@ In this tutorial, we're adding a custom 403 error page to our web app hosted on
 - an html file under 10 kb in size
 
 ## Upload an error page
-For this example, we're uploading and testing a 403 error page to present to the user. Name your html file to match the error code (for example, `403.hmtl`). Once you have your html file prepared, you can upload it to your web app. In the configuration blade, you should see an **Error pages (preview)** tab. Click on this tab to view the error page options. If the options are greyed out, you need to upgrade to at least a Premium SKU to use this feature.
+For this example, we're uploading and testing a 403 error page to present to the user. Name your html file to match the error code (for example, `403.html`). Once you have your html file prepared, you can upload it to your web app. In the configuration blade, you should see an **Error pages (preview)** tab. Click on this tab to view the error page options. If the options are greyed out, you need to upgrade to at least a Premium SKU to use this feature.
 
 Select the error code that you'd like to upload an error page for and click **Edit**. On the next screen, click the folder icon to select your html file. The file must be in html format and within the 10 kb size limit. Find your .html file and click on the **Upload** button at the bottom of the screen. Notice the Status in the table updates from Not Configured to Configured. Then click **Save** to complete the upload. 
 

articles/app-service/configure-language-java-data-sources.md

@@ -146,7 +146,7 @@ The following example XSL file adds a new connector node to the Tomcat server.xm
     </xsl:copy>
   </xsl:template>
 
-  <!-- Add the new connector after the last existing Connnector if there's one -->
+  <!-- Add the new connector after the last existing Connector if there's one -->
   <xsl:template match="Connector[last()]" mode="insertConnector">
     <xsl:call-template name="Copy" />
 
@@ -317,7 +317,7 @@ Add an XSL transform file called *configure.ps1* to the *%HOME%_\site* directory
       </xsl:copy>
     </xsl:template>
   
-    <!-- Add the new connector after the last existing Connnector if there's one -->
+    <!-- Add the new connector after the last existing Connector if there's one -->
     <xsl:template match="Connector[last()]" mode="insertConnector">
       <xsl:call-template name="Copy" />
   

articles/app-service/configure-language-java-deploy-run.md

@@ -593,14 +593,14 @@ The latest versions of Tomcat have server.xml (8.5.58 and 9.0.38 onward). Older
  ```
 * `maxHttpHeaderSize` is set to `16384`
 * `URIEncoding` is set to `UTF-8`
-* `conectionTimeout` is set to `WEBSITE_TOMCAT_CONNECTION_TIMEOUT`, which defaults to `240000`
+* `connectionTimeout` is set to `WEBSITE_TOMCAT_CONNECTION_TIMEOUT`, which defaults to `240000`
 * `maxThreads` is set to `WEBSITE_CATALINA_MAXTHREADS`, which defaults to `200`
 * `maxConnections` is set to `WEBSITE_CATALINA_MAXCONNECTIONS`, which defaults to `10000`
 
 > [!NOTE]
 > The connectionTimeout, maxThreads and maxConnections settings can be tuned with app settings
 
-Following are example CLI commands that you might use to alter the values of conectionTimeout, maxThreads, or maxConnections:
+Following are example CLI commands that you might use to alter the values of connectionTimeout, maxThreads, or maxConnections:
 
 ```azurecli-interactive
 az webapp config appsettings set --resource-group myResourceGroup --name myApp --settings WEBSITE_TOMCAT_CONNECTION_TIMEOUT=120000

articles/app-service/configure-ssl-app-service-certificate.md

@@ -209,7 +209,7 @@ The downloaded PFX file is a raw PKCS12 file that contains both the public and p
 
 ## Use Azure Advisor for App Service certificate
 
-App Service certificate is integrated with [Azure Advisor](/azure/advisor/advisor-overview) to provide reliability recommendations for when your certificate requires domain verification. You must verify domain ownership for your certificate during renew, auto-renew, or rekey process if you haven't verified the domain in the last 395 days. To ensure you do not miss any certificate that requires verification or risk any certificate from expiring, you can utlize Azure Advisor to view and set up alerts for App Service certificate.
+App Service certificate is integrated with [Azure Advisor](/azure/advisor/advisor-overview) to provide reliability recommendations for when your certificate requires domain verification. You must verify domain ownership for your certificate during renew, auto-renew, or rekey process if you haven't verified the domain in the last 395 days. To ensure you do not miss any certificate that requires verification or risk any certificate from expiring, you can utilize Azure Advisor to view and set up alerts for App Service certificate.
 
 ### View Advisor recommendation
 
@@ -223,7 +223,7 @@ To view Advisor recommendation for App Service certificate:
 
 ### Create Advisor Alerts
 
-You [create Azure Advisor alerts on new recommendations] using different configurations. To set up Advisor Alerts specifically for App Serivice certificate so you can get notifications when your certificate requires domain ownership validation:
+You [create Azure Advisor alerts on new recommendations] using different configurations. To set up Advisor Alerts specifically for App Service certificate so you can get notifications when your certificate requires domain ownership validation:
 
 1. Navigate to the [Azure Advisor page](https://portal.azure.com/#view/Microsoft_Azure_Expert/AdvisorMenuBlade/~/overview).
 

articles/app-service/environment/migrate.md

@@ -96,7 +96,7 @@ If your App Service Environment doesn't pass the validation checks or you try to
 |Migrate cannot be called on this ASE until the active upgrade has finished.    |App Service Environments can't be migrated during platform upgrades. You can set your [upgrade preference](how-to-upgrade-preference.md) from the Azure portal. Upgrades take 8-12 hours or longer depending on the size (number of instances/cores) of the App Service Environment.  |Wait until the upgrade finishes and then migrate.   |
 |App Service Environment management operation in progress.    |Your App Service Environment is undergoing a management operation. These operations can include activities such as deployments or upgrades. Migration is blocked until these operations are complete.   |You can migrate once these operations are complete.  |
 |Migrate is not available for this subscription.|Support needs to be engaged for migrating this App Service Environment.|Open a support case to engage support to resolve your issue.|
-|Your InteralLoadBalancingMode is not currently supported.|App Service Environments that have InternalLoadBalancingMode set to certain values can't be migrated using the migration feature at this time. The InternalLoadBalancingMode must be manually changed by the Microsoft team. |Open a support case to engage support to resolve your issue. Request an update to the InternalLoadBalancingMode to allow migration. |
+|Your InternalLoadBalancingMode is not currently supported.|App Service Environments that have InternalLoadBalancingMode set to certain values can't be migrated using the migration feature at this time. The InternalLoadBalancingMode must be manually changed by the Microsoft team. |Open a support case to engage support to resolve your issue. Request an update to the InternalLoadBalancingMode to allow migration. |
 
 ## Overview of the migration process using the in-place migration feature
 

articles/app-service/environment/side-by-side-migrate.md

@@ -117,7 +117,7 @@ If your App Service Environment doesn't pass the validation checks or you try to
 |Subscription has too many App Service Environments. Please remove some before trying to create more.|The App Service Environment [quota for your subscription](../../azure-resource-manager/management/azure-subscription-service-limits.md#app-service-limits) is met. |Remove unneeded environments or contact support to review your options.  |
 |Migrate cannot be called on this ASE until the active upgrade has finished.    |App Service Environments can't be migrated during platform upgrades. You can set your [upgrade preference](how-to-upgrade-preference.md) from the Azure portal. Upgrades take 8-12 hours or longer depending on the size (number of instances/cores) of the App Service Environment.  |Wait until the upgrade finishes and then migrate.   |
 |App Service Environment management operation in progress.    |Your App Service Environment is undergoing a management operation. These operations can include activities such as deployments or upgrades. Migration is blocked until these operations are complete.   |You can migrate once these operations are complete.  |
-|Your InteralLoadBalancingMode is not currently supported.|App Service Environments that have InternalLoadBalancingMode set to certain values can't be migrated using the migration feature at this time. The Microsoft team must manually change the InternalLoadBalancingMode. |Open a support case to engage support to resolve your issue. Request an update to the InternalLoadBalancingMode. |
+|Your InternalLoadBalancingMode is not currently supported.|App Service Environments that have InternalLoadBalancingMode set to certain values can't be migrated using the migration feature at this time. The Microsoft team must manually change the InternalLoadBalancingMode. |Open a support case to engage support to resolve your issue. Request an update to the InternalLoadBalancingMode. |
 |Full migration cannot be called before IP addresses are generated. |This error appears if you attempt to migrate before finishing the premigration steps. |Ensure you complete all premigration steps before you attempt to migrate. See the [step-by-step guide for migrating](#use-the-side-by-side-migration-feature).  |
 |Full migration cannot be called on Ase with custom dns suffix set but without an AseV3 Custom Dns Suffix Configuration configured. |Your existing App Service Environment uses a custom domain suffix. You have to configure custom domain suffix for your App Service Environment v3 during the migration process. |Configure a [custom domain suffix](./how-to-custom-domain-suffix.md). If you no longer want to use a custom domain suffix, you can remove it once the migration is complete. |
 

articles/app-service/includes/deploy-intelligent-apps/deploy-intelligent-apps-linux-dotnet-pivot.md

@@ -83,7 +83,7 @@ For Azure OpenAI, use the following settings:
 
 | Setting name| Value |
 |-|-|-|
-| `DEPOYMENT_NAME` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
+| `DEPLOYMENT_NAME` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
 | `ENDPOINT` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
 | `API_KEY` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
 | `MODEL_ID` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |

articles/app-service/includes/deploy-intelligent-apps/deploy-intelligent-apps-linux-java-pivot.md

@@ -54,7 +54,7 @@ For Azure OpenAI, use the following settings:
 
 | Setting name| Value |
 |-|-|-|
-| `DEPOYMENT_NAME` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
+| `DEPLOYMENT_NAME` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
 | `ENDPOINT` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
 | `API_KEY` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
 
@@ -78,7 +78,7 @@ For Azure OpenAI:
       Map<String, String> envVariables = System.getenv();
       String apiKey = envVariables.get("API_KEY");
       String endpoint = envVariables.get("ENDPOINT");
-      String depoymentName = envVariables.get("DEPLOYMENT_NAME");
+      String deploymentName = envVariables.get("DEPLOYMENT_NAME");
   }  
 ```