Skip to content

Commit 9c16f9c

Browse files
Merge branch 'dimitri-furman' of https://github.com/dimitri-furman/azure-docs-pr into dimitri-furman
2 parents efb4f66 + 36148a0 commit 9c16f9c

File tree

2,361 files changed

+37913
-22489
lines changed

Some content is hidden

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

2,361 files changed

+37913
-22489
lines changed

.openpublishing.publish.config.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,11 @@
271271
"url": "https://github.com/Azure-Samples/cognitive-services-java-sdk-samples",
272272
"branch": "master"
273273
},
274+
{
275+
"path_to_root": "cognitive-services-rest-samples",
276+
"url": "https://github.com/Azure-Samples/cognitive-services-REST-api-samples",
277+
"branch": "master"
278+
},
274279
{
275280
"path_to_root": "cognitive-services-vision-csharp-sdk-quickstarts",
276281
"url": "https://github.com/Azure-Samples/cognitive-services-vision-csharp-sdk-quickstarts",
@@ -297,11 +302,16 @@
297302
"url": "https://github.com/Azure-Samples/cosmos-dotnet-todo-app",
298303
"branch": "master"
299304
},
300-
{
305+
{
301306
"path_to_root": "samples-cosmosdb-dotnet-v3",
302307
"url": "https://github.com/Azure/azure-cosmos-dotnet-v3",
303308
"branch": "master"
304309
},
310+
{
311+
"path_to_root": "samples-cosmosdb-dotnet-v2",
312+
"url": "https://github.com/Azure/azure-cosmos-dotnet-v2",
313+
"branch": "master"
314+
},
305315
{
306316
"path_to_root": "samples-cosmosdb-dotnet-change-feed-processor",
307317
"url": "https://github.com/Azure-Samples/cosmos-dotnet-change-feed-processor",

.openpublishing.redirection.json

Lines changed: 232 additions & 95 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Microsoft Azure Documentation
22

3-
Welcome to the open source [documentation](https://docs.microsoft.com/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
3+
Welcome to the open-source [documentation](https://docs.microsoft.com/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
44

55
## Getting Started
66

@@ -10,7 +10,7 @@ Contributing to open source is more than just providing updates, it's also letti
1010

1111
You've decided to contribute, that's great! To contribute to the documentation, you need a few tools.
1212

13-
Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for [GitHub account setup](https://docs.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
13+
Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for the [GitHub account setup](https://docs.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
1414

1515
#### Download
1616

articles/active-directory-b2c/active-directory-b2c-custom-setup-adfs2016-idp.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ Open a browser and navigate to the URL. Make sure you type the correct URL and t
184184
185185
## Create an Azure AD B2C application
186186
187+
Communication with Azure AD B2C occurs through an application that you register in your B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
188+
187189
[!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
188190
189191
### Update and test the relying party file

articles/active-directory-b2c/active-directory-b2c-custom-setup-goog-idp.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.subservice: B2C
1717

1818
[!INCLUDE [active-directory-b2c-advanced-audience-warning](../../includes/active-directory-b2c-advanced-audience-warning.md)]
1919

20-
This article shows you how to enable sign-in for users from a Google account by using [custom policies](active-directory-b2c-overview-custom.md) in Azure Active Directory B2C (Azure AD B2C).
20+
This article shows you how to enable sign-in for users with a Google account by using [custom policies](active-directory-b2c-overview-custom.md) in Azure Active Directory B2C (Azure AD B2C).
2121

2222
## Prerequisites
2323

@@ -155,6 +155,8 @@ Now that you have a button in place, you need to link it to an action. The actio
155155

156156
## Create an Azure AD B2C application
157157

158+
Communication with Azure AD B2C occurs through an application that you register in your B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
159+
158160
[!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
159161

160162
## Update and test the relying party file

articles/active-directory-b2c/active-directory-b2c-custom-setup-li-idp.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,8 @@ Now that you have a button in place, you need to link it to an action. The actio
213213

214214
## Create an Azure AD B2C application
215215

216+
Communication with Azure AD B2C occurs through an application that you register in your B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
217+
216218
[!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
217219

218220
## Update and test the relying party file

articles/active-directory-b2c/active-directory-b2c-custom-setup-msa-idp.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ Now that you have a button in place, you need to link it to an action. The actio
161161

162162
## Create an Azure AD B2C application
163163

164+
Communication with Azure AD B2C occurs through an application that you register in your B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
165+
164166
[!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
165167

166168
## Update and test the relying party file

articles/active-directory-b2c/active-directory-b2c-custom-setup-twitter-idp.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ Now that you have a button in place, you need to link it to an action. The actio
150150

151151
## Create an Azure AD B2C application
152152

153+
Communication with Azure AD B2C occurs through an application that you register in your B2C tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
154+
153155
[!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
154156

155157
## Update and test the relying party file

articles/active-directory-b2c/active-directory-b2c-guide-troubleshooting-custom.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,11 @@ Common validation errors include the following:
5252

5353
## Troubleshoot the runtime
5454

55-
* Use **Run now** and `https://jwt.ms` to test your policies independently of your web or mobile application. This website acts like a relying party application. It displays the contents of the JSON Web Token (JWT) that is generated by your Azure AD B2C policy. To create a test application, navigate to **Azure AD B2C** \> **Applications** in the Azure portal and add an application with the following values:
55+
* Use **Run now** and `https://jwt.ms` to test your policies independently of your web or mobile application. This website acts like a relying party application. It displays the contents of the JSON web token (JWT) that is generated by your Azure AD B2C policy.
5656

57-
* **Name**: TestApp
58-
* **Web App/Web API**: No
59-
* **Native client**: No
57+
To create a test application that can redirect to `https://jwt.ms` for token inspection:
6058

61-
Then, add `https://jwt.ms` as a **Reply URL**.
59+
[!INCLUDE [active-directory-b2c-appreg-idp](../../includes/active-directory-b2c-appreg-idp.md)]
6260

6361
* To trace the exchange of messages between your client browser and Azure AD B2C, use [Fiddler](https://www.telerik.com/fiddler). It can help you get an indication of where your user journey is failing in your orchestration steps.
6462

articles/active-directory-b2c/active-directory-b2c-reference-manage-sso-and-token-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,5 +98,5 @@ To change your session behavior and SSO configurations, you add a **UserJourneyB
9898
The following values are configured in the previous example:
9999

100100
- **Single sign on (SSO)** - Single sign-on is configured with the **SingleSignOn**. The applicable values are `Tenant`, `Application`, `Policy`, and `Suppressed`.
101-
- **Web app session lifetime (minutes)** - The web app session lifetime is set with the **SessionExpiryInSeconds** element. The default value is 86400 seconds (1440 minutes).
102101
- **Web app session time-out** - The web app session timeout is set with the **SessionExpiryType** element. The applicable values are `Absolute` and `Rolling`.
102+
- **Web app session lifetime** - The web app session lifetime is set with the **SessionExpiryInSeconds** element. The default value is 86400 seconds (1440 minutes).

0 commit comments

Comments
 (0)