Skip to content

Commit 31af82e

Browse files
authored
Merge branch 'master' into v-ammark-seo-4
2 parents 2524be6 + 39c7ef2 commit 31af82e

39 files changed

+322
-214
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4776,6 +4776,11 @@
47764776
"redirect_url": "/azure/app-service-mobile",
47774777
"redirect_document_id": false
47784778
},
4779+
{
4780+
"source_path": "articles/application-gateway/application-gateway-multi-site-overview.md",
4781+
"redirect_url": "/azure/application-gateway/multiple-site-overview",
4782+
"redirect_document_id": false
4783+
},
47794784
{
47804785
"source_path": "articles/application-gateway/application-gateway-crs-rulegroups-rules.md",
47814786
"redirect_url": "/azure/web-application-firewall/ag/application-gateway-crs-rulegroups-rules",

articles/active-directory/manage-apps/what-is-single-sign-on.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: app-mgmt
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 07/17/2019
11+
ms.date: 11/14/2019
1212
ms.author: mimart
1313
ms.reviewer: arvindh, japere
1414

@@ -93,6 +93,8 @@ Password-based single sign-on is supported for any cloud-based application that
9393
> Internet Explorer is on limited support and no longer receives new software updates. Microsoft Edge is the recommended browser.
9494
9595
- Microsoft Edge on Windows 10 Anniversary Edition or later
96+
- Microsoft Edge for iOS and Android
97+
- Intune Managed Browser
9698
- Chrome on Windows 7 or later, and on MacOS X or later
9799
- Firefox 26.0 or later on Windows XP SP2 or later, and on Mac OS X 10.6 or later
98100

articles/aks/ssh.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ SCALE_SET_NAME=$(az vmss list --resource-group $CLUSTER_RESOURCE_GROUP --query [
4141

4242
The above example assigns the name of the cluster resource group for the *myAKSCluster* in *myResourceGroup* to *CLUSTER_RESOURCE_GROUP*. The example then uses *CLUSTER_RESOURCE_GROUP* to list the scale set name and assign it to *SCALE_SET_NAME*.
4343

44-
> [!NOTE]
45-
> SSH keys can currently only be added to Linux nodes using the Azure CLI. If you want to connect to a Windows Server node using SSH, use the SSH keys provided when you created the AKS cluster and skip the next set of commands for adding your SSH public key. You will still need the IP address of the node you wish to troubleshoot, which is shown in the final command of this section. Alternatively, you can [connect to Windows Server nodes using remote desktop protocol (RDP) connections][aks-windows-rdp] instead of using SSH.
44+
> [!IMPORTANT]
45+
> At this time, you should only update your SSH keys for your virtual machine scale set-based AKS clusters using the Azure CLI.
46+
>
47+
> For Linux nodes, SSH keys can currently only be added using the Azure CLI. If you want to connect to a Windows Server node using SSH, use the SSH keys provided when you created the AKS cluster and skip the next set of commands for adding your SSH public key. You will still need the IP address of the node you wish to troubleshoot, which is shown in the final command of this section. Alternatively, you can [connect to Windows Server nodes using remote desktop protocol (RDP) connections][aks-windows-rdp] instead of using SSH.
4648
4749
To add your SSH keys to the nodes in a virtual machine scale set, use the [az vmss extension set][az-vmss-extension-set] and [az vmss update-instances][az-vmss-update-instances] commands.
4850

articles/application-gateway/application-gateway-multi-site-overview.md

Lines changed: 0 additions & 119 deletions
This file was deleted.

articles/application-gateway/create-web-app.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
---
2-
title: Protect web apps with Azure Application Gateway - PowerShell
2+
title: Configure App Service using PowerShell
3+
titleSuffix: Azure Application Gateway
34
description: This article provides guidance on how to configure web apps as back end hosts on an existing or new application gateway.
45
services: application-gateway
56
author: vhorne
67
ms.service: application-gateway
78
ms.topic: article
8-
ms.date: 10/16/2018
9+
ms.date: 11/15/2019
910
ms.author: victorh
1011
---
1112

12-
# Configure App Service with Application Gateway
13+
# Configure App Service with Application Gateway using PowerShell
1314

1415
Application gateway allows you to have an App Service app or other multi-tenant service as a back-end pool member. In this article, you learn to configure an App Service app with Application Gateway. The first example shows you how to configure an existing application gateway to use a web app as a back-end pool member. The second example shows you how to create a new application gateway with a web app as a back-end pool member.
1516

articles/azure-databricks/databricks-connect-to-data-sources.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,34 +21,34 @@ This article provides links to all the different data sources in Azure that can
2121

2222
## Data sources for Azure Databricks
2323

24-
The following list provides the data sources in Azure that you can use with Azure Databricks. For a complete list of data sources that can be used with Azure Databricks, see [Data sources for Azure Databricks](/azure/databricks/data/data-sources/index.html).
24+
The following list provides the data sources in Azure that you can use with Azure Databricks. For a complete list of data sources that can be used with Azure Databricks, see [Data sources for Azure Databricks](/azure/databricks/data/data-sources/index).
2525

26-
- [Azure SQL database](/azure/databricks/data/data-sources/sql-databases.html)
26+
- [Azure SQL database](/azure/databricks/data/data-sources/sql-databases)
2727

2828
This link provides the DataFrame API for connecting to SQL databases using JDBC and how to control the parallelism of reads through the JDBC interface. This topic provides detailed examples using the Scala API, with abbreviated Python and Spark SQL examples at the end.
29-
- [Azure Data Lake Storage](/azure/databricks/data/data-sources/azure/azure-datalake-gen2.html)
29+
- [Azure Data Lake Storage](/azure/databricks/data/data-sources/azure/azure-datalake-gen2)
3030

3131
This link provides examples on how to use the Azure Active Directory service principal to authenticate with Azure Data Lake Storage. It also provides instructions on how to access the data in Azure Data Lake Storage from Azure Databricks.
3232

33-
- [Azure Blob Storage](/azure/databricks/data/data-sources/azure/azure-storage.html)
33+
- [Azure Blob Storage](/azure/databricks/data/data-sources/azure/azure-storage)
3434

3535
This link provides examples on how to directly access Azure Blob Storage from Azure Databricks using access key or the SAS for a given container. The link also provides info on how to access the Azure Blob Storage from Azure Databricks using the RDD API.
3636

37-
- [Azure Cosmos DB](/azure/databricks/data/data-sources/azure/cosmosdb-connector.html)
37+
- [Azure Cosmos DB](/azure/databricks/data/data-sources/azure/cosmosdb-connector)
3838

3939
This link provides instructions on how to use the [Azure Cosmos DB Spark connector](https://github.com/Azure/azure-cosmosdb-spark) from Azure Databricks to access data in Azure Cosmos DB.
4040

41-
- [Azure Event Hubs](/azure/databricks/data/data-sources/azure/eventhubs-connector.html)
41+
- [Azure Event Hubs](/azure/databricks/data/data-sources/azure/eventhubs-connector)
4242

4343
This link provides instructions on how to use the [Azure Event Hubs Spark connector](https://github.com/Azure/azure-event-hubs-spark) from Azure Databricks to access data in Azure Event Hubs.
4444

45-
- [Azure SQL Data Warehouse](/azure/databricks/data/data-sources/azure/sql-data-warehouse.html)
45+
- [Azure SQL Data Warehouse](/azure/databricks/data/data-sources/azure/sql-data-warehouse)
4646

4747
This link provides instructions on how to use the Azure SQL Data Warehouse connector to connect from Azure Databricks.
4848

4949

5050
## Next steps
5151

52-
To learn about sources from where you can import data into Azure Databricks, see [Data sources for Azure Databricks](/azure/databricks/data/data-sources/index.html#).
52+
To learn about sources from where you can import data into Azure Databricks, see [Data sources for Azure Databricks](/azure/databricks/data/data-sources/index).
5353

5454

articles/backup/backup-azure-alternate-dpm-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ To recover data from an Azure Backup Server:
7575

7676
![Clear External DPM](./media/backup-azure-alternate-dpm-server/clear-external-dpm.png)
7777

78-
## Troubleshooting Error Messages
78+
## Troubleshooting error messages
7979

8080
| No. | Error Message | Troubleshooting steps |
8181
|:---:|:--- |:--- |

articles/backup/backup-azure-backup-cloud-as-tape.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ By clicking **Modify** in the preceding screen, customers have further flexibili
6464

6565
![Modify](./media/backup-azure-backup-cloud-as-tape/modify.png)
6666

67-
## Next Steps
67+
## Next steps
6868

6969
For more information about Azure Backup, see:
7070

articles/backup/backup-azure-backup-sharepoint-mabs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ In the following example, the *Recovering SharePoint item* has been accidentally
234234
![MABS SharePoint Protection13](./media/backup-azure-backup-sharepoint/dpm-sharepoint-protection15.png)
235235
5. At this point, follow the recovery steps earlier in this article to recover a SharePoint content database from disk.
236236

237-
## Next Steps
237+
## Next steps
238238

239239
See the [Back up Exchange server](backup-azure-exchange-mabs.md) article.
240240
See the [Back up SQL Server](backup-azure-sql-mabs.md) article.

articles/backup/backup-azure-dpm-azure-server-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.author: dacurwin
1212

1313
# Azure Backup Server and DPM - FAQ
1414

15-
## General Questions
15+
## General questions
1616

1717
This article answers frequently asked questions about the Azure Backup Server and DPM.
1818

0 commit comments

Comments
 (0)