Merge branch 'MicrosoftDocs:main' into Windows-fixes

Author: allyford

.openpublishing.publish.config.json

@@ -1015,7 +1015,13 @@
       "url": "https://github.com/Azure/actions-workflow-samples",
       "branch": "master",
       "branch_mapping": {}
-    }  
+    },
+    {
+      "path_to_root": "azure-proactive-resiliency-library",
+      "url": "https://github.com/Azure/Azure-Proactive-Resiliency-Library",
+      "branch": "main",
+      "branch_mapping": {}
+    }
   ],
   "branch_target_mapping": {
     "live": ["Publish", "PDF"],
@@ -1060,15 +1066,17 @@
   ".openpublishing.redirection.sql-database.json",
   ".openpublishing.redirection.virtual-desktop.json",
   ".openpublishing.redirection.devops-project.json",
-  "articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
-  "articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
+  "articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json",
+  "articles/ai-services/.openpublishing.redirection.ai-services-from-cog.json",
+  "articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
+  "articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
+  "articles/ai-services/.openpublishing.redirection.cognitive-services.json",
   "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
   "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
   "articles/azure-relay/.openpublishing.redirection.relay.json",
   "articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
   "articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
   "articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
-  "articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
   "articles/communication-services/.openpublishing.redirection.communication-services.json",
   "articles/confidential-computing/.openpublishing.redirection.json",
   "articles/container-apps/.openpublishing.redirection.container-apps.json",

.openpublishing.redirection.active-directory.json

@@ -4375,6 +4375,11 @@
       "redirect_url": "/azure/active-directory/external-identities/user-token",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/customize-branding.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-customize-branding",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/active-directory/fundamentals/certificate-authorities.md",
       "redirect_url": "/azure/security/fundamentals/azure-CA-details",

.openpublishing.redirection.json

@@ -1790,6 +1790,21 @@
             "redirect_url": "/azure/automanage/index",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/automanage/windows-server-azure-edition-vnext.md",
+            "redirect_URL": "/windows-server/get-started/azure-edition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/automanage/automanage-hotpatch.md",
+            "redirect_URL": "/windows-server/get-started/hotpatch",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/automanage/automanage-windows-server-services-overview.md",
+            "redirect_URL": "/windows-server/get-started/azure-edition",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/aks/view-metrics.md",
             "redirect_url": "/azure/aks/monitor-aks",
@@ -22075,67 +22090,67 @@
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/apiref.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/",
+            "redirect_url": "/azure/ai-services/anomaly-detector/",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/overview.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/overview",
+            "redirect_url": "/azure/ai-services/anomaly-detector/overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/csharp.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-csharp",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-csharp",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/csharp-tutorial.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-csharp",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-csharp",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/curl.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-csharp",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-csharp",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/java.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-java",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-java",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/java-tutorial.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-java",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-java",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/javascript.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/javascript-tutorial.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/php.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/python.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/python-tutorial.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/ruby.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
             "redirect_document_id": false
         },
         {
@@ -24017,6 +24032,11 @@
             "source_path_from_root": "/articles/container-registry/github-action-scan.md",
             "redirect_url": "/azure/developer/github/",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-machines/virtual-machines-reliability.md",
+            "redirect_url": "/azure/virtual-machines/reliability-virtual-machines",
+            "redirect_document_id": true
         }
     ]
 }

CODEOWNERS

@@ -39,7 +39,7 @@ articles/service-health @rboucher
 /articles/synapse-analytics/synapse-link/ @Rodrigossz @SnehaGunda @jovanpop-msft
 
 # Cognitive Services
-/articles/cognitive-services/ @aahill @patrickfarley @nitinme @mrbullwinkle @laujan @eric-urban @jboback
+/articles/ai-services/ @aahill @patrickfarley @nitinme @mrbullwinkle @laujan @eric-urban @jboback
 
 # DevOps
 /articles/ansible/ @TomArcherMsft

articles/active-directory-b2c/application-types.md

@@ -90,7 +90,7 @@ To take advantage of this flow, your application can use an authentication libra
 
 ### Implicit grant flow
 
-Some libraries, like [MSAL.js 1.x](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-core), only support the [implicit grant flow](implicit-flow-single-page-application.md) or your application is implemented to use implicit flow. In these cases, Azure AD B2C supports the [OAuth 2.0 implicit flow](implicit-flow-single-page-application.md). The implicit grant flow allows the application to get **ID** and **Access** tokens. Unlike the authorization code flow, implicit grant flow doesn't return a **Refresh token**.
+Some libraries, like [MSAL.js 1.x](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib), only support the [implicit grant flow](implicit-flow-single-page-application.md) or your application is implemented to use implicit flow. In these cases, Azure AD B2C supports the [OAuth 2.0 implicit flow](implicit-flow-single-page-application.md). The implicit grant flow allows the application to get **ID** and **Access** tokens. Unlike the authorization code flow, implicit grant flow doesn't return a **Refresh token**.
 
 We **don't recommended** this approach.  
 

articles/active-directory-b2c/enable-authentication-angular-spa-app-options.md

@@ -26,7 +26,7 @@ Familiarize yourself with the article [Configure authentication in an Angular SP
 
 You can configure your single-page application to sign in users with MSAL.js in two ways:
 
-- **Pop-up window**: The authentication happens in a pop-up window, and the state of the application is preserved. Use this approach if you don't want users to move away from your application page during authentication.  However, there are [known issues with pop-up windows on Internet Explorer](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-browser/docs/internet-explorer.md#popups).
+- **Pop-up window**: The authentication happens in a pop-up window, and the state of the application is preserved. Use this approach if you don't want users to move away from your application page during authentication.  However, there are known issues with pop-up windows on Internet Explorer.
   - To sign in with pop-up windows, in the `src/app/app.component.ts` class, use the `loginPopup` method.  
   - In the `src/app/app.module.ts` class, set the `interactionType` attribute to `InteractionType.Popup`.
   - To sign out with pop-up windows, in the `src/app/app.component.ts` class, use the `logoutPopup` method. You can also configure `logoutPopup` to redirect the main window to a different page, such as the home page or sign-in page, after sign-out is complete by passing `mainWindowRedirectUri` as part of the request.
@@ -459,7 +459,7 @@ const msalConfig = {
 
 [!INCLUDE [active-directory-b2c-app-integration-logging](../../includes/active-directory-b2c-app-integration-logging.md)]
 
-To configure Angular [logging](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular/docs/v2-docs/logging.md), in *src/app/auth-config.ts*, configure the following keys:
+To configure Angular [logging](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular/docs/logging.md), in *src/app/auth-config.ts*, configure the following keys:
 
 - `loggerCallback` is the logger callback function. 
 - `logLevel` lets you specify the level of logging. Possible values: `Error`, `Warning`, `Info`, and `Verbose`.