resolve merge conflict

Author: mrbullwinkle

.openpublishing.redirection.container-registry.json

@@ -109,7 +109,7 @@
         },
         {
             "source_path": "articles/container-registry/container-registry-diagnostics-audit-logs.md",
-            "redirect_url": "/azure/container-registry/monitor-service"
+            "redirect_url": "/azure/container-registry/monitor-container-registry"
         },
         {
             "source_path_from_root": "/articles/container-registry/container-registry-managed-get-started-azure-cli.md",
@@ -155,6 +155,16 @@
             "source_path_from_root": "/articles/container-registry/github-action-scan.md",
             "redirect_url": "/azure/developer/github/",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/container-registry/monitor-service.md",
+            "redirect_url": "/azure/container-registry/monitor-container-registry",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/container-registry/monitor-service-reference.md",
+            "redirect_url": "/azure/container-registry/monitor-container-registry-reference",
+            "redirect_document_id": true
         }
     ]
 }

.openpublishing.redirection.json

@@ -4878,6 +4878,13 @@
             "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

articles/active-directory-b2c/custom-email-sendgrid.md

@@ -542,9 +542,9 @@ The Localization element allows you to support multiple locales or languages in
     <LocalizedString ElementType="DisplayControl" ElementId="emailVerificationControl" StringId="but_send_new_code">Send new code</LocalizedString>
     <LocalizedString ElementType="DisplayControl" ElementId="emailVerificationControl" StringId="but_change_claims">Change e-mail</LocalizedString>
     <!-- Claims-->
-    <LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="DisplayName">Verification Code</LocalizedString>
-    <LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="UserHelpText">Verification code received in the email.</LocalizedString>
-    <LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="AdminHelpText">Verification code received in the email.</LocalizedString>
+    <LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="DisplayName">Verification Code</LocalizedString>
+    <LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="UserHelpText">Verification code received in the email.</LocalizedString>
+    <LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="AdminHelpText">Verification code received in the email.</LocalizedString>
     <LocalizedString ElementType="ClaimType" ElementId="email" StringId="DisplayName">Email</LocalizedString>
     <!-- Email validation error messages-->
     <LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfSessionDoesNotExist">You have exceeded the maximum time allowed.</LocalizedString>

articles/ai-studio/concepts/fine-tuning-overview.md

@@ -99,6 +99,7 @@ There isn't a single right answer to this question, but you should have clearly
 
 Now that you know when to leverage fine-tuning for your use-case, you can go to Azure AI Studio to find several models available to fine-tune including:
 - Azure OpenAI models
+- Phi-3 family of models
 - Meta Llama 2 family models
 - Meta Llama 3.1 family of models
 
@@ -119,22 +120,33 @@ The following Azure OpenAI models are supported in Azure AI Studio for fine-tuni
 
 Please note for fine-tuning Azure OpenAI models, you must add a connection to an Azure OpenAI resource with a supported region to your project.
 
+### Phi-3 family models
+The following Phi-3 family models are supported in Azure AI Studio for fine-tuning:
+- `Phi-3-mini-4k-instruct`
+- `Phi-3-mini-128k-instruct`
+- `Phi-3-medium-4k-instruct`
+- `Phi-3-medium-128k-instruct`
+
+Fine-tuning of Phi-3 models is currently supported in projects located in East US2.
+
 ### Llama 2 family models
 The following Llama 2 family models are supported in Azure AI Studio for fine-tuning:
 - `Meta-Llama-2-70b`
 - `Meta-Llama-2-7b`
 - `Meta-Llama-2-13b`
 
-Fine-tuning of Llama 2 models is currently supported in projects located in West US 3.
+Fine-tuning of Llama 2 models is currently supported in projects located in West US3.
 
 ### Llama 3.1 family models
 The following Llama 3.1 family models are supported in Azure AI Studio for fine-tuning:
 - `Meta-Llama-3.1-70b-Instruct`
-- `Meta-Llama-3.1-7b-Instruct`
+- `Meta-Llama-3.1-8b-Instruct`
 
-Fine-tuning of Llama 3.1 models is currently supported in projects located in West US 3.
+Fine-tuning of Llama 3.1 models is currently supported in projects located in West US3.
 
 ## Related content
 
 - [Learn how to fine-tune an Azure OpenAI model in Azure AI Studio](../../ai-services/openai/how-to/fine-tuning.md?context=/azure/ai-studio/context/context)
 - [Learn how to fine-tune a Llama 2 model in Azure AI Studio](../how-to/fine-tune-model-llama.md)
+- [Learn how to fine-tune a Phi-3 model in Azure AI Studio](../how-to/fine-tune-phi-3.md)
+- [How to deploy Phi-3 family of small language models with Azure AI Studio](../how-to/deploy-models-phi-3.md)