Skip to content

Commit 972db68

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into melvyn-asc-alerts_ref
2 parents f198a5f + 45b6f18 commit 972db68

File tree

51 files changed

+490
-223
lines changed

Some content is hidden

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

51 files changed

+490
-223
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/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-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)

articles/azure-signalr/index.yml

Lines changed: 55 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,60 @@
1-
### YamlMime:YamlDocument
2-
documentType: LandingData
3-
title: Azure SignalR Service Documentation
1+
### YamlMime:Landing
2+
3+
title: Azure SignalR Service documentation
4+
summary: Azure SignalR Service is an Azure managed service that helps developers easily build web applications with real-time features.
5+
46
metadata:
5-
title: Documentation - Azure SignalR Service
7+
title: Azure SignalR Service documentation
68
description: Build and scale real-time web app easily in serverless or server mode. Based on WebSocket supporting broad range of languages and frameworks.
7-
services: azure-signalr
8-
author: v-chmccl
9-
manager: wesmc
109
ms.service: signalr
11-
ms.tgt_pltfrm: na
1210
ms.topic: landing-page
13-
ms.date: 09/12/2018
11+
author: v-chmccl
1412
ms.author: wesmc
15-
abstract:
16-
description: Azure SignalR Service is an Azure managed service that helps developers easily build web applications with real-time features.
17-
sections:
18-
- title: 5-Minute Quickstarts
19-
items:
20-
- type: paragraph
21-
text: 'Learn how to develop your first web application using Azure SignalR Service for real-time communications:'
22-
- type: list
23-
style: icon48
24-
items:
25-
- image:
26-
src: https://docs.microsoft.com/media/logos/logo_NETcore.svg
27-
text: ASP.NET Core
28-
href: /azure/azure-signalr/signalr-quickstart-dotnet-core
29-
- image:
30-
src: https://docs.microsoft.com/media/logos/logo_NET.svg
31-
text: ASP.NET
32-
href: /azure/azure-signalr/signalr-quickstart-dotnet
33-
- image:
34-
src: https://docs.microsoft.com/media/logos/logo_js.svg
35-
text: JavaScript
36-
href: /azure/azure-signalr/signalr-quickstart-azure-functions-javascript
37-
- image:
38-
src: https://docs.microsoft.com/media/logos/logo_Csharp.svg
39-
text: C#
40-
href: /azure/azure-signalr/signalr-quickstart-azure-functions-csharp
41-
- image:
42-
src: https://docs.microsoft.com/azure/media/index/logo_java.svg
43-
text: Java
44-
href: /azure/azure-signalr/signalr-quickstart-azure-functions-java
45-
- image:
46-
src: https://docs.microsoft.com/azure/media/index/logo_python.svg
47-
text: Python
48-
href: /azure/azure-signalr/signalr-quickstart-azure-functions-python
49-
- image:
50-
src: https://docs.microsoft.com/media/logos/logo_REST.svg
51-
text: REST API
52-
href: /azure/azure-signalr/signalr-quickstart-rest-api
53-
- title: Step-by-step tutorials
54-
items:
55-
- type: paragraph
56-
text: Learn how to build Azure SignalR Service applications
57-
- type: list
58-
style: unordered
59-
items:
60-
- html: <a href="/azure/azure-signalr/signalr-authenticate-oauth">Integrate Azure SignalR Service with ASP.NET Core Identity</a>
61-
- html: <a href="/azure/azure-signalr/signalr-tutorial-authenticate-azure-functions">Build a Serverless Real-time App with Authentication</a>
62-
- title: Samples
63-
items:
64-
- type: list
65-
style: unordered
66-
className: spaced noBullet
67-
items:
68-
- html: <a href="https://github.com/aspnet/AzureSignalR-samples">Azure SignalR Code Samples</a>
69-
- html: <a href="/azure/azure-signalr/signalr-cli-samples">Azure CLI</a>
70-
- title: Reference
71-
items:
72-
- type: list
73-
style: cards
74-
className: cardsD
75-
items:
76-
- title: Command-Line
77-
html: <p><a href="signalr-reference-cli.md">Azure CLI</a></p>
78-
- title: Languages
79-
html: >
80-
<p><a href="https://docs.microsoft.com/aspnet/core">ASP.NET Core server SDK</a></p>
81-
<p><a href="/azure/azure-functions/functions-bindings-signalr-service">Azure Functions bindings</a></p>
82-
<p><a href="https://docs.microsoft.com/aspnet/core/signalr/javascript-client">JavaScript client</a></p>
83-
<p><a href="https://docs.microsoft.com/aspnet/core/signalr/dotnet-client">.NET Standard client</a></p>
84-
<p><a href="https://github.com/aspnet/SignalR/tree/release/2.2/clients/java/signalr">Java client</a></p>
85-
- title: REST
86-
html: <p><a href="https://github.com/Azure/azure-signalr/blob/dev/docs/rest-api.md">REST API</a></p>
13+
ms.date: 03/11/2020
14+
15+
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new
16+
17+
landingContent:
18+
# Card
19+
- title: About Azure SignalR Service
20+
linkLists:
21+
- linkListType: overview
22+
links:
23+
- text: What is Azure SignalR Service?
24+
url: signalr-overview.md
25+
26+
# Card
27+
- title: Get started
28+
linkLists:
29+
- linkListType: quickstart
30+
links:
31+
- text: ASP.NET Core - C#
32+
url: signalr-quickstart-dotnet-core.md
33+
- text: ASP.NET - C#
34+
url: signalr-quickstart-dotnet.md
35+
- text: Azure Functions - JavaScript
36+
url: signalr-quickstart-azure-functions-javascript.md
37+
- text: Azure Functions - C#
38+
url: signalr-quickstart-azure-functions-csharp.md
39+
- text: Azure Functions - Java
40+
url: signalr-quickstart-azure-functions-java.md
41+
- text: Azure Functions - Python
42+
url: signalr-quickstart-azure-functions-python.md
43+
- text: REST API
44+
url: signalr-quickstart-rest-api.md
45+
46+
# Card
47+
- title: Build Azure SignalR Service apps
48+
linkLists:
49+
- linkListType: tutorial
50+
links:
51+
- text: Integrate Azure SignalR Service with ASP.NET Core Identity
52+
url: signalr-concept-authenticate-oauth.md
53+
- text: Build a Serverless Real-time App with Authentication
54+
url: signalr-tutorial-authenticate-azure-functions.md
55+
- linkListType: sample
56+
links:
57+
- text: Azure SignalR Code Samples
58+
url: https://github.com/aspnet/AzureSignalR-samples
59+
- text: Azure CLI
60+
url: signalr-reference-cli.md

0 commit comments

Comments
 (0)