Skip to content

Commit 683ee2d

Browse files
authored
Merge pull request #299681 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 fc6fa7a + f4bbc8b commit 683ee2d

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

articles/app-service/overview-diagnostics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This article explains how to troubleshoot issues with your app in Azure App Serv
1515

1616
Azure App Service diagnostics is an interactive experience to help you troubleshoot your app with no configuration required. App Service diagnostics points out what's wrong and guides you to the right information to more easily and quickly troubleshoot and resolve the problem.
1717

18-
Although this experience is most helpful for problems that occured within the last 24 hours, all the diagnostic graphs are always available for you to analyze.
18+
Although this experience is most helpful for problems that occurred within the last 24 hours, all the diagnostic graphs are always available for you to analyze.
1919

2020
App Service diagnostics works for not only apps on Windows, but also for apps on built-in or custom containers, [App Service Environments](./environment/intro.md), and [Azure Functions](../azure-functions/functions-overview.md).
2121

articles/app-service/tutorial-java-jboss-mysql-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ If you see the error: `The subscription '701ea799-fb46-4407-bb67-9cbcf289f1c7' i
665665
666666
Depending on your subscription and the region you select, you might see the deployment status for Azure Database for MySQL Flexible Server to be `Conflict`, with the following message in Operation details:
667667
668-
`InternalServerError: An unexpected error occured while processing the request.`
668+
`InternalServerError: An unexpected error occurred while processing the request.`
669669
670670
This error is most likely caused by a limit on your subscription for the region you select. Try choosing a different region for your deployment.
671671

articles/app-service/tutorial-java-tomcat-mysql-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ You can ignore the warnings. The Maven Jetty plugin shows the warnings because t
697697

698698
Depending on your subscription and the region you select, you might see the deployment status for Azure Database for MySQL Flexible Server to be `Conflict`, with the following message in Operation details:
699699

700-
`InternalServerError: An unexpected error occured while processing the request.`
700+
`InternalServerError: An unexpected error occurred while processing the request.`
701701
702702
This error is most likely caused by a limit on your subscription for the region you select. Try choosing a different region for your deployment.
703703

articles/azure-resource-manager/templates/syntax.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ In the `definitions` section of the template, specify the schemas used for valid
5757

5858
```json
5959
"definitions": {
60-
"<definition-name": {
60+
"<definition-name>": {
6161
"type": "<data-type-of-definition>",
6262
"allowedValues": [ "<array-of-allowed-values>" ],
6363
"minValue": <minimum-value-for-int>,
@@ -287,8 +287,8 @@ You define resources with the following structure:
287287
"<settings-for-the-resource>",
288288
"copy": [
289289
{
290-
"name": ,
291-
"count": ,
290+
"name": "<name-of-copy-loop>",
291+
"count": <number-of-iterations>,
292292
"input": {}
293293
}
294294
]

articles/azure-resource-manager/templates/template-functions-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The following example returns the deployer object.
5252
"outputs": {
5353
"developerOutput": {
5454
"type": "object",
55-
"value": "[developer()]"
55+
"value": "[deployer()]"
5656
}
5757
}
5858
}

articles/governance/machine-configuration/whats-new/migrating-from-dsc-extension.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ new solution for new machines.
9090
The expected steps for migration are:
9191

9292
1. Download and expand the `.zip` package used for the DSC extension.
93-
1. Examine the DSC configuraiton file to understand the scenario.
93+
1. Examine the DSC configuration file to understand the scenario.
9494
1. Make any required changes to the configuration.
9595
1. Use the machine configuration PowerShell cmdlets to create, test, and publish a new package.
9696
1. Use machine configuration for future deployments rather than DSC extension.

0 commit comments

Comments
 (0)