fixing merge conflict

Author: Blackmist

.acrolinx-config.edn

@@ -1,2 +1,2 @@
 {:allowed-branchname-matches ["main" "release-.*"]
- :allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/|resource-graph/samples/))"]}
+ :allowed-filename-matches ["articles"]}

.github/policies/disallow-edits.yml

@@ -19,14 +19,18 @@ configuration:
                 @${issueAuthor} - You tried to add an index file to this repository; this is not permitted so your pull request will be closed automatically.
           - closePullRequest
 
-      - description: Close PRs to the "ai-services/personalizer" folder where the author isn't a member of the MicrosoftDocs org (i.e. PRs in public repo).
+      - description: Close PRs to the "ai-services/personalizer" and "ai-services/responsible-ai" folders where the author isn't a member of the MicrosoftDocs org (i.e. PRs in public repo).
         if:
           - payloadType: Pull_Request
           - isAction:
               action: Opened
-          - filesMatchPattern:
-              matchAny: true
-              pattern: articles/ai-services/personalizer/*
+          - or:
+            - filesMatchPattern:
+                matchAny: true
+                pattern: articles/ai-services/personalizer/*
+            - filesMatchPattern:
+                matchAny: true
+                pattern: articles/ai-services/responsible-ai/*
           - not:
               activitySenderHasAssociation:
                 association: Member
@@ -65,3 +69,55 @@ configuration:
                 - mrbullwinkle
               replyTemplate: ${mentionees} - Please review this PR and sign off when you're ready to merge it.
               assignMentionees: True # This part probably won't work since the bot doesn't have write perms.
+          - addLabel:
+              label: needs-human-review
+
+      - description: \@mention specific people when a PR is opened in the "ai-services/responsible-ai" folder.
+        if:
+          - payloadType: Pull_Request
+          - isAction:
+              action: Opened
+          - filesMatchPattern:
+              matchAny: true
+              pattern: articles/ai-services/responsible-ai/*
+          - activitySenderHasAssociation:
+              association: Member
+          - not:
+              or:
+                - isActivitySender:
+                    user: eric-urban
+                - isActivitySender:
+                    user: nitinme
+                - isActivitySender:
+                    user: mrbullwinkle
+                - isActivitySender:
+                    user: aahill
+                - isActivitySender:
+                    user: laujan
+                - isActivitySender:
+                    user: patrickfarley
+                - isActivitySender:
+                    user: jboback
+                - isActivitySender:
+                    user: heidisteen
+                - isActivitySender:
+                    user: haileytap
+        then:
+          - addReply:
+              reply: >-
+                @${issueAuthor} - Please don't sign off on this PR. The area owners will sign off once they've reviewed your contribution.
+          - mentionUsers:
+              mentionees:
+                - eric-urban
+                - nitinme
+                - mrbullwinkle
+                - aahill
+                - laujan
+                - patrickfarley
+                - jboback
+                - heidisteen
+                - haileytap
+              replyTemplate: ${mentionees} - Please review this PR and sign off when you're ready to merge it.
+              assignMentionees: True # This part probably won't work since the bot doesn't have write perms.
+          - addLabel:
+              label: needs-human-review

.gitignore

@@ -9,4 +9,8 @@ _site/
 _themes*/
 _repo.*/
 
-.openpublishing.buildcore.ps1
+.openpublishing.buildcore.ps1
+
+# CoPilot instructions and prompts
+.github/copilot-instructions.md
+.github/prompts/*.md

.openpublishing.publish.config.json

@@ -92,6 +92,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure-functions-ai-services-agent-javascript",
+      "url": "https://github.com/Azure-Samples/azure-functions-ai-services-agent-javascript",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "samples-cognitive-services-speech-sdk",
       "url": "https://github.com/Azure-Samples/cognitive-services-speech-sdk",

.openpublishing.redirection.json

@@ -264,6 +264,11 @@
       "source_path_from_root": "/articles/ai-services/openai/concepts/provisioned-reservation-update.md",
       "redirect_url": "/azure/ai-services/openai/concepts/provisioned-migration",
       "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/custom-vision-service/logo-detector-mobile.md",
+      "redirect_url": "/azure/ai-services/custom-vision-service",
+      "redirect_document_id": false
     }
   ]
 }

.whatsnew.json

@@ -9,22 +9,22 @@
     "navigationOptions": {
         "maximumNumberOfArticles": 5,
         "tocParentNode": "Latest documentation updates",
-        "repoTocFolder": "articles/ai-services",
+        "repoTocFolder": "articles/whats-new",
         "indexParentNode": "Latest documentation updates",
-        "repoIndexFolder": "articles/ai-services"
+        "repoIndexFolder": "articles/whats-new"
     },
     "areas": [
         {
             "names": [ "ai-services" ],
             "heading": "Azure AI Services"
         },
         {
-            "names": [ "ai-studio" ],
-            "heading": "Azure AI Foundry"
+            "names": [ "ai-foundry" ],
+            "heading": "Azure Foundry"
         },
         {
             "names": [ "machine-learning" ],
-            "heading": "Azure Machine Learning"
+            "heading": "Machine Learning"
         },
         {
             "names": [ "search" ],

articles/ai-foundry/.openpublishing.redirection.ai-studio.json

@@ -1,5 +1,25 @@
 {
     "redirections": [
+        {
+          "source_path_from_root": "/articles/ai-foundry/azure-openai-in-ai-foundry.md",
+          "redirect_url": "/azure/ai-foundry/azure-openai-in-azure-ai-foundry",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/ai-foundry/what-is-ai-foundry.md",
+          "redirect_url": "/azure/ai-foundry/what-is-azure-ai-foundry",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/ai-foundry/whats-new-ai-foundry.md",
+          "redirect_url": "/azure/ai-foundry/whats-new-azure-ai-foundry",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/ai-foundry/concepts/rbac-ai-foundry.md",
+          "redirect_url": "/azure/ai-foundry/concepts/rbac-azure-ai-foundry",
+          "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/ai-studio/how-to/access-on-premises-resources.md",
             "redirect_url": "/azure/ai-foundry/how-to/access-on-premises-resources",
@@ -90,6 +110,11 @@
             "redirect_url": "/azure/ai-foundry/how-to/data-add",
             "redirect_document_id": true
           },
+          {
+            "source_path_from_root": "/articles/ai-foundry/model-inference/reference/api-version-updates.md",
+            "redirect_url": "/rest/api/aifoundry/modelinference",
+            "redirect_document_id": false
+          },
           {
             "source_path_from_root": "/articles/ai-studio/how-to/deploy-models-cohere-command.md",
             "redirect_url": "/azure/ai-foundry/how-to/deploy-models-cohere-command",
@@ -290,6 +315,11 @@
             "redirect_url": "/azure/ai-foundry/how-to/deploy-stability-models",
             "redirect_document_id": true
           },
+          {
+            "source_path_from_root": "/articles/ai-foundry/how-to/deploy-stability-models.md",
+            "redirect_url": "/azure/ai-foundry/concepts/models-featured#stability-ai",
+            "redirect_document_id": false
+          },          
           {
             "source_path_from_root": "/articles/ai-studio/how-to/disable-local-auth.md",
             "redirect_url": "/azure/ai-foundry/how-to/disable-local-auth",
@@ -639,7 +669,7 @@
         },
         {
             "source_path_from_root": "/articles/ai-studio/concepts/rbac-ai-studio.md",
-            "redirect_url": "/azure/ai-foundry/concepts/rbac-ai-foundry",
+            "redirect_url": "/azure/ai-foundry/concepts/rbac-azure-ai-foundry",
             "redirect_document_id": true
         },
         {
@@ -664,7 +694,7 @@
         },
         {
             "source_path_from_root": "/articles/ai-studio/azure-openai-in-ai-studio.md",
-            "redirect_url": "/azure/ai-foundry/azure-openai-in-ai-foundry",
+            "redirect_url": "/azure/ai-foundry/azure-openai-in-azure-ai-foundry",
             "redirect_document_id": true
         },
         {
@@ -674,8 +704,8 @@
         },
         {
             "source_path_from_root": "/articles/ai-studio/ai-services/how-to/connect-ai-services.md",
-            "redirect_url": "/azure/ai-foundry/ai-services/how-to/connect-ai-services",
-            "redirect_document_id": true
+            "redirect_url": "/azure/ai-services/connect-services-ai-foundry-portal",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/ai-studio/ai-services/how-to/connect-azure-openai.md",
@@ -734,12 +764,12 @@
         },
         {
             "source_path_from_root": "/articles/ai-studio/what-is-ai-studio.md",
-            "redirect_url": "/azure/ai-foundry/what-is-ai-foundry",
+            "redirect_url": "/azure/ai-foundry/what-is-azure-ai-foundry",
             "redirect_document_id": true
         },
         {
             "source_path_from_root": "/articles/ai-studio/whats-new-ai-studio.md",
-            "redirect_url": "/azure/ai-foundry/whats-new-ai-foundry",
+            "redirect_url": "/azure/ai-foundry/whats-new-azure-ai-foundry",
             "redirect_document_id": true
         },
         {
@@ -850,7 +880,7 @@
         },
         {
             "source_path_from_root": "/articles/ai-studio/how-to/models-foundation-azure-ai.md",
-            "redirect_url": "/azure/ai-studio/ai-services/how-to/connect-ai-services",
+            "redirect_url": "/azure/ai-services/connect-services-ai-foundry-portal",
             "redirect_document_id": true
         },
         {
@@ -930,17 +960,17 @@
         },
         {
             "source_path_from_root": "/articles/ai-studio/ai-services/get-started.md",
-            "redirect_url": "/azure/ai-studio/ai-services/how-to/connect-ai-services",
+            "redirect_url": "/azure/ai-services/connect-services-ai-foundry-portal",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/ai-studio/ai-services/where-to-use-ai-services.md",
-            "redirect_url": "/azure/ai-studio/ai-services/how-to/connect-ai-services",
+            "redirect_url": "/azure/ai-services/connect-services-ai-foundry-portal",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/ai-studio/ai-services/connect-ai-services.md",
-            "redirect_url": "/azure/ai-studio/ai-services/how-to/connect-ai-services",
+            "redirect_url": "/azure/ai-services/connect-services-ai-foundry-portal",
             "redirect_document_id": false
         },
         {
@@ -1102,6 +1132,11 @@
             "source_path_from_root": "/articles/ai-foundry/how-to/prompt-flow.md",
             "redirect_url": "/azure/ai-foundry/concepts/prompt-flow",
             "redirect_document_id": true
+        },
+        {
+          "source_path_from_root": "/articles/ai-foundry/ai-services/how-to/connect-ai-services.md",
+          "redirect_url": "/azure/ai-services/connect-services-ai-foundry-portal",
+          "redirect_document_id": false
         }
     ]
 }

articles/ai-foundry/ai-services/content-safety-overview.md

@@ -7,18 +7,18 @@ ms.service: azure-ai-foundry
 ms.custom:
   - ignite-2024
 ms.topic: overview
-ms.date: 02/20/2025
+ms.date: 05/01/2025
 ms.author: pafarley
 author: PatrickFarley
 ---
 
 # Content Safety in the Azure AI Foundry portal
 
-Azure AI Content Safety is an AI service that detects harmful user-generated and AI-generated content in applications and services. Azure AI Content Safety includes various APIs that allow you to detect and prevent the output of harmful content. The interactive Content Safety **try out** page in [Azure AI Foundry portal](https://ai.azure.com) allows you to view, explore, and try out sample code for detecting harmful content across different modalities. 
+Azure AI Content Safety is an AI service that detects harmful user-generated and AI-generated content in applications and services. Azure AI Content Safety includes APIs that allow you to detect and prevent the output of harmful content. The interactive Content Safety **try it out** page in [Azure AI Foundry portal](https://ai.azure.com) allows you to view, explore, and try out sample code for detecting harmful content across different modalities. 
 
 ## Features
 
-You can use Azure AI Content Safety for many scenarios: 
+You can use Azure AI Content Safety for the following scenarios: 
 
 **Text content**: 
 - Moderate text content: This feature scans and moderates text content, identifying and categorizing it based on different levels of severity to ensure appropriate responses. 

articles/ai-foundry/ai-services/how-to/connect-azure-openai.md

@@ -145,5 +145,5 @@ At some point, you want to develop apps with code. Here are some developer resou
 
 ## Related content
 
-- [Azure OpenAI in Azure AI Foundry portal](../../azure-openai-in-ai-foundry.md)
+- [Azure OpenAI in Azure AI Foundry portal](../../azure-openai-in-azure-ai-foundry.md)
 - [Use Azure AI services resources](./connect-ai-services.md)

articles/ai-foundry/azure-openai-in-ai-foundry.md renamed to articles/ai-foundry/azure-openai-in-azure-ai-foundry.md

@@ -32,7 +32,7 @@ If you've been using Azure OpenAI Studio, all your work, such as your deployment
 
 :::image type="content" source="media/azure-openai-in-ai-studio/studio-home.png" alt-text="Screenshot shows the new Azure OpenAI in Azure AI Foundry portal." lightbox="media/azure-openai-in-ai-studio/studio-home.png":::
 
-Use the left navigation area to perform your tasks with Azure OpenAI models:
+Use the left pane to perform your tasks with Azure OpenAI models:
 
 * **Select models**: The **Model catalog** houses all the available Azure OpenAI models.