Skip to content

Commit edad2f4

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into wk10-3
2 parents ed67c58 + 52bd28d commit edad2f4

File tree

309 files changed

+2964
-2913
lines changed

Some content is hidden

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

309 files changed

+2964
-2913
lines changed

.gitattributes

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@
66
*.c text
77
*.h text
88

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+
915
# Declare files that will always have CRLF line endings on checkout.
1016
*.sln text eol=crlf
1117

12-
# Denote all files that are truly binary and should not be modified.
13-
*.png binary
14-
*.jpg binary
18+
# DOCS Specific Settings
19+
# .openpublishing.redirection.json merge=union
File renamed without changes.

.github/CODE_OF_CONDUCT.md

Lines changed: 2 additions & 0 deletions
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

Lines changed: 28 additions & 0 deletions
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 renamed to .github/LICENSE

File renamed without changes.
File renamed without changes.

ThirdPartyNotices renamed to .github/ThirdPartyNotices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
##Legal Notices
1+
## Legal Notices
22
Microsoft and any contributors grant you a license to the Microsoft documentation and other content
33
in this repository under the [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/legalcode),
44
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
@@ -12,4 +12,4 @@ Microsoft's general trademark guidelines can be found at http://go.microsoft.com
1212
Privacy information can be found at https://privacy.microsoft.com/en-us/
1313

1414
Microsoft and any contributors reserve all others rights, whether under their respective copyrights, patents,
15-
or trademarks, whether by implication, estoppel or otherwise.
15+
or trademarks, whether by implication, estoppel or otherwise.

.github/media/feedback-tool.png

15.4 KB
Loading

.gitignore

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +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/*
19
log/
210
obj/
3-
_site/
11+
12+
# APEX and OPS Files
13+
.migrationtemp
14+
.openpublishing.buildcore.ps1
415
.optemp/
5-
_themes*/
616
_repo.*/
7-
8-
.openpublishing.buildcore.ps1
17+
_site/
18+
_themes*/
19+
_themes.MSDN.Modern/
20+
_themes.VS.Modern/
21+
articles/directories.txt
22+
AzureMigration.ps1

0 commit comments

Comments
 (0)