Skip to content

Commit 32b9f70

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ss21
2 parents 59fab91 + d87ab5b commit 32b9f70

File tree

77 files changed

+1743
-909
lines changed

Some content is hidden

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

77 files changed

+1743
-909
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/develop/quickstart-v2-ios.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -267,25 +267,30 @@ self.applicationContext!.acquireToken(with: parameters) { (result, error) in /*
267267
Apps shouldn't require their users to sign in every time they request a token. If the user has already signed in, this method allows apps to request tokens silently.
268268
269269
```swift
270-
guard let account = try self.applicationContext!.allAccounts().first else { return }
271-
272-
let silentParams = MSALSilentTokenParameters(scopes: kScopes, account: account)
273-
self.applicationContext!.acquireTokenSilent(with: silentParams) { (result, error) in /* Add your handling logic */}
270+
self.applicationContext!.getCurrentAccount(with: nil) { (currentAccount, previousAccount, error) in
271+
272+
guard let account = currentAccount else {
273+
return
274+
}
275+
276+
let silentParams = MSALSilentTokenParameters(scopes: self.kScopes, account: account)
277+
self.applicationContext!.acquireTokenSilent(with: silentParams) { (result, error) in /* Add your handling logic */}
278+
}
274279
```
275280
276281
> |Where: ||
277282
> |---------|---------|
278283
> | `scopes` | Contains the scopes being requested (that is, `[ "user.read" ]` for Microsoft Graph or `[ "<Application ID URL>/scope" ]` for custom Web APIs (`api://<Application ID>/access_as_user`) |
279-
> | `account` | The account a token is being requested for. This quickstart is about a single account application. If you want to build a multi-account app you'll need to define logic to identify which account to use for token requests using `applicationContext.account(forHomeAccountId: self.homeAccountId)` |
284+
> | `account` | The account a token is being requested for. This quickstart is about a single account application. If you want to build a multi-account app you'll need to define logic to identify which account to use for token requests using `accountsFromDeviceForParameters:completionBlock:` and passing correct `accountIdentifier` |
280285
281286
## Next steps
282287
283-
Try out the iOS tutorial for a complete step-by-step guide on building applications, including a complete explanation of this quickstart.
288+
Try out the tutorial for iOS and macOS for a complete step-by-step guide on building applications, including a complete explanation of this quickstart.
284289
285290
### Learn how to create the application used in this quickstart
286291
287292
> [!div class="nextstepaction"]
288-
> [Call Graph API iOS tutorial](https://docs.microsoft.com/azure/active-directory/develop/guidedsetups/active-directory-ios)
293+
> [Call Graph API tutorial for iOS and macOS](https://docs.microsoft.com/azure/active-directory/develop/guidedsetups/active-directory-ios)
289294
290295
[!INCLUDE [Help and support](../../../includes/active-directory-develop-help-support-include.md)]
291296

articles/ansible/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
href: ./ansible-matrix.md
112112
- name: All modules for Azure
113113
href: https://docs.ansible.com/ansible/latest/modules/list_of_cloud_modules#azure
114-
- name: Tools
114+
- name: Resources
115115
items:
116116
- name: Visual Studio Code extension for Ansible
117117
href: https://marketplace.visualstudio.com/items?itemName=vscoss.vscode-ansible

articles/api-management/configure-custom-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ When configuring DNS for your custom domain name, you have two options:
9090
- Configure an A-record that points to your API Management gateway IP address.
9191

9292
> [!NOTE]
93-
> Although the API Managment instance IP address is static, it may change in a few scenarios. Because of this it's recommended to use CNAME when configuring custom domain. Take that into consideration when choosing DNS configuration method. Read more in the [API Management FAQ](api-management-faq.md#how-can-i-secure-the-connection-between-the-api-management-gateway-and-my-back-end-services).
93+
> Although the API Managment instance IP address is static, it may change in a few scenarios. Because of this it's recommended to use CNAME when configuring custom domain. Take that into consideration when choosing DNS configuration method. Read more in the [the IP documentation article](api-management-howto-ip-addresses.md#changes-to-the-ip-addresses) and the [API Management FAQ](api-management-faq.md#how-can-i-secure-the-connection-between-the-api-management-gateway-and-my-back-end-services).
9494
9595
## Next steps
9696

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

0 commit comments

Comments
 (0)