Skip to content

Commit b4d6a26

Browse files
authored
Merge branch 'master' into PCI_1_29_2020
2 parents 362d1f8 + 76b6ba5 commit b4d6a26

File tree

15,950 files changed

+301854
-216528
lines changed

Some content is hidden

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

15,950 files changed

+301854
-216528
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ articles/directories.txt
2222
AzureMigration.ps1
2323

2424
!/.vscode/extensions.json
25-
articles/data-lake-analytics/.vscode/settings.json
2625
.gitignore
26+
**/.vscode/settings.json

.markdownlint.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"MD007": false,
1010
"MD009": false,
1111
"MD010": false,
12+
"MD011": true,
1213
"MD012": false,
1314
"MD013": false,
1415
"MD014": false,
@@ -32,10 +33,28 @@
3233
"MD035": false,
3334
"MD036": false,
3435
"MD037": false,
36+
"MD038": true,
37+
"MD039": true,
3538
"MD040": false,
3639
"MD041": false,
3740
"MD042": false,
41+
"MD043": true,
42+
"MD044": {
43+
"code_blocks": false,
44+
"names": [
45+
".NET",
46+
"ASP.NET",
47+
"Azure",
48+
"JavaScript",
49+
"NuGet",
50+
"PowerShell",
51+
"macOS",
52+
"C#",
53+
"CLI"
54+
]
55+
},
3856
"MD045": false,
3957
"MD046": false,
40-
"MD047": false
58+
"MD047": false,
59+
"MD048": true
4160
}

.openpublishing.publish.config.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,12 @@
146146
"url": "https://github.com/Azure/azure-functions-durable-extension",
147147
"branch": "master"
148148
},
149+
{
150+
"path_to_root": "functions-python-tensorflow-tutorial",
151+
"url": "https://github.com/Azure-Samples/functions-python-tensorflow-tutorial",
152+
"branch": "master",
153+
"branch_mapping": {}
154+
},
149155
{
150156
"path_to_root": "samples-personalizer",
151157
"url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
@@ -194,7 +200,7 @@
194200
{
195201
"path_to_root": "samples-cognitive-services-speech-sdk",
196202
"url": "https://github.com/Azure-Samples/cognitive-services-speech-sdk",
197-
"branch": "rhurey/quickstart.refactor"
203+
"branch": "release-ignite-cogserv-speech-service"
198204
},
199205
{
200206
"path_to_root": "media-services-v3-dotnet-quickstarts",

.openpublishing.redirection.json

Lines changed: 3868 additions & 225 deletions
Large diffs are not rendered by default.

CODEOWNERS

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
11
# Testing the new code owners feature in GitHub. Please contact Cory Fowler if you have questions.
2-
# articles/storage/ @tamram @robinsh
3-
# articles/virtual-machines/ @iainfoulds @cynthn
4-
# articles/virtual-machines/linux/ @iainfoulds @cynthn
5-
# articles/virtual-machines/windows/ @iainfoulds @cynthn
6-
# articles/application-insights/ @SergeyKanzhelev
7-
# articles/cosmos-db/ @mimig1
8-
9-
# All Articles
10-
articles/ @apex-docs-pr-reviewers
11-
122
# Cognitive Services
133
articles/cognitive-services/ @diberry @erhopf, @nitinme
144

155
# DevOps
16-
176
articles/ansible/ @TomArcherMsft
187
articles/chef/ @TomArcherMsft
198
articles/jenkins/ @TomArcherMsft
209
articles/terraform/ @TomArcherMsft
2110

2211
# Governance
23-
2412
articles/governance/ @DCtheGeek
13+
14+
# Configuration
15+
*.json @SyntaxC4 @snoviking @arob98
16+
.acrolinx-config.edn @MonicaRush @arob98
17+
articles/zone-pivot-groups.yml @SyntaxC4 @snoviking @arob98

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
12
# Microsoft Azure Documentation
23

34
Welcome to the open-source [documentation](https://docs.microsoft.com/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
45

56
## Getting Started
67

7-
Contributing to open source is more than just providing updates, it's also letting us know when there is an issue. Read our [Contributing guidance](CONTRIBUTING.md) to find out more.
8+
Contributing to open source is more than just providing updates, it's also about letting us know when there is an issue. Read our [Contributing guidance](CONTRIBUTING.md) to find out more.
89

910
### Prerequisites
1011

0 commit comments

Comments
 (0)