Skip to content

Commit 3c74922

Browse files
authored
Merge branch 'docs' into patch-2
2 parents 1b08708 + caca5bf commit 3c74922

File tree

4,274 files changed

+177283
-669517
lines changed

Some content is hidden

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

4,274 files changed

+177283
-669517
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,8 @@ ipch/
8383
*.psess
8484
*.vsp
8585
*.vspx
86-
*.sap
86+
*.sap
87+
.markdownlint.json
88+
89+
# Stop ReadMe file from syncing to maintain separate public and private Readme notes
90+
README.md

.openpublishing.publish.config.json

Lines changed: 116 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,117 @@
1-
{
2-
"build_entry_point": "op",
3-
"docsets_to_publish": [
4-
{
5-
"docset_name": "windows-uwp-arm",
6-
"build_source_folder": "landing/arm-docs",
7-
"build_output_subfolder": "arm",
8-
"locale": "en-us",
9-
"monikers": [],
10-
"moniker_ranges": [],
11-
"xref_query_tags": [
12-
"/uwp/api"
13-
],
14-
"open_to_public_contributors": false,
15-
"type_mapping": {
16-
"ZonePivotGroups": "Toc",
17-
"Conceptual": "Content",
18-
"ManagedReference": "Content",
19-
"RestApi": "Content"
20-
},
21-
"build_entry_point": "docs",
22-
"template_folder": "_themes"
23-
},
24-
{
25-
"docset_name": "windows-uwp-hub",
26-
"build_source_folder": "hub",
27-
"build_output_subfolder": "hub",
28-
"locale": "en-us",
29-
"xref_query_tags": [
30-
"/uwp/api"
31-
],
32-
"open_to_public_contributors": true,
33-
"type_mapping": {
34-
"ZonePivotGroups": "Toc",
35-
"Conceptual": "Content",
36-
"ManagedReference": "Content",
37-
"RestApi": "Content"
38-
},
39-
"build_entry_point": "docs",
40-
"template_folder": "_themes",
41-
"is_dynamic_rendering": false,
42-
"version": 0
43-
},
44-
{
45-
"docset_name": "windows-uwp",
46-
"build_source_folder": "windows-apps-src",
47-
"build_output_subfolder": "windows-apps-src",
48-
"locale": "en-us",
49-
"xref_query_tags": [
50-
"/uwp/api",
51-
"/dotnet"
52-
],
53-
"open_to_public_contributors": true,
54-
"type_mapping": {
55-
"ZonePivotGroups": "Toc",
56-
"Conceptual": "Content",
57-
"ManagedReference": "Content",
58-
"RestApi": "Content"
59-
},
60-
"build_entry_point": "docs",
61-
"template_folder": "_themes",
62-
"is_dynamic_rendering": false,
63-
"version": 0
64-
}
65-
],
66-
"notification_subscribers": [],
67-
"sync_notification_subscribers": [
68-
69-
],
70-
"branches_to_filter": [],
71-
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/windows-uwp",
72-
"git_repository_branch_open_to_public_contributors": "docs",
73-
"skip_source_output_uploading": false,
74-
"need_preview_pull_request": true,
75-
"resolve_user_profile_using_github": true,
76-
"contribution_branch_mappings": {},
77-
"dependent_repositories": [
78-
{
79-
"path_to_root": "_themes",
80-
"url": "https://github.com/Microsoft/templates.docs.msft",
81-
"branch": "main",
82-
"branch_mapping": {}
83-
},
84-
{
85-
"path_to_root": "samples-xaml-gallery",
86-
"url": "https://github.com/microsoft/Xaml-Controls-Gallery",
87-
"branch": "master",
88-
"branch_mapping": {}
89-
},
90-
{
91-
"path_to_root": "snippets-windows",
92-
"url": "https://github.com/MicrosoftDocs/windows-code-snippets-pr",
93-
"branch": "master",
94-
"branch_mapping": {}
95-
},
96-
{
97-
"path_to_root": "_themes.pdf",
98-
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
99-
"branch": "main",
100-
"branch_mapping": {}
101-
}
102-
],
103-
"branch_target_mapping": {
104-
"live": [
105-
"Publish",
106-
"Pdf"
107-
]
108-
},
109-
"need_generate_pdf_url_template": true,
110-
"targets": {
111-
"pdf": {
112-
"template_folder": "_themes.pdf"
113-
}
114-
},
115-
"docs_build_engine": {
116-
"name": "docfx_v3"
117-
},
118-
"need_generate_pdf": false
1+
{
2+
"build_entry_point": "op",
3+
"docsets_to_publish": [
4+
{
5+
"docset_name": "windows-uwp",
6+
"build_source_folder": "uwp",
7+
"build_output_subfolder": "uwp",
8+
"locale": "en-us",
9+
"xref_query_tags": [
10+
"/uwp/api",
11+
"/dotnet"
12+
],
13+
"open_to_public_contributors": true,
14+
"type_mapping": {
15+
"ZonePivotGroups": "Toc",
16+
"Conceptual": "Content",
17+
"ManagedReference": "Content",
18+
"RestApi": "Content"
19+
},
20+
"build_entry_point": "docs",
21+
"template_folder": "_themes",
22+
"is_dynamic_rendering": false,
23+
"version": 0
24+
},
25+
{
26+
"docset_name": "windows-uwp-arm",
27+
"build_source_folder": "landing/arm-docs",
28+
"build_output_subfolder": "arm",
29+
"locale": "en-us",
30+
"monikers": [],
31+
"moniker_ranges": [],
32+
"xref_query_tags": [
33+
"/uwp/api"
34+
],
35+
"open_to_public_contributors": true,
36+
"type_mapping": {
37+
"ZonePivotGroups": "Toc",
38+
"Conceptual": "Content",
39+
"ManagedReference": "Content",
40+
"RestApi": "Content"
41+
},
42+
"build_entry_point": "docs",
43+
"template_folder": "_themes"
44+
},
45+
{
46+
"docset_name": "windows-uwp-hub",
47+
"build_source_folder": "hub",
48+
"build_output_subfolder": "hub",
49+
"locale": "en-us",
50+
"xref_query_tags": [
51+
"/uwp/api"
52+
],
53+
"open_to_public_contributors": true,
54+
"type_mapping": {
55+
"ZonePivotGroups": "Toc",
56+
"Conceptual": "Content",
57+
"ManagedReference": "Content",
58+
"RestApi": "Content"
59+
},
60+
"build_entry_point": "docs",
61+
"template_folder": "_themes",
62+
"is_dynamic_rendering": false,
63+
"version": 0
64+
}
65+
],
66+
"notification_subscribers": [],
67+
"sync_notification_subscribers": [
68+
69+
],
70+
"branches_to_filter": [],
71+
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/windows-dev-docs",
72+
"git_repository_branch_open_to_public_contributors": "docs",
73+
"skip_source_output_uploading": false,
74+
"need_preview_pull_request": true,
75+
"resolve_user_profile_using_github": true,
76+
"dependent_repositories": [
77+
{
78+
"path_to_root": "_themes",
79+
"url": "https://github.com/Microsoft/templates.docs.msft",
80+
"branch": "main",
81+
"branch_mapping": {}
82+
},
83+
{
84+
"path_to_root": "samples-xaml-gallery",
85+
"url": "https://github.com/microsoft/Xaml-Controls-Gallery",
86+
"branch": "master",
87+
"branch_mapping": {}
88+
},
89+
{
90+
"path_to_root": "snippets-windows",
91+
"url": "https://github.com/MicrosoftDocs/windows-code-snippets-pr",
92+
"branch": "master",
93+
"branch_mapping": {}
94+
},
95+
{
96+
"path_to_root": "_themes.pdf",
97+
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
98+
"branch": "main",
99+
"branch_mapping": {}
100+
}
101+
],
102+
"branch_target_mapping": {
103+
"live": [
104+
"Publish",
105+
"Pdf"
106+
]
107+
},
108+
"targets": {
109+
"pdf": {
110+
"template_folder": "_themes.pdf"
111+
}
112+
},
113+
"docs_build_engine": {},
114+
"contribution_branch_mappings": {},
115+
"need_generate_pdf_url_template": true,
116+
"need_generate_pdf": false
119117
}

0 commit comments

Comments
 (0)