Merge branch 'master' of https://github.com/Microsoftdocs/azure-docs-pr into funlanding

Author: TerryLanfear

.openpublishing.redirection.json

@@ -1220,6 +1220,26 @@
       "redirect_url": "/azure/machine-learning/service/how-to-configure-environment",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/frontdoor/waf-front-door-monitor.md",
+      "redirect_url": "/azure/web-application-firewall/afds/waf-front-door-monitor",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/frontdoor/waf-front-door-policy-settings.md",
+      "redirect_url": "/azure/web-application-firewall/afds/waf-front-door-policy-settings",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/frontdoor/waf-front-door-custom-rules.md",
+      "redirect_url": "/azure/web-application-firewall/afds/waf-front-door-custom-rules",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/frontdoor/waf-overview.md",
+      "redirect_url": "/azure/web-application-firewall/afds/afds-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/frontdoor/front-door-powershell-reference.md",
       "redirect_url": "/powershell/module/azurerm.frontdoor",

articles/frontdoor/TOC.yml

@@ -48,16 +48,6 @@
     href: front-door-url-rewrite.md
   - name: URL redirect
     href: front-door-url-redirect.md
-  - name: WAF
-    items:
-    - name: Overview
-      href: waf-overview.md
-    - name: Custom rules
-      href: waf-front-door-custom-rules.md
-    - name: Policy settings
-      href: waf-front-door-policy-settings.md
-    - name: Monitoring and logging
-      href: waf-front-door-monitor.md  
 - name: How-to guides
   items:
   - name: Redirect Traffic