Skip to content

Commit 3bef496

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into natpatch
commit
2 parents fbf0c55 + 12ef978 commit 3bef496

File tree

60 files changed

+851
-567
lines changed

Some content is hidden

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

60 files changed

+851
-567
lines changed

articles/active-directory-b2c/custom-policy-disable-email-verification.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@ Complete the steps in [Get started with custom policies](custom-policy-get-start
2424

2525
## Add the metadata to the self-asserted technical profile
2626

27-
The **LocalAccountSignUpWithLogonEmail** technical profile is a [self-asserted](self-asserted-technical-profile.md), which is invoked during the sign-up flow. To disable the email verification, set the `EnforceEmailVerification` metadata to false. Override the LocalAccountSignUpWithLogonEmail technical profiles in the extension file. Find the `ClaimsProviders` element. Add the following claims provider to the `ClaimsProviders` element:
27+
The **LocalAccountSignUpWithLogonEmail** technical profile is a [self-asserted](self-asserted-technical-profile.md), which is invoked during the sign-up flow. To disable the email verification, set the `EnforceEmailVerification` metadata to false. Override the LocalAccountSignUpWithLogonEmail technical profiles in the extension file.
2828

29+
1. Open the extensions file of your policy. For example, <em>`SocialAndLocalAccounts/`**`TrustFrameworkExtensions.xml`**</em>.
30+
1. Find the `ClaimsProviders` element. If the element doesn't exist, add it.
31+
1. Add the following claims provider to the `ClaimsProviders` element:
2932

3033
```XML
3134
<ClaimsProvider>

articles/active-directory-b2c/custom-policy-password-complexity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,4 @@ To configure the password complexity, override the `newPassword` and `reenterPas
149149
## Next steps
150150

151151
- Learn how to [Configure password change using custom policies in Azure Active Directory B2C](custom-policy-password-change.md).
152-
- - Learn more about the [Predicates](predicates.md) and [PredicateValidations](predicates.md#predicatevalidations) elements in the IEF reference.
152+
- Learn more about the [Predicates](predicates.md) and [PredicateValidations](predicates.md#predicatevalidations) elements in the IEF reference.

articles/app-service/containers/quickstart-multi-container.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ When the App Service plan has been created, the Azure CLI shows information simi
9393

9494
## Create a Docker Compose app
9595

96+
> [!NOTE]
97+
> Docker Compose on Azure App Services currently has a limit of 4,000 characters at this time.
98+
9699
In your Cloud Shell terminal, create a multi-container [web app](app-service-linux-intro.md) in the `myAppServicePlan` App Service plan with the [az webapp create](/cli/azure/webapp?view=azure-cli-latest#az-webapp-create) command. Don't forget to replace _\<app_name>_ with a unique app name (valid characters are `a-z`, `0-9`, and `-`).
97100

98101
```azurecli

articles/azure-databricks/TOC.yml

Lines changed: 47 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -31,44 +31,9 @@
3131
items:
3232
- name: Getting started
3333
items:
34-
- name: Data overview
35-
href: /azure/databricks/getting-started/data
36-
maintainContext: true
3734
- name: Azure Databricks concepts
3835
href: /azure/databricks/getting-started/concepts
3936
maintainContext: true
40-
- name: Azure Databricks datasets
41-
href: /azure/databricks/getting-started/databricks-datasets
42-
maintainContext: true
43-
- name: Apache Spark
44-
items:
45-
- name: Apache Spark overview
46-
href: /azure/databricks/getting-started/spark/index
47-
maintainContext: true
48-
- name: Get started with Apache Spark
49-
href: /azure/databricks/getting-started/spark/quick-start
50-
maintainContext: true
51-
- name: DataFrames
52-
href: /azure/databricks/getting-started/spark/dataframes
53-
maintainContext: true
54-
- name: Datasets
55-
href: /azure/databricks/getting-started/spark/datasets
56-
maintainContext: true
57-
- name: Machine learning
58-
href: /azure/databricks/getting-started/spark/machine-learning
59-
maintainContext: true
60-
- name: Structured streaming
61-
href: /azure/databricks/getting-started/spark/streaming
62-
maintainContext: true
63-
- name: What's next
64-
href: /azure/databricks/getting-started/spark/next
65-
maintainContext: true
66-
- name: Training and FAQ
67-
href: /azure/databricks/getting-started/training-faq
68-
maintainContext: true
69-
- name: Supported browsers
70-
href: /azure/databricks/getting-started/supported-browsers
71-
maintainContext: true
7237
- name: Databricks runtimes
7338
items:
7439
- name: Runtime overview
@@ -220,6 +185,9 @@
220185
maintainContext: true
221186
- name: Data
222187
items:
188+
- name: Data overview
189+
href: /azure/databricks/getting-started/data
190+
maintainContext: true
223191
- name: Databases and tables
224192
href: /azure/databricks/data/tables
225193
maintainContext: true
@@ -311,6 +279,9 @@
311279
- name: Databricks File System (DBFS)
312280
href: /azure/databricks/data/databricks-file-system
313281
maintainContext: true
282+
- name: Azure Databricks Datasets
283+
href: /azure/databricks/getting-started/databricks-datasets
284+
maintainContext: true
314285
- name: FileStore
315286
href: /azure/databricks/data/filestore
316287
maintainContext: true
@@ -732,6 +703,9 @@
732703
- name: RStudio on Azure Databricks
733704
href: /azure/databricks/spark/latest/sparkr/rstudio
734705
maintainContext: true
706+
- name: Shiny on Azure Databricks
707+
href: /azure/databricks/spark/latest/sparkr/shiny
708+
maintainContext: true
735709
- name: Machine learning
736710
items:
737711
- name: Machine learning overview
@@ -1385,6 +1359,9 @@
13851359
- name: Ensure idempotency
13861360
href: /azure/databricks/kb/jobs/jobs-idempotency
13871361
maintainContext: true
1362+
- name: Long jobs fail with credential passthrough
1363+
href: /azure/databricks/kb/jobs/azure-long-job-failed-auth
1364+
maintainContext: true
13881365
- name: Libraries
13891366
items:
13901367
- name: Can't uninstall library from UI
@@ -1495,6 +1472,12 @@
14951472
- name: Run SQL queries
14961473
href: /azure/databricks/kb/python/sql-in-python
14971474
maintainContext: true
1475+
- name: Use the HDFS API to read files in Python
1476+
href: /azure/databricks/kb/python/hdfs-to-read-files
1477+
maintainContext: true
1478+
- name: Python 2 sunset status
1479+
href: /azure/databricks/kb/python/python-2-eol
1480+
maintainContext: true
14981481
- name: R with Spark
14991482
items:
15001483
- name: Change version of R
@@ -1650,6 +1633,35 @@
16501633
href: /azure/templates/microsoft.databricks/workspaces
16511634
- name: Resources
16521635
items:
1636+
- name: Apache Spark
1637+
items:
1638+
- name: Apache Spark overview
1639+
href: /azure/databricks/getting-started/spark/index
1640+
maintainContext: true
1641+
- name: Get started with Apache Spark
1642+
href: /azure/databricks/getting-started/spark/quick-start
1643+
maintainContext: true
1644+
- name: DataFrames
1645+
href: /azure/databricks/getting-started/spark/dataframes
1646+
maintainContext: true
1647+
- name: Datasets
1648+
href: /azure/databricks/getting-started/spark/datasets
1649+
maintainContext: true
1650+
- name: Machine learning
1651+
href: /azure/databricks/getting-started/spark/machine-learning
1652+
maintainContext: true
1653+
- name: Structured streaming
1654+
href: /azure/databricks/getting-started/spark/streaming
1655+
maintainContext: true
1656+
- name: What's next
1657+
href: /azure/databricks/getting-started/spark/next
1658+
maintainContext: true
1659+
- name: Training and FAQ
1660+
href: /azure/databricks/getting-started/training-faq
1661+
maintainContext: true
1662+
- name: Supported browsers
1663+
href: /azure/databricks/getting-started/supported-browsers
1664+
maintainContext: true
16531665
- name: Release notes
16541666
items:
16551667
- name: Platform

articles/azure-functions/functions-create-maven-eclipse.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ It's highly recommended to also install [Azure Functions Core Tools, version 2](
3737
1. Select **Add Archetype** and add the entries for the [azure-functions-archetype](https://mvnrepository.com/artifact/com.microsoft.azure/azure-functions-archetype).
3838
- Archetype Group ID: com.microsoft.azure
3939
- Archetype Artifact ID: azure-functions-archetype
40-
- Version: Use latest version **1.22** from [the central repository](https://mvnrepository.com/artifact/com.microsoft.azure/azure-functions-archetype)
40+
- Version: Check and use latest version from [the central repository](https://mvnrepository.com/artifact/com.microsoft.azure/azure-functions-archetype)
4141
![Eclipse Maven create](media/functions-create-first-java-eclipse/functions-create-eclipse.png)
4242
1. Click **OK** and then click **Next**. Be sure to fill in values for all of the fields including `resourceGroup`, `appName`, and `appRegion` (please use a different appName other than **fabrikam-function-20170920120101928**), and eventually **Finish**.
4343
![Eclipse Maven create2](media/functions-create-first-java-eclipse/functions-create-eclipse2.png)

articles/azure-functions/functions-create-maven-intellij.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ To develop a function with Java and IntelliJ, install the following software:
4141
1. In the **Add Archetype** window, complete the fields as follows:
4242
- _GroupId_: com.microsoft.azure
4343
- _ArtifactId_: azure-functions-archetype
44-
- _Version_: Use the latest version **1.22** from [the central repository](https://mvnrepository.com/artifact/com.microsoft.azure/azure-functions-archetype)
44+
- _Version_: Check and use the latest version from [the central repository](https://mvnrepository.com/artifact/com.microsoft.azure/azure-functions-archetype)
4545
![Create a Maven project from archetype in IntelliJ IDEA](media/functions-create-first-java-intellij/functions-create-intellij.png)
4646
1. Select **OK**, and then select **Next**.
4747
1. Enter your details for current project, and select **Finish**.

articles/azure-monitor/app/app-insights-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ There are several ways to get started. Begin with whichever works best for you.
9898
* [.NET Console Applications](../../azure-monitor/app/console.md)
9999
* [Java](../../azure-monitor/app/java-get-started.md)
100100
* [Node.js](../../azure-monitor/app/nodejs.md)
101-
* [Python (preview)](../../azure-monitor/app/opencensus-python.md)
101+
* [Python](../../azure-monitor/app/opencensus-python.md)
102102
* [Other platforms](../../azure-monitor/app/platforms.md)
103103
* **[Instrument your web pages](../../azure-monitor/app/javascript.md)** for page view, AJAX, and other client-side telemetry.
104104
* **[Analyze mobile app usage](../../azure-monitor/learn/mobile-center-quickstart.md)** by integrating with Visual Studio App Center.
@@ -117,7 +117,7 @@ Get started at development time with:
117117
* [ASP.NET Core](../../azure-monitor/app/asp-net-core.md)
118118
* [Java](../../azure-monitor/app/java-get-started.md)
119119
* [Node.js](../../azure-monitor/app/nodejs.md)
120-
* [Python (preview)](../../azure-monitor/app/opencensus-python.md)
120+
* [Python](../../azure-monitor/app/opencensus-python.md)
121121

122122

123123
## Support and feedback

articles/azure-monitor/app/distributed-tracing.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ ms.reviewer: mbullwin
1111

1212
# What is Distributed Tracing?
1313

14-
The advent of modern cloud and [microservices](https://azure.com/microservices) architectures has given rise to simple, independently deployable services that can help reduce costs while increasing availability and throughput. But while these movements have made individual services easier to understand as a whole, theyve made overall systems more difficult to reason about and debug.
14+
The advent of modern cloud and [microservices](https://azure.com/microservices) architectures has given rise to simple, independently deployable services that can help reduce costs while increasing availability and throughput. But while these movements have made individual services easier to understand as a whole, they've made overall systems more difficult to reason about and debug.
1515

16-
In monolithic architectures, weve gotten used to debugging with call stacks. Call stacks are brilliant tools for showing the flow of execution (Method A called Method B, which called Method C), along with details and parameters about each of those calls. This is great for monoliths or services running on a single process, but how do we debug when the call is across a process boundary, not simply a reference on the local stack?
16+
In monolithic architectures, we've gotten used to debugging with call stacks. Call stacks are brilliant tools for showing the flow of execution (Method A called Method B, which called Method C), along with details and parameters about each of those calls. This is great for monoliths or services running on a single process, but how do we debug when the call is across a process boundary, not simply a reference on the local stack?
1717

18-
Thats where distributed tracing comes in.
18+
That's where distributed tracing comes in.
1919

2020
Distributed tracing is the equivalent of call stacks for modern cloud and microservices architectures, with the addition of a simplistic performance profiler thrown in. In Azure Monitor, we provide two experiences for consuming distributed trace data. The first is our [transaction diagnostics](https://docs.microsoft.com/azure/application-insights/app-insights-transaction-diagnostics) view, which is like a call stack with a time dimension added in. The transaction diagnostics view provides visibility into one single transaction/request, and is helpful for finding the root cause of reliability issues and performance bottlenecks on a per request basis.
2121

@@ -34,7 +34,7 @@ The Application Insights SDKs for .NET, .NET Core, Java, Node.js, and JavaScript
3434
* [Java](https://docs.microsoft.com/azure/application-insights/app-insights-java-get-started)
3535
* [Node.js](https://docs.microsoft.com/azure/application-insights/app-insights-nodejs-quick-start)
3636
* [JavaScript](https://docs.microsoft.com/azure/application-insights/app-insights-javascript)
37-
* [Python (preview)](opencensus-python.md)
37+
* [Python](opencensus-python.md)
3838

3939
With the proper Application Insights SDK installed and configured, tracing information is automatically collected for popular frameworks, libraries, and technologies by SDK dependency auto-collectors. The full list of supported technologies is available in [the Dependency auto-collection documentation](https://docs.microsoft.com/azure/application-insights/auto-collect-dependencies).
4040

@@ -44,7 +44,7 @@ With the proper Application Insights SDK installed and configured, tracing infor
4444

4545
In addition to the Application Insights SDKs, Application Insights also supports distributed tracing through [OpenCensus](https://opencensus.io/). OpenCensus is an open source, vendor-agnostic, single distribution of libraries to provide metrics collection and distributed tracing for services. It also enables the open source community to enable distributed tracing with popular technologies like Redis, Memcached, or MongoDB. [Microsoft collaborates on OpenCensus with several other monitoring and cloud partners](https://open.microsoft.com/2018/06/13/microsoft-joins-the-opencensus-project/).
4646

47-
[Python (preview)](opencensus-python.md)
47+
[Python](opencensus-python.md)
4848

4949
The OpenCensus website maintains API reference documentation for [Python](https://opencensus.io/api/python/trace/usage.html) and [Go](https://godoc.org/go.opencensus.io), as well as various different guides for using OpenCensus.
5050

articles/azure-monitor/app/platforms.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.reviewer: olegan
1313
* [Java](../../azure-monitor/app/java-get-started.md)
1414
* [JavaScript](../../azure-monitor/app/javascript.md)
1515
* [Node.JS](../../azure-monitor/app/nodejs.md)
16-
* [Python (preview)](../../azure-monitor/app/opencensus-python.md)
16+
* [Python](../../azure-monitor/app/opencensus-python.md)
1717

1818
## Supported platforms and frameworks
1919

@@ -30,7 +30,7 @@ ms.reviewer: olegan
3030
* [iOS](../../azure-monitor/learn/mobile-center-quickstart.md) (App Center)
3131
* [Java EE](../../azure-monitor/app/java-get-started.md)
3232
* [Node.JS](https://www.npmjs.com/package/applicationinsights)
33-
* [Python (preview)](../../azure-monitor/app/opencensus-python.md)
33+
* [Python](../../azure-monitor/app/opencensus-python.md)
3434
* [Universal Windows app](../../azure-monitor/learn/mobile-center-quickstart.md) (App Center)
3535
* [Windows desktop applications, services, and worker roles](../../azure-monitor/app/windows-desktop.md)
3636

@@ -46,4 +46,4 @@ ms.reviewer: olegan
4646
* [Stream Analytics](../../azure-monitor/app/export-power-bi.md)
4747

4848
## Unsupported SDKs
49-
We're aware that several other community-supported SDKs exist. However, Azure Monitor only provides support when using the supported SDKs listed on this page. Were constantly assessing opportunities to expand our support for other languages, so follow our [GitHub Announcements](https://github.com/microsoft/ApplicationInsights-Announcements/issues) page to receive the latest SDK news.
49+
We're aware that several other community-supported SDKs exist. However, Azure Monitor only provides support when using the supported SDKs listed on this page. We're constantly assessing opportunities to expand our support for other languages, so follow our [GitHub Announcements](https://github.com/microsoft/ApplicationInsights-Announcements/issues) page to receive the latest SDK news.

articles/azure-monitor/app/sdk-connection-string.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ See also: https://docs.microsoft.com/azure/azure-monitor/app/custom-endpoints#re
102102

103103
In this example, only the Instrumentation Key has been set.
104104

105-
- Authorization scheme defaults to ikey
105+
- Authorization scheme defaults to "ikey"
106106
- Instrumentation Key: 00000000-0000-0000-0000-000000000000
107107
- The regional service URIs are based on the [SDK defaults](https://github.com/microsoft/ApplicationInsights-dotnet/blob/e50d569cebf485e72e98f4a08a0bc0e30cdf42bc/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Endpoints/Constants.cs#L6) and will connect to the public global Azure:
108108
- Ingestion: https://dc.services.visualstudio.com/
@@ -118,7 +118,7 @@ In this example, only the Instrumentation Key has been set.
118118

119119
In this example, this connection string specifies the endpoint suffix and the SDK will construct service endpoints.
120120

121-
- Authorization scheme defaults to ikey
121+
- Authorization scheme defaults to "ikey"
122122
- Instrumentation Key: 00000000-0000-0000-0000-000000000000
123123
- The regional service URIs are based on provided endpoint suffix:
124124
- Ingestion: https://dc.ai.contoso.com
@@ -134,7 +134,7 @@ In this example, this connection string specifies the endpoint suffix and the SD
134134

135135
In this example, this connection string specifies explicit overrides for every service. The SDK will use the exact endpoints provided without modification.
136136

137-
- Authorization scheme defaults to ikey
137+
- Authorization scheme defaults to "ikey"
138138
- Instrumentation Key: 00000000-0000-0000-0000-000000000000
139139
- The regional service URIs are based on the explicit override values:
140140
- Ingestion: https:\//custom.com:111/
@@ -275,4 +275,4 @@ Get started at development time with:
275275
* [ASP.NET Core](../../azure-monitor/app/asp-net-core.md)
276276
* [Java](../../azure-monitor/app/java-get-started.md)
277277
* [Node.js](../../azure-monitor/app/nodejs.md)
278-
* [Python (preview)](../../azure-monitor/app/opencensus-python.md)
278+
* [Python](../../azure-monitor/app/opencensus-python.md)

0 commit comments

Comments
 (0)