Skip to content

Commit da37839

Browse files
authored
Merge pull request #3 from MicrosoftDocs/master
Merge from the parent repository
2 parents a5fc561 + 15f32b0 commit da37839

File tree

29,210 files changed

+629292
-404493
lines changed

Some content is hidden

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

29,210 files changed

+629292
-404493
lines changed

.acrolinx-config.edn

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
**More info about Acrolinx**
2525
2626
- [Install Acrolinx locally for VSCode](https://review.docs.microsoft.com/en-us/help/contribute/contribute-acrolinx-vscode)
27-
- The scorecard links are good for one hour. If you're prompted to authenticate, you can close and reopen the PR to get new links. Or, use these credentials:
28-
Account: report-viewer
29-
Password: kermit$
30-
31-
- [False positives or issues](https://aka.ms/acrolinxbug)
27+
- [Report false positives or issues](https://aka.ms/acrolinxbug)
3228
3329
"}

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ _site/
55
_themes/
66
_themes.MSDN.Modern/
77
_themes.VS.Modern/
8-
8+
.DS_Store
9+
Thumbs.db
910
.openpublishing.buildcore.ps1
10-
1111
AzureMigration.ps1
1212
.migrationtemp
1313
articles/directories.txt
14-
1514
.vscode/*
1615
.vs/*
1716
.settings.json

.openpublishing.publish.config.json

Lines changed: 222 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -1,143 +1,225 @@
11
{
2-
"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-
},
13-
"docsets_to_publish": [{
14-
"docset_name": "azure-documents",
15-
"build_source_folder": ".",
16-
"build_output_subfolder": "azure",
17-
"locale": "en-us",
18-
"version": 0,
19-
"open_to_public_contributors": true,
20-
"type_mapping": {
21-
"Conceptual": "Content",
22-
"ManagedReference": "Content",
23-
"LandingData": "Content",
24-
"RestApi": "Content"
25-
},
26-
"build_entry_point": "docs",
27-
"template_folder": "_themes"
28-
}],
29-
"Targets": {
30-
"Pdf": {
31-
"template_folder": "_themes.pdf"
32-
}
33-
},
34-
"notification_subscribers": [],
35-
"branches_to_filter": [],
36-
"skip_source_output_uploading": false,
37-
"need_preview_pull_request": true,
38-
"git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/azure-docs",
39-
"git_repository_branch_open_to_public_contributors": "master",
40-
"enable_incremental_build": true,
41-
"dependent_repositories": [{
42-
"path_to_root": "_themes",
43-
"url": "https://github.com/Microsoft/templates.docs.msft",
44-
"branch": "master",
45-
"branch_mapping": {
46-
47-
}
48-
},
49-
{
50-
"path_to_root": "_themes.pdf",
51-
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
52-
"branch": "master"
53-
},
54-
{
55-
"path_to_root": "cli_scripts",
56-
"url": "https://github.com/Azure/azure-docs-cli-python-samples",
57-
"branch": "master",
58-
"branch_mapping":
59-
{
60-
"release-build-mysql": "release-build",
61-
"release-build-postgresql": "release-build",
62-
"release-build-stellar": "release-build"
63-
}
64-
},
65-
{
66-
"path_to_root": "powershell_scripts",
67-
"url": "https://github.com/Azure/azure-docs-powershell-samples",
68-
"branch": "master",
69-
"branch_mapping":
70-
{
71-
"release-build-mysql": "release-build",
72-
"release-build-postgresql": "release-build",
73-
"release-build-stellar": "release-build"
74-
}
75-
},
76-
{
77-
"path_to_root": "policy-templates",
78-
"url": "https://github.com/Azure/azure-policy",
79-
"branch": "master",
80-
"branch_mapping":
81-
{
82-
"release-build-mysql": "release-build",
83-
"release-build-postgresql": "release-build",
84-
"release-build-stellar": "release-build"
85-
}
86-
},
87-
{
88-
"path_to_root": "samples-mediaservices-integration",
89-
"url": "https://github.com/Azure-Samples/media-services-dotnet-functions-integration",
90-
"branch": "master"
91-
},
92-
{
93-
"path_to_root": "samples-mediaservices-encryptiondrm",
94-
"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-drm",
95-
"branch": "master"
96-
},
97-
{
98-
"path_to_root": "samples-mediaservices-encryptionfairplay",
99-
"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-fairplay",
100-
"branch": "master"
101-
},
102-
{
103-
"path_to_root": "samples-mediaservices-encryptionaes",
104-
"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-aes",
105-
"branch": "master"
106-
},
107-
{
108-
"path_to_root": "samples-mediaservices-copyblob",
109-
"url": "https://github.com/Azure-Samples/media-services-dotnet-copy-blob-into-asset",
110-
"branch": "master"
111-
},
112-
{
113-
"path_to_root": "samples-mediaservices-deliverplayready",
114-
"url": "https://github.com/Azure-Samples/media-services-dotnet-deliver-playready-widevine-licenses",
115-
"branch": "master"
116-
},
117-
{
118-
"path_to_root": "samples-mediaservices-livestream",
119-
"url": "https://github.com/Azure-Samples/media-services-dotnet-encode-live-stream-with-ams-clear",
120-
"branch": "master"
121-
},
122-
{
123-
"path_to_root": "samples-mediaservices-encoderstandard",
124-
"url": "https://github.com/Azure-Samples/media-services-dotnet-on-demand-encoding-with-media-encoder-standard",
125-
"branch":"master"
126-
},
127-
{
128-
"path_to_root": "samples-durable-functions",
129-
"url": "https://github.com/Azure/azure-functions-durable-extension",
130-
"branch":"master"
131-
},
132-
{
133-
"path_to_root": "samples-luis",
134-
"url": "https://github.com/Microsoft/Luis-Samples",
135-
"branch":"master"
136-
},
137-
{
138-
"path_to_root": "api-management-policy-samples",
139-
"url": "https://github.com/Azure/api-management-policy-snippets",
140-
"branch": "master"
2+
"build_entry_point": "docs",
3+
"docsets_to_publish": [
4+
{
5+
"docset_name": "azure-documents",
6+
"build_source_folder": ".",
7+
"build_output_subfolder": "azure",
8+
"locale": "en-us",
9+
"monikers": [],
10+
"moniker_ranges": [],
11+
"open_to_public_contributors": true,
12+
"type_mapping": {
13+
"Conceptual": "Content",
14+
"ManagedReference": "Content",
15+
"LandingData": "Content",
16+
"RestApi": "Content",
17+
"ContextObject": "Toc"
18+
},
19+
"build_entry_point": "docs",
20+
"template_folder": "_themes",
21+
"version": 0
22+
}
23+
],
24+
"notification_subscribers": [],
25+
"branches_to_filter": [],
26+
"git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/azure-docs",
27+
"git_repository_branch_open_to_public_contributors": "master",
28+
"skip_source_output_uploading": false,
29+
"need_preview_pull_request": true,
30+
"contribution_branch_mappings": {},
31+
"dependent_repositories": [
32+
{
33+
"path_to_root": "_themes",
34+
"url": "https://github.com/Microsoft/templates.docs.msft",
35+
"branch": "master",
36+
"branch_mapping": {}
37+
},
38+
{
39+
"path_to_root": "_themes.pdf",
40+
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
41+
"branch": "master",
42+
"branch_mapping": {}
43+
},
44+
{
45+
"path_to_root": "cli_scripts",
46+
"url": "https://github.com/Azure/azure-docs-cli-python-samples",
47+
"branch": "master",
48+
"branch_mapping": {
49+
"release-build-mysql": "release-build",
50+
"release-build-postgresql": "release-build",
51+
"release-build-stellar": "release-build"
52+
}
53+
},
54+
{
55+
"path_to_root": "powershell_scripts",
56+
"url": "https://github.com/Azure/azure-docs-powershell-samples",
57+
"branch": "master",
58+
"branch_mapping": {
59+
"release-build-mysql": "release-build",
60+
"release-build-postgresql": "release-build",
61+
"release-build-stellar": "release-build"
62+
}
63+
},
64+
{
65+
"path_to_root": "policy-templates",
66+
"url": "https://github.com/Azure/azure-policy",
67+
"branch": "master",
68+
"branch_mapping": {
69+
"release-build-mysql": "release-build",
70+
"release-build-postgresql": "release-build",
71+
"release-build-stellar": "release-build"
72+
}
73+
},
74+
{
75+
"path_to_root": "azure-docs-json-samples",
76+
"url": "https://github.com/Azure/azure-docs-json-samples",
77+
"branch": "master",
78+
"branch_mapping": {}
79+
},
80+
{
81+
"path_to_root": "samples-mediaservices-integration",
82+
"url": "https://github.com/Azure-Samples/media-services-dotnet-functions-integration",
83+
"branch": "master",
84+
"branch_mapping": {}
85+
},
86+
{
87+
"path_to_root": "samples-mediaservices-encryptiondrm",
88+
"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-drm",
89+
"branch": "master",
90+
"branch_mapping": {}
91+
},
92+
{
93+
"path_to_root": "samples-mediaservices-encryptionfairplay",
94+
"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-fairplay",
95+
"branch": "master",
96+
"branch_mapping": {}
97+
},
98+
{
99+
"path_to_root": "samples-mediaservices-encryptionaes",
100+
"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-aes",
101+
"branch": "master",
102+
"branch_mapping": {}
103+
},
104+
{
105+
"path_to_root": "samples-mediaservices-copyblob",
106+
"url": "https://github.com/Azure-Samples/media-services-dotnet-copy-blob-into-asset",
107+
"branch": "master",
108+
"branch_mapping": {}
109+
},
110+
{
111+
"path_to_root": "samples-mediaservices-deliverplayready",
112+
"url": "https://github.com/Azure-Samples/media-services-dotnet-deliver-playready-widevine-licenses",
113+
"branch": "master",
114+
"branch_mapping": {}
115+
},
116+
{
117+
"path_to_root": "samples-mediaservices-livestream",
118+
"url": "https://github.com/Azure-Samples/media-services-dotnet-encode-live-stream-with-ams-clear",
119+
"branch": "master",
120+
"branch_mapping": {}
121+
},
122+
{
123+
"path_to_root": "samples-mediaservices-encoderstandard",
124+
"url": "https://github.com/Azure-Samples/media-services-dotnet-on-demand-encoding-with-media-encoder-standard",
125+
"branch": "master",
126+
"branch_mapping": {}
127+
},
128+
{
129+
"path_to_root": "azure-app-service-multi-container",
130+
"url": "https://github.com/Azure-Samples/multicontainerwordpress",
131+
"branch": "master",
132+
"branch_mapping": {}
133+
},
134+
{
135+
"path_to_root": "samples-durable-functions",
136+
"url": "https://github.com/Azure/azure-functions-durable-extension",
137+
"branch": "master",
138+
"branch_mapping": {}
139+
},
140+
{
141+
"path_to_root": "samples-luis",
142+
"url": "https://github.com/Microsoft/Luis-Samples",
143+
"branch": "master",
144+
"branch_mapping": {}
145+
},
146+
{
147+
"path_to_root": "api-management-policy-samples",
148+
"url": "https://github.com/Azure/api-management-policy-snippets",
149+
"branch": "master",
150+
"branch_mapping": {}
151+
},
152+
{
153+
"path_to_root": "WebApp-OpenIdConnect-DotNet",
154+
"url": "https://github.com/AzureADQuickStarts/WebApp-OpenIdConnect-DotNet",
155+
"branch": "GuidedSetup",
156+
"branch_mapping": {}
157+
},
158+
{
159+
"path_to_root": "iot-samples-node",
160+
"url": "https://github.com/Azure-Samples/azure-iot-samples-node",
161+
"branch": "master",
162+
"branch_mapping": {}
163+
},
164+
{
165+
"path_to_root": "samples-cognitive-services-speech-sdk",
166+
"url": "https://github.com/Azure-Samples/cognitive-services-speech-sdk",
167+
"branch": "docs",
168+
"branch_mapping": {}
169+
},
170+
{
171+
"path_to_root": "media-services-v3-dotnet-quickstarts",
172+
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-quickstarts",
173+
"branch": "master",
174+
"branch_mapping": {}
175+
},
176+
{
177+
"path_to_root": "media-services-v3-dotnet-tutorials",
178+
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-tutorials",
179+
"branch": "master",
180+
"branch_mapping": {}
181+
},
182+
{
183+
"path_to_root": "samples-javascript",
184+
"url": "https://github.com/Microsoft/tsiclient",
185+
"branch": "tutorial",
186+
"branch_mapping": {}
187+
},
188+
{
189+
"path_to_root": "media-services-v3-dotnet-core-tutorials",
190+
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-core-tutorials",
191+
"branch": "master",
192+
"branch_mapping": {}
193+
},
194+
{
195+
"path_to_root": "media-services-v3-rest-postman",
196+
"url": "https://github.com/Azure-Samples/media-services-v3-rest-postman",
197+
"branch": "master",
198+
"branch_mapping": {}
199+
}
200+
],
201+
"branch_target_mapping": {
202+
"live": [
203+
"Publish",
204+
"PDF"
205+
],
206+
"master": [
207+
"Publish",
208+
"PDF"
209+
],
210+
"release-event-grid": [
211+
"Publish",
212+
"PDF"
213+
],
214+
"hd-insight-pdf": [
215+
"Publish",
216+
"PDF"
217+
]
218+
},
219+
"need_generate_pdf_url_template": true,
220+
"Targets": {
221+
"Pdf": {
222+
"template_folder": "_themes.pdf"
141223
}
142-
]
224+
}
143225
}

0 commit comments

Comments
 (0)