Skip to content

Commit a85cd9e

Browse files
authored
Merge pull request #107119 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents becf291 + 3cfdaf7 commit a85cd9e

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

articles/active-directory/conditional-access/terms-of-use.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,11 @@ If a user is using Windows 10 and Microsoft Edge, they will receive a message si
274274

275275
If they are using Chrome, they will be prompted to install the [Windows 10 Accounts extension](https://chrome.google.com/webstore/detail/windows-10-accounts/ppnbnpeolgkicgegkbkbjmhlideopiji).
276276

277-
### Join an Android device
277+
### Register an iOS device
278+
279+
If a user is using an iOS device, they will be prompted to install the [Microsoft Authenticator app](https://apps.apple.com/us/app/microsoft-authenticator/id983156458).
280+
281+
### Register an Android device
278282

279283
If a user is using an Android device, they will be prompted to install the [Microsoft Authenticator app](https://play.google.com/store/apps/details?id=com.azure.authenticator).
280284

articles/aks/limit-egress-traffic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Restrict egress traffic in Azure Kubernetes Service (AKS)
33
description: Learn what ports and addresses are required to control egress traffic in Azure Kubernetes Service (AKS)
44
services: container-service
55
ms.topic: article
6-
ms.date: 01/21/2020
6+
ms.date: 03/10/2020
77

88

99
#Customer intent: As an cluster operator, I want to restrict egress traffic for nodes to only access defined ports and addresses and improve cluster security.

articles/hdinsight/interactive-query/hdinsight-grafana.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ ms.date: 12/27/2019
1313

1414
[Grafana](https://grafana.com/) is a popular, open-source graph and dashboard builder. Grafana is feature rich; not only does it let users create customizable and shareable dashboards, it also offers templated/scripted dashboards, LDAP integration, multiple data sources, and more.
1515

16-
Currently, in Azure HDInsight, Grafana is supported with the HBase, Kafka and Interactive Query cluster types. It is not supported for clusters with Enterprise Security Pack enabled.
16+
Currently, in Azure HDInsight, Grafana is supported with the Spark, HBase, Kafka and Interactive Query cluster types. It is not supported for clusters with Enterprise Security Pack enabled.
1717

1818
If you don’t have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
1919

2020
## Create an Apache Hadoop cluster
2121

22-
See [Create Apache Hadoop clusters using the Azure portal](../hdinsight-hadoop-create-linux-clusters-portal.md). For **Cluster type**, select **Kafka**, **HBase**, or **Interactive Query**.
22+
See [Create Apache Hadoop clusters using the Azure portal](../hdinsight-hadoop-create-linux-clusters-portal.md). For **Cluster type**, select **Spark**, **Kafka**, **HBase**, or **Interactive Query**.
2323

2424
## Access the Grafana dashboard
2525

articles/sql-database/sql-database-aad-authentication-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ tags: azure-synapse
1818
This article shows you how to create and populate Azure AD, and then use Azure AD with Azure [SQL Database](sql-database-technical-overview.md), [managed instance](sql-database-managed-instance.md), and [Azure Synapse](../sql-data-warehouse/sql-data-warehouse-overview-what-is.md). For an overview, see [Azure Active Directory Authentication](sql-database-aad-authentication.md).
1919

2020
> [!NOTE]
21-
> This article applies to Azure SQL server, and to both SQL Database and Azure Synpase] that are created on the Azure SQL server. For simplicity, SQL Database is used when referring to both SQL Database and Azure Synapse.
21+
> This article applies to Azure SQL server, and to both SQL Database and Azure Synpase that are created on the Azure SQL server. For simplicity, SQL Database is used when referring to both SQL Database and Azure Synapse.
2222
2323
> [!IMPORTANT]
2424
> Connecting to SQL Server running on an Azure VM is not supported using an Azure Active Directory account. Use a domain Active Directory account instead.

0 commit comments

Comments
 (0)