Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into firewall-access

Author: ElazarK

.openpublishing.publish.config.json

@@ -429,6 +429,12 @@
       "branch": "cli-preview",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "terraform",
+      "url": "https://github.com/Azure/terraform",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "samples-qnamaker-nodejs",
       "url": "https://github.com/Azure-Samples/cognitive-services-qnamaker-nodejs",

.openpublishing.redirection.active-directory.json

@@ -10509,6 +10509,11 @@
             "source_path": "articles/active-directory/privileged-identity-management/pim-resource-roles-start-access-review.md",
             "redirect_url": "/azure/active-directory/privileged-identity-management/pim-create-azure-ad-roles-and-resource-roles-review",
             "redirect_document_id": false
-        }
+        },
+        {
+            "source_path_from_root": "/articles/active-directory-b2c/troubleshoot-custom-policies.md",
+            "redirect_url": "/azure/active-directory-b2c/troubleshoot",
+            "redirect_document_id": false
+          }
     ]
 }

.openpublishing.redirection.iot-hub.json

@@ -125,6 +125,16 @@
       "redirect_url": "/azure/iot-hub/about-iot-hub",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/iot-hub/about-iot-hub.md",
+      "redirect_url": "/azure/iot-hub/iot-concepts-and-iot-hub",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-concepts.md",
+      "redirect_url": "/azure/iot-hub/iot-concepts-and-iot-hub",
+      "redirect_document_id": false
+    },   
     {
       "source_path_from_root": "/articles/iot-hub/quickstart-send-telemetry-xamarinforms.md",
       "redirect_url": "/azure/iot-hub/about-iot-hub",

.openpublishing.redirection.json

@@ -223,6 +223,11 @@
       "redirect_url": "/azure/azure-arc/kubernetes/quickstart-connect-cluster",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/whats-new-docs.md",
+      "redirect_url": "/azure/cognitive-services/what-are-cognitive-services",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cognitive-services/Ink-Recognizer/concepts/send-ink-data.md",
       "redirect_url": "/previous-versions/azure/cognitive-services/Ink-Recognizer/concepts/send-ink-data",
@@ -393,6 +398,16 @@
       "redirect_url": "/articles/load-balancer/concepts",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-sql/database/doc-changes-updates-release-notes.md",
+      "redirect_url": "/azure/azure-sql/database/doc-changes-updates-release-notes-whats-new",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/azure-sql/virtual-machines/windows/doc-changes-updates-release-notes.md",
+      "redirect_url": "/azure/azure-sql/virtual-machines/windows/doc-changes-updates-release-notes-whats-new",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/app-service-web/web-sites-dotnet-deploy-aspnet-mvc-app-membership-oauth-sql-database.md",
       "redirect_url": "/aspnet/core/security/authorization/secure-data",
@@ -1455,7 +1470,7 @@
     },
     {
       "source_path_from_root": "/articles/active-directory-b2c/active-directory-b2c-reference-sspr.md",
-      "redirect_url": "/azure/active-directory-b2c/user-flow-self-service-password-reset",
+      "redirect_url": "/azure/active-directory-b2c/add-password-reset-policy",
       "redirect_document_id": true
     },
     {
@@ -5893,6 +5908,11 @@
       "redirect_url": "/azure/azure-cache-for-redis/scripts/show-cache",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/storage/blobs/Storage-blob-performance-tiers.md",
+      "redirect_url": "/azure/storage/common/storage-account-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/storage/blobs/data-lake-storage-handle-data-using-databricks.md",
       "redirect_url": "/azure/azure-databricks/databricks-extract-load-sql-data-warehouse",
@@ -6674,8 +6694,23 @@
       "redirect_document_id": false
     },
     {
-      "source_path_from_root": "/articles/azure-maps/quick-ios-app.md",
-      "redirect_url": "/azure/azure-maps/quick-demo-map-app",
+      "source_path_from_root": "/articles/azure-maps/how-to-request-real-time-data.md",
+      "redirect_url": "/azure/azure-maps",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-maps/how-to-request-transit-data.md",
+      "redirect_url": "/azure/azure-maps",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-maps/mobility-coverage.md ",
+      "redirect_url": "/azure/azure-maps",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-maps/mobility-service-data-structure.md ",
+      "redirect_url": "/azure/azure-maps",
       "redirect_document_id": false
     },
     {
@@ -28129,10 +28164,15 @@
       "redirect_document_id": false
     },
     {
-      "source_path_from_root": "/articles/blobs/storage-blob-storage-tiers.md",
+      "source_path_from_root": "/articles/storage/blobs/storage-blob-storage-tiers.md",
       "redirect_url": "/azure/storage/blobs/access-tiers-overview",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/storage/common/storage-auth-aad-msi.md",
+      "redirect_url": "/azure/storage/blobs/authorize-managed-identity",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/storage/storage-c-plus-plus-how-to-use-blobs.md",
       "redirect_url": "/azure/storage/blobs/storage-c-plus-plus-how-to-use-blobs",
@@ -46412,7 +46452,66 @@
       "source_path_from_root": "/articles/iot-dps/quick-enroll-device-tpm-python.md",
       "redirect_url": "/azure/iot-dps/quick-enroll-device-tpm",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/applied-ai-services/form-recognizer/quickstarts/get-started-with-form-recognizer.md",
+      "redirect_url": "/azure/applied-ai-services/form-recognizer/quickstarts/try-sample-label-tool",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/applied-ai-services/form-recognizer/quickstarts/client-library.md",
+      "redirect_url": "/azure/applied-ai-services/form-recognizer/quickstarts/try-sdk-rest-api",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/applied-ai-services/form-recognizer/concept-receipts.md",
+      "redirect_url": "/azure/applied-ai-services/form-recognizer/concept-receipt",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/applied-ai-services/form-recognizer/concept-business-cards.md",
+      "redirect_url": "/azure/applied-ai-services/form-recognizer/concept-business-card",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/applied-ai-services/form-recognizer/concept-identification-cards.md",
+      "redirect_url": "/azure/applied-ai-services/form-recognizer/concept-id-document",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/applied-ai-services/form-recognizer/concept-invoices.md",
+      "redirect_url": "/azure/applied-ai-services/form-recognizer/concept-invoice",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/environment/app-service-app-service-environment-web-application-firewall.md",
+      "redirect_url": "/azure/app-service/environment/integrate-with-application-gateway",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/environment/app-service-environment-with-internal-load-balancer.md",
+      "redirect_url": "/azure/app-service/environment/app-service-app-service-environment-create-ilb-ase-resourcemanager",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/environment/app-service-web-how-to-create-an-app-service-environment.md",
+      "redirect_url": "/azure/app-service/environment/app-service-app-service-environment-create-ilb-ase-resourcemanager",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/environment/app-service-web-how-to-create-a-web-app-in-an-ase.md",
+      "redirect_url": "/azure/app-service/environment/using",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-desktop/diagnostics-role-service.md",
+      "redirect_url": "/azure/virtual-desktop/troubleshoot-set-up-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-monitor/app/how-do-i.md",
+      "redirect_url": "/azure/azure-monitor/faq",
+      "redirect_document_id": false
     }
-
   ]
-}
+}

CODEOWNERS

@@ -1,91 +1,91 @@
 # Testing the new code owners feature in GitHub. Please contact Cory Fowler if you have questions.
+#
+# Help: https://docs.github.com/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+# Background: https://github.blog/2017-07-06-introducing-code-owners/
+# NOTE: The people you choose as code owners must have _write_ permissions for the repository. When the code owner is a team, that team must be _visible_ and it must have _write_ permissions, even if all the individual members of the team already have write permissions directly, through organization membership, or through another team membership.
 
-# Horizontals
-
-## Azure Policy: Samples and Compliance Controls
-articles/**/policy-reference.md @DCtheGeek
-articles/**/security-controls-policy.md @DCtheGeek
-includes/policy/ @DCtheGeek
+# Azure Policy: Samples and Compliance Controls
+/articles/**/policy-reference.md @DCtheGeek
+/articles/**/security-controls-policy.md @DCtheGeek
+/includes/policy/ @DCtheGeek
 
 # Azure Monitor
-
 articles/azure-monitor/* @bwren
 articles/azure-monitor/agents @bwren
-articles/azure-monitor/alerts @rboucher
-articles/azure-monitor/app @bwren @lgayhardt
+articles/azure-monitor/alerts @rboucher @abbyMSFT
+articles/azure-monitor/app @bwren 
 articles/azure-monitor/autoscale @rboucher
 articles/azure-monitor/containers @bwren
 articles/azure-monitor/essentials @bwren @rboucher
-articles/azure-monitor/insights @bwren @rboucher @lgayhardt
-articles/azure-monitor/logs @bwren
-articles/azure-monitor/visualize @bwren @lgayhardt
+articles/azure-monitor/insights @bwren @rboucher 
+articles/azure-monitor/logs @bwren @abbyMSFT
+articles/azure-monitor/visualize @bwren  @rboucher
 articles/azure-monitor/vm @bwren
 articles/advisor @rboucher
 articles/service-health @rboucher
 
-# Azure Active Directory
 
-articles/active-directory-b2c/ @msmimart @yoelhor
-articles/active-directory/app-provisioning/ @CelesteDG
-articles/active-directory/develop/ @mmacy
-articles/active-directory/manage-apps/ @CelesteDG
+# Azure Active Directory
+/articles/active-directory-b2c/ @msmimart @yoelhor
+/articles/active-directory/app-provisioning/ @CelesteDG
+/articles/active-directory/develop/ @mmacy
+/articles/active-directory/manage-apps/ @CelesteDG
 
 # Azure Synapse Analytics
-articles/synapse-analytics/ @julieMSFT [email protected] @ryanmajidi @saveenr 
-articles/synapse-analytics/backuprestore/ @joannapea @julieMSFT
-articles/synapse-analytics/catalog-governance/@djpmsft @chanuengg 
-articles/synapse-analytics/ccid/ @liudan66 @julieMSFT
-articles/synapse-analytics/data-integration/ @kromerm @jonburchel 
-articles/synapse-analytics/machine-learning/ @garyericson @NelGson @midesa 
-articles/synapse-analytics/metadata/@MikeRys @julieMSFT @jocaplan
-articles/synapse-analytics/security/ @RonyMSFT  @nanditavalsan @meenalsri @julieMSFT
-articles/synapse-analytics/spark/ @euangms @mlee3gsd @midesa 
-articles/synapse-analytics/sql/ @filippopovic @azaricstefan @anumjs @WilliamDAssafMSFT @jovanpop-msft
-articles/synapse-analytics/sql-data-warehouse/ @anumjs @ronortloff @julieMSFT
-articles/synapse-analytics/synapse-link/ @Rodrigossz @SnehaGunda @jovanpop-msft
+/articles/synapse-analytics/ @julieMSFT @ryanmajidi @saveenr 
+/articles/synapse-analytics/backuprestore/ @joannapea @julieMSFT
+/articles/synapse-analytics/catalog-governance/@djpmsft @chanuengg 
+/articles/synapse-analytics/ccid/ @liudan66 @julieMSFT
+/articles/synapse-analytics/data-integration/ @kromerm @jonburchel 
+/articles/synapse-analytics/machine-learning/ @garyericson @NelGson @midesa 
+/articles/synapse-analytics/metadata/@MikeRys @julieMSFT @jocaplan
+/articles/synapse-analytics/security/ @RonyMSFT  @nanditavalsan @meenalsri @julieMSFT
+/articles/synapse-analytics/spark/ @euangms @mlee3gsd @midesa 
+/articles/synapse-analytics/sql/ @filippopovic @azaricstefan @anumjs @WilliamDAssafMSFT @jovanpop-msft
+/articles/synapse-analytics/sql-data-warehouse/ @anumjs @ronortloff @julieMSFT
+/articles/synapse-analytics/synapse-link/ @Rodrigossz @SnehaGunda @jovanpop-msft
 
 # Cognitive Services
-articles/cognitive-services/ @aahill @patrickfarley @nitinme @mrbullwinkle @laujan
+/articles/cognitive-services/ @aahill @patrickfarley @nitinme @mrbullwinkle @laujan
 
 # DevOps
-articles/ansible/ @TomArcherMsft
-articles/chef/ @TomArcherMsft
-articles/jenkins/ @TomArcherMsft
-articles/terraform/ @TomArcherMsft
+/articles/ansible/ @TomArcherMsft
+/articles/chef/ @TomArcherMsft
+/articles/jenkins/ @TomArcherMsft
+/articles/terraform/ @TomArcherMsft
 
 # compute
-articles/virtual-machines/ @cynthn @mimckitt
-articles/virtual-machine-scale-sets/ @ju-shim @mimckitt
-articles/cloud-services/ @mimckitt
-articles/cloud-services-extended-support/ @mimckitt
-articles/service-fabric/ @sukanyamsft @mimckitt
-articles/container-instances/ @macolso @mimckitt
-articles/container-registry/ @dlepow @mimckitt
+/articles/virtual-machines/ @cynthn @mimckitt
+/articles/virtual-machine-scale-sets/ @ju-shim @mimckitt
+/articles/cloud-services/ @mimckitt
+/articles/cloud-services-extended-support/ @mimckitt
+/articles/service-fabric/ @sukanyamsft @mimckitt
+/articles/container-instances/ @macolso @mimckitt
+/articles/container-registry/ @dlepow @mimckitt
 
 # Requires Internal Review
-articles/best-practices-availability-paired-regions.md @martinekuan @syntaxc4 @snoviking
+/articles/best-practices-availability-paired-regions.md @martinekuan @syntaxc4 @snoviking
 
 # Governance
-articles/governance/ @DCtheGeek
+/articles/governance/ @DCtheGeek
 
 # Security
-articles/security/fundamentals/feature-availability.md @msmbaldwin @terrylanfear
+/articles/security/fundamentals/feature-availability.md @msmbaldwin @terrylanfear
 
 # Azure Security Center
-articles/security-center/ @memildin
-includes/*security-controls*.md @memildin
+/articles/security-center/ @memildin
+/includes/*security-controls*.md @memildin
 
 # DDOS Protection
-
-articles/ddos-protection @aletheatoh @anupamvi
+/articles/ddos-protection @aletheatoh @anupamvi
 
 # Lighthouse
-articles/lighthouse/ @JnHs
+/articles/lighthouse/ @JnHs
 
 # Healthcare APIs
-articles/healthcare-apis/ @ginalee-dotcom
+/articles/healthcare-apis/ @ginalee-dotcom
 
 # Configuration
-*.json @SyntaxC4 @snoviking @martinekuan
-.acrolinx-config.edn @MonicaRush @martinekuan
-articles/zone-pivot-groups.yml @SyntaxC4 @snoviking @martinekuan
+*.json @SyntaxC4 @snoviking
+.acrolinx-config.edn @MonicaRush 
+articles/zone-pivot-groups.yml @SyntaxC4 @snoviking

articles/active-directory-b2c/TOC.yml

@@ -205,8 +205,6 @@
     - name: Resource owner password credentials policy
       href: add-ropc-policy.md
       displayName: ROPC
-    - name: Set up a self-serve password reset policy (deprecated)
-      href: user-flow-self-service-password-reset.md
     - name: Phone sign-up and sign-in
       href: phone-authentication-user-flows.md
   - name: Identity providers
@@ -378,6 +376,8 @@
       items:
       - name: Datawiza
         href: partner-datawiza.md
+      - name: F5
+        href: partner-f5.md
       - name: Ping Identity
         href: partner-ping-identity.md
       - name: Strata
@@ -398,15 +398,13 @@
       displayName: rest claims exchange
     - name: Secure an API connector
       href: secure-rest-api.md
-  - name: Custom policy
+  - name: Troubleshooting
     items:
-    - name: Troubleshooting
-      items:
-      - name: Collect logs using Application Insights
-        href: troubleshoot-with-application-insights.md
-        displayName: troubleshooting, app insights
-      - name: Troubleshooting custom policies
-        href: troubleshoot-custom-policies.md
+    - name: Collect logs using Application Insights
+      href: troubleshoot-with-application-insights.md
+      displayName: troubleshooting, app insights
+    - name: Troubleshooting and error handling
+      href: troubleshoot.md
   - name: UserInfo endpoint
     href: userinfo-endpoint.md
   - name: Partner integration