Merge branch 'main' into revert-236178-aml-rollback

Author: aahill

.gitattributes

@@ -6,6 +6,9 @@
 *.c text
 *.h text
 
+# Include Markdown in the GitHub language breakdown statistics
+*.md linguist-detectable
+
 # Denote all files that are truly binary and should not be modified.
 *.gif   binary
 *.ico   binary

.openpublishing.redirection.active-directory.json

@@ -1,5 +1,30 @@
 {
   "redirections": [
+    {
+      "source_path_from_root": "/articles/app-service/scenario-secure-app-authentication-app-service-as-user.md",
+      "redirect_url": "/azure/app-service/scenario-secure-app-authentication-app-service",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/deploy-resource-manager-template.md",
+      "redirect_url": "/azure/app-service/quickstart-arm-template",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/deploy-complex-application-predictably.md",
+      "redirect_url": "/azure/app-service/quickstart-arm-template",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/quickstart-html.md",
+      "redirect_url": "/azure/static-web-apps/get-started-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/quickstart-html-uiex.md",
+      "redirect_url": "/azure/static-web-apps/get-started-portal",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/app-service-web/web-sites-restore.md",
       "redirect_url": "/azure/app-service/manage-backup",

.openpublishing.redirection.app-service.json

@@ -6026,11 +6026,6 @@
             "redirect_url": "/previous-versions/azure/azure-monitor/alerts/monitoring-classic-retirement",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-log-api-switch.md",
-            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-log-api-switch",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/view-designer.md",
             "redirect_url": "/previous-versions/azure/azure-monitor/visualize/view-designer",

.openpublishing.redirection.azure-monitor.json

@@ -4,6 +4,11 @@
             "source_path_from_root": "/articles/azure-vmware/send-logs-to-log-analytics.md",
             "redirect_url": "/azure/azure-vmware/configure-vmware-syslogs",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/attach-disk-pools-to-azure-vmware-solution-hosts.md",
+            "redirect_url": "/azure/storage/elastic-san/elastic-san-introduction",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.azure-vmware.json

@@ -66,6 +66,10 @@ articles/service-health @rboucher
 /articles/security-center/ @memildin
 /includes/*security-controls*.md @memildin
 
+# Defender for Cloud
+
+/articles/defender-for-cloud @dcurwin @ElazarK
+
 # DDOS Protection
 /articles/ddos-protection @aletheatoh @anupamvi
 

.openpublishing.redirection.json

@@ -73,7 +73,7 @@ git clone https://github.com/Azure-Samples/active-directory-b2c-msal-node-sign-i
 
 Extract the sample file to a folder. You'll get a web app with the following directory structure:
 
-```text
+```output
 active-directory-b2c-msal-node-sign-in-sign-out-webapp/
 ├── index.js
 └── package.json

CODEOWNERS

@@ -177,8 +177,8 @@ In the `ContosoCustomPolicy.XML` file, locate the `SignInUser` technical profile
             <Item Key="SignUpTarget">AccountTypeInputCollectorClaimsExchange</Item>
         </Metadata>
         <DisplayClaims>
-            <OutputClaim ClaimTypeReferenceId="email" Required="true" />
-            <OutputClaim ClaimTypeReferenceId="password" Required="true" />
+            <DisplayClaim ClaimTypeReferenceId="email" Required="true" />
+            <DisplayClaim ClaimTypeReferenceId="password" Required="true" />
         </DisplayClaims>
         <OutputClaims>
             <OutputClaim ClaimTypeReferenceId="email" />
@@ -327,4 +327,4 @@ You can sign in by entering the **Email Address** and **Password** of an existin
 
 - Learn how to [Remove the sign-up link](add-sign-in-policy.md), so users can just sign in.  
 
-- Learn more about [OpenID Connect technical profile](openid-connect-technical-profile.md).
+- Learn more about [OpenID Connect technical profile](openid-connect-technical-profile.md).

articles/active-directory-b2c/configure-a-sample-node-web-app.md

@@ -195,7 +195,7 @@ While the *Predicates* define the validation to check against a claim type, the
         </Parameters>
       </Predicate>
 
-      <Predicate Id="AllowedAADCharacters" Method="MatchesRegex" HelpText="An invalid character was provided.">
+      <Predicate Id="AllowedCharacters" Method="MatchesRegex" HelpText="An invalid character was provided.">
         <Parameters>
           <Parameter Id="RegularExpression">(^([0-9A-Za-z\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~"();! ]|(\.(?!@)))+$)|(^$)</Parameter>
         </Parameters>