merge conflict

Author: dlepow

.openpublishing.publish.config.json

@@ -1289,7 +1289,6 @@
   ".openpublishing.redirection.azure-databricks.json",
   ".openpublishing.redirection.azure-datalake-storage-gen1.json",
   ".openpublishing.redirection.azure-hpc.json",
-  ".openpublishing.redirection.azure-kubernetes-service.json",
   ".openpublishing.redirection.azure-monitor.json",
   ".openpublishing.redirection.azure-percept.json",
   ".openpublishing.redirection.azure-productivity.json",
@@ -1337,7 +1336,6 @@
   "articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
   "articles/ai-services.openpublishing.redirection.ai-services.json",
   "articles/ai-studio/.openpublishing.redirection.ai-studio.json",
-  "articles/aks/.openpublishing.redirection.aks.json",
   "articles/analysis-services/.openpublishing.redirection.analysis-services.json",
   "articles/application-gateway/.openpublishing.redirection.application-gateway.json",
   "articles/automation/.openpublishing.redirection.automation.json",

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

@@ -165,6 +165,16 @@
             "source_path": "articles/container-registry/monitor-service-reference.md",
             "redirect_url": "/azure/container-registry/monitor-container-registry-reference",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/container-registry/container-registry-auth-aks.md",
+            "redirect_url": "/azure/aks/cluster-container-registry-integration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/container-service/kubernetes/container-service-kubernetes-jenkins.md",
+            "redirect_url": "/azure/aks/jenkins-continuous-deployment",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.container-registry.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path": "articles/sentinel/cef-name-mapping.md",
+            "redirect_url": "/azure/sentinel/cef-syslog-ama-overview",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/sentinel/detect-threats-built-in.md#use-analytics-rule-templates",
             "redirect_url": "/azure/sentinel/create-analytics-rule-from-template",

.openpublishing.redirection.json

@@ -1,5 +1,11 @@
 # Codeowners file
 # Each line is a file pattern followed by one or more owners.
 
-# Specify owners for the aks folder
+# Folder paths in this list have been migrated to new repositories and content can no longer be created for these services in this repo.
 /articles/aks @tynevi @thomps23
+/articles/defender-for-cloud  @tynevi @thomps23
+/articles/attestation  @tynevi @thomps23
+/articles/confidential-ledger  @tynevi @thomps23
+/articles/dedicated-hsm  @tynevi @thomps23
+/articles/key-vault  @tynevi @thomps23
+/articles/payment-hsm  @tynevi @thomps23

.openpublishing.redirection.sentinel.json

@@ -42,7 +42,7 @@ As a *Global Administrator* in an Azure AD B2C tenant, you can restrict non-admi
 
 1. Under **Manage**, select **User Settings**.
 
-1. Under **Tenant creation**, select **Yes**. 
+1. Under **Default user role permissions**, for **Restrict non-admin users from creating tenants**, select **Yes**. 
 
 1. At the top of the **User Settings** page, select **Save**. 
 
@@ -58,7 +58,7 @@ Before you create an Azure AD B2C tenant, make sure that you've the permission t
 
 1. Under **Manage**, select **User Settings**.
 
-1. Review your **Tenant Creation** setting. If the settings is set to **No**, then contact your administrator to assign the tenant creator role to you. The setting is greyed out if you're not an administrator in the tenant.
+1.  Under **Default user role permissions**, review your **Restrict non-admin users from creating tenants** setting. If the setting is set to **No**, then contact your administrator to assign the tenant creator role to you. The setting is greyed out if you're not an administrator in the tenant.
 
 
 ## Next steps 

CODEOWNERS

@@ -1,5 +1,5 @@
 ---
-ms.service: advisor
+ms.service: azure-advisor
 ms.topic: include
 ms.date: 07/07/2022
 author: ikhapova

articles/active-directory-b2c/tenant-management-check-tenant-creation-permission.md

@@ -7,7 +7,7 @@ metadata:
   title: Azure Advisor documentation
   description: Azure Advisor is a personalized cloud consultant that helps you follow best practices to optimize your Azure deployments. It analyzes your resource configuration and usage telemetry. It then recommends solutions to help improve the performance, security, and high availability of your resources while looking for opportunities to reduce your overall Azure spend.
   ms.topic: landing-page
-  ms.service: advisor
+  ms.service: azure-advisor
   author: rboucher
   ms.author: robb
   ms.date: 10/16/2019

articles/advisor/includes/azure-advisor.md

@@ -314,6 +314,77 @@
             "source_path_from_root": "/articles/ai-services/document-intelligence/concept-document-intelligence-studio.md",
             "redirect_url": "/azure/ai-services/document-intelligence/studio-overview",
             "redirect_document_id": true
+          },
+          {
+            "source_path_from_root": "/articles/ai-services/speech-service/quickstart-custom-commands-application.md",
+            "redirect_url": "/azure/ai-services/speech-service/custom-commands",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/ai-services/speech-service/how-to-develop-custom-commands-application.md",
+            "redirect_url": "/azure/ai-services/speech-service/custom-commands",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/ai-services/speech-service/how-to-custom-commands-setup-speech-sdk.md",
+            "redirect_url": "/azure/ai-services/speech-service/custom-commands",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/ai-services/speech-service/how-to-custom-commands-send-activity-to-client.md",
+            "redirect_url": "/azure/ai-services/speech-service/custom-commands",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/ai-services/speech-service/how-to-custom-commands-setup-web-endpoints.md",
+            "redirect_url": "/azure/ai-services/speech-service/custom-commands",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/ai-services/speech-service/how-to-custom-commands-update-command-from-client.md",
+            "redirect_url": "/azure/ai-services/speech-service/custom-commands",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/ai-services/speech-service/how-to-custom-commands-update-command-from-web-endpoint.md",
+            "redirect_url": "/azure/ai-services/speech-service/custom-commands",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/ai-services/speech-service/how-to-custom-commands-deploy-cicd.md",
+            "redirect_url": "/azure/ai-services/speech-service/custom-commands",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/ai-services/speech-service/how-to-custom-commands-developer-flow-test.md",
+            "redirect_url": "/azure/ai-services/speech-service/custom-commands",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/ai-services/speech-service/how-to-custom-commands-debug-build-time.md",
+            "redirect_url": "/azure/ai-services/speech-service/custom-commands",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/ai-services/speech-service/how-to-custom-commands-debug-runtime.md",
+            "redirect_url": "/azure/ai-services/speech-service/custom-commands",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/ai-services/speech-service/custom-commands-references.md",
+            "redirect_url": "/azure/ai-services/speech-service/custom-commands",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/ai-services/speech-service/custom-commands-encryption-of-data-at-rest.md",
+            "redirect_url": "/azure/ai-services/speech-service/custom-commands",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/ai-services/speech-service/faq-voice-assistants.yml",
+            "redirect_url": "/azure/ai-services/speech-service/custom-commands",
+            "redirect_document_id": false
           }
+
     ]
-  }
+}