Skip to content

Commit 96e3c4c

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into release-preview-hpc-cache
2 parents cca99cb + a305192 commit 96e3c4c

File tree

190 files changed

+2059
-2499
lines changed

Some content is hidden

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

190 files changed

+2059
-2499
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4970,6 +4970,11 @@
49704970
"redirect_url": "/azure/app-service-mobile",
49714971
"redirect_document_id": false
49724972
},
4973+
{
4974+
"source_path": "articles/application-gateway/application-gateway-redirect-overview.md",
4975+
"redirect_url": "/azure/application-gateway/redirect-overview",
4976+
"redirect_document_id": false
4977+
},
49734978
{
49744979
"source_path": "articles/application-gateway/application-gateway-create-gateway-arm-template.md",
49754980
"redirect_url": "/azure/application-gateway/create-vmss-template",

articles/active-directory/authentication/howto-sspr-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Before deploying SSPR, organizations may want to determine how many password res
3434

3535
## Licensing considerations
3636

37-
Azure Active Directory is license per-user meaning each user has to have an appropriate license for the features they utilize.
37+
Azure Active Directory is licensed per-user meaning each user has to have an appropriate license for the features they utilize.
3838

3939
More information about licensing can be found on the [Azure Active Directory pricing page](https://azure.microsoft.com/pricing/details/active-directory/)
4040

articles/active-directory/manage-apps/bread/toc.yml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
tocHref: /azure/active-directory/saas-apps/
77
topicHref: /azure/active-directory/index
88
items:
9-
- name: Manage applications
9+
- name: Application management
1010
tocHref: /azure/active-directory/saas-apps/
1111
topicHref: /azure/active-directory/manage-apps/index
1212

@@ -18,7 +18,30 @@
1818
tocHref: /azure/active-directory/fundamentals/
1919
topicHref: /azure/active-directory/index
2020
items:
21-
- name: Manage applications
21+
- name: Application management
2222
tocHref: /azure/active-directory/fundamentals/
2323
topicHref: /azure/active-directory/manage-apps/index
2424

25+
- name: Azure
26+
tocHref: /azure/
27+
topicHref: /azure/index
28+
items:
29+
- name: Active Directory
30+
tocHref: /azure/active-directory/hybrid/
31+
topicHref: /azure/active-directory/index
32+
items:
33+
- name: Application management
34+
tocHref: /azure/active-directory/hybrid/
35+
topicHref: /azure/active-directory/manage-apps/index
36+
37+
- name: Azure
38+
tocHref: /azure/
39+
topicHref: /azure/index
40+
items:
41+
- name: Active Directory
42+
tocHref: /azure/active-directory/develop/
43+
topicHref: /azure/active-directory/index
44+
items:
45+
- name: Application management
46+
tocHref: /azure/active-directory/develop/
47+
topicHref: /azure/active-directory/manage-apps/index
-16.7 KB
Loading

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

Lines changed: 68 additions & 112 deletions
Large diffs are not rendered by default.

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

Lines changed: 104 additions & 130 deletions
Large diffs are not rendered by default.

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

Lines changed: 66 additions & 143 deletions
Large diffs are not rendered by default.
-13 KB
Loading
130 KB
Loading
135 KB
Loading

0 commit comments

Comments
 (0)