Merge branch 'multiIP' of https://github.com/rishjai-msft/azure-docs-pr into multiIP

Author: rrishabhjn

.github/workflows/stale.yml

@@ -19,8 +19,7 @@ jobs:
         close-pr-label: auto-close
         exempt-pr-labels: keep-open
         operations-per-run: 1200
-        ascending: true
-        start-date: '2019-12-19' 
+        ascending: false
         stale-pr-message: >
           This pull request has been inactive for at least 14 days.
           If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation) for instructions.

.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",
@@ -826,7 +832,10 @@
     ".openpublishing.redirection.media-services.json",
     ".openpublishing.redirection.security-benchmark.json",
     ".openpublishing.redirection.synapse-analytics.json",
+    "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
+    "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",   
     "articles/azure-relay/.openpublishing.redirection.relay.json",
+    "articles/communication-services/.openpublishing.redirection.communication-services.json",
     "articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
     "articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
     "articles/data-catalog/.openpublishing.redirection.data-catalog.json",
@@ -844,6 +853,7 @@
     "articles/purview/.openpublishing.redirection.purview.json",
     "articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
     "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
-    "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
+    "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
+    "articles/mysql/.openpublishing.redirection.mysql.json"
   ]
 }

.openpublishing.redirection.active-directory.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",
@@ -928,7 +938,6 @@
       "redirect_url": "/azure/iot-hub/tutorial-x509-scripts",
       "redirect_document_id": false
     },
- 
     {
       "source_path_from_root": "/articles/iot-hub/iot-hub-gateway-kit-c-iot-gateway-connect-device-to-cloud.md",
       "redirect_url": "https://github.com/Azure/iot-edge/tree/master/v1/doc/commercial_gateway_kit/iot-hub-gateway-kit-c-iot-gateway-connect-device-to-cloud.md",
@@ -995,7 +1004,11 @@
       "redirect_url": "https://github.com/Azure/iot-edge/tree/master/v1/samples/simulated_device_cloud_upload/iot-hub-windows-iot-edge-simulated-device.md",
       "redirect_document_id": false
     },
-  
+    {
+      "source_path_from_root": "/articles/iot-hub/tutorial-firmware-update.md",
+      "redirect_url": "/azure/iot-hub-device-update/device-update-raspberry-pi",
+      "redirect_document_id": false
+    }
 
   ]
 }

.openpublishing.redirection.iot-hub.json

@@ -54,6 +54,11 @@
             "source_path_from_root": "/articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-best-practices-development.md",
             "redirect_url": "/azure/synapse-analytics/sql/best-practices-dedicated-sql-pool",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/synapse-analytics/quickstart-sql-on-demand.md",
+            "redirect_url": "/azure/synapse-analytics/quickstart-serverless-sql-pool",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.json

@@ -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

.openpublishing.redirection.synapse-analytics.json

@@ -2,7 +2,7 @@
 
 Thank you for taking the time to contribute to the Microsoft Azure documentation.
 
-This guide covers some general topics related to contribution and refers to the [contributors guide](https://docs.microsoft.com/contribute) for more detailed explanations when required.
+This guide covers some general topics related to contribution and refers to the [contributors guide](/contribute) for more detailed explanations when required.
 
 ## Code of Conduct
 
@@ -21,8 +21,8 @@ Please use the Feedback tool at the bottom of any article to submit bugs and sug
 
 ### Editing in GitHub
 
-Follow the guidance for [Quick edits to existing documents](https://docs.microsoft.com/contribute/#quick-edits-to-existing-documents) in our contributors guide.
+Follow the guidance for [Quick edits to existing documents](/contribute/#quick-edits-to-existing-documents) in our contributors guide.
 
 ### Pull Request
 
-Review the guidance for [Pull Requests](https://docs.microsoft.com/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.
+Review the guidance for [Pull Requests](/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.

CODEOWNERS

@@ -1,7 +1,6 @@
-
 # Microsoft Azure Documentation
 
-Welcome to the open-source [documentation](https://docs.microsoft.com/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
+Welcome to the open-source [documentation](/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
 
 ## Getting Started
 
@@ -11,7 +10,7 @@ Contributing to open source is more than just providing updates, it's also about
 
 You've decided to contribute, that's great! To contribute to the documentation, you need a few tools.
 
-Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for the [GitHub account setup](https://docs.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
+Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for the [GitHub account setup](/contribute/get-started-setup-github) from our contributor guide.
 
 #### Download
 
@@ -23,7 +22,7 @@ Install the following tools:
 
 #### Install
 
-Follow the instructions provided in the [Install content authoring tools](https://docs.microsoft.com/contribute/get-started-setup-tools) from our contributor guide.
+Follow the instructions provided in the [Install content authoring tools](/contribute/get-started-setup-tools) from our contributor guide.
 
 ## License
 
@@ -32,4 +31,4 @@ Please refer to [LICENSE](LICENSE), [LICENSE-CODE](LICENSE-CODE) and [ThirdParty
 ## Code of Conduct
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
-For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
+For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

CONTRIBUTING.md

@@ -7,6 +7,8 @@
     href: overview.md
   - name: Technical and feature overview
     href: technical-overview.md
+  - name: Supported Azure AD features
+    href: supported-azure-ad-features.md
   - name: What's new in docs?
     href: whats-new-docs.md
 - name: Quickstarts
@@ -26,7 +28,9 @@
     href: tutorial-register-applications.md
   - name: 3 - Create user flows and custom policies
     href: tutorial-create-user-flows.md
-  - name: Clean up and delete tenant
+  - name: 4 - Manage your tenant
+    href: tenant-management.md
+  - name: 5 - Clean up and delete tenant
     href: tutorial-delete-tenant.md
 - name: Samples
   items:
@@ -82,14 +86,14 @@
     href: user-overview.md
   - name: User profile attributes
     href: user-profile-attributes.md
+  - name: Roles and resource access control
+    href: roles-resource-access-control.md
   - name: Identity Protection and Conditional Access
     href: conditional-access-identity-protection-overview.md
   - name: Policy keys
     href: policy-keys-overview.md
 - name: How-to guides
   items:
-  - name: Manage your tenant
-    href: tenant-management.md
   - name: App integration
     items:
     - name: ASP.NET Core web app
@@ -201,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
@@ -307,6 +309,10 @@
           href: partner-bloksec.md
         - name: HYPR
           href: partner-hypr.md
+        - name: IDEMIA
+          href: partner-idemia.md
+        - name: itsme
+          href: partner-itsme.md
         - name: Keyless
           href: partner-keyless.md
         - name: Nevis
@@ -374,6 +380,8 @@
       items:
       - name: Datawiza
         href: partner-datawiza.md
+      - name: F5
+        href: partner-f5.md
       - name: Ping Identity
         href: partner-ping-identity.md
       - name: Strata
@@ -394,15 +402,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