Skip to content

Commit fad9d07

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-java
2 parents f16124c + d897abd commit fad9d07

12 files changed

+48
-58
lines changed

articles/azure-vmware/includes/azure-vmware-solution-networking-description.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ title: Azure VMware Solution networking and connectivity
33
description: Azure VMware Solution networking and connectivity description.
44
ms.topic: include
55
ms.service: azure-vmware
6-
ms.date: 10/07/2022
6+
ms.custom: engagement-fy23
7+
ms.date: 10/25/2022
78
author: suzizuber
89
ms.author: v-szuber
910
---

articles/azure-vmware/move-azure-vmware-solution-across-regions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Move Azure VMware Solution resources across regions
33
description: This article describes how to move Azure VMware Solution resources from one Azure region to another.
4-
ms.custom: subject-moving-resources
4+
ms.custom: "subject-moving-resources, engagement-fy23"
55
ms.topic: how-to
66
ms.service: azure-vmware
77
ms.date: 04/11/2022

articles/machine-learning/how-to-use-batch-endpoint.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ A batch endpoint is an HTTPS endpoint that clients can call to trigger a batch s
9090
> [!TIP]
9191
> One of the batch deployments will serve as the default deployment for the endpoint. The default deployment will be used to do the actual batch scoring when the endpoint is invoked. Learn more about [batch endpoints and batch deployment](concept-endpoints.md#what-are-batch-endpoints).
9292
93-
The following YAML file defines a batch endpoint, which you can include in the CLI command for [batch endpoint creation](#create-a-batch-endpoint). In the repository, this file is located at `/cli/endpoints/batch/batch-endpoint.yml`.
93+
The following YAML file defines a batch endpoint, which you can include in the CLI command for [batch endpoint creation](#create-a-batch-endpoint). In the repository, this file is located at `/cli/endpoints/batch/mnist-endpoint.yml`.
9494

95-
:::code language="yaml" source="~/azureml-examples-main/cli/endpoints/batch/batch-endpoint.yml":::
95+
:::code language="yaml" source="~/azureml-examples-main/cli/endpoints/batch/mnist-endpoint.yml":::
9696

9797
The following table describes the key properties of the endpoint YAML. For the full batch endpoint YAML schema, see [CLI (v2) batch endpoint YAML schema](./reference-yaml-endpoint-batch.md).
9898

@@ -111,9 +111,9 @@ To create a batch deployment, you need all the following items:
111111

112112
For more information about how to reference an Azure ML entity, see [Referencing an Azure ML entity](reference-yaml-core-syntax.md#referencing-an-azure-ml-entity).
113113

114-
The example repository contains all the required files. The following YAML file defines a batch deployment with all the required inputs and optional settings. You can include this file in your CLI command to [create your batch deployment](#create-a-batch-deployment). In the repository, this file is located at `/cli/endpoints/batch/nonmlflow-deployment.yml`.
114+
The example repository contains all the required files. The following YAML file defines a batch deployment with all the required inputs and optional settings. You can include this file in your CLI command to [create your batch deployment](#create-a-batch-deployment). In the repository, this file is located at `/cli/endpoints/batch/mnist-torch-deployment.yml`.
115115

116-
:::code language="yaml" source="~/azureml-examples-main/cli/endpoints/batch/nonmlflow-deployment.yml":::
116+
:::code language="yaml" source="~/azureml-examples-main/cli/endpoints/batch/mnist-torch-deployment.yml":::
117117

118118
For the full batch deployment YAML schema, see [CLI (v2) batch deployment YAML schema](./reference-yaml-deployment-batch.md).
119119

@@ -281,9 +281,9 @@ Notice that `--set-default` isn't used. If you `show` the batch endpoint again,
281281
282282
The example uses a model (`/cli/endpoints/batch/autolog_nyc_taxi`) trained and tracked with MLflow. `scoring_script` and `environment` can be auto generated using model's metadata, no need to specify in the YAML file. For more about MLflow, see [Train and track ML models with MLflow and Azure Machine Learning](how-to-use-mlflow.md).
283283
284-
Below is the YAML file the example uses to deploy an MLflow model, which only contains the minimum required properties. The source file in repository is `/cli/endpoints/batch/mlflow-deployment.yml`.
284+
Below is the YAML file the example uses to deploy an MLflow model, which only contains the minimum required properties. The source file in repository is `/cli/endpoints/batch/nyc-taxi-mlflow-deployment.yml`.
285285
286-
:::code language="yaml" source="~/azureml-examples-main/cli/endpoints/batch/mlflow-deployment.yml":::
286+
:::code language="yaml" source="~/azureml-examples-main/cli/endpoints/batch/nyc-taxi-mlflow-deployment.yml":::
287287
288288
> [!NOTE]
289289
> `scoring_script` and `environment` auto generation only supports Python Function model flavor and column-based model signature.

articles/machine-learning/reference-yaml-deployment-batch.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ Examples are available in the [examples GitHub repository](https://github.com/Az
6060

6161
## YAML: basic (MLflow)
6262

63-
:::code language="yaml" source="~/azureml-examples-main/cli/endpoints/batch/mlflow-deployment.yml":::
63+
:::code language="yaml" source="~/azureml-examples-main/cli/endpoints/batch/nyc-taxi-mlflow-deployment.yml":::
6464

6565
## YAML: custom model and scoring code
6666

67-
:::code language="yaml" source="~/azureml-examples-main/cli/endpoints/batch/nonmlflow-deployment.yml":::
67+
:::code language="yaml" source="~/azureml-examples-main/cli/endpoints/batch/mnist-torch-deployment.yml":::
6868

6969
## Next steps
7070

articles/machine-learning/reference-yaml-endpoint-batch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Examples are available in the [examples GitHub repository](https://github.com/Az
4545

4646
## YAML: basic
4747

48-
:::code language="yaml" source="~/azureml-examples-main/cli/endpoints/batch/batch-endpoint.yml":::
48+
:::code language="yaml" source="~/azureml-examples-main/cli/endpoints/batch/mnist-endpoint.yml":::
4949

5050
## Next steps
5151

articles/virtual-machines/dasv5-dadsv5-series.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Dadsv5-series virtual machines support Standard SSD, Standard HDD, and Premium S
7979
| Standard_D64ads_v5 | 64 | 256 | 2400 | 32 | 300000 / 4000 | 80000/1200 | 80000/2000 | 8 | 32000 |
8080
| Standard_D96ads_v5 | 96 | 384 | 3600 | 32 | 450000 / 4000 | 80000/1600 | 80000/2000 | 8 | 40000 |
8181

82-
* These IOPs values can be achieved by using Gen2 VMs.<br>
82+
<sup>*</sup> These IOPs values can be achieved by using Gen2 VMs.<br>
8383
<sup>1</sup> Dadsv5-series VMs can [burst](disk-bursting.md) their disk performance and get up to their bursting max for up to 30 minutes at a time.
8484

8585

articles/virtual-machines/ddv5-ddsv5-series.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ Ddv5-series virtual machines support Standard SSD and Standard HDD disk types. T
2828
[Live Migration](maintenance-and-updates.md): Supported<br>
2929
[Memory Preserving Updates](maintenance-and-updates.md): Supported<br>
3030
[VM Generation Support](generation-2.md): Generation 1 and 2<br>
31-
[Accelerated Networking](../virtual-network/create-vm-accelerated-networking-cli.md): Required <br>
31+
[Accelerated Networking](../virtual-network/create-vm-accelerated-networking-cli.md)<sup>1</sup>: Required <br>
3232
[Ephemeral OS Disks](ephemeral-os-disks.md): Supported <br>
3333
[Nested Virtualization](/virtualization/hyper-v-on-windows/user-guide/nested-virtualization): Supported <br>
3434
<br>
3535

3636
| Size | vCPU | Memory: GiB | Temp storage (SSD) GiB | Max data disks | Max temp storage throughput: IOPS/MBps<sup>*</sup> | Max NICs|Max network bandwidth (Mbps) |
3737
|---|---|---|---|---|---|---|---|
38-
| Standard_D2d_v5<sup>1,2</sup> | 2 | 8 | 75 | 4 | 9000/125 | 2 | 12500 |
38+
| Standard_D2d_v5 | 2 | 8 | 75 | 4 | 9000/125 | 2 | 12500 |
3939
| Standard_D4d_v5 | 4 | 16 | 150 | 8 | 19000/250 | 2 | 12500 |
4040
| Standard_D8d_v5 | 8 | 32 | 300 | 16 | 38000/500 | 4 | 12500 |
4141
| Standard_D16d_v5 | 16 | 64 | 600 | 32 | 75000/1000 | 8 | 12500 |
@@ -46,7 +46,6 @@ Ddv5-series virtual machines support Standard SSD and Standard HDD disk types. T
4646

4747
<sup>*</sup> These IOPs values can be guaranteed by using [Gen2 VMs](generation-2.md)<br>
4848
<sup>1</sup> Accelerated networking is required and turned on by default on all Ddv5 virtual machines.<br>
49-
<sup>2</sup> Accelerated networking can be applied to two NICs.
5049

5150
## Ddsv5-series
5251

@@ -59,15 +58,15 @@ Ddsv5-series virtual machines support Standard SSD, Standard HDD, and Premium SS
5958
[Live Migration](maintenance-and-updates.md): Supported<br>
6059
[Memory Preserving Updates](maintenance-and-updates.md): Supported<br>
6160
[VM Generation Support](generation-2.md): Generation 1 and 2<br>
62-
[Accelerated Networking](../virtual-network/create-vm-accelerated-networking-cli.md): Required <br>
61+
[Accelerated Networking](../virtual-network/create-vm-accelerated-networking-cli.md)<sup>1</sup>: Required <br>
6362
[Ephemeral OS Disks](ephemeral-os-disks.md): Supported <br>
6463
[Nested Virtualization](/virtualization/hyper-v-on-windows/user-guide/nested-virtualization): Supported <br>
6564
<br>
6665

6766

6867
| Size | vCPU | Memory: GiB | Temp storage (SSD) GiB | Max data disks | Max temp storage throughput: IOPS/MBps<sup>*</sup> | Max uncached disk throughput: IOPS/MBps | Max burst uncached disk throughput: IOPS/MBps<sup>3</sup> | Max NICs | Max network bandwidth (Mbps) |
6968
|---|---|---|---|---|---|---|---|---|---|
70-
| Standard_D2ds_v5<sup>1,2</sup> | 2 | 8 | 75 | 4 | 9000/125 | 3750/85 | 10000/1200 | 2 | 12500 |
69+
| Standard_D2ds_v5 | 2 | 8 | 75 | 4 | 9000/125 | 3750/85 | 10000/1200 | 2 | 12500 |
7170
| Standard_D4ds_v5 | 4 | 16 | 150 | 8 | 19000/250 | 6400/145 | 20000/1200 | 2 | 12500 |
7271
| Standard_D8ds_v5 | 8 | 32 | 300 | 16 | 38000/500 | 12800/290 | 20000/1200 | 4 | 12500 |
7372
| Standard_D16ds_v5 | 16 | 64 | 600 | 32 | 75000/1000 | 25600/600 | 40000/1200 | 8 | 12500 |
@@ -78,8 +77,7 @@ Ddsv5-series virtual machines support Standard SSD, Standard HDD, and Premium SS
7877

7978
<sup>*</sup> These IOPs values can be guaranteed by using [Gen2 VMs](generation-2.md)<br>
8079
<sup>1</sup> Accelerated networking is required and turned on by default on all Ddsv5 virtual machines.<br>
81-
<sup>2</sup> Accelerated networking can be applied to two NICs.<br>
82-
<sup>3</sup> Ddsv5-series virtual machines can [burst](disk-bursting.md) their disk performance and get up to their bursting max for up to 30 minutes at a time.
80+
<sup>2</sup> Ddsv5-series virtual machines can [burst](disk-bursting.md) their disk performance and get up to their bursting max for up to 30 minutes at a time.
8381

8482
[!INCLUDE [virtual-machines-common-sizes-table-defs](../../includes/virtual-machines-common-sizes-table-defs.md)]
8583

articles/virtual-machines/disks-cross-tenant-customer-managed-keys.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to use customer-managed keys with your Azure disks in dif
44
author: roygara
55
ms.service: storage
66
ms.topic: how-to
7-
ms.date: 10/04/2022
7+
ms.date: 10/26/2022
88
ms.author: rogarana
99
ms.subservice: disks
1010
---
@@ -37,7 +37,7 @@ If you have questions about cross-tenant customer-managed keys with managed disk
3737
3838
## Limitations
3939
40-
- Currently this feature is only available in the North Central US, West Central US, West US, East US 2, and North Europe regions.
40+
- Currently this feature is only available in the Central US, North Central US, West US, West Central US, East US, East US 2, and North Europe regions.
4141
- Managed Disks and the customer's Key Vault must be in the same Azure region, but they can be in different subscriptions.
4242
- This feature doesn't support Ultra Disks or Azure Premium SSD v2 managed disks.
4343

articles/virtual-machines/dv5-dsv5-series.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ Dv5-series virtual machines do not have any temporary storage thus lowering the
2929
[Live Migration](maintenance-and-updates.md): Supported<br>
3030
[Memory Preserving Updates](maintenance-and-updates.md): Supported<br>
3131
[VM Generation Support](generation-2.md): Generation 1 and 2<br>
32-
[Accelerated Networking](../virtual-network/create-vm-accelerated-networking-cli.md): Required <br>
32+
[Accelerated Networking](../virtual-network/create-vm-accelerated-networking-cli.md)<sup>1</sup>: Required <br>
3333
[Ephemeral OS Disks](ephemeral-os-disks.md): Not Supported <br>
3434
[Nested Virtualization](/virtualization/hyper-v-on-windows/user-guide/nested-virtualization): Supported <br>
3535
<br>
3636

3737
| Size | vCPU | Memory: GiB | Temp storage (SSD) GiB | Max data disks | Max NICs|Max network bandwidth (Mbps) |
3838
|---|---|---|---|---|---|---|
39-
| Standard_D2_v5<sup>1, 2</sup> | 2 | 8 | Remote Storage Only | 4 | 2 | 12500 |
39+
| Standard_D2_v5 | 2 | 8 | Remote Storage Only | 4 | 2 | 12500 |
4040
| Standard_D4_v5 | 4 | 16 | Remote Storage Only | 8 | 2 | 12500 |
4141
| Standard_D8_v5 | 8 | 32 | Remote Storage Only | 16 | 4 | 12500 |
4242
| Standard_D16_v5 | 16 | 64 | Remote Storage Only | 32 | 8 | 12500 |
@@ -46,7 +46,6 @@ Dv5-series virtual machines do not have any temporary storage thus lowering the
4646
| Standard_D96_v5 | 96 | 384 | Remote Storage Only | 32 | 8 | 35000 |
4747

4848
<sup>1</sup> Accelerated networking is required and turned on by default on all Dv5 virtual machines.<br>
49-
<sup>2</sup> Accelerated networking can be applied to two NICs.
5049

5150
## Dsv5-series
5251

@@ -59,14 +58,14 @@ Dsv5-series virtual machines do not have any temporary storage thus lowering the
5958
[Live Migration](maintenance-and-updates.md): Supported<br>
6059
[Memory Preserving Updates](maintenance-and-updates.md): Supported<br>
6160
[VM Generation Support](generation-2.md): Generation 1 and 2<br>
62-
[Accelerated Networking](../virtual-network/create-vm-accelerated-networking-cli.md): Required <br>
61+
[Accelerated Networking](../virtual-network/create-vm-accelerated-networking-cli.md)<sup>1</sup>: Required <br>
6362
[Ephemeral OS Disks](ephemeral-os-disks.md): Not Supported <br>
6463
[Nested Virtualization](/virtualization/hyper-v-on-windows/user-guide/nested-virtualization): Supported <br>
6564
<br>
6665

67-
| Size | vCPU | Memory: GiB | Temp storage (SSD) GiB | Max data disks | Max uncached disk throughput: IOPS/MBps | Max burst uncached disk throughput: IOPS/MBps<sup>3</sup> | Max NICs | Max network bandwidth (Mbps) |
66+
| Size | vCPU | Memory: GiB | Temp storage (SSD) GiB | Max data disks | Max uncached disk throughput: IOPS/MBps | Max burst uncached disk throughput: IOPS/MBps<sup>2</sup> | Max NICs | Max network bandwidth (Mbps) |
6867
|---|---|---|---|---|---|---|---|---|
69-
| Standard_D2s_v5<sup>1,2</sup> | 2 | 8 | Remote Storage Only | 4 | 3750/85 | 10000/1200 | 2 | 12500 |
68+
| Standard_D2s_v5 | 2 | 8 | Remote Storage Only | 4 | 3750/85 | 10000/1200 | 2 | 12500 |
7069
| Standard_D4s_v5 | 4 | 16 | Remote Storage Only | 8 | 6400/145 | 20000/1200 | 2 | 12500 |
7170
| Standard_D8s_v5 | 8 | 32 | Remote Storage Only | 16 | 12800/290 | 20000/1200 | 4 | 12500 |
7271
| Standard_D16s_v5 | 16 | 64 | Remote Storage Only | 32 | 25600/600 | 40000/1200 | 8 | 12500 |
@@ -76,8 +75,7 @@ Dsv5-series virtual machines do not have any temporary storage thus lowering the
7675
| Standard_D96s_v5 | 96 | 384 | Remote Storage Only | 32 | 80000/2600 | 80000/4000 | 8 | 35000 |
7776

7877
<sup>1</sup> Accelerated networking is required and turned on by default on all Dsv5 virtual machines.<br>
79-
<sup>2</sup> Accelerated networking can be applied to two NICs.<br>
80-
<sup>3</sup> Dsv5-series virtual machines can [burst](disk-bursting.md) their disk performance and get up to their bursting max for up to 30 minutes at a time.
78+
<sup>2</sup> Dsv5-series virtual machines can [burst](disk-bursting.md) their disk performance and get up to their bursting max for up to 30 minutes at a time.
8179

8280
[!INCLUDE [virtual-machines-common-sizes-table-defs](../../includes/virtual-machines-common-sizes-table-defs.md)]
8381

articles/virtual-machines/ebdsv5-ebsv5-series.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ The Ebdsv5 and Ebsv5 series run on the Intel® Xeon® Platinum 8370C (Ice Lake)
2828

2929
> [!IMPORTANT]
3030
> - Accelerated networking is required and turned on by default on all Ebsv5 and Ebdsv5 VMs.
31-
> - Accelerated networking can be applied to two NICs.
32-
>- Ebsv5 and Ebdsv5-series VMs can [burst their disk performance](disk-bursting.md) and get up to their bursting max for up to 30 minutes at a time.
31+
> - Ebsv5 and Ebdsv5-series VMs can [burst their disk performance](disk-bursting.md) and get up to their bursting max for up to 30 minutes at a time.
3332
3433
## Ebdsv5 series
3534

0 commit comments

Comments
 (0)