Skip to content

Commit 36b2424

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into privdns-rbac
2 parents 47b151a + 4914f99 commit 36b2424

File tree

32 files changed

+203
-155
lines changed

32 files changed

+203
-155
lines changed

articles/automation/automation-dsc-compile.md

Lines changed: 44 additions & 71 deletions
Large diffs are not rendered by default.

articles/automation/automation-role-based-access-control.md

Lines changed: 37 additions & 39 deletions
Large diffs are not rendered by default.

articles/cloud-services/cloud-services-startup-tasks-common.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ REM ERRORLEVEL 183 occurs when trying to add a section that already exists. Th
8585
REM batch file were executed twice. This can occur and must be accounted for in an Azure startup
8686
REM task. To handle this situation, set the ERRORLEVEL to zero by using the Verify command. The Verify
8787
REM command will safely set the ERRORLEVEL to zero.
88-
IF %ERRORLEVEL% EQU 183 DO VERIFY > NUL
88+
IF %ERRORLEVEL% EQU 183 VERIFY > NUL
8989
9090
REM If the ERRORLEVEL is not zero at this point, some other error occurred.
9191
IF %ERRORLEVEL% NEQ 0 (

articles/cognitive-services/cognitive-services-apis-create-account-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ If you want to clean up and remove a Cognitive Services resource, you can delete
190190
To remove the resource group and its associated resources, use the az group delete command.
191191

192192
```azurecli-interactive
193-
az group delete --name storage-resource-group
193+
az group delete --name cognitive-services-resource-group
194194
```
195195

196196
## See also

articles/cosmos-db/mongodb-feature-support-36.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.author: sivethe
1313

1414
Azure Cosmos DB is Microsoft's globally distributed multi-model database service. You can communicate with the Azure Cosmos DB's API for MongoDB using any of the open-source MongoDB client [drivers](https://docs.mongodb.org/ecosystem/drivers). The Azure Cosmos DB's API for MongoDB enables the use of existing client drivers by adhering to the MongoDB [wire protocol](https://docs.mongodb.org/manual/reference/mongodb-wire-protocol).
1515

16-
By using the Azure Cosmos DB's API for MongoDB, you can enjoy the benefits of the MongoDB you're used to, with all of the enterprise capabilities that Cosmos DB provides: [global distribution](distribute-data-globally.md), [automatic sharding](partition-data.md), availability and latency guarantees, automatic indexing of every field, encryption at rest, backups, and much more.
16+
By using the Azure Cosmos DB's API for MongoDB, you can enjoy the benefits of the MongoDB you're used to, with all of the enterprise capabilities that Cosmos DB provides: [global distribution](distribute-data-globally.md), [automatic sharding](partition-data.md), availability and latency guarantees, encryption at rest, backups, and much more.
1717

1818
## Protocol Support
1919

articles/event-hubs/event-hubs-capture-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ Learn how to enable this feature using the Azure portal and Azure Resource Manag
154154
[support request]: https://portal.azure.com/?#blade/Microsoft_Azure_Support/HelpAndSupportBlade
155155
[Azure Storage Explorer]: https://azurestorageexplorer.codeplex.com/
156156
[3]: ./media/event-hubs-capture-overview/event-hubs-capture3.png
157-
[Avro Tools]: https://www.apache.org/dist/avro/stable/java/avro-tools-1.9.1.jar
157+
[Avro Tools]: https://www.apache.org/dist/avro/stable/java/avro-tools-1.9.2.jar
158158
[Java]: https://avro.apache.org/docs/current/gettingstartedjava.html
159159
[Python]: https://avro.apache.org/docs/current/gettingstartedpython.html
160160
[Event Hubs overview]: event-hubs-what-is-event-hubs.md

articles/event-hubs/get-started-dotnet-standard-send-v2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ In this quickstart, you use Azure Storage as the checkpoint store. Follow these
129129
130130
1. In the Solution Explorer window, right-click the **EventHubQuickStart** solution, point to **Add**, and select **New Project**.
131131
1. Select **Console App (.NET Core)**, and select **Next**.
132-
1. Event **EventHubsReceiver** for the **Project name**, and select **Create**.
132+
1. Enter **EventHubsReceiver** for the **Project name**, and select **Create**.
133133
134134
### Add the Event Hubs NuGet package
135135

articles/firewall/tutorial-hybrid-ps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ Get-AzRouteTable `
362362
-ResourceGroupName $RG1 `
363363
-Name UDR-DG `
364364
| Add-AzRouteConfig `
365-
-Name "ToSpoke" `
365+
-Name "ToFirewall" `
366366
-AddressPrefix 0.0.0.0/0 `
367367
-NextHopType "VirtualAppliance" `
368368
-NextHopIpAddress $AzfwPrivateIP `

articles/germany/germany-migration-main.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ At the end of this stage, you have:
5353
In the planning stage, complete the following tasks:
5454

5555
- Use the output of the dependency analysis completed in the assessment stage to define related components. Consider migrating related components together in a *migration package*.
56-
- (Optional) Use the migration as an opportunity to apply [Gartner 5-R criteria](https://www.gartner.com/newsroom/id/1684114) and to optimize your workload.
56+
- (Optional) Use the migration as an opportunity to apply [Gartner 5-R criteria](https://www.gartner.com/en/documents/3873016/evaluation-criteria-for-cloud-management-platforms-and-t) and to optimize your workload.
5757
- Determine the target environment in global Azure:
5858
1. Identify the target global Azure tenant (create one, if necessary).
5959
1. Create subscriptions.

articles/hdinsight/storm/apache-storm-develop-python-topology.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Learn how to create an [Apache Storm](https://storm.apache.org/) topology that u
2121

2222
* An Apache Storm cluster on HDInsight. See [Create Apache Hadoop clusters using the Azure portal](../hdinsight-hadoop-create-linux-clusters-portal.md) and select **Storm** for **Cluster type**.
2323

24-
* A local Storm development environment (Optional). A local Storm environment is only needed if you want to run the topology locally. For more information, see [Setting up a development environment](http://storm.apache.org/releases/current/Setting-up-development-environment.html).
24+
* A local Storm development environment (Optional). A local Storm environment is only needed if you want to run the topology locally. For more information, see [Setting up a development environment](https://storm.apache.org/releases/current/Setting-up-development-environment.html).
2525

2626
* [Python 2.7 or higher](https://www.python.org/downloads/).
2727

@@ -33,7 +33,7 @@ Learn how to create an [Apache Storm](https://storm.apache.org/) topology that u
3333

3434
Apache Storm was designed to work with components written using any programming language. The components must understand how to work with the Thrift definition for Storm. For Python, a module is provided as part of the Apache Storm project that allows you to easily interface with Storm. You can find this module at [https://github.com/apache/storm/blob/master/storm-multilang/python/src/main/resources/resources/storm.py](https://github.com/apache/storm/blob/master/storm-multilang/python/src/main/resources/resources/storm.py).
3535

36-
Storm is a Java process that runs on the Java Virtual Machine (JVM). Components written in other languages are executed as subprocesses. The Storm communicates with these subprocesses using JSON messages sent over stdin/stdout. More details on communication between components can be found in the [Multi-lang Protocol](https://storm.apache.org/documentation/Multilang-protocol.html) documentation.
36+
Storm is a Java process that runs on the Java Virtual Machine (JVM). Components written in other languages are executed as subprocesses. The Storm communicates with these subprocesses using JSON messages sent over stdin/stdout. More details on communication between components can be found in the [Multi-lang Protocol](https://storm.apache.org/releases/current/Multilang-protocol.html) documentation.
3737

3838
## Python with the Flux framework
3939

0 commit comments

Comments
 (0)