Skip to content

Commit 6ecff19

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into update-backup
2 parents 26eda05 + 051ebec commit 6ecff19

File tree

11 files changed

+491
-23
lines changed

11 files changed

+491
-23
lines changed

articles/azure-monitor/app/powershell-azure-diagnostics.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ ms.author: mbullwin
1414
---
1515
# Using PowerShell to set up Application Insights for Azure Cloud Services
1616

17-
[!INCLUDE [updated-for-az](../../../includes/updated-for-az.md)]
18-
1917
[Microsoft Azure](https://azure.com) can be [configured to send Azure Diagnostics](../../azure-monitor/platform/diagnostics-extension-to-application-insights.md) to [Azure Application Insights](../../azure-monitor/app/app-insights-overview.md). The diagnostics relate to Azure Cloud Services and Azure VMs. They complement the telemetry that you send from within the app using the Application Insights SDK. As part of automating the process of creating new resources in Azure, you can configure diagnostics using PowerShell.
2018

2119
## Azure template

articles/azure-resource-manager/child-resource-name-type.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Describes how to set the name and type for child resources in an Az
44
author: tfitzmac
55
ms.service: azure-resource-manager
66
ms.topic: conceptual
7-
ms.date: 08/02/2019
7+
ms.date: 08/26/2019
88
ms.author: tomfitz
99
---
1010
# Set name and type for child resources
@@ -16,9 +16,9 @@ In a Resource Manger template, you can specify the child resource either within
1616
```json
1717
"resources": [
1818
{
19-
// parent resource
19+
<parent-resource>
2020
"resources": [
21-
// child resource
21+
<child-resource>
2222
]
2323
}
2424
]
@@ -29,10 +29,10 @@ The next example shows the child resource outside of the parent resource. You mi
2929
```json
3030
"resources": [
3131
{
32-
// parent resource
32+
<parent-resource>
3333
},
3434
{
35-
// child resource
35+
<child-resource>
3636
}
3737
]
3838
```

articles/databox/data-box-disk-quickstart-portal.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ author: alkohli
66

77
ms.service: databox
88
ms.subservice: disk
9-
ms.topic: quickstart
10-
ms.localizationpriority: high
11-
ms.date: 02/26/2019
9+
ms.topic: quickstart
10+
ms.date: 08/26/2019
1211
ms.author: alkohli
1312
Customer intent: As an IT admin, I need to quickly deploy Data Box Disk so as to import data into Azure.
1413
---
@@ -60,6 +59,7 @@ Sign in to the Azure portal at [https://aka.ms/azuredataboxfromdiskdocs](https:/
6059

6160
- You have placed your order for Data Box Disk using the [Tutorial: Order Azure Data Box Disk](data-box-disk-deploy-ordered.md).
6261
- You have received your disks and the job status in the portal is updated to **Delivered**.
62+
- You have checked the number of disks you've received and that you have one connecting cable per disk.
6363
- You have a client computer available from which you can copy the data. Your client computer must:
6464

6565
- Run a [supported operating system](data-box-disk-system-requirements.md#supported-operating-systems-for-clients).

0 commit comments

Comments
 (0)