Fix merge conflict redirection file

Author: cwatson-cat

.openpublishing.publish.config.json

@@ -969,6 +969,12 @@
       "branch_mapping": {}
     },
     {
+		"path_to_root": "azure-load-testing-samples",
+		"url": "https://github.com/Azure-Samples/azure-load-testing-samples",
+		"branch": "main",
+		"branch_mapping": {}
+	  },
+	  {
       "path_to_root": "microsoft-graph",
       "url": "https://github.com/MicrosoftGraph/microsoft-graph-docs",
       "branch": "main",
@@ -994,6 +1000,7 @@
   ".openpublishing.redirection.app-service.json",
   ".openpublishing.redirection.azure-arc-data.json",
   ".openpublishing.redirection.azure-attestation.json",
+  ".openpublishing.redirection.azure-app-configuration.json",
   ".openpublishing.redirection.azure-australia.json",
   ".openpublishing.redirection.azure-databricks.json",
   ".openpublishing.redirection.azure-hpc.json",

.openpublishing.redirection.azure-app-configuration.json

@@ -0,0 +1,9 @@
+{
+  "redirections": [
+    {
+      "source_path_from_root": "/articles/azure-app-configuration/howto-backup-config-store.md",
+      "redirect_url": "/articles/azure-app-configuration/concept-geo-replication.md",
+      "redirect_document_id": false
+    }
+  ]
+}

.openpublishing.redirection.azure-monitor.json

@@ -6136,6 +6136,11 @@
             "redirect_url": "/azure/azure-monitor/app/data-model-complete",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/vm/monitor-virtual-machine-management-packs.md",
+            "redirect_url": "/azure/azure-monitor/azure-monitor-operations-manager#migrate-management-pack-logic",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/logs/dashboard-upgrade.md",
             "redirect_url": "/azure/azure-monitor/visualize/tutorial-logs-dashboards",

.openpublishing.redirection.azure-productivity.json

@@ -149,6 +149,11 @@
       "source_path": "articles/lab-services/classroom-labs-faq.yml",
       "redirect_url": "/azure/lab-services/lab-services-overview",
       "redirect_document_id": false
-    }
+    },
+	{
+		"source_path": "articles/lab-services/how-to-enable-nested-virtualization-template-vm-ui.md",
+		"redirect_url": "/azure/lab-services/how-to-enable-nested-virtualization-template-vm-using-script",
+		"redirect_document_id": false
+	}
   ]
 }

.openpublishing.redirection.healthcare-apis.json

@@ -594,15 +594,27 @@
           "redirect_document_id": false
       },
       {   "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-config.md",
-          "redirect_url": "/azure/healthcare-apis/iot/deploy-manual-config",
+          "redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
           "redirect_document_id": false
       },
       {   "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-deploy.md",
-          "redirect_url": "/azure/healthcare-apis/iot/deploy-manual-post",
+          "redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
           "redirect_document_id": false
       },
       {   "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-manual.md",
-          "redirect_url": "/azure/healthcare-apis/iot/deploy-manual-prerequisites",
+          "redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
+          "redirect_document_id": false
+      },
+      {   "source_path_from_root": "/articles/healthcare-apis/iot/deploy-manual-prerequisites.md",
+          "redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
+          "redirect_document_id": false
+      },
+      {   "source_path_from_root": "/articles/healthcare-apis/iot/deploy-manual-config.md",
+          "redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
+          "redirect_document_id": false
+      },
+      {   "source_path_from_root": "/articles/healthcare-apis/iot/deploy-manual-post.md",
+          "redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
           "redirect_document_id": false
       },
       {   "source_path_from_root": "/articles/healthcare-apis/iot/iot-connector-overview.md",

.openpublishing.redirection.json

@@ -22564,9 +22564,14 @@
           "redirect_document_id": true
         },
         {
-          "source_path_from_root": "/articles/sentinel/data-connectors/azure-information-protection.md",
-          "redirect_url": "/azure/sentinel/data-connectors-reference.md",
+          "source_path_from_root": "/articles/healthcare-apis/dicom/dicom-cast-access-request.md",
+          "redirect_url": "/azure/healthcare-apis/dicom/dicom-cast-overview",
           "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/data-connectors/azure-information-protection.md",
+            "redirect_url": "/azure/sentinel/data-connectors-reference.md",
+            "redirect_document_id": false
         }
     ]
 }

CODE_OF_CONDUCT.md

@@ -1,2 +1,2 @@
 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.

README.md

@@ -4,23 +4,23 @@ Welcome to the open-source [documentation](/azure) of [Microsoft Azure](https://
 
 ## Getting Started
 
-Contributing to open source is more than just providing updates, it's also about letting us know when there is an issue. Read our [Contributing guidance](CONTRIBUTING.md) to find out more.
+Contributing to open source is more than just providing updates. It's also about letting us know when there is an issue. Read our [Contributing guidance](CONTRIBUTING.md) to find out more.
 
 ### Prerequisites
 
-You've decided to contribute, that's great! To contribute to the documentation, you need a few tools.
+You've decided to contribute. That's great! To contribute to the documentation, you need a few tools.
 
 #### GitHub
 
 Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for [GitHub account setup](https://learn.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
 
 #### Tools
 
-To install necessary tools, follow the instructions for [Install content authoring tools](https://learn.microsoft.com/contribute/get-started-setup-tools) from our contributor guide.
+To install the necessary tools, follow the instructions for [Install content authoring tools](https://learn.microsoft.com/contribute/get-started-setup-tools) from our contributor guide.
 
 ## License
 
-Please refer to [LICENSE](LICENSE), [LICENSE-CODE](LICENSE-CODE) and [ThirdPartyNotices](ThirdPartyNotices.md) for all Licensing information.
+Please refer to [LICENSE](LICENSE), [LICENSE-CODE](LICENSE-CODE), and [ThirdPartyNotices](ThirdPartyNotices.md) for all Licensing information.
 
 ## Code of Conduct
 

SECURITY.md

@@ -12,13 +12,13 @@ If you believe you have found a security vulnerability in any Microsoft-owned re
 
 Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
 
-If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
+If you prefer to submit without logging in, email [[email protected]](mailto:[email protected]). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
 
-You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
+You should receive a response within 24 hours. If you do not, you can email us to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
 
 Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
 
-  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Type of issue (e.g., buffer overflow, SQL injection, cross-site scripting, etc.)
   * Full paths of source file(s) related to the manifestation of the issue
   * The location of the affected source code (tag/branch/commit or direct URL)
   * Any special configuration required to reproduce the issue
@@ -28,7 +28,7 @@ Please include the requested information listed below (as much as you can provid
 
 This information will help us triage your report more quickly.
 
-If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+If you are reporting for a bug bounty, providing more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
 
 ## Preferred Languages
 

ThirdPartyNotices.md

@@ -1,7 +1,7 @@
 ## Legal Notices
 Microsoft and any contributors grant you a license to the Microsoft documentation and other content
 in this repository under the [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/legalcode),
-see the [LICENSE](LICENSE) file, and grant you a license to any code in the repository under the [MIT License](https://opensource.org/licenses/MIT), see the
+see the [LICENSE](LICENSE) file, and grant you a license to any code in the repository under the [MIT License](https://opensource.org/licenses/MIT). See the
 [LICENSE-CODE](LICENSE-CODE) file.
 
 Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation
@@ -11,5 +11,5 @@ Microsoft's general trademark guidelines can be found at http://go.microsoft.com
 
 Privacy information can be found at https://privacy.microsoft.com/en-us/
 
-Microsoft and any contributors reserve all others rights, whether under their respective copyrights, patents,
-or trademarks, whether by implication, estoppel or otherwise.
+Microsoft and any contributors reserve all other rights, whether under their respective copyrights, patents,
+or trademarks, whether by implication, estoppel, or otherwise.