Skip to content

Commit 5130902

Browse files
author
Michael Blome
committed
resolved merge conflicts
2 parents 5ab907a + 3452428 commit 5130902

3,036 files changed

Lines changed: 42658 additions & 50781 deletions

File tree

Some content is hidden

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

‎.openpublishing.publish.config.json‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
11
{
22
"build_entry_point": "docs",
3-
"need_generate_pdf": false,
4-
"need_generate_intellisense": false,
5-
"branch_target_mapping": {
6-
"live": [
7-
"Publish",
8-
"Pdf"
9-
],
10-
"master": [
11-
"Publish",
12-
"Pdf"
13-
]
14-
},
15-
"Targets": {
16-
"Pdf": {
17-
"template_folder": "_themes.pdf"
18-
}
19-
},
203
"docsets_to_publish": [
214
{
225
"docset_name": "vcppdocs",
@@ -25,23 +8,23 @@
258
"locale": "en-us",
269
"monikers": [],
2710
"moniker_ranges": [">= vs-2015"],
28-
"version": 0,
2911
"open_to_public_contributors": true,
3012
"type_mapping": {
3113
"Conceptual": "Content",
3214
"ManagedReference": "Content",
3315
"RestApi": "Content"
3416
},
35-
"build_entry_point": "docs",
36-
"template_folder": "_themes"
17+
"template_folder": "_themes",
18+
"version": 0
3719
}
3820
],
3921
"notification_subscribers": [],
4022
"branches_to_filter": [],
41-
"skip_source_output_uploading": false,
4223
"git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/cpp-docs",
4324
"git_repository_branch_open_to_public_contributors": "master",
25+
"skip_source_output_uploading": false,
4426
"need_preview_pull_request": true,
27+
"enable_incremental_build": true,
4528
"dependent_repositories": [
4629
{
4730
"path_to_root": "_themes",
@@ -52,9 +35,26 @@
5235
{
5336
"path_to_root": "_themes.pdf",
5437
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
55-
"branch": "master"
38+
"branch": "master",
39+
"branch_mapping": {}
5640
}
5741
],
42+
"branch_target_mapping": {
43+
"live": [
44+
"Publish",
45+
"Pdf"
46+
],
47+
"master": [
48+
"Publish",
49+
"Pdf"
50+
]
51+
},
5852
"need_generate_pdf_url_template": true,
59-
"enable_incremental_build": false
53+
"targets": {
54+
"Pdf": {
55+
"template_folder": "_themes.pdf"
56+
}
57+
},
58+
"need_generate_pdf": false,
59+
"need_generate_intellisense": false
6060
}

0 commit comments

Comments
 (0)