Skip to content

Commit 4499035

Browse files
ttorblettorble
authored
Merge pull request #113680 from MicrosoftDocs/master
Merge master to live, 4 AM
2 parents 366e95d + 1dc1a1b commit 4499035

File tree

153 files changed

+1793
-1603
lines changed

Some content is hidden

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

153 files changed

+1793
-1603
lines changed

‎articles/active-directory/develop/scenario-desktop-app-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ Before the call to the `.Build()` method, you can override your configuration wi
181181

182182
# [Java](#tab/java)
183183

184-
Here's the class used in MSAL Java development samples to configure the samples: [TestData](https://github.com/AzureAD/microsoft-authentication-library-for-java/blob/dev/src/samples/public-client/TestData.java).
184+
Here's the class used in MSAL Java development samples to configure the samples: [TestData](https://github.com/AzureAD/microsoft-authentication-library-for-java/blob/dev/src/samples/public-client/).
185185

186186
```Java
187187
PublicClientApplication pca = PublicClientApplication.builder(CLIENT_ID)

‎articles/active-directory/develop/scenario-web-app-sign-user-app-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ The filter processes the OAuth 2.0 authorization code flow and checks if the use
295295
296296
When the response arrives, containing the authorization code, it acquires the token by using MSAL Java. When it finally receives the token from the token endpoint (on the redirect URI), the user is signed in.
297297
298-
For details, see the `doFilter()` method in [AuthFilter.java](https://github.com/Azure-Samples/ms-identity-java-webapp/blob/master/src/main/java/com/microsoft/azure/msalwebsample/AuthFilter.java).
298+
For details, see the `doFilter()` method in [AuthFilter.java](https://github.com/Azure-Samples/ms-identity-java-webapp/blob/master/msal-java-webapp-sample/src/main/java/com/microsoft/azure/msalwebsample/AuthFilter.java).
299299
300300
> [!NOTE]
301301
> The code of the `doFilter()` is written in a slightly different order, but the flow is the one described.

‎articles/active-directory/develop/scenario-web-app-sign-user-sign-in.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ else
7171

7272
# [Java](#tab/java)
7373

74-
In our Java quickstart, the sign-in button is located in the [main/resources/templates/index.html](https://github.com/Azure-Samples/ms-identity-java-webapp/blob/master/src/main/resources/templates/index.html) file.
74+
In our Java quickstart, the sign-in button is located in the [main/resources/templates/index.html](https://github.com/Azure-Samples/ms-identity-java-webapp/blob/master/msal-java-webapp-sample/src/main/resources/templates/index.html) file.
7575

7676
```html
7777
<!DOCTYPE html>

‎articles/active-directory/fundamentals/add-custom-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Create your new directory by following the steps in [Create a new tenant for you
3333
>[!IMPORTANT]
3434
>The person who creates the tenant is automatically the Global administrator for that tenant. The Global administrator can add additional administrators to the tenant.
3535
36-
For more information about subscription roles, see [Azure RBAC roles](../../role-based-access-control/rbac-and-directory-admin-roles.md#azure-rbac-roles).
36+
For more information about subscription roles, see [Azure roles](../../role-based-access-control/rbac-and-directory-admin-roles.md#azure-roles).
3737

3838
>[!TIP]
3939
> If you plan to federate your on-premises Windows Server AD with Azure AD, then you need to select **I plan to configure this domain for single sign-on with my local Active Directory** when you run the Azure AD Connect tool to synchronize your directories.

‎articles/active-directory/saas-apps/evidence-tutorial.md

Lines changed: 80 additions & 121 deletions
Large diffs are not rendered by default.

‎articles/active-directory/saas-apps/media/netdocuments-tutorial/advance-authentication.png

24.5 KB
Loading

‎articles/active-directory/saas-apps/media/netdocuments-tutorial/federated-id.png

93.3 KB
Loading

‎articles/active-directory/saas-apps/media/netdocuments-tutorial/security-center.png

19 KB
Loading

‎articles/active-directory/saas-apps/media/netdocuments-tutorial/user-admin.png

1.81 KB
Loading

‎articles/active-directory/saas-apps/media/netdocuments-tutorial/user-mail.png

4.69 KB
Loading

0 commit comments

Comments
 (0)