Merge branch 'main' into FacialMotion

Author: sally-baolian

.openpublishing.publish.config.json

@@ -813,8 +813,8 @@
       "branch_mapping": {}
     },
     {
-      "path_to_root": "azure-spring-cloud-reference-architecture",
-      "url": "https://github.com/Azure/azure-spring-cloud-reference-architecture",
+      "path_to_root": "azure-spring-apps-reference-architecture",
+      "url": "https://github.com/Azure/azure-spring-apps-reference-architecture",
       "branch": "main",
       "branch_mapping": {}
     },
@@ -978,6 +978,7 @@
     ".openpublishing.redirection.app-service.json",
     ".openpublishing.redirection.key-vault.json",
     ".openpublishing.redirection.sql-database.json",
+    ".openpublishing.redirection.machine-configuration.json",
     ".openpublishing.redirection.security-benchmark.json",
     "articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
     ".openpublishing.redirection.azure-web-pubsub.json",
@@ -1016,9 +1017,11 @@
     "articles/mysql/.openpublishing.redirection.mysql.json",
     "articles/container-apps/.openpublishing.redirection.container-apps.json",
     "articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
+    "articles/spring-apps/.openpublishing.redirection.spring-apps.json",
     "articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
     "articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
     "articles/machine-learning/.openpublishing.redirection.machine-learning.json",
-    "articles/static-web-apps/.openpublishing.redirection.static-web-apps.json"
+    "articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
+    ".openpublishing.redirection.virtual-desktop.json"
   ]
 }

.openpublishing.redirection.active-directory.json

@@ -55,6 +55,11 @@
       "redirect_url": "/azure/active-directory/authentication/how-to-mfa-registration-campaign",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust-github.md",
+      "redirect_url":"/azure/active-directory/develop/workload-identity-federation-create-trust",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
       "redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
@@ -10825,7 +10830,13 @@
       "source_path": "articles/active-directory/manage-apps/howto-enforce-signed-saml-authentication.md",
       "redirect_url": "/azure/active-directory/manage-apps/howto-saml-token-encryption",
       "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
+      "redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
+      "redirect_document_id": false
     }
 
+
   ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -233,27 +233,27 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-examples.md",
-            "redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-options.md",
-            "redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-overview.md",
-            "redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-tasks.md",
-            "redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-tiles.md",
-            "redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
             "redirect_document_id": false
         },
         {
@@ -268,7 +268,7 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/workbooks-add-text.md",
-            "redirect_url": "/azure/azure-monitor/visualize/workbooks-add-workbook-elements",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-create-workbook",
             "redirect_document_id": false
         },
         {
@@ -341,6 +341,11 @@
             "redirect_url": "/azure/data-explorer/data-explorer-insights",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/insights/troubleshoot-workbooks.md" ,
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/vm/vminsights-ga-release-faq.md" ,
             "redirect_url": "/azure/azure-monitor/faq#vm-insights",
@@ -430,6 +435,56 @@
             "source_path_from_root": "/articles/azure-monitor/insights/key-vault-insights-overview.md" ,
             "redirect_url": "/azure/key-vault/key-vault-insights-overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/proactive-diagnostics.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/proactive-diagnostics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/proactive-failure-diagnostics.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/proactive-failure-diagnostics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/proactive-performance-diagnostics.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/proactive-performance-diagnostics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/proactive-trace-severity.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/proactive-trace-severity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/proactive-exception-volume.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/proactive-exception-volume",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/proactive-potential-memory-leak.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/proactive-potential-memory-leak",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/proactive-application-security-detection-pack.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/proactive-application-security-detection-pack",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/proactive-arm-config.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/proactive-arm-config",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/proactive-email-notification.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/proactive-email-notification",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/cloudservices.md" ,
+            "redirect_url": "/azure/azure-monitor/app/azure-web-apps-net-core",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.json

@@ -24728,11 +24728,6 @@
       "redirect_url": "/azure/traffic-manager/traffic-manager-manage-profiles",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/virtual-desktop/connect-windows-7-and-10.md",
-      "redirect_url": "/azure/virtual-desktop/connect-windows-7-10",
-      "redirect_document_id": true
-    },
     {
       "source_path_from_root": "/articles/troubleshoot-client-connection.md",
       "redirect_url": "/azure/virtual-desktop/troubleshoot-client",

.openpublishing.redirection.machine-configuration.json

@@ -0,0 +1,69 @@
+{
+    "redirections": [
+        {
+          "source_path_from_root": "/articles/governance/policy/concepts/guest-configuration.md",
+          "redirect_url": "/azure/governance/machine-configuration/overview",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/concepts/guest-configuration-policy-effects.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-policy-effects",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-desired-state-configuration-extension-migration.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-dsc-extension-migration",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/concepts/guest-configuration-custom.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-custom",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-test.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-test",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-signing.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-signing",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-setup.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-setup",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-publish.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-publish",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-definition.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-definition",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-assignment.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-assignment",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-azure-automation-migration.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-azure-automation-migration",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/concepts/guest-configuration-assignments.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-assignments",
+          "redirect_document_id": false
+        },
+      ]
+}

.openpublishing.redirection.virtual-desktop.json

@@ -0,0 +1,24 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/virtual-desktop/connect-windows-7-and-10.md",
+            "redirect_url": "/azure/virtual-desktop/connect-windows-7-10",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/create-file-share.md",
+            "redirect_url": "/azure/virtual-desktop/fslogix-profile-container-configure-azure-files-active-directory",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/azure-files-authorization.md",
+            "redirect_url": "/azure/virtual-desktop/fslogix-profile-container-configure-azure-files-active-directory",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/create-profile-container-adds.md",
+            "redirect_url": "/azure/virtual-desktop/fslogix-profile-container-configure-azure-files-active-directory",
+            "redirect_document_id": true
+        }
+    ]
+}

.whatsnew/.azure-monitor.json

@@ -0,0 +1,77 @@
+{
+  "$schema": "https://whatsnewapi.azurewebsites.net/schema",
+  "docSetProductName": "Azure Monitor",
+  "rootDirectory": "articles/azure-monitor/",
+  "docLinkSettings": {
+    "linkFormat": "relative",
+    "relativeLinkPrefix": "/azure/azure-monitor/"
+  },
+  "inclusionCriteria": {
+    "labels": [
+      "label:whats-new"
+    ],
+    "minAdditionsToFile": 1
+  },
+  "areas": [
+    {
+      "names": ["."],
+      "heading": "General"
+    },
+    {
+      "names":["agents"],
+      "heading": "Agents"
+    },
+    {
+      "names":["alters"],
+      "heading": "Alerts"
+    },
+    {
+      "names":["app"],
+      "heading": "Application Insights"
+    },
+    {
+      "names":["autoscale"],
+      "heading": "Autoscale"
+    },
+    {
+      "names":["change"],
+      "heading": "Change Analysis"
+    },
+    {
+      "names":["containers"],
+      "heading": "Containers"
+    },
+    {
+      "names":["essentials"],
+      "heading": "Essentials"
+    },
+    {
+      "names":["insights"],
+      "heading": "Insights"
+    },
+    {
+      "names":["logs"],
+      "heading": "Logs"
+    },
+    {
+      "names":["media"],
+      "heading": "Media"
+    },
+    {
+      "names":["profiler"],
+      "heading": "Profiler"
+    },
+    {
+      "names":["snapshot-debugger"],
+      "heading": "Snapshot Debugger"
+    },
+    {
+      "names":["visualize"],
+      "heading": "Visualize"
+    },
+    {
+      "names":["vm"],
+      "heading": "VMs"
+    }
+  ]
+}

articles/active-directory-b2c/authorization-code-flow.md

@@ -8,7 +8,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 04/12/2022
+ms.date: 07/29/2022
 ms.author: kengaderdus
 ms.subservice: B2C
 ms.custom: fasttrack-edit
@@ -60,7 +60,7 @@ client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6
 |{tenant}| Required | Name of your Azure AD B2C tenant|
 | {policy} | Required | The user flow to be run. Specify the name of a user flow you've created in your Azure AD B2C tenant. For example: `b2c_1_sign_in`, `b2c_1_sign_up`, or `b2c_1_edit_profile`. |
 | client_id |Required |The application ID assigned to your app in the [Azure portal](https://portal.azure.com). |
-| response_type |Required |The response type, which must include `code` for the authorization code flow. |
+| response_type |Required |The response type, which must include `code` for the authorization code flow. You can receive an ID token if you include it in the response type, such as `code+id_token`, and in this case, the scope needs to include `openid`.|
 | redirect_uri |Required |The redirect URI of your app, where authentication responses are sent and received by your app. It must exactly match one of the redirect URIs that you registered in the portal, except that it must be URL-encoded. |
 | scope |Required |A space-separated list of scopes. The `openid` scope indicates a permission to sign in the user and get data about the user in the form of ID tokens. The `offline_access` scope is optional for web applications. It indicates that your application will need a *refresh token* for extended access to resources.The client-id indicates the token issued are intended for use by Azure AD B2C registered client. The `https://{tenant-name}/{app-id-uri}/{scope}` indicates a permission to protected resources, such as a web API. For more information, see [Request an access token](access-tokens.md#scopes). |
 | response_mode |Recommended |The method that you use to send the resulting authorization code back to your app. It can be `query`, `form_post`, or `fragment`. |