Skip to content

Commit 735cbf9

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nat-over-fresh
2 parents 86bb5ba + dfd9dc1 commit 735cbf9

17 files changed

+588
-21
lines changed

articles/applied-ai-services/form-recognizer/language-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ Receipt supports all English receipts and the following locales:
232232
|English (United Kingdom)|`en-gb`|
233233
|English (India|`en-in`|
234234
|English (United States)| `en-us`|
235-
|French | 'fr' |
235+
|French | `fr` |
236236
| Spanish | `es` |
237237

238238
## Business card model

articles/cost-management-billing/savings-plan/reservation-trade-in.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: cost-management-billing
88
ms.subservice: savings-plan
99
ms.custom: ignite-2022
1010
ms.topic: how-to
11-
ms.date: 10/24/2022
11+
ms.date: 12/06/2022
1212
ms.author: banders
1313
---
1414

@@ -21,7 +21,7 @@ If you find that your Azure VMs, Dedicated Hosts, or Azure App Services reservat
2121
Although you can return the above offerings for a savings plan, you can't exchange a savings plan for them or for another savings plan.
2222

2323
> [!NOTE]
24-
> Exchanges will be unavailable for Azure reserved instances for compute services purchased on or after **January 1, 2024**. Azure savings plan for compute is designed to help you save broadly on predictable compute usage. The savings plan provides more flexibility needed to accommodate changes such as virtual machine series and regions. With savings plan providing the flexibility automatically, we’re adjusting our reservations exchange policy. You can continue to exchange VM sizes (with instance size flexibility) but we'll no longer support exchanging instance series or regions for Azure Reserved Virtual Machine Instances, Azure Dedicated Host reservations, and Azure App Services reservations. Until **December 31, 2023** you can trade-in your Azure reserved instances for compute for a savings plan. Or, you may continue to use and purchase reservations for those predictable, stable workloads where you know the specific configuration you’ll need and want additional savings. For more information, see [Self-service exchanges and refunds for Azure Reservations](../reservations/exchange-and-refund-azure-reservations.md).
24+
> Exchanges will be unavailable for Azure reserved instances for compute services purchased on or after **January 1, 2024**. Azure savings plan for compute is designed to help you save broadly on predictable compute usage. The savings plan provides more flexibility needed to accommodate changes such as virtual machine series and regions. With savings plan providing the flexibility automatically, we’re adjusting our reservations exchange policy. You can continue to exchange VM sizes (with instance size flexibility) but we'll no longer support exchanging instance series or regions for Azure Reserved Virtual Machine Instances, Azure Dedicated Host reservations, and Azure App Services reservations. For a limited time you may trade-in your Azure reserved instances for compute for a savings plan. Or, you may continue to use and purchase reservations for those predictable, stable workloads where you know the specific configuration you’ll need and want additional savings. For more information, see [Self-service exchanges and refunds for Azure Reservations](../reservations/exchange-and-refund-azure-reservations.md).
2525
2626
The following reservations aren't eligible to be traded in for savings plans:
2727

articles/defender-for-cloud/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@
336336
- name: Find vulnerabilities and software inventory with agentless scanning
337337
displayName: vulnerability, software inventory, agentless scanning
338338
href: enable-vulnerability-assessment-agentless.md
339-
- name: Find vulnerabilities with threat and vulnerability management
339+
- name: Find vulnerabilities with Microsoft Defender Vulnerability Management
340340
displayName: mde, tvm, vulnerability, va, arc, hybrid, defender vulnerability management
341341
href: deploy-vulnerability-assessment-defender-vulnerability-management.md
342342
- name: Find vulnerabilities with the integrated Qualys scanner

articles/defender-for-cloud/deploy-vulnerability-assessment-defender-vulnerability-management.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
title: Use Microsoft Defender for Endpoint's Defender Vulnerability Management with Microsoft Defender for Cloud
3-
description: Enable, deploy, and use Microsoft Defender for Endpoint's Defender Vulnerability Management with Microsoft Defender for Cloud to discover weaknesses in your Azure and hybrid machines
2+
title: Use Microsoft Defender Vulnerability Management with Microsoft Defender for Cloud
3+
description: Enable, deploy, and use Microsoft Defender Vulnerability Management with Microsoft Defender for Cloud to discover weaknesses in your Azure and hybrid machines
44
ms.topic: how-to
55
ms.custom: ignite-2022
66
ms.date: 11/24/2022
77
---
88

9-
# Investigate weaknesses with Microsoft Defender for Endpoint's Defender Vulnerability Management
9+
# Investigate weaknesses with Microsoft Defender Vulnerability Management
1010

1111
[Microsoft's Defender Vulnerability Management](/microsoft-365/security/defender-vulnerability-management/defender-vulnerability-management) is a built-in module in Microsoft Defender for Endpoint that can:
1212

articles/defender-for-cloud/workflow-automation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ To implement these policies:
116116
|Workflow automation for regulatory compliance changes|[Deploy Workflow Automation for Microsoft Defender for Cloud regulatory compliance](https://portal.azure.com/#view/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2F509122b9-ddd9-47ba-a5f1-d0dac20be63c)|509122b9-ddd9-47ba-a5f1-d0dac20be63c|
117117

118118
> [!NOTE]
119-
> The three workflow automation policies have recently been rebranded. nfortunately, this change came with an unavoidable breaking change. To learn how to mitigate this breaking change, see [mitigate breaking change](#mitigate-breaking-change),
119+
> The three workflow automation policies have recently been rebranded. Unfortunately, this change came with an unavoidable breaking change. To learn how to mitigate this breaking change, see [mitigate breaking change](#mitigate-breaking-change),
120120
121121
> [!TIP]
122122
> You can also find these by searching Azure Policy:

articles/digital-twins/how-to-use-azure-digital-twins-explorer.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ titleSuffix: Azure Digital Twins
55
description: Learn how to use all the features of Azure Digital Twins Explorer (preview)
66
author: baanders
77
ms.author: baanders # Microsoft employees only
8-
ms.date: 02/24/2022
8+
ms.date: 12/2/2022
99
ms.topic: how-to
1010
ms.service: digital-twins
1111
ms.custom: event-tier1-build-2022
@@ -365,7 +365,7 @@ For information about the viewing experience for models, see [Explore models and
365365

366366
### Upload models
367367

368-
You can upload models from your machine by selecting them individually, or by uploading an entire folder of models at once.
368+
You can upload models from your machine by selecting model files individually, or by uploading an entire folder of model files at once. If you're uploading one JSON file that contains the code for many models, be sure to review the [bulk model upload limitations](#limitations-of-bulk-model-upload).
369369

370370
To upload one or more models that are individually selected, select the **Upload a model** icon showing an upwards arrow.
371371

@@ -380,7 +380,18 @@ To upload a folder of models, including everything that's inside it, select the
380380
In the file selector box that appears, navigate on your machine to a folder containing JSON model files. Select **Open** to upload that top-level folder and all of its contents.
381381

382382
>[!IMPORTANT]
383-
>If a model references another model in its definition, like when you're defining relationships or components, the model being referenced needs to be present in the instance in order to upload the model that uses it. If you're uploading models one-by-one, that means that you should upload the model being referenced **before** uploading any models that use it. If you're uploading models in bulk, you can select them both in the same import and Azure Digital Twins will infer the order to upload them in.
383+
>If a model references another model in its definition, like when you're defining relationships or components, the model being referenced needs to be present in the instance in order to upload the model that uses it. If you're uploading models one-by-one, that means that you should upload the model being referenced **before** uploading any models that use it. If you're uploading models in bulk, you can select them all in the same import and Azure Digital Twins will infer the order to upload them in. However, if you're uploading more than 50 models in the same file, see the [bulk model upload limitations](#limitations-of-bulk-model-upload).
384+
385+
#### Limitations of bulk model upload
386+
387+
The limitations in this section apply to models that are contained within a single JSON file, therefore being uploaded at the same time.
388+
389+
While there's no limit to how many models you can include with a single JSON file, there are special considerations for files containing more than 50 models. If you're uploading more than 50 models within the same model file, follow these tips:
390+
* If there are any models that inherit from other models that are defined in the same file, place them near the end of the list.
391+
* If there are any models that reference other models defined in the same file as components, place them near the end of the list.
392+
* Verify that wherever a model references another model that's defined in the same file (either through inheritance or as a component), the model that contains the reference comes later in the list than the referenced model definition.
393+
394+
This will help make sure that model dependencies are resolved correctly during the upload process.
384395

385396
### Delete models
386397

@@ -410,6 +421,9 @@ From the **Twin Graph** panel, you have the options to [import](#import-graph) a
410421

411422
You can use the import feature to add twins, relationships, and models to your instance. This feature can be useful for creating many twins, relationships, and/or models at once.
412423

424+
>[!NOTE]
425+
> If your graph import file includes models, they'll be subject to the [bulk model upload limitations](#limitations-of-bulk-model-upload).
426+
413427
#### Create import file
414428

415429
The first step in importing a graph is creating a file representing the twins and relationships you want to add.

articles/dms/tutorial-mysql-azure-single-to-flex-offline-portal.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,8 @@ To register the Microsoft.DataMigration resource provider, perform the following
159159
6. To the right of **Pricing tier**, select **Configure tier**.
160160
:::image type="content" source="media/tutorial-azure-mysql-single-to-flex-offline/7-project-details.png" alt-text="Screenshot of a Select Configure Tier.":::
161161

162-
7. On the **Configure** page, select the pricing tier and number of vCores for your DMS instance, and then select **Apply**.
163-
164-
For more information on DMS costs and pricing tiers, see the [pricing page](https://aka.ms/dms-pricing).
162+
7. On the **Configure** page, select the **Premium** pricing tier with 4 vCores for your DMS instance, and then select **Apply**.
163+
DMS Premium 4-vCore is free for 6 months (183 days) from the DMS service creation date before incurring any charges. For more information on DMS costs and pricing tiers, see the [pricing page](https://aka.ms/dms-pricing).
165164
:::image type="content" source="media/tutorial-azure-mysql-single-to-flex-offline/8-configure-pricing-tier.png" alt-text="Screenshot of a Select Pricing tier.":::
166165

167166
Next, we need to specify the VNet that will provide the DMS instance with access to the source single server and the target flexible server.

articles/dms/tutorial-mysql-azure-single-to-flex-online-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ To register the Microsoft.DataMigration resource provider, perform the following
168168
6. To the right of **Pricing tier**, select **Configure tier**.
169169
:::image type="content" source="media/tutorial-azure-mysql-single-to-flex-online/7-project-details.png" alt-text="Screenshot of a Select Configure Tier.":::
170170

171-
7. On the **Configure** page, select the pricing tier and number of vCores for your DMS instance, and then select **Apply**.
172-
For more information on DMS costs and pricing tiers, see the [pricing page](https://aka.ms/dms-pricing).
171+
7. On the **Configure** page, select the **Premium** pricing tier with 4 vCores for your DMS instance, and then select **Apply**.
172+
DMS Premium 4-vCore is free for 6 months (183 days) from the DMS service creation date before incurring any charges. For more information on DMS costs and pricing tiers, see the [pricing page](https://aka.ms/dms-pricing).
173173
:::image type="content" source="media/tutorial-azure-mysql-single-to-flex-online/8-configure-pricing-tier.png" alt-text="Screenshot of a Select Pricing tier.":::
174174

175175
Next, we need to specify the VNet that will provide the DMS instance with access to the source single server and the target flexible server.

articles/mysql/single-server/whats-happening-to-mysql-single-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ A. To limit any downtime you might incur, perform an online migration to Flexibl
8888

8989
**Q. Will there be future updates to Single Server to support latest MySQL versions?**
9090

91-
A. The last minor version upgrade to Single Server version 8.0 will be 8.0.28. Consider migrating to Flexible Server to use the benefits of the latest version upgrades.
91+
A. The last minor version upgrade to Single Server version 8.0 will be 8.0.15. Consider migrating to Flexible Server to use the benefits of the latest version upgrades.
9292

9393
**Q. How does the flexible server’s 99.99% availability SLA differ from that of single server?**
9494

127 KB
Loading

0 commit comments

Comments
 (0)