Fixing conflicts and other links

Author: JasonWHowell

articles/batch/batch-service-workflow-features.md

@@ -42,4 +42,4 @@ The following topics discuss the resources of Batch that enable your distributed
 - Learn about the [Batch APIs and tools](batch-apis-tools.md) available for building Batch solutions.
 - Learn the basics of developing a Batch-enabled application using the [Batch .NET client library](quick-run-dotnet.md) or [Python](quick-run-python.md). These quickstarts guide you through a sample application that uses the Batch service to execute a workload on multiple compute nodes, and includes using Azure Storage for workload file staging and retrieval.
 - Download and install [Batch Explorer](https://azure.github.io/BatchExplorer/) for use while you develop your Batch solutions. Use Batch Explorer to help create, debug, and monitor Azure Batch applications.
-- See community resources including [Stack Overflow](https://stackoverflow.com/questions/tagged/azure-batch), the [Batch Community repo](https://github.com/Azure/Batch), and the [Azure Batch forum](https://social.msdn.microsoft.com/Forums/en-US/home?forum=azurebatch).
+- See community resources including [Stack Overflow](https://stackoverflow.com/questions/tagged/azure-batch), the [Batch Community repo](https://github.com/Azure/Batch), and the [Azure Batch forum](https://docs.microsoft.com/answers/topics/azure-batch.html).

articles/cost-management-billing/index.yml

@@ -144,6 +144,6 @@ conceptualContent:
         - url: https://techcommunity.microsoft.com/t5/forums/searchpage/tab/message?filter=location&q=%22billing%22&noSynonym=false&location=category:Azure&collapse_discussion=true
           itemType: how-to-guide
           text: Azure Billing Tech Community
-        - url: https://social.msdn.microsoft.com/Forums/en-US/home?forum=AzureCostManagement&filter=alltypes&sort=relevancedesc&searchTerm=Azure%20Cost%20Management
+        - url: https://docs.microsoft.com/answers/topics/azure-cost-management.html
           itemType: how-to-guide
           text: Ask a Cost Management and Billing forum question

articles/storage/blobs/TOC.yml

@@ -585,7 +585,7 @@
       - name: Storage Explorer accessibility
         href: ../../vs-azure-tools-storage-explorer-accessibility.md?toc=%2fazure%2fstorage%2fblobs%2ftoc.json
     - name: Azure Storage forum
-      href: https://docs.microsoft.com/answers/products/azure
+      href: https://docs.microsoft.com/answers/topics/azure-blob-storage.html
     - name: Azure Storage on Stack Overflow
       href: https://stackoverflow.com/questions/tagged/windows-azure-storage
     - name: Pricing for Blob storage
@@ -854,7 +854,7 @@
       - name: Storage Explorer accessibility
         href: ../../vs-azure-tools-storage-explorer-accessibility.md?toc=%2fazure%2fstorage%2fblobs%2ftoc.json
     - name: Microsoft Q&A question page
-      href: https://docs.microsoft.com/answers/products/azure
+      href: https://docs.microsoft.com/answers/products/topics/azure-blob-storage.html
     - name: Azure Storage on Stack Overflow
       href: https://stackoverflow.com/questions/tagged/windows-azure-storage
     - name: Pricing

articles/storage/blobs/storage-ios-how-to-use-blob-storage.md

@@ -390,5 +390,5 @@ Now that you've learned how to use Blob Storage from iOS, follow these links to
 - [Azure Storage Services REST API](https://msdn.microsoft.com/library/azure/dd179355.aspx)
 - [Azure Storage Team Blog](https://docs.microsoft.com/archive/blogs/windowsazurestorage/)
 
-If you have questions regarding this library, feel free to post to our [Microsoft Q&A question page](https://docs.microsoft.com/answers/products/azure) or [Stack Overflow](https://stackoverflow.com/questions/tagged/windows-azure-storage+or+windows-azure-storage+or+azure-storage-blobs+or+azure-storage-tables+or+azure-table-storage+or+windows-azure-queues+or+azure-storage-queues+or+azure-storage-emulator+or+azure-storage-files).
+If you have questions regarding this library, feel free to post to our [Microsoft Q&A question page](https://docs.microsoft.com/answers/topics/azure-blob-storage.html) or [Stack Overflow](https://stackoverflow.com/questions/tagged/windows-azure-storage+or+windows-azure-storage+or+azure-storage-blobs+or+azure-storage-tables+or+azure-table-storage+or+windows-azure-queues+or+azure-storage-queues+or+azure-storage-emulator+or+azure-storage-files).
 If you have feature suggestions for Azure Storage, please post to [Azure Storage Feedback](https://feedback.azure.com/forums/217298-storage/).

articles/storage/files/TOC.yml

@@ -266,7 +266,7 @@
   - name: Azure File Sync release notes
     href: storage-files-release-notes.md
   - name: Azure Storage forum
-    href: https://docs.microsoft.com/answers/products/azure
+    href: https://docs.microsoft.com/answers/products/azure?product=storage
   - name: Azure Storage on Stack Overflow
     href: https://stackoverflow.com/questions/tagged/windows-azure-storage
   - name: Pricing for Azure storage

articles/storage/files/storage-files-faq.md

@@ -15,7 +15,7 @@ ms.topic: conceptual
 This article answers common questions about Azure Files features and functionality, including the use of Azure File Sync with Azure Files. If you don't see the answer to your question, you can contact us through the following channels (in escalating order):
 
 1. The comments section of this article.
-2. [Microsoft Q&A question page for Azure Storage](https://docs.microsoft.com/answers/products/azure).
+2. [Microsoft Q&A question page for Azure Storage](https://docs.microsoft.com/answers/topics/azure-file-storage.html).
 3. [Azure Files UserVoice](https://feedback.azure.com/forums/217298-storage/category/180670-files). 
 4. Microsoft Support. To create a new support request, in the Azure portal, on the **Help** tab, select the **Help + support** button, and then select **New support request**.
 

articles/storage/files/storage-sync-files-troubleshoot.md

@@ -14,7 +14,7 @@ Use Azure File Sync to centralize your organization's file shares in Azure Files
 
 This article is designed to help you troubleshoot and resolve issues that you might encounter with your Azure File Sync deployment. We also describe how to collect important logs from the system if a deeper investigation of the issue is required. If you don't see the answer to your question, you can contact us through the following channels (in escalating order):
 
-1. [Microsoft Q&A question page for Azure Storage](https://docs.microsoft.com/answers/products/azure).
+1. [Microsoft Q&A question page for Azure Storage](https://docs.microsoft.com/answers/products/azure?product=storage).
 2. [Azure Files UserVoice](https://feedback.azure.com/forums/217298-storage/category/180670-files).
 3. Microsoft Support. To create a new support request, in the Azure portal, on the **Help** tab, select the **Help + support** button, and then select **New support request**.