Skip to content

Commit 9e46e7d

Browse files
authored
Merge pull request #116555 from stevestein/sqldb-5.26.2
sqldb - sync with master
2 parents 55d6cf0 + 120540f commit 9e46e7d

14 files changed

+729
-728
lines changed

articles/active-directory/b2b/facebook-federation.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
23
title: Add Facebook as an identity provider - Azure AD
34
description: Federate with Facebook to enable external users (guests) to sign in to your Azure AD apps with their own Facebook accounts.
45

articles/azure-monitor/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@
453453
- name: Availability
454454
href: app/monitor-web-app-availability.md
455455
- name: Metric alerts
456-
href: platform/alerts-log.md
456+
href: app/alerts.md
457457
- name: Metric alert rules
458458
items:
459459
- name: Manage metric alerts

articles/batch/batch-nodejs-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Learn the basics of building a Batch client in Node.js using [Azure Batch Node.j
1212
## Prerequisites
1313
This article assumes that you have a working knowledge of Node.js and familiarity with Linux. It also assumes that you have an Azure account setup with access rights to create Batch and Storage services.
1414

15-
We recommend reading [Azure Batch Technical Overview](../azure-sql/database/sql-database-paas-overview.md) before you go through the steps outlined this article.
15+
We recommend reading [Azure Batch Technical Overview](batch-technical-overview.md) before you go through the steps outlined this article.
1616

1717
## The tutorial scenario
1818
Let us understand the batch workflow scenario. We have a simple script written in Python that downloads all csv files from an Azure Blob storage container and converts them to JSON. To process multiple storage account containers in parallel, we can deploy the script as an Azure Batch job.

articles/container-service/dcos-swarm/container-service-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Currently Linux containers are supported with all orchestrators. Support for Win
3333
### Do you recommend a specific orchestrator in Azure Container Service? 
3434
Generally we do not recommend a specific orchestrator. If you have experience with one of the supported orchestrators, you can apply that experience in Azure Container Service. Data trends suggest, however, that DC/OS is production proven for Big Data and IoT workloads, Kubernetes is suited for cloud-native workloads, and Docker Swarm is known for its integration with Docker tools and easy learning curve.
3535

36-
Depending on your scenario, you can also build and manage custom container solutions with other Azure services. These services include [Virtual Machines](../../virtual-machines/linux/overview.md), [Service Fabric](../../service-fabric/service-fabric-overview.md), [Web Apps](../../app-service/overview.md), and [Batch](../../azure-sql/database/sql-database-paas-overview.md)
36+
Depending on your scenario, you can also build and manage custom container solutions with other Azure services. These services include [Virtual Machines](../../virtual-machines/linux/overview.md), [Service Fabric](../../service-fabric/service-fabric-overview.md), [Web Apps](../../app-service/overview.md), and [Batch](../../batch/batch-technical-overview.md)
3737

3838
### What is the difference between Azure Container Service and ACS Engine? 
3939
Azure Container Service is an SLA-backed Azure service with features in the Azure portal, Azure command-line tools, and Azure APIs. The service enables you to quickly implement and manage clusters running standard container orchestration tools with a relatively small number of configuration choices.

articles/container-service/kubernetes/container-service-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Currently Linux containers are supported with all orchestrators. Support for Win
3333
### Do you recommend a specific orchestrator in Azure Container Service? 
3434
Generally we do not recommend a specific orchestrator. If you have experience with one of the supported orchestrators, you can apply that experience in Azure Container Service. Data trends suggest, however, that DC/OS is production proven for Big Data and IoT workloads, Kubernetes is suited for cloud-native workloads, and Docker Swarm is known for its integration with Docker tools and easy learning curve.
3535

36-
Depending on your scenario, you can also build and manage custom container solutions with other Azure services. These services include [Virtual Machines](../../virtual-machines/linux/overview.md), [Service Fabric](../../service-fabric/service-fabric-overview.md), [Web Apps](../../app-service/overview.md), and [Batch](../../azure-sql/database/sql-database-paas-overview.md)
36+
Depending on your scenario, you can also build and manage custom container solutions with other Azure services. These services include [Virtual Machines](../../virtual-machines/linux/overview.md), [Service Fabric](../../service-fabric/service-fabric-overview.md), [Web Apps](../../app-service/overview.md), and [Batch](../../batch/batch-technical-overview.md)
3737

3838
### What is the difference between Azure Container Service and ACS Engine? 
3939
Azure Container Service is an SLA-backed Azure service with features in the Azure portal, Azure command-line tools, and Azure APIs. The service enables you to quickly implement and manage clusters running standard container orchestration tools with a relatively small number of configuration choices.

articles/data-factory/compute-linked-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ You can create an Azure Batch linked service to register a Batch pool of virtual
320320

321321
See following articles if you are new to Azure Batch service:
322322

323-
* [Azure Batch basics](../azure-sql/database/sql-database-paas-overview.md) for an overview of the Azure Batch service.
323+
* [Azure Batch basics](../batch/batch-technical-overview.md) for an overview of the Azure Batch service.
324324
* [New-AzBatchAccount](/powershell/module/az.batch/New-azBatchAccount) cmdlet to create an Azure Batch account (or) [Azure portal](../batch/batch-account-create-portal.md) to create the Azure Batch account using Azure portal. See [Using PowerShell to manage Azure Batch Account](https://blogs.technet.com/b/windowshpc/archive/2014/10/28/using-azure-powershell-to-manage-azure-batch-account.aspx) article for detailed instructions on using the cmdlet.
325325
* [New-AzBatchPool](/powershell/module/az.batch/New-AzBatchPool) cmdlet to create an Azure Batch pool.
326326

articles/germany/germany-migration-compute.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ Redeploy your deployment scripts, templates, or code in the new region. Redeploy
169169
For more information:
170170
171171
- Refresh your knowledge by completing the [Batch tutorials](https://docs.microsoft.com/azure/batch/tutorial-parallel-dotnet).
172-
- Review the [Azure Batch overview](../azure-sql/database/sql-database-paas-overview.md).
172+
- Review the [Azure Batch overview](../batch/batch-technical-overview.md).
173173
174174
## Functions
175175

articles/service-fabric/service-fabric-common-questions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,4 +180,4 @@ Follow the [Service Fabric blog](https://blogs.msdn.microsoft.com/azureservicefa
180180

181181
## Next steps
182182

183-
Learn about [core Service Fabric concepts](../azure-sql/database/sql-database-paas-overview.md) and [best practices](service-fabric-best-practices-overview.md)
183+
Learn about [core Service Fabric concepts](service-fabric-technical-overview.md) and [best practices](service-fabric-best-practices-overview.md)

0 commit comments

Comments
 (0)