Skip to content

Commit a76cc09

Browse files
authored
Merge branch 'master' into rebrand_sqldw_v2
2 parents 0e137ed + cd0a465 commit a76cc09

File tree

72 files changed

+854
-448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+854
-448
lines changed

articles/active-directory/hybrid/whatis-azure-ad-connect.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Azure AD Connect is the Microsoft tool designed to meet and accomplish your hybr
2121
- [Pass-through authentication](how-to-connect-pta.md) - A sign-in method that allows users to use the same password on-premises and in the cloud, but doesn't require the additional infrastructure of a federated environment.
2222
- [Federation integration](how-to-connect-fed-whatis.md) - Federation is an optional part of Azure AD Connect and can be used to configure a hybrid environment using an on-premises AD FS infrastructure. It also provides AD FS management capabilities such as certificate renewal and additional AD FS server deployments.
2323
- [Synchronization](how-to-connect-sync-whatis.md) - Responsible for creating users, groups, and other objects. As well as, making sure identity information for your on-premises users and groups is matching the cloud. This synchronization also includes password hashes.
24-
- [Health Monitoring](whatis-hybrid-identity-health.md) - Azure AD Connect Health can provide robust monitoring and provide a central location in the Azure portal to view this activity.
24+
- [Health Monitoring](whatis-hybrid-identity-health.md) - Azure AD Connect Health can provide robust monitoring and provide a central location in the Azure portal to view this activity.
2525

2626

2727
![What is Azure AD Connect](./media/whatis-hybrid-identity/arch.png)

articles/active-directory/saas-apps/jiramicrosoft-tutorial.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Use your Microsoft Azure Active Directory account with Atlassian JIRA server to
3939
To configure Azure AD integration with JIRA SAML SSO by Microsoft, you need the following items:
4040

4141
- An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
42-
- JIRA Core and Software 6.4 to 8.5.1 or JIRA Service Desk 3.0 to 4.6.0 should installed and configured on Windows 64-bit version
42+
- JIRA Core and Software 6.4 to 8.8.0 or JIRA Service Desk 3.0 to 4.8.0 should installed and configured on Windows 64-bit version
4343
- JIRA server is HTTPS enabled
4444
- Note the supported versions for JIRA Plugin are mentioned in below section.
4545
- JIRA server is reachable on internet particularly to Azure AD Login page for authentication and should able to receive the token from Azure AD
@@ -57,8 +57,8 @@ To get started, you need the following items:
5757

5858
## Supported versions of JIRA
5959

60-
* JIRA Core and Software: 6.4 to 8.5.1
61-
* JIRA Service Desk 3.0.0 to 4.6.0
60+
* JIRA Core and Software: 6.4 to 8.8.0
61+
* JIRA Service Desk 3.0.0 to 4.8.0
6262
* JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](jira52microsoft-tutorial.md)
6363

6464
> [!NOTE]

articles/active-directory/user-help/multi-factor-authentication-end-user-troubleshoot.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.workload: identity
1010
ms.service: active-directory
1111
ms.subservice: user-help
1212
ms.topic: conceptual
13-
ms.date: 02/20/2020
13+
ms.date: 04/02/2020
1414
ms.author: curtand
1515
ms.reviewer: kexia
1616
---
@@ -96,6 +96,8 @@ App passwords replace your normal password for older desktop applications that d
9696

9797
If you're using two-factor verification with your work or school account (for example, [email protected]), it most likely means that your organization has decided you must use this added security feature. Because your organization has decided you must use this feature, there is no way for you to individually turn it off. If, however, you're using two-factor verification with a personal account, like [email protected], you have the ability to turn the feature on and off. For instructions about how to control two-factor verification for your personal accounts, see [Turning two-factor verification on or off for your Microsoft account](https://support.microsoft.com/help/4028586/microsoft-account-turning-two-step-verification-on-or-off).
9898

99+
If you can't turn off two-factor verification, it could also be because of the security defaults that have been applied at the organization level. For more information about security defaults, see [What are security defulta?](../fundamentals/concept-fundamentals-security-defaults.md)
100+
99101
## I didn't find an answer to my problem
100102

101103
If you've tried these steps but are still running into problems, contact your organization's Help desk for assistance.

articles/aks/http-application-routing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: HTTP application routing add-on on Azure Kubernetes Service (AKS)
3-
description: Use the HTTP application routing add-on on Azure Kubernetes Service (AKS).
3+
description: Use the HTTP application routing add-on to access applications deployed on Azure Kubernetes Service (AKS).
44
services: container-service
55
author: lachie83
66
ms.topic: article

articles/aks/kubernetes-draft.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Develop on Azure Kubernetes Service (AKS) with Draft
3-
description: Use Draft with AKS and Azure Container Registry
3+
description: Use Draft with AKS and Azure Container Registry to package and run application containers in a cluster.
44
services: container-service
55
author: zr-msft
66
ms.topic: article

articles/aks/openfaas.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Use OpenFaaS with Azure Kubernetes Service (AKS)
3-
description: Deploy and use OpenFaaS with Azure Kubernetes Service (AKS)
3+
description: Learn how to deploy and use OpenFaaS on an Azure Kubernetes Service (AKS) cluster to build serverless functions with containers.
44
author: justindavies
55

66
ms.topic: conceptual

articles/aks/spark-job.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Run an Apache Spark job with Azure Kubernetes Service (AKS)
3-
description: Use Azure Kubernetes Service (AKS) to run an Apache Spark job
3+
description: Use Azure Kubernetes Service (AKS) to create and run an Apache Spark job for large-scale data processing.
44
author: lenadroid
55
ms.topic: conceptual
66
ms.date: 10/18/2019

articles/aks/upgrade-cluster.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Upgrade an Azure Kubernetes Service (AKS) cluster
3-
description: Learn how to upgrade an Azure Kubernetes Service (AKS) cluster
3+
description: Learn how to upgrade an Azure Kubernetes Service (AKS) cluster to get the latest features and security updates.
44
services: container-service
55
ms.topic: article
66
ms.date: 05/31/2019

articles/application-gateway/high-traffic-support.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ ms.date: 03/24/2020
99
ms.author: caya
1010
---
1111

12-
# Application Gateway high traffic support
12+
# Application Gateway high traffic support
1313

14-
This article describes a few suggested guidelines to help you set up your Application Gateway to handle extra traffic due to high traffic volume scenarios, such as the COVID-19 situation. You can use Application Gateway with Web Application Firewall (WAF) for a scalable and secure way to manage traffic to your web applications.
14+
>[!NOTE]
15+
> This article describes a few suggested guidelines to help you set up your Application Gateway to handle extra traffic due to high traffic volume that may occur due to the COVID-19 crisis.
1516
16-
The following suggestions help you set up Application Gateway with WAF to handle extra traffic.
17+
You can use Application Gateway with Web Application Firewall (WAF) for a scalable and secure way to manage traffic to your web applications.
18+
19+
The following suggestions help you set up Application Gateway with WAF to handle extra traffic.
1720

1821
## Use the v2 SKU over v1 for its autoscaling capabilities and performance benefits
1922
The v2 SKU offers autoscaling to ensure that your Application Gateway can scale up as traffic increases. It also offers other significant performance benefits, such as 5x better TLS offload performance, quicker deployment and update times, zone redundancy, and more when compared to v1. For more information, see our [v2 documentation](https://docs.microsoft.com/azure/application-gateway/application-gateway-autoscaling-zone-redundant).

articles/azure-monitor/platform/alerts-common-schema-definitions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ Any alert instance describes the resource that was affected and the cause of the
167167
"SearchIntervalInMinutes": "15",
168168
"Threshold": 10000,
169169
"Operator": "Less Than",
170-
"SearchResult": {
170+
"SearchResults": {
171171
"tables": [
172172
{
173173
"name": "PrimaryResult",
@@ -230,7 +230,7 @@ Any alert instance describes the resource that was affected and the cause of the
230230
"Threshold": 10000,
231231
"Operator": "Less Than",
232232
"ApplicationId": "8e20151d-75b2-4d66-b965-153fb69d65a6",
233-
"SearchResult": {
233+
"SearchResults": {
234234
"tables": [
235235
{
236236
"name": "PrimaryResult",

0 commit comments

Comments
 (0)