Merge branch 'MicrosoftDocs:main' into main

Author: fred-cardoso

articles/ai-services/openai/concepts/models.md

@@ -170,7 +170,7 @@ GPT-3.5 Turbo version 0301 is the first version of the model released.  Version
 See [model versions](../concepts/model-versions.md) to learn about how Azure OpenAI Service handles model version upgrades, and [working with models](../how-to/working-with-models.md) to learn how to view and configure the model version settings of your GPT-3.5 Turbo deployments.
 
 > [!NOTE]
-> Version `0613` of `gpt-35-turbo` and `gpt-35-turbo-16k` will be retired no earlier than June 13, 2024. Version `0301` of `gpt-35-turbo` will be retired no earlier than July 5, 2024.  See [model updates](../how-to/working-with-models.md#model-updates) for model upgrade behavior.
+> Version `0613` of `gpt-35-turbo` and `gpt-35-turbo-16k` will be retired no earlier than July 13, 2024. Version `0301` of `gpt-35-turbo` will be retired no earlier than June 13, 2024.  See [model updates](../how-to/working-with-models.md#model-updates) for model upgrade behavior.
 
 |  Model ID   | Max Request (tokens) | Training Data (up to) |
 |  --------- |:------:|:----:|

articles/azure-arc/servers/billing-extended-security-updates.md

@@ -1,28 +1,30 @@
 ---
 title: Billing service for Extended Security Updates for Windows Server 2012 through Azure Arc
 description: Learn about billing services for Extended Security Updates for Windows Server 2012 enabled by Azure Arc.
-ms.date: 12/19/2023
+ms.date: 04/10/2023
 ms.topic: conceptual
 ---
 
 # Billing service for Extended Security Updates for Windows Server 2012 enabled by Azure Arc
 
-Billing for Extended Security Updates (ESUs) is impacted by three factors:
+Three factors impact billing for Extended Security Updates (ESUs):
 
-- The number of cores you've provisioned
+- The number of cores provisioned
 - The edition of the license (Standard vs. Datacenter)
 - The application of any eligible discounts
 
-Billing is monthly. Decrementing, deactivating, or deleting a license will result in charges for up to five more calendar days from the time of decrement, deactivation, or deletion. Reduction in billing isn't immediate. This is an Azure-billed service and can be used to decrement a customer's Microsoft Azure Consumption Commitment (MACC) and be eligible for Azure Consumption Discount (ACD).
+Billing is monthly. Decrementing, deactivating, or deleting a license results in charges for up to five more calendar days from the time of decrement, deactivation, or deletion. Reduction in billing isn't immediate. This is an Azure-billed service and can be used to decrement a customer's Microsoft Azure Consumption Commitment (MACC) and be eligible for Azure Consumption Discount (ACD).
 
 > [!NOTE]
 > Licenses or additional cores provisioned after End of Support are subject to a one-time back-billing charge during the month in which the license was provisioned. This isn't reflective of the recurring monthly bill.
 
 ## Back-billing for ESUs enabled by Azure Arc
 
-Licenses that are provisioned after the End of Support (EOS) date of October 10, 2023 are charged a back bill for the time elapsed since the EOS date. For example, an ESU license provisioned in December 2023 will be back-billed for October and November upon provisioning. Enrolling late in WS2012 ESUs makes you eligible for all the critical security patches up to that point. The back-billing charge reflects the value of these critical security patches.
+Licenses that are provisioned after the End of Support (EOS) date of October 10, 2023 are charged a back bill for the time elapsed since the EOS date. For example, an ESU license provisioned in December 2023 is back-billed for October and November upon provisioning. Enrolling late in WS2012 ESUs makes you eligible for all the critical security patches up to that point. The back-billing charge reflects the value of these critical security patches.
 
-If you deactivate and then later reactivate a license, you'll be billed for the window during which the license was deactivated. It isn't possible to evade charges by deactivating a license before a critical security patch and reactivating it shortly before.
+If you deactivate and then later reactivate a license, you're billed for the window during which the license was deactivated. It isn't possible to evade charges by deactivating a license before a critical security patch and reactivating it shortly before.
+
+If the region of an ESU license is changed, this will be subject to back-billing charges.
 
 > [!NOTE]
 > The back-billing cost appears as a separate line item in invoicing. If you acquired a discount for your core WS2012 ESUs enabled by Azure Arc, the same discount may or may not apply to back-billing. You should verify that the same discounting, if applicable, has been applied to back-billing charges as well.

articles/azure-resource-manager/templates/deployment-script-template.md

@@ -3,7 +3,7 @@ title: Use deployment scripts in templates | Microsoft Docs
 description: Use deployment scripts in Azure Resource Manager templates.
 ms.custom: devx-track-arm-template
 ms.topic: conceptual
-ms.date: 12/12/2023
+ms.date: 04/09/2024
 ---
 
 # Use deployment scripts in ARM templates
@@ -660,7 +660,7 @@ The identity that your deployment script uses needs to be authorized to work wit
 With Microsoft.Resources/deploymentScripts version 2023-08-01, you can run deployment scripts in private networks with some additional configurations.
 
 - Create a user-assigned managed identity, and specify it in the `identity` property. To assign the identity, see [Identity](#identity).
-- Create a storage account, and specify the deployment script to use the existing storage account. To specify an existing storage account, see [Use existing storage account](#use-existing-storage-account). Some additional configuration is required for the storage account.
+- Create a storage account with [`allowSharedKeyAccess`](/azure/templates/microsoft.storage/storageaccounts) set to `true` , and specify the deployment script to use the existing storage account. To specify an existing storage account, see [Use existing storage account](#use-existing-storage-account). Some additional configuration is required for the storage account.
 
     1. Open the storage account in the [Azure portal](https://portal.azure.com).
     1. From the left menu, select **Access Control (IAM)**, and then select the **Role assignments** tab.
@@ -708,7 +708,7 @@ The following ARM template shows how to configure the environment for running a
   "resources": [
     {
       "type": "Microsoft.Network/virtualNetworks",
-      "apiVersion": "2023-05-01",
+      "apiVersion": "2023-09-01",
       "name": "[parameters('vnetName')]",
       "location": "[parameters('location')]",
       "properties": {
@@ -761,15 +761,16 @@ The following ARM template shows how to configure the environment for running a
             }
           ],
           "defaultAction": "Deny"
-        }
+        },
+        "allowSharedKeyAccess": true
       },
       "dependsOn": [
         "[resourceId('Microsoft.Network/virtualNetworks', parameters('vnetName'))]"
       ]
     },
     {
       "type": "Microsoft.ManagedIdentity/userAssignedIdentities",
-      "apiVersion": "2023-01-31",
+      "apiVersion": "2023-07-31-preview",
       "name": "[parameters('userAssignedIdentityName')]",
       "location": "[parameters('location')]"
     },
@@ -779,7 +780,7 @@ The following ARM template shows how to configure the environment for running a
       "scope": "[format('Microsoft.Storage/storageAccounts/{0}', parameters('storageAccountName'))]",
       "name": "[guid(tenantResourceId('Microsoft.Authorization/roleDefinitions', '69566ab7-960f-475b-8e7c-b3118f30c6bd'), resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', parameters('userAssignedIdentityName')), resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')))]",
       "properties": {
-        "principalId": "[reference(resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', parameters('userAssignedIdentityName')), '2023-01-31').principalId]",
+        "principalId": "[reference(resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', parameters('userAssignedIdentityName')), '2023-07-31-preview').principalId]",
         "roleDefinitionId": "[tenantResourceId('Microsoft.Authorization/roleDefinitions', '69566ab7-960f-475b-8e7c-b3118f30c6bd')]",
         "principalType": "ServicePrincipal"
       },

articles/cosmos-db/vector-database.md

@@ -149,8 +149,8 @@ The natively integrated vector database in our NoSQL API will become available i
 > [!div class="nextstepaction"]
 > [Use the Azure Cosmos DB lifetime free tier](free-tier.md)
 
-## More Vector Databases
+## More Vector Stores
 
 - [Azure PostgreSQL Server pgvector Extension](../postgresql/flexible-server/how-to-use-pgvector.md)
-- [Azure AI Search](../search/search-what-is-azure-search.md)
+- [Azure AI Search](../search/vector-store.md)
 - [Open Source Vector Databases](mongodb/vcore/vector-search-ai.md)

articles/defender-for-cloud/includes/defender-for-dns-note.md

@@ -1,4 +1,4 @@
 
 > [!IMPORTANT]
 >
-> As of August 1, customers with an existing subscription to Defender for DNS can continue to use the service, but new subscribers will receive alerts about suspicious DNS activity as part of Defender for Servers P2.
+> As of August 1 2023, customers with an existing subscription to Defender for DNS can continue to use the service, but new subscribers will receive alerts about suspicious DNS activity as part of Defender for Servers P2.

articles/hdinsight-aks/flink/azure-databricks.md

@@ -1,9 +1,9 @@
 ---
 title: Incorporate Apache Flink® DataStream into Azure Databricks Delta Lake Table
-description: Learn about incorporate Apache Flink® DataStream into Azure Databricks Delta Lake Table
+description: Learn about incorporate Apache Flink® DataStream into Azure Databricks Delta Lake Table.
 ms.service: hdinsight-aks
 ms.topic: how-to
-ms.date: 10/27/2023
+ms.date: 04/10/2024
 ---
 
 # Incorporate Apache Flink® DataStream into Azure Databricks Delta Lake Tables
@@ -12,9 +12,9 @@ This example shows how to sink stream data in Azure ADLS Gen2 from Apache Flink
 
 ## Prerequisites
 
-- [Apache Flink 1.16.0 on HDInsight on AKS](../flink/flink-create-cluster-portal.md)
+- [Apache Flink 1.17.0 on HDInsight on AKS](../flink/flink-create-cluster-portal.md)
 - [Apache Kafka 3.2 on HDInsight](../../hdinsight/kafka/apache-kafka-get-started.md)
-- [Azure Databricks](/azure/databricks/getting-started/) in the same VNET as HDInsight on AKS
+- [Azure Databricks](/azure/databricks/getting-started/) in the same virtual network as HDInsight on AKS
 - [ADLS Gen2](/azure/databricks/getting-started/connect-to-azure-storage/) and Service Principal
 
 ## Azure Databricks Auto Loader
@@ -25,9 +25,9 @@ Here are the steps how you can use data from Flink in Azure Databricks delta liv
 
 ### Create Apache Kafka® table on Apache Flink® SQL
 
-In this step, you can create Kafka table and ADLS Gen2 on Flink SQL. For the purpose of this document, we are using a airplanes_state_real_time table, you can use any topic of your choice. 
+In this step, you can create Kafka table and ADLS Gen2 on Flink SQL. In this document, we're using a `airplanes_state_real_time table`. You can use any article of your choice.
 
-You are required to update the broker IPs with your Kafka cluster in the code snippet.
+You  need to update the broker IPs with your Kafka cluster in the code snippet.
 
 ```SQL
 CREATE TABLE kafka_airplanes_state_real_time (
@@ -68,34 +68,34 @@ Update the container-name and storage-account-name in the code snippet with your
 
 ```SQL
 CREATE TABLE adlsgen2_airplanes_state_real_time (
-   `date` STRING,
-   `geo_altitude` FLOAT,
-   `icao24` STRING,
-   `latitude` FLOAT,
-   `true_track` FLOAT,
-   `velocity` FLOAT,
-   `spi` BOOLEAN,
-   `origin_country` STRING,
-   `minute` STRING,
-   `squawk` STRING,
-   `sensors` STRING,
-   `hour` STRING,
-   `baro_altitude` FLOAT,
-   `time_position` BIGINT,
-   `last_contact` BIGINT,
-   `callsign` STRING,
-   `event_time` STRING,
-   `on_ground` BOOLEAN,
-   `category` STRING,
-   `vertical_rate` FLOAT,
-   `position_source` INT,
-   `current_time` STRING,
-   `longitude` FLOAT
- ) WITH (
-     'connector' = 'filesystem',
-     'path' = 'abfs://<container-name>@<storage-account-name>/flink/airplanes_state_real_time/',
-     'format' = 'json'
- );
+  `date` STRING,
+  `geo_altitude` FLOAT,
+  `icao24` STRING,
+  `latitude` FLOAT,
+  `true_track` FLOAT,
+  `velocity` FLOAT,
+  `spi` BOOLEAN,
+  `origin_country` STRING,
+  `minute` STRING,
+  `squawk` STRING,
+  `sensors` STRING,
+  `hour` STRING,
+  `baro_altitude` FLOAT,
+  `time_position` BIGINT,
+  `last_contact` BIGINT,
+  `callsign` STRING,
+  `event_time` STRING,
+  `on_ground` BOOLEAN,
+  `category` STRING,
+  `vertical_rate` FLOAT,
+  `position_source` INT,
+  `current_time` STRING,
+  `longitude` FLOAT
+) WITH (
+    'connector' = 'filesystem',
+    'path' = 'abfs://<container-name>@<storage-account-name>.dfs.core.windows.net/data/airplanes_state_real_time/flink/airplanes_state_real_time/',
+    'format' = 'json'
+);
 ```
 
 Further, you can insert Kafka table into ADLSgen2 table on Flink SQL.
@@ -114,9 +114,9 @@ Further, you can insert Kafka table into ADLSgen2 table on Flink SQL.
 
 ADLS Gen2 provides OAuth 2.0 with your Microsoft Entra application service principal for authentication from an Azure Databricks notebook and then mount into Azure Databricks DBFS.
 
-**Let's get service principle appid, tenant id and secret key.**
+**Let's get service principle appid, tenant ID, and secret key.**
 
-:::image type="content" source="media/azure-databricks/service-id.png" alt-text="Screenshot shows get service principle appid, tenant ID and secret key." lightbox="media/azure-databricks/service-id.png":::
+:::image type="content" source="media/azure-databricks/service-id.png" alt-text="Screenshot shows get service principle appid, tenant ID, and secret key." lightbox="media/azure-databricks/service-id.png":::
 
 **Grant service principle the Storage Blob Data Owner on Azure portal**