Skip to content

Commit da1544e

Browse files
authored
Merge branch 'master' into doc
2 parents 8d3eff1 + f1699a6 commit da1544e

File tree

14,404 files changed

+247902
-127783
lines changed

Some content is hidden

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

14,404 files changed

+247902
-127783
lines changed

.gitattributes

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Set the default behavior, in case people don't have core.autocrlf set.
2+
* text=auto
3+
4+
# Explicitly declare text files you want to always be normalized and converted
5+
# to native line endings on checkout.
6+
*.c text
7+
*.h text
8+
9+
# Denote all files that are truly binary and should not be modified.
10+
*.gif binary
11+
*.ico binary
12+
*.jpg binary
13+
*.png binary
14+
15+
# Declare files that will always have CRLF line endings on checkout.
16+
*.sln text eol=crlf
17+
18+
# DOCS Specific Settings
19+
# .openpublishing.redirection.json merge=union

.github/CODEOWNERS

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Testing the new code owners feature in GitHub. Please contact Tyson 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+
12+
# Cognitive Services
13+
articles/cognitive-services/ @nitinme @tchristiani @cjgronlund
14+
articles/cognitive-services/LUIS/ @cjgronlund @nitinme @diberry
15+
articles/cognitive-services/Speaker-recognition/ @cjgronlund @nitinme @erhopf
16+
articles/cognitive-services/Speech-Service/ @cjgronlund @nitinme @erhopf
17+
articles/cognitive-services/Translator/ @cjgronlund @nitinme @erhopf
18+
articles/cognitive-services/QnAMaker/ @cjgronlund @nitinme @diberry
19+
20+
# DevOps
21+
22+
articles/ansible/ @TomArcher
23+
articles/chef/ @TomArcher
24+
articles/jenkins/ @TomArcher
25+
articles/terraform/ @TomArcher

.github/CODE_OF_CONDUCT.md

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
2+
For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

.github/CONTRIBUTING.md

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Contributing to Microsoft Azure Documentation
2+
3+
Thank you for taking the time to contribute to the Microsoft Azure documentation.
4+
5+
This guide covers some general topics around contribution and refers out to our [contributors guide](https://docs.microsoft.com/contribute) for more detailed explanations where relevant.
6+
7+
## Code of Conduct
8+
9+
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
10+
For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/), or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
11+
12+
## How can I contribute?
13+
14+
There are a variety of ways to contribute to the documentation, review the sections below to find out which one is right for you.
15+
16+
### Reporting Bugs and Suggesting Enhancements
17+
18+
Please use the Feedback tool at the bottom of any article to submit bugs and suggestions.
19+
20+
![Feedback Tool](media/feedback-tool.png)
21+
22+
### Editing in GitHub
23+
24+
Follow the guidance for [Quick edits to existing documents](https://docs.microsoft.com/contribute/#quick-edits-to-existing-documents) in our contributors guide.
25+
26+
### Pull Request
27+
28+
Review the guidance for [Pull Requests](https://docs.microsoft.com/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.
File renamed without changes.

LICENSE .github/LICENSE

File renamed without changes.

LICENSE-CODE .github/LICENSE-CODE

File renamed without changes.

.github/ThirdPartyNotices.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
## Legal Notices
2+
Microsoft and any contributors grant you a license to the Microsoft documentation and other content
3+
in this repository under the [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/legalcode),
4+
see the [LICENSE](LICENSE) file, and grant you a license to any code in the repository under the [MIT License](https://opensource.org/licenses/MIT), see the
5+
[LICENSE-CODE](LICENSE-CODE) file.
6+
7+
Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation
8+
may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries.
9+
The licenses for this project do not grant you rights to use any Microsoft names, logos, or trademarks.
10+
Microsoft's general trademark guidelines can be found at http://go.microsoft.com/fwlink/?LinkID=254653.
11+
12+
Privacy information can be found at https://privacy.microsoft.com/en-us/
13+
14+
Microsoft and any contributors reserve all others rights, whether under their respective copyrights, patents,
15+
or trademarks, whether by implication, estoppel or otherwise.

.github/media/feedback-tool.png

15.4 KB
Loading

.gitignore

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Operating System files
2+
.DS_Store
3+
Thumbs.db
4+
5+
# Visual Studio and VS Code files
6+
.settings.json
7+
.vscode/*
8+
.vs/*
9+
log/
10+
obj/
11+
12+
# APEX and OPS Files
13+
.migrationtemp
14+
.openpublishing.buildcore.ps1
15+
.optemp/
16+
_repo.*/
17+
_site/
18+
_themes*/
19+
_themes.MSDN.Modern/
20+
_themes.VS.Modern/
21+
articles/directories.txt
22+
AzureMigration.ps1

.openpublishing.publish.config.json

+32-5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
}
2323
],
2424
"notification_subscribers": [],
25+
"sync_notification_subscribers": [
26+
27+
],
2528
"branches_to_filter": [],
2629
"git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/azure-docs",
2730
"git_repository_branch_open_to_public_contributors": "master",
@@ -155,6 +158,12 @@
155158
"branch": "GuidedSetup",
156159
"branch_mapping": {}
157160
},
161+
{
162+
"path_to_root": "acr-tasks",
163+
"url": "https://github.com/Azure-Samples/acr-tasks",
164+
"branch": "master",
165+
"branch_mapping": {}
166+
},
158167
{
159168
"path_to_root": "iot-samples-node",
160169
"url": "https://github.com/Azure-Samples/azure-iot-samples-node",
@@ -170,15 +179,15 @@
170179
{
171180
"path_to_root": "samples-cognitive-services-speech-sdk",
172181
"url": "https://github.com/Azure-Samples/cognitive-services-speech-sdk",
173-
"branch": "docs-201807",
182+
"branch": "docs-201809",
174183
"branch_mapping": {}
175184
},
176185
{
177186
"path_to_root": "media-services-v3-dotnet-quickstarts",
178187
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-quickstarts",
179188
"branch": "master",
180189
"branch_mapping": {}
181-
},
190+
},
182191
{
183192
"path_to_root": "media-services-v3-dotnet-tutorials",
184193
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-tutorials",
@@ -202,7 +211,25 @@
202211
"url": "https://github.com/Azure-Samples/media-services-v3-rest-postman",
203212
"branch": "master",
204213
"branch_mapping": {}
205-
}
214+
},
215+
{
216+
"path_to_root": "remote-monitoring-webui",
217+
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
218+
"branch": "master",
219+
"branch_mapping": {}
220+
},
221+
{
222+
"path_to_root": "samples-qnamaker-nodejs",
223+
"url": "https://github.com/Azure-Samples/cognitive-services-qnamaker-nodejs",
224+
"branch": "master",
225+
"branch_mapping": {}
226+
},
227+
{
228+
"path_to_root": "samples-qnamaker-csharp",
229+
"url": "https://github.com/Azure-Samples/cognitive-services-qnamaker-csharp",
230+
"branch": "master",
231+
"branch_mapping": {}
232+
}
206233
],
207234
"branch_target_mapping": {
208235
"live": [
@@ -223,9 +250,9 @@
223250
]
224251
},
225252
"need_generate_pdf_url_template": true,
226-
"Targets": {
253+
"targets": {
227254
"Pdf": {
228-
"template_folder": "_themes.pdf"
255+
"template_folder": "_themes.pdf"
229256
}
230257
}
231258
}

0 commit comments

Comments
 (0)