Skip to content

Commit f272ba8

Browse files
authored
Merge pull request #91403 from MicrosoftDocs/master
Merge Master to Live, 3 AM
2 parents b4665f4 + ea18bec commit f272ba8

File tree

74 files changed

+982
-364
lines changed

Some content is hidden

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

74 files changed

+982
-364
lines changed

articles/active-directory/conditional-access/technical-reference.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ You can assign a Conditional Access policy to the following cloud apps from Micr
7070
- Project Online
7171
- Skype for Business Online
7272
- Virtual Private Network (VPN)
73-
- Visual Studio App Center
7473
- Windows Defender ATP
7574

7675
### Other applications

articles/active-directory/develop/scenario-web-app-call-api-acquire-token.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ public async Task<IActionResult> Profile()
5858
string[] scopes = new string[]{"user.read"};
5959
string accessToken = await tokenAcquisition.GetAccessTokenOnBehalfOfUserAsync(scopes);
6060

61-
// use the access token to call a protected web API
62-
HttpClient client = new HttpClient();
63-
client.DefaultRequestHeaders.Add("Authorization", result.CreateAuthorizationHeader());
64-
string json = await client.GetStringAsync(url);
61+
// use the access token to call a protected web API
62+
HttpClient client = new HttpClient();
63+
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
64+
string json = await client.GetStringAsync(url);
6565
}
6666
```
6767

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: SaaS App Integration Tutorials for use with Azure AD | Microsoft Docs
3-
description: Configure Azure Active Directory single sign-on integration with a variety of third-party software as a service applications.
2+
title: SSO and SCIM provisioning SaaS App Integration Tutorials for use with Azure AD | Microsoft Docs
3+
description: Configure Azure Active Directory single sign-on (SSO) and SCIM provisioning integration with a variety of third-party software as a service applications.
44
services: active-directory
55
documentationcenter: ''
66
author: jeevansd
@@ -24,7 +24,7 @@ ms.collection: M365-identity-device-management
2424

2525
To help integrate your cloud-enabled [software as a service (SaaS)](https://azure.microsoft.com/overview/what-is-saas/) applications with Azure Active Directory, we have developed a collection of tutorials that walk you through configuration.
2626

27-
For a list of all SaaS apps that have been pre-integrated into Azure AD, see the [Active Directory Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps/category/azure-active-directory-apps).
27+
For a list of all SaaS apps that have been pre-integrated into Azure AD, see the [Active Directory Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps/category/azure-active-directory-apps). Click [here](https://docs.microsoft.com/azure/active-directory/develop/howto-app-gallery-listing) to request an app be added to the application gallery.
2828

2929
## Quick links
3030

articles/app-service/app-service-key-vault-references.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ editor: ''
99
ms.service: app-service
1010
ms.tgt_pltfrm: na
1111
ms.topic: article
12-
ms.date: 09/03/2019
12+
ms.date: 10/09/2019
1313
ms.author: mahender
1414
ms.custom: seodec18
1515

1616
---
1717

18-
# Use Key Vault references for App Service and Azure Functions (preview)
18+
# Use Key Vault references for App Service and Azure Functions
1919

2020
> [!NOTE]
21-
> Currently, Key Vault references are in preview, and they are not currently supported by Linux consumption plans.
21+
> Key Vault references are not currently available in Linux consumption plans.
2222
2323
This topic shows you how to work with secrets from Azure Key Vault in your App Service or Azure Functions application without requiring any code changes. [Azure Key Vault](../key-vault/key-vault-overview.md) is a service that provides centralized secrets management, with full control over access policies and audit history.
2424

@@ -49,7 +49,7 @@ A Key Vault reference is of the form `@Microsoft.KeyVault({referenceString})`, w
4949
> | VaultName=_vaultName_;SecretName=_secretName_;SecretVersion=_secretVersion_ | The **VaultName** should the name of your Key Vault resource. The **SecretName** should be the name of the target secret. The **SecretVersion** should be the version of the secret to use. |
5050
5151
> [!NOTE]
52-
> In the current preview, versions are required. When rotating secrets, you will need to update the version in your application configuration.
52+
> Versions are currently required. When rotating secrets, you will need to update the version in your application configuration.
5353
5454
For example, a complete reference would look like the following:
5555

@@ -189,7 +189,9 @@ If a reference is not resolved properly, the reference value will be used instea
189189

190190
Most commonly, this is due to a misconfiguration of the [Key Vault access policy](#granting-your-app-access-to-key-vault). However, it could also be due to a secret no longer existing or a syntax error in the reference itself.
191191

192-
If the syntax is correct, you can view other causes for error by checking the current resolution status using a built-in detector.
192+
If the syntax is correct, you can view other causes for error by checking the current resolution status in the portal. Navigate to Application Settings and select "Edit" for the reference in question. Below the setting configuration, you should see status information, including any errors. The absence of these implies that the reference syntax is invalid.
193+
194+
You can also use one of the built-in detectors to get additional information.
193195

194196
### Using the detector for App Service
195197

articles/azure-databricks/databricks-sentiment-analysis-cognitive-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 'Tutorial: Sentiment analysis on streaming data using Azure Databricks'
2+
title: Use Azure Databricks for sentiment analysis
33
description: Learn to use Azure Databricks with Event Hubs and Cognitive Services API to run sentiment analysis on streaming data in near real time.
44
services: azure-databricks
55
author: lenadroid

articles/azure-databricks/quickstart-create-databricks-workspace-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 'Quickstart: Run a Spark job on Azure Databricks using Azure portal'
2+
title: Run a Spark job on Azure Databricks using Azure portal
33
description: The quickstart shows how to use the Azure portal to create an Azure Databricks workspace, an Apache Spark cluster, and run a Spark job.
44
services: azure-databricks
55
ms.service: azure-databricks

articles/azure-databricks/quickstart-create-databricks-workspace-resource-manager-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 'Quickstart: Run a Spark job on Azure Databricks using Resource Manager template '
2+
title: Create an Azure Databricks workspace with Azure Resource manager
33
description: The quickstart shows how to use the Azure Resource Manager template to create an Azure Databricks workspace, then create an Apache Spark cluster, and run a Spark job.
44
services: azure-databricks
55
ms.service: azure-databricks

articles/azure-databricks/store-secrets-azure-key-vault.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Access Azure Blob Storage from Azure Databricks using Azure Key Vault tutorial
2+
title: Access blob storage using key vault - Azure Databricks
33
description: This tutorial describes how to access Azure Blob Storage from Azure Databricks using secrets stored in a key vault.
44
author: mamccrea
55
ms.author: mamccrea

articles/azure-databricks/vnet-injection-sql-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Query a SQL Server Linux Docker container in a virtual network from an Azure Databricks notebook
2+
title: Query a SQL Server Linux Docker container with Azure Databricks
33
description: This article describes how to deploy Azure Databricks to your virtual network, also known as VNet injection.
44
services: azure-databricks
55
author: mamccrea

articles/azure-monitor/app/console.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ namespace ConsoleApp
154154
configuration.InstrumentationKey = "removed";
155155
configuration.TelemetryInitializers.Add(new HttpDependenciesParsingTelemetryInitializer());
156156

157-
var telemetryClient = new TelemetryClient();
157+
var telemetryClient = new TelemetryClient(configuration);
158158
using (InitializeDependencyTracking(configuration))
159159
{
160160
// run app...

0 commit comments

Comments
 (0)