Skip to content

Commit 4bc956c

Browse files
authored
Merge pull request #291275 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 6fba004 + 04ab566 commit 4bc956c

File tree

60 files changed

+72
-72
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+72
-72
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public class Startup
130130
public void ConfigureServices(IServiceCollection services)
131131
{
132132
services.AddControllersWithViews();
133-
// Configure the application to use the protocol and client ip address forwared by the frontend load balancer
133+
// Configure the application to use the protocol and client ip address forwarded by the frontend load balancer
134134
services.Configure<ForwardedHeadersOptions>(options =>
135135
{
136136
options.ForwardedHeaders =
@@ -295,7 +295,7 @@ public class Startup
295295

296296
if (!foundIssuerCN || !foundIssuerO) return false;
297297

298-
// 4. Check thumprint of certificate
298+
// 4. Check thumbprint of certificate
299299
if (String.Compare(certificate.Thumbprint.Trim().ToUpper(), "30757A2E831977D8BD9C8496E4C99AB26CB9622B") != 0) return false;
300300

301301
return true;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ az resource update --resource-group <resource-group> --name scm --namespace Micr
5353

5454
-----
5555

56-
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.
56+
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.
5757

5858
To confirm that Git access is blocked, try [local Git deployment](deploy-local-git.md). You should get an `Authentication failed` message.
5959

@@ -80,7 +80,7 @@ The following table shows how various deployment methods behave when basic authe
8080

8181
## Create a custom role with no permissions for basic authentication
8282

83-
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.
83+
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.
8484

8585
### [Azure portal](#tab/portal)
8686

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ In this tutorial, we're adding a custom 403 error page to our web app hosted on
1818
- an html file under 10 kb in size
1919

2020
## Upload an error page
21-
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.
21+
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.
2222

2323
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.
2424

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ The following example XSL file adds a new connector node to the Tomcat server.xm
146146
</xsl:copy>
147147
</xsl:template>
148148
149-
<!-- Add the new connector after the last existing Connnector if there's one -->
149+
<!-- Add the new connector after the last existing Connector if there's one -->
150150
<xsl:template match="Connector[last()]" mode="insertConnector">
151151
<xsl:call-template name="Copy" />
152152
@@ -317,7 +317,7 @@ Add an XSL transform file called *configure.ps1* to the *%HOME%_\site* directory
317317
</xsl:copy>
318318
</xsl:template>
319319
320-
<!-- Add the new connector after the last existing Connnector if there's one -->
320+
<!-- Add the new connector after the last existing Connector if there's one -->
321321
<xsl:template match="Connector[last()]" mode="insertConnector">
322322
<xsl:call-template name="Copy" />
323323

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,14 +593,14 @@ The latest versions of Tomcat have server.xml (8.5.58 and 9.0.38 onward). Older
593593
```
594594
* `maxHttpHeaderSize` is set to `16384`
595595
* `URIEncoding` is set to `UTF-8`
596-
* `conectionTimeout` is set to `WEBSITE_TOMCAT_CONNECTION_TIMEOUT`, which defaults to `240000`
596+
* `connectionTimeout` is set to `WEBSITE_TOMCAT_CONNECTION_TIMEOUT`, which defaults to `240000`
597597
* `maxThreads` is set to `WEBSITE_CATALINA_MAXTHREADS`, which defaults to `200`
598598
* `maxConnections` is set to `WEBSITE_CATALINA_MAXCONNECTIONS`, which defaults to `10000`
599599

600600
> [!NOTE]
601601
> The connectionTimeout, maxThreads and maxConnections settings can be tuned with app settings
602602
603-
Following are example CLI commands that you might use to alter the values of conectionTimeout, maxThreads, or maxConnections:
603+
Following are example CLI commands that you might use to alter the values of connectionTimeout, maxThreads, or maxConnections:
604604

605605
```azurecli-interactive
606606
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ The downloaded PFX file is a raw PKCS12 file that contains both the public and p
209209

210210
## Use Azure Advisor for App Service certificate
211211

212-
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.
212+
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.
213213

214214
### View Advisor recommendation
215215

@@ -223,7 +223,7 @@ To view Advisor recommendation for App Service certificate:
223223

224224
### Create Advisor Alerts
225225

226-
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:
226+
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:
227227

228228
1. Navigate to the [Azure Advisor page](https://portal.azure.com/#view/Microsoft_Azure_Expert/AdvisorMenuBlade/~/overview).
229229

articles/app-service/environment/migrate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ If your App Service Environment doesn't pass the validation checks or you try to
9696
|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. |
9797
|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. |
9898
|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.|
99-
|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. |
99+
|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. |
100100

101101
## Overview of the migration process using the in-place migration feature
102102

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ If your App Service Environment doesn't pass the validation checks or you try to
117117
|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. |
118118
|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. |
119119
|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. |
120-
|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. |
120+
|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. |
121121
|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). |
122122
|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. |
123123

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ For Azure OpenAI, use the following settings:
8383

8484
| Setting name| Value |
8585
|-|-|-|
86-
| `DEPOYMENT_NAME` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
86+
| `DEPLOYMENT_NAME` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
8787
| `ENDPOINT` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
8888
| `API_KEY` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
8989
| `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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ For Azure OpenAI, use the following settings:
5454

5555
| Setting name| Value |
5656
|-|-|-|
57-
| `DEPOYMENT_NAME` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
57+
| `DEPLOYMENT_NAME` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
5858
| `ENDPOINT` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
5959
| `API_KEY` | @Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/) |
6060

@@ -78,7 +78,7 @@ For Azure OpenAI:
7878
Map<String, String> envVariables = System.getenv();
7979
String apiKey = envVariables.get("API_KEY");
8080
String endpoint = envVariables.get("ENDPOINT");
81-
String depoymentName = envVariables.get("DEPLOYMENT_NAME");
81+
String deploymentName = envVariables.get("DEPLOYMENT_NAME");
8282
}
8383
```
8484

0 commit comments

Comments
 (0)