Merge pull request #241138 from MicrosoftDocs/main

Publish to live, Sunday 4 AM PST, 6/11

Author: ttorble

.openpublishing.redirection.active-directory.json

@@ -2515,6 +2515,16 @@
       "redirect_url": "/azure/active-directory/develop/active-directory-authentication-protocols",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/active-directory-authentication-protocols.md",
+      "redirect_url": "/azure/active-directory/develop/authentication-protocols",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/active-directory-certificate-credentials.md",
+      "redirect_url": "/azure/active-directory/develop/certificate-credentials",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/active-directory-authentication-scenarios.md",
       "redirect_url": "/azure/active-directory/develop/active-directory-authentication-scenarios",
@@ -2734,6 +2744,16 @@
       "redirect_url": "/azure/active-directory/develop/active-directory-saml-protocol-reference",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/active-directory-saml-protocol-reference.md",
+      "redirect_url": "/azure/active-directory/develop/saml-protocol-reference",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/howto-add-app-roles-in-azure-ad-apps.md",
+      "redirect_url": "/azure/active-directory/develop/howto-add-app-roles-in-apps",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/active-directory-signing-key-rollover.md",
       "redirect_url": "/azure/active-directory/develop/signing-key-rollover",

.openpublishing.redirection.azure-kubernetes-service.json

@@ -4,6 +4,11 @@
             "source_path_from_root": "/articles/aks/stop-api-upgrade.md",
             "redirect_url": "/azure/aks/upgrade-cluster",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/aks/cilium-enterprise-marketplace.md",
+            "redirect_url": "/azure/aks/azure-cni-powered-by-cilium",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.json

@@ -13928,6 +13928,26 @@
             "redirect_url": "/previous-versions/azure/search/search-how-to-index-power-query-data-sources",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/search/search-get-started-dotnet.md",
+            "redirect_url": "/azure/search/search-get-started-text",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/search/search-get-started-python.md",
+            "redirect_url": "/azure/search/search-get-started-text",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/search/search-get-started-java.md",
+            "redirect_url": "/azure/search/search-get-started-text",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/search/search-get-started-javascript.md",
+            "redirect_url": "/azure/search/search-get-started-text",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/search/search-performance-optimization.md",
             "redirect_url": "/azure/search/search-reliability",

articles/active-directory/develop/TOC.yml

@@ -445,7 +445,7 @@
             - name: Restrict your app to a set of users
               href: howto-restrict-your-app-to-a-set-of-users.md
             - name: Add app roles in your application
-              href: howto-add-app-roles-in-azure-ad-apps.md
+              href: howto-add-app-roles-in-apps.md
             - name: Implement RBAC in your application
               href: howto-implement-rbac-for-apps.md
             - name: Support FIDO2 authentication
@@ -822,15 +822,15 @@
               displayName: App types, OAuth
               href: v2-app-types.md
             - name: Certificate credentials
-              href: active-directory-certificate-credentials.md
+              href: certificate-credentials.md
             - name: Signing key rollover
               href: signing-key-rollover.md
             - name: UserInfo endpoint (OIDC)
               href: userinfo.md            
         - name: SAML 2.0
           items:
             - name: How Azure AD uses the SAML protocol
-              href: active-directory-saml-protocol-reference.md
+              href: saml-protocol-reference.md
             - name: SAML single sign-on (SSO)
               displayName: SSO
               href: single-sign-on-saml-protocol.md

articles/active-directory/develop/active-directory-v2-protocols.md

@@ -22,7 +22,7 @@ Knowing about OAuth or OpenID Connect (OIDC) at the protocol level isn't require
 
 Four parties are generally involved in an OAuth 2.0 and OpenID Connect authentication and authorization exchange. These exchanges are often called *authentication flows* or *auth flows*.
 
-![Diagram showing the OAuth 2.0 roles](./media/active-directory-v2-flows/protocols-roles.svg)
+![Diagram showing the OAuth 2.0 roles](./media/v2-flows/protocols-roles.svg)
 
 * **Authorization server** - The identity platform is the authorization server. Also called an *identity provider* or *IdP*, it securely handles the end-user's information, their access, and the trust relationships between the parties in the auth flow. The authorization server issues the security tokens your apps and APIs use for granting, denying, or revoking access to resources (authorization) after the user has signed in (authenticated).
 

articles/active-directory/develop/active-directory-authentication-protocols.md renamed to articles/active-directory/develop/authentication-protocols.md

@@ -37,7 +37,7 @@ Use the following steps to locate the enterprise application:
 1. Enter the name of the existing application in the search box, and then select the application from the search results.
 1. After the application is selected, copy the object ID from the overview pane.
 
-    :::image type="content" source="media/active-directory-enterprise-app-role-management/record-objectid.png" alt-text="Screenshot that shows how to locate and record the object identifier for the application.":::
+    :::image type="content" source="media/enterprise-app-role-management/record-objectid.png" alt-text="Screenshot that shows how to locate and record the object identifier for the application.":::
 
 ## Add roles
 
@@ -119,7 +119,7 @@ Update the attributes to define the role claim that is included in the token.
 1. From the **Source attribute** list, select **user.assignedroles**.
 1. Select **Save**. The new **Role Name** attribute should now appear in the **Attributes & Claims** section. The claim should now be included in the access token when signing into the application.
 
-    :::image type="content" source="media/active-directory-enterprise-app-role-management/attributes-summary.png" alt-text="Screenshot that shows a display of the list of attributes and claims defined for the application.":::
+    :::image type="content" source="media/enterprise-app-role-management/attributes-summary.png" alt-text="Screenshot that shows a display of the list of attributes and claims defined for the application.":::
 
 ## Assign roles
 
@@ -131,7 +131,7 @@ After the service principal is patched with more roles, you can assign users to
 1. Select **None Selected**, select the role from the list, and then select **Select**.
 1. Select **Assign** to assign the role to the user.
 
-    :::image type="content" source="media/active-directory-enterprise-app-role-management/assign-role.png" alt-text="Screenshot that shows how to assign a role to a user of an application.":::
+    :::image type="content" source="media/enterprise-app-role-management/assign-role.png" alt-text="Screenshot that shows how to assign a role to a user of an application.":::
 
 ## Update roles
 

articles/active-directory/develop/active-directory-certificate-credentials.md renamed to articles/active-directory/develop/certificate-credentials.md

@@ -43,11 +43,11 @@ To create an app role by using the Azure portal's user interface:
 1. Under **Manage**, select **App registrations**, and then select the application you want to define app roles in.
 1. Select **App roles**, and then select **Create app role**.
 
-   :::image type="content" source="media/howto-add-app-roles-in-azure-ad-apps/app-roles-overview-pane.png" alt-text="An app registration's app roles pane in the Azure portal":::
+   :::image type="content" source="media/howto-add-app-roles-in-apps/app-roles-overview-pane.png" alt-text="An app registration's app roles pane in the Azure portal":::
 
 1. In the **Create app role** pane, enter the settings for the role. The table following the image describes each setting and their parameters.
 
-   :::image type="content" source="media/howto-add-app-roles-in-azure-ad-apps/app-roles-create-context-pane.png" alt-text="An app registration's app roles create context pane in the Azure portal":::
+   :::image type="content" source="media/howto-add-app-roles-in-apps/app-roles-create-context-pane.png" alt-text="An app registration's app roles create context pane in the Azure portal":::
 
    | Field                                    | Description                                                                                                                                                                                                                                                                                                       | Example                       |
    | ---------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------- |

articles/active-directory/develop/enterprise-app-role-management.md

@@ -183,7 +183,7 @@ To learn more about making API calls to Azure AD and Microsoft 365 services like
 [MSFT-Graph-permission-scopes]: /graph/permissions-reference
 
 <!--Image references-->
-[AAD-Sign-In]: ./media/active-directory-devhowto-multi-tenant-overview/sign-in-with-microsoft-light.png
+[AAD-Sign-In]: ./media/devhowto-multi-tenant-overview/sign-in-with-microsoft-light.png
 [Consent-Single-Tier]: ./media/howto-convert-app-to-be-multi-tenant/consent-flow-single-tier.svg
 [Consent-Multi-Tier-Known-Client]: ./media/howto-convert-app-to-be-multi-tenant/consent-flow-multi-tier-known-clients.svg
 [Consent-Multi-Tier-Multi-Party]: ./media/howto-convert-app-to-be-multi-tenant/consent-flow-multi-tier-multi-party.svg