Merge branch 'master' into PackageIndexUpdates

Author: Cam Soper

.openpublishing.redirection.json

@@ -4610,8 +4610,7 @@
         },
         {
             "source_path": "docs/framework/winforms/controls/99f6e876-3f7f-4139-9063-e36587c95b02.md",
-            "redirect_url": "/dotnet/desktop/winforms/controls/create-a-master-detail-form-using-two-datagridviews",
-            "redirect_document_id": true
+            "redirect_url": "/dotnet/desktop/winforms/controls/create-a-master-detail-form-using-two-datagridviews?view=netframeworkdesktop-4.8"
         },
         {
             "source_path": "docs/framework/winforms/controls/access-objects-in-a-wf-datagridviewcomboboxcell-drop-down-list.md",
@@ -4759,8 +4758,7 @@
         },
         {
             "source_path": "docs/framework/winforms/controls/c5fa29e8-47f7-4691-829b-0e697a691f36.md",
-            "redirect_url": "/dotnet/desktop/winforms/controls/creating-a-master-detail-form-using-two-datagridviews",
-            "redirect_document_id": true
+            "redirect_url": "/dotnet/desktop/winforms/controls/creating-a-master-detail-form-using-two-datagridviews?view=netframeworkdesktop-4.8"
         },
         {
             "source_path": "docs/framework/winforms/controls/cell-styles-in-the-windows-forms-datagridview-control.md",
@@ -6376,8 +6374,7 @@
         },
         {
             "source_path": "docs/framework/winforms/controls/performing-common-tasks-using-smart-tags-on-wf-controls.md",
-            "redirect_url": "/dotnet/desktop/winforms/controls/perform-common-tasks-design-actions",
-            "redirect_document_id": true
+            "redirect_url": "/dotnet/desktop/winforms/controls/perform-common-tasks-design-actions?view=netframeworkdesktop-4.8"
         },
         {
             "source_path": "docs/framework/winforms/controls/picturebox-control-overview-windows-forms.md",
@@ -7345,8 +7342,7 @@
         },
         {
             "source_path": "docs/framework/wpf/advanced/globalization-and-localization-how-to-topics.md",
-            "redirect_url": "/dotnet/desktop/wpf/advanced/how-to-localize-an-application",
-            "redirect_document_id": true
+            "redirect_url": "/dotnet/desktop/wpf/advanced/how-to-localize-an-application"
         },
         {
             "source_path": "docs/framework/wpf/advanced/globalization-and-localization.md",
@@ -8584,8 +8580,7 @@
         },
         {
             "source_path": "docs/framework/wpf/controls/datepicker-syles-and-templates.md",
-            "redirect_url": "/dotnet/desktop/wpf/controls/datepicker-styles-and-templates",
-            "redirect_document_id": true
+            "redirect_url": "/dotnet/desktop/wpf/controls/datepicker-styles-and-templates"
         },
         {
             "source_path": "docs/framework/wpf/controls/datepicker.md",
@@ -9125,8 +9120,7 @@
         },
         {
             "source_path": "docs/framework/wpf/controls/passwordbox-syles-and-templates.md",
-            "redirect_url": "/dotnet/desktop/wpf/controls/passwordbox-styles-and-templates",
-            "redirect_document_id": true
+            "redirect_url": "/dotnet/desktop/wpf/controls/passwordbox-styles-and-templates"
         },
         {
             "source_path": "docs/framework/wpf/controls/passwordbox.md",
@@ -9178,8 +9172,7 @@
         },
         {
             "source_path": "docs/framework/wpf/controls/repeatbutton-syles-and-templates.md",
-            "redirect_url": "/dotnet/desktop/wpf/controls/repeatbutton-styles-and-templates",
-            "redirect_document_id": true
+            "redirect_url": "/dotnet/desktop/wpf/controls/repeatbutton-styles-and-templates"
         },
         {
             "source_path": "docs/framework/wpf/controls/repeatbutton.md",
@@ -9300,17 +9293,15 @@
         },
         {
             "source_path": "docs/framework/wpf/controls/thumb-syles-and-templates.md",
-            "redirect_url": "/dotnet/desktop/wpf/controls/thumb-styles-and-templates",
-            "redirect_document_id": true
+            "redirect_url": "/dotnet/desktop/wpf/controls/thumb-styles-and-templates"
         },
         {
             "source_path": "docs/framework/wpf/controls/togglebutton-styles-and-templates.md",
             "redirect_url": "/dotnet/desktop/wpf/controls/togglebutton-styles-and-templates"
         },
         {
             "source_path": "docs/framework/wpf/controls/togglebutton-syles-and-templates.md",
-            "redirect_url": "/dotnet/desktop/wpf/controls/togglebutton-styles-and-templates",
-            "redirect_document_id": true
+            "redirect_url": "/dotnet/desktop/wpf/controls/togglebutton-styles-and-templates"
         },
         {
             "source_path": "docs/framework/wpf/controls/toolbar-overview.md",
@@ -10554,8 +10545,7 @@
         },
         {
             "source_path": "docs/framework/xaml-services/types-migrated-from-wpf-to-system-xaml.md",
-            "redirect_url": "/dotnet/desktop/wpf/advanced/types-migrated-from-wpf-to-system",
-            "redirect_document_id": true
+            "redirect_url": "/dotnet/desktop/wpf/advanced/types-migrated-from-wpf-to-system"
         },
         {
             "source_path": "docs/framework/xaml-services/understanding-xaml-node-stream-structures-and-concepts.md",

api/index.md

@@ -11,4 +11,4 @@ ms.date: "01/24/2020"
 ---
 # .NET API browser
 
-Welcome to the .NET API browser – your one-stop shop for all .NET-based APIs from Microsoft. Start searching for any managed APIs by typing in the box below. You can learn more about the API browser [in our blog post](https://aka.ms/apibrowser). If you have any feedback, create a new issue in the [MicrosoftDocs/feedback repository on GitHub](https://github.com/MicrosoftDocs/feedback/issues).
+Welcome to the .NET API browser – your one-stop shop for all .NET-based APIs from Microsoft. Start searching for any managed APIs by typing in the box below. You can learn more about the API browser [in our blog post](/teamblog/announcing-unified-dotnet-experience-on-docs). If you have any feedback, create a new issue in the [MicrosoftDocs/feedback repository on GitHub](https://github.com/MicrosoftDocs/feedback/issues).

docs/architecture/microservices/microservice-ddd-cqrs-patterns/cqrs-microservice-reads.md

@@ -167,7 +167,7 @@ public class OrderSummary
 }
 ```
 
-This is another reason why explicit returned types are better than dynamic types, in the long term. When using the `ProducesResponseType` attribute, you can also specify what is the expected outcome in regards possible HTTP errors/codes, like 200, 400, etc.
+This is another reason why explicit returned types are better than dynamic types, in the long term. When using the `ProducesResponseType` attribute, you can also specify what is the expected outcome in regards to possible HTTP errors/codes, like 200, 400, etc.
 
 In the following image, you can see how Swagger UI shows the ResponseType information.
 

docs/architecture/microservices/multi-container-microservice-net-applications/data-driven-crud-microservice.md

@@ -283,7 +283,7 @@ Versioning enables a Web API to indicate the features and resources that it expo
 
 - Header versioning
 
-Query string and URI versioning are the simplest to implement. Header versioning is a good approach. However, header versioning not as explicit and straightforward as URI versioning. Because URL versioning is the simplest and most explicit, the eShopOnContainers sample application uses URI versioning.
+Query string and URI versioning are the simplest to implement. Header versioning is a good approach. However, header versioning is not as explicit and straightforward as URI versioning. Because URL versioning is the simplest and most explicit, the eShopOnContainers sample application uses URI versioning.
 
 With URI versioning, as in the eShopOnContainers sample application, each time you modify the Web API or change the schema of resources, you add a version number to the URI for each resource. Existing URIs should continue to operate as before, returning resources that conform to the schema that matches the requested version.
 

docs/architecture/microservices/multi-container-microservice-net-applications/implement-api-gateways-with-ocelot.md

@@ -368,7 +368,7 @@ Because of testing or debugging reasons, if you wanted to directly access to the
 
 **Figure 6-36**. Direct access to a microservice for testing purposes
 
-But the application is configured so it accesses all the microservices through the API Gateways, not though the direct port "shortcuts".
+But the application is configured so it accesses all the microservices through the API Gateways, not through the direct port "shortcuts".
 
 ### The Gateway aggregation pattern in eShopOnContainers
 

docs/azure/authentication.md

@@ -20,7 +20,7 @@ To authenticate with libraries that don't support Azure.Identity, see the rest o
 
 ## Access Azure resources
 
-To interact with Azure resources, such as retrieving a secret from Key Vault or storing a blob in Storage, many Azure service libraries require a connection string or keys for authentication. For example, SQL Database uses a [standard SQL connection string](https://docs.microsoft.com/azure/azure-sql/database/connect-query-dotnet-core). Service connection strings are used in other Azure services like [CosmosDB](/azure/cosmos-db/), [Azure Cache for Redis](/azure/azure-cache-for-redis/cache-dotnet-how-to-use-azure-redis-cache), and [Service Bus](/azure/service-bus-messaging/service-bus-dotnet-get-started-with-queues). You can get those strings using the Azure portal, CLI, or PowerShell. You can also use the Azure management libraries for .NET to query resources to build connection strings in your code.
+To interact with Azure resources, such as retrieving a secret from Key Vault or storing a blob in Storage, many Azure service libraries require a connection string or keys for authentication. For example, SQL Database uses a [standard SQL connection string](/azure/azure-sql/database/connect-query-dotnet-core). Service connection strings are used in other Azure services like [CosmosDB](/azure/cosmos-db/), [Azure Cache for Redis](/azure/azure-cache-for-redis/cache-dotnet-how-to-use-azure-redis-cache), and [Service Bus](/azure/service-bus-messaging/service-bus-dotnet-get-started-with-queues). You can get those strings using the Azure portal, CLI, or PowerShell. You can also use the Azure management libraries for .NET to query resources to build connection strings in your code.
 
 The methods for using a connection string vary by product. [Refer to the documentation for your Azure product](/azure/?product=featured).
 

docs/azure/includes/dotnet-all.md

@@ -280,7 +280,7 @@
 | Microsoft.Azure.Management.Reservations | NuGet [1.13.0-preview](https://www.nuget.org/packages/Microsoft.Azure.Management.Reservations/1.13.0-preview) |  | GitHub [1.13.0-preview](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.Reservations_1.13.0-preview/sdk/reservations/Microsoft.Azure.Management.Reservations/) |
 | Microsoft.Azure.Management.ResourceGraph | NuGet [2.0.0](https://www.nuget.org/packages/Microsoft.Azure.Management.ResourceGraph/2.0.0) |  | GitHub [2.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.ResourceGraph_2.0.0/sdk/resourcegraph/Microsoft.Azure.Management.ResourceGraph/) |
 | Microsoft.Azure.Management.ResourceManager | NuGet [3.10.0-preview](https://www.nuget.org/packages/Microsoft.Azure.Management.ResourceManager/3.10.0-preview) |  |  |
-| Microsoft.Azure.Management.ResourceManager.Fluent | NuGet [1.34.0](https://www.nuget.org/packages/Microsoft.Azure.Management.ResourceManager.Fluent/1.34.0) | [docs](https://docs.microsoft.com/dotnet/api/overview/azure/resource-manager?view=azure-dotnet) |  |
+| Microsoft.Azure.Management.ResourceManager.Fluent | NuGet [1.34.0](https://www.nuget.org/packages/Microsoft.Azure.Management.ResourceManager.Fluent/1.34.0) | [docs](/dotnet/api/overview/azure/resource-manager?view=azure-dotnet) |  |
 | Microsoft.Azure.Management.Resources | NuGet [2.20.1-preview](https://www.nuget.org/packages/Microsoft.Azure.Management.Resources/2.20.1-preview) |  |  |
 | Microsoft.Azure.Management.SampleProjectPublish | NuGet [0.9.0-Preview](https://www.nuget.org/packages/Microsoft.Azure.Management.SampleProjectPublish/0.9.0-Preview) |  |  |
 | Microsoft.Azure.Management.Scheduler | NuGet [2.2.0](https://www.nuget.org/packages/Microsoft.Azure.Management.Scheduler/2.2.0) |  | GitHub [2.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.Scheduler_2.2.0/sdk/https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/scheduler/Microsoft.Azure.Management.Scheduler/Microsoft.Azure.Management.Scheduler/) |

docs/azure/landing-page.yml

@@ -226,10 +226,10 @@ landingContent:
       - linkListType: architecture
         links:
           - text: ".NET Microservices: Architecture for containerized .NET apps"
-            url: /dotnet/architecture/microservices/
+            url: ../architecture/microservices/index.md
           - text: Architect modern web applications with ASP.NET Core and Azure
-            url: /dotnet/architecture/modern-web-apps-azure/
+            url: ../architecture/modern-web-apps-azure/index.md
           - text: Containerized Docker application lifecycle with Microsoft platform and tools
-            url: /dotnet/architecture/containerized-lifecycle/
+            url: ../architecture/containerized-lifecycle/index.md
           - text: Modernize existing .NET applications with Azure cloud and Windows containers
             url: /dotnet/architecture/modernize-with-azure-containers/

docs/azure/migration/app-service.md

@@ -31,9 +31,9 @@ For WCF, the following bindings are supported:
 |--|--|
 | `BasicHttp` |  |
 | `WSHttp` |  |
-| `WSDualHttpBinding` | [Web socket support](https://docs.microsoft.com/azure/app-service/web-sites-configure) must be enabled. | [Web socket support](/azure/app-service/web-sites-configure) must be enabled. |
-| `NetHttpBinding` | [Web socket support](https://docs.microsoft.com/azure/app-service/web-sites-configure) must be enabled for duplex contracts. | [Web socket support](/azure/app-service/web-sites-configure) must be enabled for duplex contracts. |
-| `NetHttpsBinding` | [Web socket support](https://docs.microsoft.com/azure/app-service/web-sites-configure) must be enabled for duplex contracts. | [Web socket support](/azure/app-service/web-sites-configure) must be enabled for duplex contracts. |
+| `WSDualHttpBinding` | [Web socket support](/azure/app-service/web-sites-configure) must be enabled. | [Web socket support](/azure/app-service/web-sites-configure) must be enabled. |
+| `NetHttpBinding` | [Web socket support](/azure/app-service/web-sites-configure) must be enabled for duplex contracts. | [Web socket support](/azure/app-service/web-sites-configure) must be enabled for duplex contracts. |
+| `NetHttpsBinding` | [Web socket support](/azure/app-service/web-sites-configure) must be enabled for duplex contracts. | [Web socket support](/azure/app-service/web-sites-configure) must be enabled for duplex contracts. |
 | `BasicHttpContextBinding` |  |
 | `WebHttpBinding` |  |
 | `WSHttpContextBinding` |  |
@@ -56,7 +56,7 @@ IIS5 Compatibility Mode is not supported. In Azure App Service, each web app and
 
 #### IIS7+ schema compliance
 
-Some elements and attributes are not defined in the Azure App Service IIS schema. If you encounter issues, consider using [XDT transforms](https://azure.microsoft.com/documentation/articles/web-sites-transform-extend/).
+Some elements and attributes are not defined in the Azure App Service IIS schema. If you encounter issues, consider using [XDT transforms](/azure/app-service/configure-common).
 
 #### Single application pool per site
 

docs/core/about.md

@@ -33,7 +33,7 @@ Editor integration is provided, in part, by the contributors of the [OmniSharp](
 
 * Cloud apps with [ASP.NET Core](/aspnet/core/)
 * Mobile apps with [Xamarin](/xamarin)
-* IoT apps with [System.Device.GPIO](https://docs.microsoft.com/archive/msdn-magazine/2019/august/net-core-cross-platform-iot-programming-with-net-core-3-0)
+* IoT apps with [System.Device.GPIO](/archive/msdn-magazine/2019/august/net-core-cross-platform-iot-programming-with-net-core-3-0)
 * Windows client apps with [WPF](../desktop-wpf/overview/index.md) and Windows Forms
 * Machine learning [ML.NET](../machine-learning/index.yml)
 
@@ -58,7 +58,7 @@ Many APIs are included that satisfy common needs:
 
 ### Open source
 
-[.NET Core](about.md) is an [open-source](https://github.com/dotnet/runtime/blob/master/LICENSE.TXT), general-purpose development platform. You can create .NET Core apps for Windows, macOS, and Linux for x64, x86, ARM32, and ARM64 processors. Frameworks and APIs are provided for [cloud](/aspnet/core/), [IoT](https://docs.microsoft.com/archive/msdn-magazine/2019/august/net-core-cross-platform-iot-programming-with-net-core-3-0), [client UI](../desktop-wpf/overview/index.md), and [machine learning](../machine-learning/index.yml).
+[.NET Core](about.md) is an [open-source](https://github.com/dotnet/runtime/blob/master/LICENSE.TXT), general-purpose development platform. You can create .NET Core apps for Windows, macOS, and Linux for x64, x86, ARM32, and ARM64 processors. Frameworks and APIs are provided for [cloud](/aspnet/core/), [IoT](/archive/msdn-magazine/2019/august/net-core-cross-platform-iot-programming-with-net-core-3-0), [client UI](../desktop-wpf/overview/index.md), and [machine learning](../machine-learning/index.yml).
 
 ## Support