Skip to content

Commit 1488960

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ss19
2 parents 5df4e1a + 57cb7e6 commit 1488960

File tree

56 files changed

+1224
-476
lines changed

Some content is hidden

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

56 files changed

+1224
-476
lines changed

.openpublishing.redirection.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45687,7 +45687,12 @@
4568745687
},
4568845688
{
4568945689
"source_path": "articles/synapse-analytics/index.yml",
45690-
"redirect_url": "/azure/sql-data-warehouse/",
45690+
"redirect_url": "/azure/synapse-analytics/sql-data-warehouse/",
45691+
"redirect_document_id": false
45692+
},
45693+
{
45694+
"source_path": "articles/sql-data-warehouse/index.yml",
45695+
"redirect_url": "/azure/synapse-analytics/sql-data-warehouse/",
4569145696
"redirect_document_id": false
4569245697
},
4569345698
{

articles/active-directory/devices/assign-local-admin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ To view and update the membership of the global administrator role, see:
4646

4747
In the Azure portal, you can manage the device administrator role on the **Devices** page. To open the **Devices** page:
4848

49-
1. Sign in to your [Azure portal](https://portal.azure.com) as a global administrator or device administrator.
49+
1. Sign in to your [Azure portal](https://portal.azure.com) as a global administrator.
5050
1. Search for and select *Azure Active Directory*.
5151
1. In the **Manage** section, click **Devices**.
5252
1. On the **Devices** page, click **Device settings**.

articles/active-directory/devices/troubleshoot-device-dsregcmd.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ This section lists the status of various attributes for the user currently logge
131131
- **CanReset:** - Denotes if the Windows Hello key can be reset by the user.
132132
- **Possible values:** - DestructiveOnly, NonDestructiveOnly, DestructiveAndNonDestructive, or Unknown if error.
133133
- **WorkplaceJoined:** - Set to “YES” if Azure AD registered accounts have been added to the device in the current NTUSER context.
134-
- **WamDefaultSet:** - Set to “YES” if a WAM default WebAccount is created for the logged in user. This field could display an error if dsreg /status is run in admin context.
134+
- **WamDefaultSet:** - Set to “YES” if a WAM default WebAccount is created for the logged in user. This field could display an error if dsreg /status is run from an elevated command prompt.
135135
- **WamDefaultAuthority:** - Set to “organizations” for Azure AD.
136136
- **WamDefaultId:** - Always “https://login.microsoft.com” for Azure AD.
137137
- **WamDefaultGUID:** - The WAM provider’s (Azure AD/Microsoft account) GUID for the default WAM WebAccount.

articles/application-gateway/application-gateway-covid-guidelines.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Application Gateway COVID-19 update
2+
title: Application Gateway COVID-19 guidelines
33
description: This article provides an update given the current COVID-19 situation and guidelines on how to set up your Application Gateway.
44
services: application-gateway
55
author: caya
@@ -9,7 +9,7 @@ ms.date: 03/21/2020
99
ms.author: caya
1010
---
1111

12-
# Application Gateway COVID-19 update
12+
# Application Gateway COVID-19 guidelines
1313

1414
This article describes a few suggested guidelines to help you set up your Application Gateway to handle extra traffic due to the COVID-19 pandemic. You can use Application Gateway with Web Application Firewall (WAF) for a scalable and secure way to manage traffic to your web applications.
1515

articles/application-gateway/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ landingContent:
3131
url: application-gateway-faq.md
3232

3333
# Card
34-
- title: COVID-19 Guidelines
34+
- title: COVID-19 guidelines
3535
linkLists:
3636
- linkListType: concept
3737
links:

articles/azure-functions/functions-monitoring.md

Lines changed: 76 additions & 87 deletions
Large diffs are not rendered by default.
87.4 KB
Loading
103 KB
Loading
69.2 KB
Loading
Binary file not shown.

0 commit comments

Comments
 (0)