resolve conflict

Author: EdB-MSFT

.openpublishing.redirection.active-directory.json

@@ -33690,6 +33690,6 @@
             "source_path_from_root": "/articles/active-directory-domain-services/contact-us.md",
             "redirect_url": "/azure/active-directory/fundamentals/support-help-options",
             "redirect_document_id": false
-        },
+        }
     ]
-}
+}

.openpublishing.redirection.azure-datalake-storage-gen1.json

@@ -289,16 +289,6 @@
             "source_path": "articles/data-lake-store/security-controls-policy.md",
             "redirect_url": "/previous-versions/azure/data-lake-store/security-controls-policy",
             "redirect_document_id": false
-          },
-          {
-            "source_path": "articles/storage/blobs/data-lake-storage-migrate-gen1-to-gen2.md",
-            "redirect_url": "/previous-versions/azure/storage/blobs/data-lake-storage-migrate-gen1-to-gen2",
-            "redirect_document_id": false
-          },
-          {
-            "source_path": "articles/storage/blobs/data-lake-storage-migrate-gen1-to-gen2-azure-portal.md",
-            "redirect_url": "/previous-versions/azure/storage/blobs/data-lake-storage-migrate-gen1-to-gen2-azure-portal",
-            "redirect_document_id": false
           }
 
     ]

.openpublishing.redirection.json

@@ -6705,6 +6705,21 @@
             "redirect_url": "/azure/active-directory/conditional-access/concept-conditional-access-cloud-apps",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/role-based-access-control/deny-assignments-portal.md",
+            "redirect_url": "/azure/role-based-access-control/deny-assignments",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/role-based-access-control/deny-assignments-powershell.md",
+            "redirect_url": "/azure/role-based-access-control/deny-assignments",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/role-based-access-control/deny-assignments-rest.md",
+            "redirect_url": "/azure/role-based-access-control/deny-assignments",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/scheduler/scheduler-intro.md",
             "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
@@ -10940,6 +10955,11 @@
             "redirect_url": "/azure/azure-health-insights/overview",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-functions/functions-monitor-log-analytics.md",
+            "redirect_url": "/azure/azure-functions/monitor-functions",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/cloud-services-php-create-web-role.md",
             "redirect_url": "/azure/cloud-services/cloud-services-php-create-web-role",

.openpublishing.redirection.kubernetes-fleet.json

@@ -0,0 +1,9 @@
+{
+    "redirections": [
+       {
+            "source_path_from_root": "/articles/kubernetes-fleet/architectural-overview.md",
+            "redirect_url": "/azure/kubernetes-fleet/concepts-fleet",
+            "redirect_document_id": true
+        }
+    ]
+}

.openpublishing.redirection.sql-database.json

@@ -2580,6 +2580,6 @@
             "source_path_from_root": "/articles/sql-data-warehouse/sql-data-warehouse-security-threat-detection.md",
             "redirect_url": "/azure/sql-database/sql-database-threat-detection-overview",
             "redirect_document_id": false
-        },
+        }
     ]
 }

articles/advisor/advisor-reference-cost-recommendations.md

@@ -136,7 +136,7 @@ Learn more about [Log Analytics workspace - DeleteRestoredTables (Consider remov
 
 ### Consider enabling autopause on Spark compute
 
-Auto-pause releases and shuts down unused Compute resources after a set idle period of inactivity.
+Autopause releases and shuts down unused Compute resources after a set idle period of inactivity.
 
 Learn more about [Synapse workspace - EnableSynapseSparkComputeAutoPauseGuidance (Consider enabling autopause feature on spark compute.)](https://aka.ms/EnableSynapseSparkComputeAutoPauseGuidance).
 
@@ -154,15 +154,15 @@ Learn more about [Synapse workspace - EnableSynapseSparkComputeAutoScaleGuidance
 
 Customers running high IO workloads in Standard HDDs can upgrade to Standard SSDs and benefit from better performance and SLA and now experience a limit on the maximum number of billed transactions.
 
-Learn more about [Disk - UpgradeHDDtoSDD (Standard SSD disks billing caps.)]().
+Learn more about [Understand Azure Disk Storage billing](/azure/virtual-machines/disks-understand-billing).
 
 ### Underutilized Disks Identified
 
 You have disks that are utilized less than 10%, right-size to save cost.
 
-Learn more about [Disk - wiprounderutilizeddisks (Underutilized Disks Identified)]().
+Learn more about [Managed disks: Find and delete unattached disks](/azure/virtual-machines/disks-find-unattached-portal).
 
-### You have disks that have not been attached to a VM for more than 30 days. Evaluate if you still need the disk.
+### You have disks that haven't been attached to a VM for more than 30 days. Evaluate if you still need the disk.
 
 We've observed that you have disks that haven't been attached to a VM for more than 30 days. Evaluate if you still need the disk. If you decide to delete the disk, recovery isn't possible. We recommend that you create a snapshot before deletion or ensure the data in the disk is no longer required.
 
@@ -176,7 +176,7 @@ Learn more about [Virtual machine scale set - LowUsageVmss (Right-size or shutdo
 
 ### Use Virtual Machines with Ephemeral OS Disk enabled to save cost and get better performance
 
-With Ephemeral OS Disk, You get these benefits: Save on storage cost for OS disk. Get lower read/write latency to OS disk. Faster VM Reimage operation by resetting OS (and Temporary disk) to its original state. It is preferable to use Ephemeral OS Disk for short-lived IaaS VMs or VMs with stateless workloads.
+With Ephemeral OS Disk, You get these benefits: Save on storage cost for OS disk. Get lower read/write latency to OS disk. Faster VM Reimage operation by resetting OS (and Temporary disk) to its original state. It's preferable to use Ephemeral OS Disk for short-lived IaaS VMs or VMs with stateless workloads.
 
 Learn more about [Subscription - EphemeralOsDisk (Use Virtual Machines with Ephemeral OS Disk enabled to save cost and get better performance)](/azure/virtual-machines/windows/ephemeral-os-disks).
 
@@ -205,7 +205,7 @@ Learn more about [PostgreSQL server - OrcasPostgreSqlCpuRightSize (Right-size un
 
 ### Review the configuration of your Azure Cosmos DB free tier account
 
-Your Azure Cosmos DB free tier account currently contains resources with a total provisioned throughput exceeding 1000 Request Units per second (RU/s). Because the free tier only covers the first 1000 RU/s of throughput provisioned across your account, any throughput beyond 1000 RU/s is billed at the regular pricing. As a result, we anticipate that you're charged for the throughput currently provisioned on your Azure Cosmos DB account.
+Your Azure Cosmos DB free tier account currently contains resources with a total provisioned throughput exceeding 1,000 Request Units per second (RU/s). Because the free tier only covers the first 1000 RU/s of throughput provisioned across your account, any throughput beyond 1000 RU/s is billed at the regular pricing. As a result, we anticipate that you're charged for the throughput currently provisioned on your Azure Cosmos DB account.
 
 Learn more about [Azure Cosmos DB account - CosmosDBFreeTierOverage (Review the configuration of your Azure Cosmos DB free tier account)](../cosmos-db/understand-your-bill.md#azure-free-tier).
 
@@ -256,13 +256,13 @@ Learn more about [ExpressRoute circuit - ExpressRouteCircuit (Delete ExpressRout
 
 ### Repurpose or delete idle virtual network gateways
 
-We noticed that your virtual network gateway has been idle for over 90 days. This gateway is being billed hourly. Reconfigure this gateway, or delete it if you do not intend to use it anymore.
+We noticed that your virtual network gateway has been idle for over 90 days. This gateway is being billed hourly. Reconfigure this gateway, or delete it if you don't intend to use it anymore.
 
 Learn more about [Virtual network gateway - IdleVNetGateway (Repurpose or delete idle virtual network gateways)](https://aka.ms/aa_idlevpngateway_learnmore).
 
 ### Consider migrating to Front Door Standard/Premium
 
-Your Front Door Classic tier contains a large number of domains or routing rules, which adds extra charges. Front Door Standard or Premium do not charge per additional domain or routing rule. Consider migrating to save costs.
+Your Front Door Classic tier contains a large number of domains or routing rules, which adds extra charges. Front Door Standard or Premium tiers don't charge per additional domain or routing rule. Consider migrating to save costs.
 
 Learn more about [Front Door pricing](https://aka.ms/afd-pricing).
 

articles/ai-services/breadcrumb/toc.yml

@@ -0,0 +1,7 @@
+- name: Azure
+  tocHref: /azure/
+  topicHref: /azure/index
+  items:
+  - name: Azure AI services
+    tocHref: /azure/ai-services/
+    topicHref: /azure/ai-services/index

articles/ai-services/computer-vision/how-to/identity-access-token.md

@@ -9,25 +9,25 @@ manager: nitinme
 ms.service: azure-ai-vision
 ms.subservice: azure-ai-face
 ms.topic: how-to
-ms.date: 05/11/2023
+ms.date: 03/07/2024
 ms.author: pafarley
 ---
 
 # Use limited access tokens for Face
 
-Independent software vendors (ISVs) can manage the Face API usage of their clients by issuing access tokens that grant access to Face features which are normally gated. This allows client companies to use the Face API without having to go through the formal approval process.
+Independent software vendors (ISVs) can manage the Face API usage of their clients by issuing access tokens that grant access to Face features which are normally gated. This allows their client companies to use the Face API without having to go through the formal approval process.
 
 This guide shows you how to generate the access tokens, if you're an approved ISV, and how to use the tokens if you're a client. 
 
-The LimitedAccessToken feature is a part of the existing [Azure AI services token service](https://westus.dev.cognitive.microsoft.com/docs/services/57346a70b4769d2694911369/operations/issueScopedToken).  We have added a new operation for the purpose of bypassing the Limited Access gate for approved scenarios. Only ISVs that pass the gating requirements will be given access to this feature.
+The limited access token feature is a part of the existing [Azure AI services token service](https://westus.dev.cognitive.microsoft.com/docs/services/57346a70b4769d2694911369/operations/issueScopedToken).  We have added a new operation for the purpose of bypassing the Limited Access gate for approved scenarios. Only ISVs that pass the gating requirements will be given access to this feature.
 
 ## Example use case
 
-A company sells software that uses the Azure AI Face service to operate door access security systems. Their clients, individual manufacturers of door devices, subscribe to the software and run it on their devices. These client companies want to make Face API calls from their devices to perform Limited Access operations like face identification. By relying on access tokens from the ISV, they can bypass the formal approval process for face identification. The ISV, which has already been approved, can grant the client just-in-time access tokens.
+An example company sells software that uses the Azure AI Face service to operate door access security systems. Their clients, individual manufacturers of door devices, subscribe to the software and run it on their devices. These client companies want to make Face API calls from their devices to perform Limited Access operations like face identification. By relying on access tokens from the ISV, they can bypass the formal approval process for face identification. The ISV, which has already been approved, can grant the client just-in-time access tokens.
 
 ## Expectation of responsibility
 
-The issuing ISV  is responsible for ensuring that the tokens are used only for the approved purpose.
+The token-issuing ISV is responsible for ensuring that the tokens are used only for the approved purpose.
 
 If the ISV learns that a client is using the LimitedAccessToken for non-approved purposes, the ISV should stop generating tokens for that customer. Microsoft can track the issuance and usage of LimitedAccessTokens, and we reserve the right to revoke an ISV's access to the **issueLimitedAccessToken** API if abuse is not addressed.
 
@@ -80,7 +80,7 @@ The API should return a `200` response with the token in the form of a JSON web
 
 ## Step 3: Client application uses the token
 
-The ISV's application can then pass the LimitedAccessToken as an HTTP request header for future Face API requests on behalf of the client. This works independently of other authentication mechanisms, so no personal information of the client's is ever leaked to the ISV. 
+The ISV's application can then pass the limited access token as an HTTP request header for future Face API requests on behalf of the client. This works independently of other authentication mechanisms, so no personal information of the client's is ever leaked to the ISV. 
 
 > [!CAUTION]
 > The client doesn't need to be aware of the token value, as it can be passed in the background. If the client were to use a web monitoring tool to intercept the traffic, they'd be able to view the LimitedAccessToken header. However, because the token expires after a short period of time, they are limited in what they can do with it. This risk is known and considered acceptable.

articles/ai-services/content-safety/concepts/response-codes.md

@@ -8,7 +8,7 @@ manager: nitinme
 ms.service: azure-ai-content-safety
 ms.custom: build-2023
 ms.topic: conceptual
-ms.date: 05/09/2023
+ms.date: 03/07/2024
 ms.author: pafarley
 ---
 
@@ -18,9 +18,9 @@ The content APIs may return the following error codes:
 
 | Error Code    | Possible reasons   | Suggestions           |
 | ---------- | ------- | -------------------- |
-| InvalidRequestBody  | One or more fields in the request body do not match the API definition. | 1. Check the API version you specified in the API call. <br/>2. Check the corresponding API definition for the API version you selected. |
-| InvalidResourceName | The resource name you specified in the URL does not meet the requirements, like the blocklist name, blocklist term ID, etc. | 1. Check the API version you specified in the API call.  <br/>2. Check whether the given name has invalid characters according to the API definition. |
-| ResourceNotFound    | The resource you specified in the URL may not exist, like the blocklist name. | 1. Check the API version you specified in the API call. <br/> 2. Double check the existence of the resource specified in the URL. |
-| InternalError       | Some unexpected situations on the server side have been triggered. | 1. You may want to retry a few times after a small period and see it the issue happens again.  <br/>             2. Contact Azure Support if this issue persists. |
-| ServerBusy          | The server side cannot process the request temporarily.      | 1. You may want to retry a few times after a small period and see it the issue happens again.  <br/>2.Contact Azure Support if this issue persists. |
-| TooManyRequests     | The current RPS has exceeded the quota for your current SKU. | 1. Check the pricing table to understand the RPS quota.   <br/>2.Contact Azure Support if you need more QPS. |
+| InvalidRequestBody  | One or more fields in the request body do not match the API definition. | Check the API version you specified in the API call. <br/>Check the corresponding API definition for the API version you selected. |
+| InvalidResourceName | The resource name you specified in the URL does not meet the requirements, like the blocklist name, blocklist term ID, etc. | Check the API version you specified in the API call.  <br/>Check whether the given name has invalid characters according to the API definition. |
+| ResourceNotFound    | The resource you specified in the URL may not exist, like the blocklist name. | Check the API version you specified in the API call. <br/>Double check the existence of the resource specified in the URL. |
+| InternalError       | Some unexpected situations on the server side have been triggered. | You may want to retry a few times after a small period and see it the issue happens again.  <br/>             Contact Azure Support if this issue persists. |
+| ServerBusy          | The server side cannot process the request temporarily.      | You may want to retry a few times after a small period and see it the issue happens again.  <br/>Contact Azure Support if this issue persists. |
+| TooManyRequests     | The current RPS has exceeded the quota for your current SKU. | Check the pricing table to understand the RPS quota.   <br/>Contact Azure Support if you need more QPS. |

articles/ai-services/content-safety/how-to/use-blocklist.md

@@ -23,7 +23,7 @@ The default AI classifiers are sufficient for most content moderation needs. How
 ## Prerequisites
 
 * An Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services/) 
-* Once you have your Azure subscription, <a href="https://aka.ms/acs-create"  title="Create a Content Safety resource"  target="_blank">create a Content Safety resource </a> in the Azure portal to get your key and endpoint. Enter a unique name for your resource, select the subscription you entered on the application form, and select a resource group, supported region, and supported pricing tier. Then select **Create**.
+* Once you have your Azure subscription, <a href="https://aka.ms/acs-create"  title="Create a Content Safety resource"  target="_blank">create a Content Safety resource </a> in the Azure portal to get your key and endpoint. Enter a unique name for your resource, select your subscription, and select a resource group, supported region (East US or West Europe), and supported pricing tier. Then select **Create**.
   * The resource takes a few minutes to deploy. After it finishes, Select **go to resource**. In the left pane, under **Resource Management**, select **Subscription Key and Endpoint**. The endpoint and either of the keys are used to call APIs.
 * One of the following installed:
   * [cURL](https://curl.haxx.se/) for REST API calls.