Merge branch 'MicrosoftDocs:main' into main

Author: KimForss

.openpublishing.redirection.app-service.json

@@ -2659,6 +2659,21 @@
             "source_path": "articles/app-service/quickstart-dotnet-framework.md",
             "redirect_url": "/azure/app-service/quickstart-dotnetcore?tabs=netframework48",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/app-service/quickstart-arm-template-uiex.md",
+            "redirect_url": "/azure/app-service/quickstart-arm-template",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/app-service/quickstart-dotnetcore-uiex.md",
+            "redirect_url": "/azure/app-service/quickstart-dotnetcore",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/app-service/quickstart-java-uiex.md",
+            "redirect_url": "/azure/app-service/quickstart-java",
+            "redirect_document_id": true
         }
     ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -6750,6 +6750,11 @@
             "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/search/cognitive-search-tutorial-blob-python.md",
+            "redirect_url": "/azure/search/samples-python",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/search/semantic-ranking.md",
             "redirect_url": "/azure/search/semantic-search-overview",
@@ -9385,6 +9390,11 @@
             "redirect_url": "/visualstudio/containers/overview-local-process-kubernetes",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/docker/index.yml",
+            "redirect_url": "/dotnet/architecture/microservices/container-docker-introduction/docker-defined",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/vs-azure-tools-docker-edit-and-refresh.md",
             "redirect_url": "/visualstudio/docker/vs-azure-tools-docker-edit-and-refresh",

.openpublishing.redirection.json

@@ -1055,6 +1055,21 @@
             "redirect_url": "/azure/sentinel/normalization-schema-process-event",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/sentinel/connect-cef-ama.md",
+            "redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/connect-cef-syslog.md",
+            "redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/connect-cef-syslog-options.md",
+            "redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/sentinel/notebooks-with-synapse.md",
             "redirect_url": "/azure/sentinel/notebooks-hunt",

.openpublishing.redirection.sentinel.json

@@ -218,45 +218,46 @@ Akamai Enterprise Application Access supports SAML federation with cloud IdPs li
    ```xml
    <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
    <TrustFrameworkPolicy
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns="http://schemas.microsoft.com/online/cpim/schemas/2013/06"
-    PolicySchemaVersion="0.3.0.0"
-    TenantId="fabrikam.onmicrosoft.com"
-    PolicyId="B2C_1A_signup_signin_saml"
-    PublicPolicyUri="http://fabrikam.onmicrosoft.com/B2C_1A_signup_signin_saml">
-    <BasePolicy>
-      <TenantId>fabrikam.onmicrosoft.com</TenantId>
-      <PolicyId>B2C_1A_TrustFrameworkExtensions</PolicyId>
-    </BasePolicy>
-
-    <UserJourneys>
-      <UserJourney Id="SignUpOrSignIn">
-        <OrchestrationSteps>
-          <OrchestrationStep Order="7" Type="SendClaims" CpimIssuerTechnicalProfileReferenceId="AkamaiSaml2AssertionIssuer"/>
-        </OrchestrationSteps>
-      </UserJourney>
-    </UserJourneys>
-    <RelyingParty>
-      <DefaultUserJourney ReferenceId="SignUpOrSignIn" />
-      <TechnicalProfile Id="PolicyProfile">
-        <DisplayName>PolicyProfile</DisplayName>
-        <Protocol Name="SAML2"/>
-        <OutputClaims>
-          <OutputClaim ClaimTypeReferenceId="displayName" />
-          <OutputClaim ClaimTypeReferenceId="givenName" />
-          <OutputClaim ClaimTypeReferenceId="surname" />
-          <OutputClaim ClaimTypeReferenceId="email" DefaultValue="" />
-          <OutputClaim ClaimTypeReferenceId="identityProvider" DefaultValue="" />
-          <OutputClaim ClaimTypeReferenceId="objectId" PartnerClaimType="objectId"/>
-        </OutputClaims>
-        <SubjectNamingInfo ClaimType="objectId" ExcludeAsClaim="true"/>
-      </TechnicalProfile>
-    </RelyingParty>
-    </TrustFrameworkPolicy>
-    ```
-  >[!NOTE]
-  >You can follow this same process to implement other types of flows, for example, sign-in, password reset, or profile editing flows.
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+     xmlns="http://schemas.microsoft.com/online/cpim/schemas/2013/06"
+     PolicySchemaVersion="0.3.0.0"
+     TenantId="fabrikam.onmicrosoft.com"
+     PolicyId="B2C_1A_signup_signin_saml"
+     PublicPolicyUri="http://fabrikam.onmicrosoft.com/B2C_1A_signup_signin_saml">
+     <BasePolicy>
+       <TenantId>fabrikam.onmicrosoft.com</TenantId>
+       <PolicyId>B2C_1A_TrustFrameworkExtensions</PolicyId>
+     </BasePolicy>
+
+     <UserJourneys>
+       <UserJourney Id="SignUpOrSignIn">
+         <OrchestrationSteps>
+           <OrchestrationStep Order="7" Type="SendClaims" CpimIssuerTechnicalProfileReferenceId="AkamaiSaml2AssertionIssuer"/>
+         </OrchestrationSteps>
+       </UserJourney>
+     </UserJourneys>
+     <RelyingParty>
+       <DefaultUserJourney ReferenceId="SignUpOrSignIn" />
+       <TechnicalProfile Id="PolicyProfile">
+         <DisplayName>PolicyProfile</DisplayName>
+         <Protocol Name="SAML2"/>
+         <OutputClaims>
+           <OutputClaim ClaimTypeReferenceId="displayName" />
+           <OutputClaim ClaimTypeReferenceId="givenName" />
+           <OutputClaim ClaimTypeReferenceId="surname" />
+           <OutputClaim ClaimTypeReferenceId="email" DefaultValue="" />
+           <OutputClaim ClaimTypeReferenceId="identityProvider" DefaultValue="" />
+           <OutputClaim ClaimTypeReferenceId="objectId" PartnerClaimType="objectId"/>
+         </OutputClaims>
+         <SubjectNamingInfo ClaimType="objectId" ExcludeAsClaim="true"/>
+       </TechnicalProfile>
+     </RelyingParty>
+   </TrustFrameworkPolicy>
+   ```
+
+   >[!NOTE]
+   >You can follow this same process to implement other types of flows, for example, sign-in, password reset, or profile editing flows.
 
 ### Step 4 - Upload your policy
 

.whatsnew/.azure-monitor.json

@@ -635,7 +635,13 @@
       "source_path_from_root": "/articles/ai-services/translator/document-translation/quickstarts/document-translation-rest-api.md",
       "redirect_url": "/azure/ai-services/translator/document-translation/quickstarts/asynchronous-rest-api",
       "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/document-intelligence/concept-retrieval-augumented-generation.md",
+      "redirect_url": "/azure/ai-services/document-intelligence/concept-retrieval-augmented-generation",
+      "redirect_document_id": true
     }
 
+
   ]
 }