Skip to content

Commit fe9f2e2

Browse files
authored
Merge pull request #5185 from MicrosoftDocs/FromPrivateRepo
From private repo
2 parents 4150854 + 28ceed9 commit fe9f2e2

File tree

217 files changed

+2861
-1635
lines changed

Some content is hidden

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

217 files changed

+2861
-1635
lines changed
Lines changed: 60 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
{
22
"build_entry_point": "docs",
3-
"need_generate_pdf_url_template": true,
4-
"need_generate_intellisense": false,
5-
"enable_push_aggregation": true,
6-
"enable_pull_request_aggregation": true,
7-
"branch_target_mapping": {
8-
"live": ["Publish", "PDF"],
9-
"master": ["Publish", "PDF"],
10-
"release-event-grid": ["Publish", "PDF"],
11-
"hd-insight-pdf": ["Publish", "PDF"]
12-
},
133
"docsets_to_publish": [
144
{
155
"docset_name": "azure-documents",
166
"build_source_folder": ".",
177
"build_output_subfolder": "azure",
188
"locale": "en-us",
19-
"version": 0,
9+
"monikers": [],
10+
"moniker_ranges": [],
2011
"open_to_public_contributors": true,
2112
"type_mapping": {
2213
"Conceptual": "Content",
@@ -25,21 +16,17 @@
2516
"RestApi": "Content"
2617
},
2718
"build_entry_point": "docs",
28-
"template_folder": "_themes"
19+
"template_folder": "_themes",
20+
"version": 0
2921
}
3022
],
31-
"Targets": {
32-
"Pdf": {
33-
"template_folder": "_themes.pdf"
34-
}
35-
},
3623
"notification_subscribers": [],
3724
"branches_to_filter": [],
38-
"skip_source_output_uploading": false,
39-
"need_preview_pull_request": true,
4025
"git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/azure-docs",
4126
"git_repository_branch_open_to_public_contributors": "master",
42-
"enable_incremental_build": true,
27+
"skip_source_output_uploading": false,
28+
"need_preview_pull_request": true,
29+
"contribution_branch_mappings": {},
4330
"dependent_repositories": [
4431
{
4532
"path_to_root": "_themes",
@@ -50,7 +37,8 @@
5037
{
5138
"path_to_root": "_themes.pdf",
5239
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
53-
"branch": "master"
40+
"branch": "master",
41+
"branch_mapping": {}
5442
},
5543
{
5644
"path_to_root": "cli_scripts",
@@ -85,67 +73,104 @@
8573
{
8674
"path_to_root": "azure-docs-json-samples",
8775
"url": "https://github.com/Azure/azure-docs-json-samples",
88-
"branch": "master"
76+
"branch": "master",
77+
"branch_mapping": {}
8978
},
9079
{
9180
"path_to_root": "samples-mediaservices-integration",
9281
"url": "https://github.com/Azure-Samples/media-services-dotnet-functions-integration",
93-
"branch": "master"
82+
"branch": "master",
83+
"branch_mapping": {}
9484
},
9585
{
9686
"path_to_root": "samples-mediaservices-encryptiondrm",
9787
"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-drm",
98-
"branch": "master"
88+
"branch": "master",
89+
"branch_mapping": {}
9990
},
10091
{
10192
"path_to_root": "samples-mediaservices-encryptionfairplay",
10293
"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-fairplay",
103-
"branch": "master"
94+
"branch": "master",
95+
"branch_mapping": {}
10496
},
10597
{
10698
"path_to_root": "samples-mediaservices-encryptionaes",
10799
"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-aes",
108-
"branch": "master"
100+
"branch": "master",
101+
"branch_mapping": {}
109102
},
110103
{
111104
"path_to_root": "samples-mediaservices-copyblob",
112105
"url": "https://github.com/Azure-Samples/media-services-dotnet-copy-blob-into-asset",
113-
"branch": "master"
106+
"branch": "master",
107+
"branch_mapping": {}
114108
},
115109
{
116110
"path_to_root": "samples-mediaservices-deliverplayready",
117111
"url": "https://github.com/Azure-Samples/media-services-dotnet-deliver-playready-widevine-licenses",
118-
"branch": "master"
112+
"branch": "master",
113+
"branch_mapping": {}
119114
},
120115
{
121116
"path_to_root": "samples-mediaservices-livestream",
122117
"url": "https://github.com/Azure-Samples/media-services-dotnet-encode-live-stream-with-ams-clear",
123-
"branch": "master"
118+
"branch": "master",
119+
"branch_mapping": {}
124120
},
125121
{
126122
"path_to_root": "samples-mediaservices-encoderstandard",
127123
"url": "https://github.com/Azure-Samples/media-services-dotnet-on-demand-encoding-with-media-encoder-standard",
128-
"branch": "master"
124+
"branch": "master",
125+
"branch_mapping": {}
129126
},
130127
{
131128
"path_to_root": "samples-durable-functions",
132129
"url": "https://github.com/Azure/azure-functions-durable-extension",
133-
"branch": "master"
130+
"branch": "master",
131+
"branch_mapping": {}
134132
},
135133
{
136134
"path_to_root": "samples-luis",
137135
"url": "https://github.com/Microsoft/Luis-Samples",
138-
"branch": "master"
136+
"branch": "master",
137+
"branch_mapping": {}
139138
},
140139
{
141140
"path_to_root": "api-management-policy-samples",
142141
"url": "https://github.com/Azure/api-management-policy-snippets",
143-
"branch": "master"
142+
"branch": "master",
143+
"branch_mapping": {}
144144
},
145145
{
146146
"path_to_root": "WebApp-OpenIdConnect-DotNet",
147147
"url": "https://github.com/AzureADQuickStarts/WebApp-OpenIdConnect-DotNet",
148-
"branch": "GuidedSetup"
148+
"branch": "GuidedSetup",
149+
"branch_mapping": {}
150+
}
151+
],
152+
"branch_target_mapping": {
153+
"live": [
154+
"Publish",
155+
"PDF"
156+
],
157+
"master": [
158+
"Publish",
159+
"PDF"
160+
],
161+
"release-event-grid": [
162+
"Publish",
163+
"PDF"
164+
],
165+
"hd-insight-pdf": [
166+
"Publish",
167+
"PDF"
168+
]
169+
},
170+
"need_generate_pdf_url_template": false,
171+
"Targets": {
172+
"Pdf": {
173+
"template_folder": "_themes.pdf"
149174
}
150-
]
175+
}
151176
}

.openpublishing.redirection.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17042,6 +17042,11 @@
1704217042
"source_path": "articles/sql-data-warehouse/sql-data-warehouse-index-all-articles.md",
1704317043
"redirect_url": "/azure/sql-data-warehouse/sql-data-warehouse-overview-what-is",
1704417044
"redirect_document_id": false
17045-
}
17045+
},
17046+
{
17047+
"source_path": "articles/python-how-to-install.md",
17048+
"redirect_url": "/python/azure/python-sdk-azure-install",
17049+
"redirect_document_id": false
17050+
}
1704617051
]
1704717052
}

articles/active-directory/active-directory-b2b-add-guest-to-role.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Add an Azure Active Directory B2B collaboration user to a role | Microsof
44
description: Add a guest user to a role in Azure Active Directory
55
services: active-directory
66
documentationcenter: ''
7-
author: sasubram
7+
author: twooley
88
manager: mtillman
99
editor: ''
1010
tags: ''
@@ -16,7 +16,8 @@ ms.topic: article
1616
ms.tgt_pltfrm: NA
1717
ms.workload: identity
1818
ms.date: 03/15/2017
19-
ms.author: sasubram
19+
ms.author: twooley
20+
ms.reviewer: sasubram
2021

2122
ms.custom: H1Hack27Feb2017
2223

articles/active-directory/active-directory-b2b-add-user-without-invite.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Add B2B collaboration users to Azure Active Directory without an invitati
44
description: You can let a guest user add other guest users to your Azure AD without redeeming an invitation in Azure Active Directory B2B collaboration.
55
services: active-directory
66
documentationcenter: ''
7-
author: sasubram
7+
author: twooley
88
manager: mtillman
99
editor: ''
1010
tags: ''
@@ -16,7 +16,8 @@ ms.topic: article
1616
ms.tgt_pltfrm: NA
1717
ms.workload: identity
1818
ms.date: 03/15/2017
19-
ms.author: sasubram
19+
ms.author: twooley
20+
ms.reviewer: sasubram
2021

2122
---
2223

articles/active-directory/active-directory-b2b-admin-add-users.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: How do Azure Active Directory admins add B2B collaboration users? | Micro
44
description: An admin can add guest users to your Azure AD from a partner organization using Azure Active Directory B2B collaboration.
55
services: active-directory
66
documentationcenter: ''
7-
author: sasubram
7+
author: twooley
88
manager: mtillman
99
editor: ''
1010
tags: ''
@@ -16,7 +16,8 @@ ms.topic: article
1616
ms.tgt_pltfrm: NA
1717
ms.workload: identity
1818
ms.date: 03/15/2017
19-
ms.author: sasubram
19+
ms.author: twooley
20+
ms.reviewer: sasubram
2021

2122
---
2223

articles/active-directory/active-directory-b2b-api.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure Active Directory B2B collaboration API and customization | Microsof
33
description: Azure Active Directory B2B collaboration supports your cross-company relationships by enabling business partners to selectively access your corporate applications
44
services: active-directory
55
documentationcenter: ''
6-
author: sasubram
6+
author: twooley
77
manager: mtillman
88
editor: ''
99
tags: ''
@@ -15,7 +15,8 @@ ms.topic: article
1515
ms.tgt_pltfrm: NA
1616
ms.workload: identity
1717
ms.date: 04/11/2017
18-
ms.author: sasubram
18+
ms.author: twooley
19+
ms.reviewer: sasubram
1920

2021
---
2122

articles/active-directory/active-directory-b2b-auditing-and-reporting.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Auditing and reporting an Azure Active Directory B2B collaboration user |
33
description: Guest user properties are configurable in Azure Active Directory B2B collaboration
44
services: active-directory
55
documentationcenter: ''
6-
author: sasubram
6+
author: twooley
77
manager: mtillman
88
editor: ''
99
tags: ''
@@ -15,7 +15,8 @@ ms.topic: article
1515
ms.tgt_pltfrm: NA
1616
ms.workload: identity
1717
ms.date: 04/12/2017
18-
ms.author: sasubram
18+
ms.author: twooley
19+
ms.reviewer: sasubram
1920

2021
---
2122

articles/active-directory/active-directory-b2b-claims-mapping.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: B2B collaboration user claims mapping in Azure Active Directory | Microso
33
description: claims mapping reference for Azure Active Directory B2B collaboration
44
services: active-directory
55
documentationcenter: ''
6-
author: sasubram
6+
author: twooley
77
manager: mtillman
88
editor: ''
99
tags: ''
@@ -15,7 +15,8 @@ ms.topic: article
1515
ms.tgt_pltfrm: NA
1616
ms.workload: identity
1717
ms.date: 03/15/2017
18-
ms.author: sasubram
18+
ms.author: twooley
19+
ms.reviewer: sasubram
1920

2021
---
2122

articles/active-directory/active-directory-b2b-code-samples.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure Active Directory B2B collaboration code and PowerShell samples | Mi
33
description: Code and PowerShell samples for Azure Active Directory B2B collaboration
44
services: active-directory
55
documentationcenter: ''
6-
author: sasubram
6+
author: twooley
77
manager: mtillman
88
editor: ''
99
tags: ''
@@ -15,6 +15,7 @@ ms.tgt_pltfrm: NA
1515
ms.workload: identity
1616
ms.date: 04/11/2017
1717
ms.author: twooley
18+
ms.reviewer: twooley
1819
ms.reviewer: sasubram
1920

2021
---

articles/active-directory/active-directory-b2b-compare-b2c.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Compare B2B collaboration and B2C in Azure Active Directory | Microsoft D
44
description: What is the difference between Azure Active Directory B2B collaboration and Azure AD B2C?
55
services: active-directory
66
documentationcenter: ''
7-
author: sasubram
7+
author: twooley
88
manager: mtillman
99
editor: ''
1010
tags: ''
@@ -16,7 +16,8 @@ ms.topic: article
1616
ms.tgt_pltfrm: NA
1717
ms.workload: identity
1818
ms.date: 03/15/2017
19-
ms.author: sasubram
19+
ms.author: twooley
20+
ms.reviewer: sasubram
2021

2122
---
2223

0 commit comments

Comments
 (0)