Resolve merge issue, redirects.

Author: TimShererWithAquent

.openpublishing.redirection.json

@@ -895,7 +895,7 @@
             "redirect_url": "/azure/advisor/advisor-reference-operational-excellence-recommendations",
             "redirect_document_id": false
         },
-	            {
+        {
             "source_path_from_root": "/articles/advisor/advisor-performance-recommendations.md",
             "redirect_url": "/azure/advisor/advisor-reference-performance-recommendations",
             "redirect_document_id": false
@@ -904,7 +904,7 @@
             "source_path_from_root": "/articles/advisor/advisor-high-availability-recommendations.md",
             "redirect_url": "/azure/advisor/advisor-reference-reliability-recommendations",
             "redirect_document_id": false
-        },	    
+        },
         {
             "source_path_from_root": "/articles/network-functions-manager/index.yml",
             "redirect_url": "/azure/network-function-manager",
@@ -2335,7 +2335,7 @@
             "redirect_url": "/azure/dns/dns-getstarted-powershell",
             "redirect_document_id": false
         },
-		{
+        {
             "source_path_from_root": "/articles/time-series-insights/migration-to-adx.md",
             "redirect_url": "/azure/time-series-insights/migration-to-fabric.md",
             "redirect_document_id": false
@@ -4696,7 +4696,6 @@
             "source_path_from_root":"/articles/virtual-network-manager/concept-user-defined-route-management.md",
             "redirect_url":"/azure/virtual-network-manager/overview",
             "redirect_document_id":false
-
         },
         {
             "source_path_from_root":"/articles/virtual-network-manager/how-to-create-user-defined-routes.md",
@@ -4800,33 +4799,31 @@
         },
         {
             "source_path_from_root": "/articles/azure-resource-manager/management/control-plane-metrics.md",
-             "redirect_url": "/azure/azure-resource-manager/management/monitor-resource-manager",
-             "redirect_document_id": false
+            "redirect_url": "/azure/azure-resource-manager/management/monitor-resource-manager",
+            "redirect_document_id": false
         },
-	{
-           "source_path_from_root": "/articles/expressroute/expressroute-monitoring-metrics-alerts.md",
+        {
+            "source_path_from_root": "/articles/expressroute/expressroute-monitoring-metrics-alerts.md",
             "redirect_url": "/azure/expressroute/monitor-expressroute-reference",
             "redirect_document_id": false
         },
         {
-           "source_path_from_root": "/articles/data-factory/continuous-integration-delivery-automate-github-actions.md",
+            "source_path_from_root": "/articles/data-factory/continuous-integration-delivery-automate-github-actions.md",
             "redirect_url": "/azure",
             "redirect_document_id": false
         },
         {
-
             "source_path_from_root": "/articles/backup/azure-backup-move-vaults-across-regions.md",
             "redirect_url": "/azure/operational-excellence/relocation-backup",
             "redirect_document_id": false
         },
         {
-
-           "source_path_from_root": "/articles/cosmos-db/how-to-move-regions.md",
-           "redirect_url": "/azure/operational-excellence/relocation-cosmos-db",
-           "redirect_document_id": false
+            "source_path_from_root": "/articles/cosmos-db/how-to-move-regions.md",
+            "redirect_url": "/azure/operational-excellence/relocation-cosmos-db",
+            "redirect_document_id": false
         },
         {
-           "source_path_from_root": "/articles/site-recovery/move-vaults-across-regions.md",
+            "source_path_from_root": "/articles/site-recovery/move-vaults-across-regions.md",
             "redirect_url": "/azure/operational-excellence/relocation-site-recovery",
             "redirect_document_id": false
         },
@@ -4896,9 +4893,9 @@
             "redirect_document_id": false
         },
         {
-          "source_path_from_root":"/articles/container-registry/manual-regional-move.md",
-          "redirect_url":"/azure/operational-excellence/relocation-container-registry",
-          "redirect_document_id":false
+            "source_path_from_root":"/articles/container-registry/manual-regional-move.md",
+            "redirect_url":"/azure/operational-excellence/relocation-container-registry",
+            "redirect_document_id":false
         },
         {
             "source_path_from_root":"/articles/bastion/howto-metrics-monitor-alert.md",
@@ -4910,6 +4907,126 @@
             "redirect_url":"/azure/bastion/monitor-bastion",
             "redirect_document_id":true
         },
+        {
+            "source_path": "articles/data-catalog/data-catalog-developer-concepts.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-developer-concepts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-dsr.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-dsr",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-frequently-asked-questions.yml",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-frequently-asked-questions",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-get-started.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-get-started",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-how-to-annotate.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-annotate",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-how-to-big-data.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-big-data",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-how-to-business-glossary.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-business-glossary",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-how-to-connect.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-connect",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-how-to-data-profile.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-data-profile",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-how-to-discover.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-discover",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-how-to-documentation.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-documentation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-how-to-manage.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-manage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-how-to-register.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-register",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-how-to-save-pin.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-save-pin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-how-to-secure-catalog.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-secure-catalog",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-how-to-view-related-data-assets.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-view-related-data-assets",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-keyboard-shortcuts.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-keyboard-shortcuts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-migration-to-microsoft-purview.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-migration-to-microsoft-purview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-samples.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-samples",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/data-catalog-terminology.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-terminology",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/index.yml",
+            "redirect_url": "/previous-versions/azure/data-catalog/index",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/overview.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/register-data-assets-tutorial.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/register-data-assets-tutorial",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/data-catalog/troubleshoot-policy-configuration.md",
+            "redirect_url": "/previous-versions/azure/data-catalog/troubleshoot-policy-configuration",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-powershell.md",
             "redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6--portal",
@@ -4919,7 +5036,6 @@
             "source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-cli.md",
             "redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6--portal",
             "redirect_document_id": false
-        }  
-        
+        } 
     ]
 }

articles/ai-services/openai/concepts/model-retirements.md

@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
 description: Learn about the model deprecations and retirements in Azure OpenAI.
 ms.service: azure-ai-openai
 ms.topic: conceptual
-ms.date: 07/30/2024
+ms.date: 08/01/2024
 ms.custom: 
 manager: nitinme
 author: mrbullwinkle
@@ -31,7 +31,7 @@ Azure OpenAI notifies customers of active Azure OpenAI Service deployments for m
 
 1. At model launch, we programmatically designate a "not sooner than" retirement date (typically six months to one year out).
 2. At least 60 days notice before model retirement for Generally Available (GA) models.
-3. At least 14 days notice before preview model version upgrades.  
+3. At least 30 days notice before preview model version upgrades.  
 
 Retirements are done on a rolling basis, region by region.
 
@@ -102,7 +102,7 @@ These models are currently available for use in Azure OpenAI Service.
 | `text-embedding-3-small` | | No earlier than Feb 2, 2025 |
 | `text-embedding-3-large` | | No earlier than Feb 2, 2025 |
 
- **<sup>1</sup>** We will notify all customers with these preview deployments at least two weeks before the start of the upgrades. We will publish an upgrade schedule detailing the order of regions and model versions that we will follow during the upgrades, and link to that schedule from here.
+ **<sup>1</sup>** We will notify all customers with these preview deployments at least 30 days before the start of the upgrades. We will publish an upgrade schedule detailing the order of regions and model versions that we will follow during the upgrades, and link to that schedule from here.
 
 
 ## Deprecated models

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

@@ -296,18 +296,18 @@ These models can only be used with Embedding API requests.
 
 For Assistants you need a combination of a supported model, and a supported region. Certain tools and capabilities require the latest models. The following models are available in the Assistants API, SDK, Azure AI Studio and Azure OpenAI Studio. The following table is for pay-as-you-go. For information on Provisioned Throughput Unit (PTU) availability, see [provisioned throughput](./provisioned-throughput.md). The listed models and regions can be used with both Assistants v1 and v2.
 
-| Region | `gpt-35-turbo (0613)` | `gpt-35-turbo (1106)`| `fine tuned gpt-3.5-turbo-0125` | `gpt-4 (0613)` | `gpt-4 (1106)` | `gpt-4 (0125)` | `gpt-4o (2024-05-13)` |
-|-----|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-| Australia East | ✅ | ✅ | | ✅ |✅ | | |
-| East US  | ✅ | | | | | ✅ | ✅ |
-| East US 2 | ✅ |  | ✅ | ✅ |✅ | |✅|
-| France Central  | ✅ | ✅ | | ✅ |✅ |  | |
-| Japan East | ✅ |  | | | | | |
-| Norway East | |  | | | ✅ |  | |
-| Sweden Central | ✅ |✅ | ✅ |✅ |✅| |✅|
-| UK South | ✅  | ✅ | | | ✅ | ✅ |  |
-| West US |  | ✅ | | | ✅ | |✅|
-| West US 3 |  |  | | |✅ | |✅|
+| Region | `gpt-35-turbo (0613)` | `gpt-35-turbo (1106)`| `fine tuned gpt-3.5-turbo-0125` | `gpt-4 (0613)` | `gpt-4 (1106)` | `gpt-4 (0125)` | `gpt-4o (2024-05-13)` | `gpt-4o-mini (2024-07-18)` |
+|-----|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
+| Australia East | ✅ | ✅ | | ✅ |✅ | | | |
+| East US  | ✅ | | | | | ✅ | ✅ |✅|
+| East US 2 | ✅ |  | ✅ | ✅ |✅ | |✅| |
+| France Central  | ✅ | ✅ | | ✅ |✅ |  | | |
+| Japan East | ✅ |  | | | | | | |
+| Norway East | |  | | | ✅ |  | | |
+| Sweden Central | ✅ |✅ | ✅ |✅ |✅| |✅| |
+| UK South | ✅  | ✅ | | | ✅ | ✅ |  | |
+| West US |  | ✅ | | | ✅ | |✅| |
+| West US 3 |  |  | | |✅ | |✅| |
 
 ## Model retirement
 

articles/ai-services/openai/how-to/file-search.md

@@ -16,13 +16,9 @@ recommendations: false
 
 File Search augments the Assistant with knowledge from outside its model, such as proprietary product information or documents provided by your users. OpenAI automatically parses and chunks your documents, creates and stores the embeddings, and use both vector and keyword search to retrieve relevant content to answer user queries.
 
-<!--
 > [!IMPORTANT]
-> * File search has [additional charges](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) beyond the token based fees for Azure OpenAI usage. For example, if your Assistant calls file search simultaneously in two different threads, two file search sessions are created.
--->
+> * File search has [additional charges](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) beyond the token based fees for Azure OpenAI usage.
 
-> [!NOTE]
-> File search is currently not billed. 
 
 [!INCLUDE [Assistants v2 note](../includes/assistants-v2-note.md)]
 
@@ -149,7 +145,7 @@ assistant = client.beta.assistants.update(
 
 ## Create a thread
 
-You can also attach files as Message attachments on your thread. Doing so will create another `vector_store` associated with the thread, or, if there is already a vector store attached to this thread, attach the new files to the existing thread vector store. When you create a Run on this thread, the file search tool will query both the `vector_store` from your assistant and the `vector_store` on the thread.
+You can also attach files as Message attachments on your thread. Doing so will create another `vector_store` associated with the thread, or, if there's already a vector store attached to this thread, attach the new files to the existing thread vector store. When you create a Run on this thread, the file search tool will query both the `vector_store` from your assistant and the `vector_store` on the thread.
 
 ```python
 # Upload the user provided file to OpenAI
@@ -243,7 +239,7 @@ The file search tool implements several retrieval best practices out of the box
 
 ## Vector stores
 
-Vector store objects give the file search tool the ability to search your files. Adding a file to a vector store automatically parses, chunks, embeds and stores the file in a vector database that's capable of both keyword and semantic search. Each vector store can hold up to 10,000 files. Vector stores can be attached to both Assistants and Threads. Currently you can attach at most one vector store to an assistant and at most one vector store to a thread.
+Vector store objects give the file search tool the ability to search your files. Adding a file to a vector store automatically parses, chunks, embeds, and stores the file in a vector database that's capable of both keyword and semantic search. Each vector store can hold up to 10,000 files. Vector stores can be attached to both Assistants and Threads. Currently you can attach at most one vector store to an assistant and at most one vector store to a thread.
 
 ### Creating vector stores and adding files
 
@@ -313,9 +309,9 @@ You can also attach a vector store to Threads or Assistants after they're create
 
 ## Ensuring vector store readiness before creating runs
 
-We highly recommend that you ensure all files in a vector_store are fully processed before you create a run. This will ensure that all the data in your vector store is searchable. You can check for vector store readiness by using the polling helpers in the SDKs, or by manually polling the `vector_store` object to ensure the status is completed.
+We highly recommend that you ensure all files in a vector_store are fully processed before you create a run. This ensures that all the data in your vector store is searchable. You can check for vector store readiness by using the polling helpers in the SDKs, or by manually polling the `vector_store` object to ensure the status is completed.
 
-As a fallback, there is a 60-second maximum wait in the Run object when the thread's vector store contains files that are still being processed. This is to ensure that any files your users upload in a thread a fully searchable before the run proceeds. This fallback wait does not apply to the assistant's vector store.
+As a fallback, there's a 60-second maximum wait in the run object when the thread's vector store contains files that are still being processed. This is to ensure that any files your users upload in a thread a fully searchable before the run proceeds. This fallback wait does not apply to the assistant's vector store.
 
 ## Managing costs with expiration policies