Skip to content

Commit a14e767

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-filter
2 parents 748e95a + 0373ae1 commit a14e767

File tree

5 files changed

+11
-53
lines changed

5 files changed

+11
-53
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,11 @@
171171
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/auto-instrumentation-troubleshoot",
172172
"redirect_document_id": false
173173
},
174+
{
175+
"source_path_from_root": "/articles/azure-monitor/app/usage-troubleshoot.md",
176+
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/usage-troubleshoot",
177+
"redirect_document_id": false
178+
},
174179
{
175180
"source_path_from_root": "/articles/azure-monitor/app/java-on-premises.md",
176181
"redirect_url": "/azure/azure-monitor/app/java-in-process-agent",

articles/azure-monitor/app/usage-troubleshoot.md

Lines changed: 0 additions & 45 deletions
This file was deleted.

articles/azure-monitor/toc.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,8 +1031,6 @@ items:
10311031
href: app/usage-retention.md
10321032
- name: User Flows
10331033
href: app/usage-flows.md
1034-
- name: Usage analytics
1035-
href: app/usage-troubleshoot.md
10361034
- name: HEART Framework
10371035
href: app/usage-heart.md
10381036
- name: Azure DevOps

articles/orbital/howto-downlink-aqua.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Sign in to the [Azure portal - Orbital Preview](https://aka.ms/orbital/portal).
8181

8282
## Prepare a virtual machine (VM) to receive the downlinked AQUA data
8383
1. [Create a virtual network](../virtual-network/quick-create-portal.md) to host your data endpoint virtual machine (VM)
84-
2. [Create a virtual machine (VM)](../virtual-network/quick-create-portal.md) within the virtual network above. Ensure that this VM has the following specifications:
84+
2. [Create a virtual machine (VM)](../virtual-network/quick-create-portal.md#create-virtual-machines) within the virtual network above. Ensure that this VM has the following specifications:
8585
- Operation System: Linux (Ubuntu 18.04 or higher)
8686
- Size: at least 32 GiB of RAM
8787
- Ensure that the VM has at least one standard public IP
@@ -174,4 +174,4 @@ socat -u tcp-listen:56001,fork create:/media/aqua/out.bin
174174
## Next steps
175175

176176
- [Quickstart: Configure a contact profile](contact-profile.md)
177-
- [Quickstart: Schedule a contact](schedule-contact.md)
177+
- [Quickstart: Schedule a contact](schedule-contact.md)

articles/virtual-machines/linux/tutorial-manage-vm.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Debian credativ 8 credativ:Debian:8:lat
113113
CoreOS CoreOS Stable CoreOS:CoreOS:Stable:latest CoreOS latest
114114
```
115115

116-
A full list can be seen by adding the `--all` argument. The image list can also be filtered by `--publisher` or `–-offer`. In this example, the list is filtered for all images with an offer that matches *CentOS*.
116+
A full list can be seen by adding the `--all` parameter. The image list can also be filtered by `--publisher` or `–-offer`. In this example, the list is filtered for all images with an offer that matches *CentOS*.
117117

118118
```azurecli-interactive
119119
az vm image list --offer CentOS --all --output table
@@ -132,7 +132,7 @@ CentOS OpenLogic 6.5 OpenLogic:CentOS:6.5:6.5.20160309
132132
CentOS OpenLogic 6.5 OpenLogic:CentOS:6.5:6.5.20170207 6.5.20170207
133133
```
134134

135-
To deploy a VM using a specific image, take note of the value in the *Urn* column, which consists of the publisher, offer, SKU, and optionally a version number to [identify](cli-ps-findimage.md#terminology) the image. When specifying the image, the image version number can be replaced with latest, which selects the latest version of the distribution. In this example, the `--image` argument is used to specify the latest version of a CentOS 6.5 image.
135+
To deploy a VM using a specific image, take note of the value in the *Urn* column, which consists of the publisher, offer, SKU, and optionally a version number to [identify](cli-ps-findimage.md#terminology) the image. When specifying the image, the image version number can be replaced with `latest`, which selects the latest version of the distribution. In this example, the `--image` parameter is used to specify the latest version of a CentOS 6.5 image.
136136

137137
```azurecli-interactive
138138
az vm create --resource-group myResourceGroupVM --name myVM2 --image OpenLogic:CentOS:6.5:latest --generate-ssh-keys
@@ -189,7 +189,7 @@ Partial output:
189189

190190
### Create VM with specific size
191191

192-
In the previous VM creation example, a size was not provided, which results in a default size. A VM size can be selected at creation time using [az vm create](/cli/azure/vm) and the `--size` argument.
192+
In the previous VM creation example, a size was not provided, which results in a default size. A VM size can be selected at creation time using [az vm create](/cli/azure/vm) and the `--size` parameter.
193193

194194
```azurecli-interactive
195195
az vm create \
@@ -323,4 +323,4 @@ In this tutorial, you learned about basic VM creation and management such as how
323323
Advance to the next tutorial to learn about VM disks.
324324

325325
> [!div class="nextstepaction"]
326-
> [Create and Manage VM disks](./tutorial-manage-disks.md)
326+
> [Create and Manage VM disks](./tutorial-manage-disks.md)

0 commit comments

Comments
 (0)