Skip to content

Commit f34165b

Browse files
authored
Merge pull request #100960 from MicrosoftDocs/master
1/13 AM Publish
2 parents 68a85e2 + ee711bd commit f34165b

File tree

82 files changed

+335
-532
lines changed

Some content is hidden

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

82 files changed

+335
-532
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40799,6 +40799,11 @@
4079940799
"redirect_url": "/azure/azure-databricks/databricks-extract-load-sql-data-warehouse",
4080040800
"redirect_document_id": false
4080140801
},
40802+
{
40803+
"source_path": "articles/azure-databricks/vnet-injection.md",
40804+
"redirect_url": "/azure/databricks/administration-guide/cloud-configurations/azure/vnet-inject",
40805+
"redirect_document_id": false
40806+
},
4080240807
{
4080340808
"source_path": "articles/security/blueprints/gdpr-analytics-overview.md",
4080440809
"redirect_url": "https://aka.ms/azureblueprint",

articles/analysis-services/analysis-services-datasource.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ For cloud data sources:
115115

116116
## OAuth credentials
117117

118-
For tabular models at the 1400 and higher compatibility level, Azure SQL Database, Azure SQL Data Warehouse, Dynamics 365, and SharePoint List support OAuth credentials. Azure Analysis Services manages token refresh for OAuth data sources to avoid timeouts for long-running refresh operations. To generate valid tokens, set credentials by using SSMS.
118+
For tabular models at the 1400 and higher compatibility level using in-memory mode, Azure SQL Database, Azure SQL Data Warehouse, Dynamics 365, and SharePoint List support OAuth credentials. Azure Analysis Services manages token refresh for OAuth data sources to avoid timeouts for long-running refresh operations. To generate valid tokens, set credentials by using SSMS.
119+
120+
Direct Query mode is not supported with OAuth credentials.
119121

120122
## Next steps
121123
[On-premises gateway](analysis-services-gateway.md)

articles/asc-for-iot/architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Azure Security Center for IoT is composed of the following components:
3535
Azure Security Center for IoT works in one of two feature workflows: Built-in and Enhanced
3636

3737
### Built-in
38-
In **Built-in** mode, Azure Security Center for IoT is enabled when you elect to turn on the **Security** option in your IoT Hub. Offering real-time monitoring, recommendations and alerts, Built-in mode offers singe-step device visibility and unmatched security. Build-in mode does not require agent installation on any devices and uses advanced analytics on logged activities to analyze and protect your field device.
38+
In **Built-in** mode, Azure Security Center for IoT is enabled when you elect to turn on the **Security** option in your IoT Hub. Offering real-time monitoring, recommendations and alerts, Built-in mode offers single-step device visibility and unmatched security. Build-in mode does not require agent installation on any devices and uses advanced analytics on logged activities to analyze and protect your field device.
3939

4040
### Enhanced
4141
In **Enhanced** mode, after turning on the **Security** option in your IoT Hub and installing Azure Security Center for IoT device agents on your devices, the agents collect, aggregate and analyze raw security events from your devices. Raw security events can include IP connections, process creation, user logins, and other security-relevant information. Azure Security Center for IoT device agents also handle event aggregation to help avoid high network throughput. The agents are highly customizable, allowing you to use them for specific tasks, such as sending only important information at the fastest SLA, or for aggregating extensive security information and context into larger segments, avoiding higher service costs.

articles/azure-databricks/vnet-injection.md

Lines changed: 0 additions & 197 deletions
This file was deleted.

articles/azure-functions/functions-app-settings.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,15 @@ The language worker runtime to load in the function app. This will correspond t
136136

137137
## WEBSITE_CONTENTAZUREFILECONNECTIONSTRING
138138

139-
For consumption & Premium plans only. Connection string for storage account where the function app code and configuration are stored. See [Create a function app](functions-infrastructure-as-code.md#create-a-function-app).
139+
For Consumption & Premium plans only. Connection string for storage account where the function app code and configuration are stored. See [Create a function app](functions-infrastructure-as-code.md#create-a-function-app).
140140

141141
|Key|Sample value|
142142
|---|------------|
143143
|WEBSITE_CONTENTAZUREFILECONNECTIONSTRING|DefaultEndpointsProtocol=https;AccountName=[name];AccountKey=[key]|
144144

145145
## WEBSITE\_CONTENTSHARE
146146

147-
For consumption & Premium plans only. The file path to the function app code and configuration. Used with WEBSITE_CONTENTAZUREFILECONNECTIONSTRING. Default is a unique string that begins with the function app name. See [Create a function app](functions-infrastructure-as-code.md#create-a-function-app).
147+
For Consumption & Premium plans only. The file path to the function app code and configuration. Used with WEBSITE_CONTENTAZUREFILECONNECTIONSTRING. Default is a unique string that begins with the function app name. See [Create a function app](functions-infrastructure-as-code.md#create-a-function-app).
148148

149149
|Key|Sample value|
150150
|---|------------|

0 commit comments

Comments
 (0)