Skip to content

Commit e81a662

Browse files
authored
Merge pull request #49445 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 4fc16ca + c54e2c5 commit e81a662

File tree

6 files changed

+8
-7
lines changed

6 files changed

+8
-7
lines changed

articles/azure-resource-manager/resource-manager-quickstart-create-templates-use-visual-studio-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ There are many methods for deploying templates. In this quickstart, you use the
126126

127127
From the screenshot output, the storage account name is *3tqebj3slyfyestandardsa*.
128128

129-
7. Run the following PowerShell command to list the newly created storage account:
129+
7. Run the following CLI command to list the newly created storage account:
130130

131131
```cli
132132
az storage account show --resource-group <ResourceGroupName> --name <StorageAccountName>

articles/hdinsight/hdinsight-component-versioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The component versions associated with HDInsight cluster versions are listed in
4646
| Apache Phoenix |4.7.0 |4.7.0 |4.4.0 |4.4.0 |4.2.0 |4.0.0.2.1.7.0-2162 |-|
4747
| Apache Spark |2.3.0, 2.2.0, 2.1.0 |1.6.2, 2.0 |1.6.0 |1.5.2 |1.3.1 (Windows only) |-|-|
4848
| Apache Livy |0.4 |0.3 |0.3 |0.2 |-|-|-|
49-
| Apache Kafka | 1.0, 0.10.1 | 0.10.0 | 0.9.0 |-|-|-|-|
49+
| Apache Kafka | 1.1, 1.0, 0.10.1 | 0.10.0 | 0.9.0 |-|-|-|-|
5050
| Apache Ambari | 2.6.0 | 2.4.0 | 2.2.1 | 2.1.0 |-|-|-|
5151
| Apache Zeppelin | 0.7.0 |-|-|-|-|-|-|
5252
| Mono |4.2.1 |4.2.1 |3.2.8 |-|-|-|

articles/iot-edge/quickstart-linux.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,8 @@ Delete the containers that were created on your device by the IoT Edge runtime.
287287
Remove the container runtime.
288288

289289
```bash
290-
sudo apt-get remove --purge moby
290+
sudo apt-get remove --purge moby-cli
291+
sudo apt-get remove --purge moby-engine
291292
```
292293

293294
## Next steps

articles/monitoring-and-diagnostics/monitor-alerts-unified-log.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Then alert would run the query every 5 minutes, with 30 minutes of data - to loo
8181
#### Example
8282
Consider a scenario where you wanted an alert if any computer exceeded processor utilization of 90% three times over 30 minutes. You would create an alert rule with the following details:
8383

84-
- **Query:** Perf | where ObjectName == "Processor" and CounterName == "% Processor Time" | summarize AggregatedValue = avg(CounterValue) by bin(TimeGenerated, 5 m), Computer<br>
84+
- **Query:** Perf | where ObjectName == "Processor" and CounterName == "% Processor Time" | summarize AggregatedValue = avg(CounterValue) by bin(TimeGenerated, 5m), Computer<br>
8585
- **Time period:** 30 minutes<br>
8686
- **Alert frequency:** five minutes<br>
8787
- **Aggregate value:** Greater than 90<br>

articles/sql-database/sql-database-managed-instance-vnet-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Plan how you deploy a Managed Instance in virtual network using your answers to
3333

3434
## Requirements
3535

36-
For Managed Instance creation you need dedicate subnet inside the VNet that conforms to the following requirements:
36+
For Managed Instance creation you need to dedicate a subnet inside the VNet that conforms to the following requirements:
3737
- **Be empty**: The subnet must not contain any other cloud service associated to it, and it must not be Gateway subnet. You won’t be able to create Managed Instance in subnet that contains resources other than managed instance or add other resources inside the subnet later.
3838
- **No NSG**: The subnet must not have a Network Security Group associated with it.
3939
- **Have specific route table**: The subnet must have a User Route Table (UDR) with 0.0.0.0/0 Next Hop Internet as the only route assigned to it. For more information, see [Create the required route table and associate it](#create-the-required-route-table-and-associate-it)

includes/app-service-mobile-android-run-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

2-
1. Visit the [Azure Portal]. Click **Browse All** > **Mobile Apps** > the backend that you just created. In the mobile app settings, click **Quickstart** > **Android)**. Under **Configure your client application**, click **Download**. This downloads a complete Android project for an app pre-configured to connect to your backend.
2+
1. Visit the [Azure Portal]. Click **Browse All** > **Mobile Apps** > the backend that you just created. In the mobile app settings, click **Quickstart** > **Android**. Under **Configure your client application**, click **Download**. This downloads a complete Android project for an app pre-configured to connect to your backend.
33
2. Open the project using **Android Studio**, using **Import project (Eclipse ADT, Gradle, etc.)**. Make sure you make this import selection to avoid any JDK errors.
44
3. Press the **Run 'app'** button to build the project and start the app in the Android simulator.
5-
4. In the app, type meaningful text, such as *Complete the tutorial* and then click the 'Add' button. This sends a POST request to the Azure backend you deployed earlier. The backend inserts data from the request is into the TodoItem SQL table, and returns information about the newly stored items back to the mobile app. The mobile app displays this data in the list.
5+
4. In the app, type meaningful text, such as *Complete the tutorial* and then click the 'Add' button. This sends a POST request to the Azure backend you deployed earlier. The backend inserts data from the request into the TodoItem SQL table, and returns information about the newly stored items back to the mobile app. The mobile app displays this data in the list.
66

77
![](./media/app-service-mobile-android-quickstart/mobile-quickstart-startup-android.png)
88

0 commit comments

Comments
 (0)