Skip to content

Commit 1ae41ee

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into cloudfix
2 parents c7ff49f + 80662a5 commit 1ae41ee

File tree

7,639 files changed

+141131
-94962
lines changed

Some content is hidden

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

7,639 files changed

+141131
-94962
lines changed

.openpublishing.publish.config.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,17 @@
157157
"url": "https://github.com/Azure-Samples/functions-python-pytorch-tutorial",
158158
"branch": "master",
159159
"branch_mapping": {}
160-
},
160+
},
161161
{
162162
"path_to_root": "functions-quickstart-templates",
163163
"url": "https://github.com/Azure/azure-functions-templates",
164164
"branch": "dev"
165165
},
166+
{
167+
"path_to_root": "functions-quickstart-java",
168+
"url": "https://github.com/Azure-Samples/functions-quickstarts-java",
169+
"branch": "master"
170+
},
166171
{
167172
"path_to_root": "functions-docs-csharp",
168173
"url": "https://github.com/Azure-Samples/functions-docs-csharp",
@@ -187,7 +192,8 @@
187192
"path_to_root": "functions-docs-powershell",
188193
"url": "https://github.com/Azure-Samples/functions-docs-powershell",
189194
"branch": "master"
190-
}, {
195+
},
196+
{
191197
"path_to_root": "samples-personalizer",
192198
"url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
193199
"branch": "master"
@@ -366,7 +372,7 @@
366372
"path_to_root": "azure-sdk-for-java-script-event-hubs",
367373
"url": "https://github.com/Azure/azure-sdk-for-js/",
368374
"branch": "master"
369-
},
375+
},
370376
{
371377
"path_to_root": "azure-sdk-for-net-event-hubs",
372378
"url": "https://github.com/Azure/azure-sdk-for-net/",
@@ -376,7 +382,7 @@
376382
"path_to_root": "azure-sdk-for-python-event-hubs",
377383
"url": "https://github.com/Azure/azure-sdk-for-python/",
378384
"branch": "master"
379-
},
385+
},
380386
{
381387
"path_to_root": "cosmos-dotnet-getting-started",
382388
"url": "https://github.com/Azure-Samples/cosmos-dotnet-getting-started",
@@ -510,5 +516,8 @@
510516
"Pdf": {
511517
"template_folder": "_themes.pdf"
512518
}
519+
},
520+
"docs_build_engine": {
521+
"name": "docfx_v3"
513522
}
514523
}

0 commit comments

Comments
 (0)