Skip to content

Commit cf82011

Browse files
authored
Merge branch 'master' into patch-2
2 parents a45e74e + 23e6b59 commit cf82011

File tree

38,850 files changed

+591192
-422864
lines changed

Some content is hidden

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

38,850 files changed

+591192
-422864
lines changed

.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{:allowed-branchname-matches ["master" "release-.*" "sandbox-.*"]
1+
{:allowed-branchname-matches ["^master$" "^release..*"]
22
:allowed-filename-matches ["articles" "includes"]
33

44
:template-header

.openpublishing.publish.config.json

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@
125125
"branch": "master",
126126
"branch_mapping": {}
127127
},
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+
},
128134
{
129135
"path_to_root": "samples-durable-functions",
130136
"url": "https://github.com/Azure/azure-functions-durable-extension",
@@ -148,7 +154,49 @@
148154
"url": "https://github.com/AzureADQuickStarts/WebApp-OpenIdConnect-DotNet",
149155
"branch": "GuidedSetup",
150156
"branch_mapping": {}
151-
}
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+
}
152200
],
153201
"branch_target_mapping": {
154202
"live": [
@@ -168,7 +216,7 @@
168216
"PDF"
169217
]
170218
},
171-
"need_generate_pdf_url_template": false,
219+
"need_generate_pdf_url_template": true,
172220
"Targets": {
173221
"Pdf": {
174222
"template_folder": "_themes.pdf"

.openpublishing.redirection.json

Lines changed: 16181 additions & 8298 deletions
Large diffs are not rendered by default.

CODEOWNERS

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,3 @@
55
# articles/virtual-machines/windows/ @iainfoulds @cynthn
66
# articles/application-insights/ @SergeyKanzhelev
77
# articles/cosmos-db/ @mimig1
8-
9-
articles/service-fabric/TOC.yml @tysonn
10-
articles/service-fabric/toc.yml @tysonn
11-
articles/service-fabric/TOC.md @tysonn
12-
articles/service-fabric/toc.md @tysonn

articles/active-directory-b2c/TOC.md

Lines changed: 0 additions & 126 deletions
This file was deleted.

0 commit comments

Comments
 (0)