Skip to content

Commit 727a0d5

Browse files
authored
Merge pull request #47032 from MicrosoftDocs/master
7/19 AM Publish
2 parents dc646da + 6a94e95 commit 727a0d5

File tree

113 files changed

+3377
-1009
lines changed

Some content is hidden

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

113 files changed

+3377
-1009
lines changed

.openpublishing.redirection.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
{
104104
"source_path": "articles/active-directory/active-directory-licensing-product-and-service-plan-reference.md",
105105
"redirect_url": "/azure/active-directory/users-groups-roles/licensing-service-plan-reference",
106+
"redirect_document_id": true
106107
},
107108
{
108109
"source_path": "articles/active-directory/active-directory-accessmanagement-groups-settings-cmdlets.md",
@@ -11823,7 +11824,6 @@
1182311824
"source_path": "articles/stream-analytics/stream-analytics-resource-health.md",
1182411825
"redirect_url": "/azure/stream-analytics/stream-analytics-troubleshooting-guide",
1182511826
"redirect_document_id": false
11826-
1182711827
},
1182811828
{
1182911829
"source_path": "articles/stream-analytics/stream-analytics-get-started.md",
@@ -25406,29 +25406,29 @@
2540625406
"redirect_document_id": false
2540725407
},
2540825408
{
25409-
"source_path": "articles/iot-accelerators/iot-accelerators-connected-factory-overview.md",
25410-
"redirect_url": "/azure/iot-accelerators/quickstart-connected-factory-deploy",
25411-
"redirect_document_id": false
25409+
"source_path": "articles/iot-accelerators/iot-accelerators-connected-factory-overview.md",
25410+
"redirect_url": "/azure/iot-accelerators/quickstart-connected-factory-deploy",
25411+
"redirect_document_id": false
2541225412
},
2541325413
{
25414-
"source_path": "articles/iot-accelerators/iot-accelerators-predictive-overview.md",
25415-
"redirect_url": "/azure/iot-accelerators/quickstart-predictive-maintenance-deploy",
25416-
"redirect_document_id": false
25414+
"source_path": "articles/iot-accelerators/iot-accelerators-predictive-overview.md",
25415+
"redirect_url": "/azure/iot-accelerators/quickstart-predictive-maintenance-deploy",
25416+
"redirect_document_id": false
2541725417
},
2541825418
{
2541925419
"source_path": "articles/iot-suite/securing-iot-ground-up.md",
2542025420
"redirect_url": "/azure/iot-fundamentals/iot-security-ground-up",
2542125421
"redirect_document_id": false
2542225422
},
2542325423
{
25424-
"source_path": "articles/iot-accelerators/iot-accelerators-device-simulation-deploy.md",
25425-
"redirect_url": "/azure/iot-accelerators/quickstart-device-simulation-deploy",
25426-
"redirect_document_id": false
25424+
"source_path": "articles/iot-accelerators/iot-accelerators-device-simulation-deploy.md",
25425+
"redirect_url": "/azure/iot-accelerators/quickstart-device-simulation-deploy",
25426+
"redirect_document_id": false
2542725427
},
2542825428
{
25429-
"source_path": "articles/iot-accelerators/iot-accelerators-device-simulation-explore.md",
25430-
"redirect_url": "/azure/iot-accelerators/quickstart-device-simulation-deploy",
25431-
"redirect_document_id": false
25429+
"source_path": "articles/iot-accelerators/iot-accelerators-device-simulation-explore.md",
25430+
"redirect_url": "/azure/iot-accelerators/quickstart-device-simulation-deploy",
25431+
"redirect_document_id": false
2543225432
},
2543325433
{
2543425434
"source_path": "articles/active-directory/develop/active-directory-v2-devquickstarts-angular-dotnet.md",
@@ -26306,24 +26306,24 @@
2630626306
"redirect_document_id": true
2630726307
},
2630826308
{
26309-
"source_path": "articles/cognitive-services/LUIS/Create-new-app.md",
26310-
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-start-new-app",
26311-
"redirect_document_id": true
26309+
"source_path": "articles/cognitive-services/LUIS/Create-new-app.md",
26310+
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-start-new-app",
26311+
"redirect_document_id": true
2631226312
},
2631326313
{
26314-
"source_path": "articles/cognitive-services/LUIS/Label-Suggested-Utterances.md",
26315-
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-review-endoint-utt",
26316-
"redirect_document_id": true
26314+
"source_path": "articles/cognitive-services/LUIS/Label-Suggested-Utterances.md",
26315+
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-review-endoint-utt",
26316+
"redirect_document_id": true
2631726317
},
2631826318
{
26319-
"source_path": "articles/cognitive-services/LUIS/luis-how-to-cortana-prebuilt-app.md",
26320-
"redirect_url": "/azure/cognitive-services/LUIS/luis-resources-faq#does-luis-currently-support-cortana",
26321-
"redirect_document_id": true
26319+
"source_path": "articles/cognitive-services/LUIS/luis-how-to-cortana-prebuilt-app.md",
26320+
"redirect_url": "/azure/cognitive-services/LUIS/luis-resources-faq#does-luis-currently-support-cortana",
26321+
"redirect_document_id": true
2632226322
},
2632326323
{
26324-
"source_path": "articles/cognitive-services/LUIS/luis-reference-cortana-prebuilt.md",
26325-
"redirect_url": "/azure/cognitive-services/LUIS/luis-resources-faq#does-luis-currently-support-cortana",
26326-
"redirect_document_id": true
26324+
"source_path": "articles/cognitive-services/LUIS/luis-reference-cortana-prebuilt.md",
26325+
"redirect_url": "/azure/cognitive-services/LUIS/luis-resources-faq#does-luis-currently-support-cortana",
26326+
"redirect_document_id": true
2632726327
},
2632826328
{
2632926329
"source_path": "articles/active-directory/authentication/end-user/current/microsoft-authenticator-app-backup-and-recovery.md",
@@ -26406,9 +26406,9 @@
2640626406
"redirect_document_id": false
2640726407
},
2640826408
{
26409-
"source_path": "articles/cognitive-services/LUIS/traffic-manager.md",
26410-
"redirect_url": "/azure/cognitive-services/LUIS/luis-traffic-manager",
26411-
"redirect_document_id": true
26409+
"source_path": "articles/cognitive-services/LUIS/traffic-manager.md",
26410+
"redirect_url": "/azure/cognitive-services/LUIS/luis-traffic-manager",
26411+
"redirect_document_id": true
2641226412
}
2641326413
]
2641426414
}
-20.2 KB
Loading

articles/active-directory/develop/active-directory-devquickstarts-openidconnect-nodejs.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ The completed application is provided at the end of this tutorial as well.
5858

5959
6. After you register, Azure AD assigns your app a unique application ID. You need this value in the following sections, so copy it from the application page.
6060
7. From the **Settings** -> **Properties** page for your application, update the App ID URI. The **App ID URI** is a unique identifier for your application. The convention is to use the format `https://<tenant-domain>/<app-name>`, for example: `https://contoso.onmicrosoft.com/my-first-aad-app`.
61-
8. To create a secret key, follow step 4 in [To add application credentials, or permissions to access web APIs](https://docs.microsoft.com/azure/active-directory/develop/active-directory-integrating-applications#to-add-application-credentials-or-permissions-to-access-web-apis).
61+
62+
8. From the **Settings** -> **Reply URLs** page for your application, add the URL added in Sign-on URL from Step 5 and click on Save.
63+
64+
9. To create a secret key, follow step 4 in [To add application credentials, or permissions to access web APIs](https://docs.microsoft.com/azure/active-directory/develop/active-directory-integrating-applications#to-add-application-credentials-or-permissions-to-access-web-apis).
6265

6366
> [!IMPORTANT]
6467
> Copy the application key value. This is the value for the `clientSecret`, which you'll need for **Step 3** below.
@@ -87,7 +90,7 @@ Here, we configure Express to use the OpenID Connect authentication protocol. Pa
8790

8891
* The `clientID` is the **Application Id** that's assigned to your app in the registration portal.
8992

90-
* The `returnURL` is the **Redirect Uri** that you entered in the portal.
93+
* The `returnURL` is the **Reply URL** that you entered in the portal.
9194

9295
* The `clientSecret` is the secret that you generated in the portal.
9396

articles/active-directory/manage-apps/tenant-restrictions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ An example user is on the Contoso network, but is trying to access the Fabrikam
9393

9494
While configuration of Tenant Restrictions is done on the corporate proxy infrastructure, admins can access the Tenant Restrictions reports in the Azure portal directly. To view the reports, go to the Azure Active Directory Overview page, then look under ‘Other capabilities’.
9595

96-
The admin for the tenant specified as the Restricted-Access-Context tenant can use this report to see all sign-ins blocked because of the Tenant Restrictions policy, including the identity used and the target directory ID.
96+
The admin for the tenant specified as the Restricted-Access-Context tenant can use this report to see sign-ins blocked because of the Tenant Restrictions policy, including the identity used and the target directory ID. Sign-ins are included if the tenant setting the restriction is either the user tenant or resource tenant for the sign-in.
9797

9898
![Use the Azure portal to view restricted sign-in attempts](./media/tenant-restrictions/portal-report.png)
9999

articles/active-directory/saas-apps/freshservice-tutorial.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: identity
1313
ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: article
16-
ms.date: 06/16/2017
16+
ms.date: 07/16/2017
1717
ms.author: jeedes
1818

1919
---
@@ -118,7 +118,7 @@ In this section, you enable Azure AD single sign-on in the Azure portal and conf
118118

119119
4. On the **SAML Signing Certificate** section, copy **THUMBPRINT** value of certificate.
120120

121-
![Configure Single Sign-On](./media/freshservice-tutorial/tutorial_freshservice_certificate.png)
121+
![Configure Single Sign-On](./media/freshservice-tutorial/tutorial_freshservice_certificate.png)
122122

123123
5. Click **Save** button.
124124

@@ -146,17 +146,13 @@ In this section, you enable Azure AD single sign-on in the Azure portal and conf
146146

147147
b. Select **SAML SSO**.
148148

149-
c. In the **SAML Login URL** textbox, paste the value of **SAML Single Sign-On Service URL** which you have copied from Azure portal.
149+
c. In the **SAML Login URL** textbox, paste the value of **SAML Single Sign-On Service URL**, which you have copied from Azure portal.
150150

151-
d. In the **Logout URL** textbox, paste the value of **Sign-Out URL** which you have copied from Azure portal.
151+
d. In the **Logout URL** textbox, paste the value of **Sign-Out URL**, which you have copied from Azure portal.
152152

153-
e. In **Security Certificate Fingerprint** textbox, paste the **THUMBPRINT** value of certificate which you have copied from Azure portal.
153+
e. In **Security Certificate Fingerprint** textbox, paste the **THUMBPRINT** value of certificate, which you have copied from Azure portal.
154154

155155
f. Click **Save**
156-
157-
> [!TIP]
158-
> You can now read a concise version of these instructions inside the [Azure portal](https://portal.azure.com), while you are setting up the app! After adding this app from the **Active Directory > Enterprise Applications** section, simply click the **Single Sign-On** tab and access the embedded documentation through the **Configuration** section at the bottom. You can read more about the embedded documentation feature here: [Azure AD embedded documentation]( https://go.microsoft.com/fwlink/?linkid=845985)
159-
>
160156

161157
### Creating an Azure AD test user
162158
The objective of this section is to create a test user in the Azure portal called Britta Simon.
909 Bytes
Loading
781 Bytes
Loading
679 Bytes
Loading
1.26 KB
Loading
1.03 KB
Loading

0 commit comments

Comments
 (0)