Merge branch 'live' into master

MicrosoftDocs · Mar 22, 2017 · 542901b · 542901b
2 parents 5b6334c + a5d6019
commit 542901b
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 9 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Attribution 4.0 International
+Attribution 4.0 International
 
 =======================================================================
 

diff --git a/README.md b/README.md
@@ -1,3 +1,8 @@
+## Microsoft Open Source Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+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.
+
 # Visual Studio 2017 documentation
 
 Welcome! This repo contains source files for the work-in-progress Visual Studio 2017 technical documentation. The topics are published on the [Visual Studio documentation site](https://docs.microsoft.com/visualstudio).

diff --git a/ThirdPartyNotices b/ThirdPartyNotices
@@ -0,0 +1,15 @@
+##Legal Notices
+Microsoft and any contributors grant you a license to the Microsoft documentation and other content
+in this repository under the [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/legalcode),
+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
+[LICENSE-CODE](LICENSE-CODE) file.
+
+Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation
+may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries.
+The licenses for this project do not grant you rights to use any Microsoft names, logos, or trademarks.
+Microsoft's general trademark guidelines can be found at http://go.microsoft.com/fwlink/?LinkID=254653.
+
+Privacy information can be found at https://privacy.microsoft.com/en-us/
+
+Microsoft and any contributors reserve all others rights, whether under their respective copyrights, patents,
+or trademarks, whether by implication, estoppel or otherwise.
diff --git a/docs/ide/dotfuscator/media/install_from_vs_12.png b/docs/ide/dotfuscator/media/install_from_vs_12.png
diff --git a/docs/ide/dotfuscator/media/install_from_vs_345.png b/docs/ide/dotfuscator/media/install_from_vs_345.png
diff --git a/docs/ide/dotfuscator/media/install_individually_12.png b/docs/ide/dotfuscator/media/install_individually_12.png
diff --git a/docs/ide/dotfuscator/media/install_individually_3.png b/docs/ide/dotfuscator/media/install_individually_3.png
diff --git a/docs/ide/dotfuscator/media/install_ui.png b/docs/ide/dotfuscator/media/install_ui.png
diff --git a/docs/msbuild/parameter-element.md b/docs/msbuild/parameter-element.md
@@ -13,7 +13,8 @@ dev_langs:
   - "CSharp"
   - "C++"
   - "jsharp"
-helpviewer_keywords:
+  - "xml"
+helpviewer_keywords: 
   - "Parameter element [MSBuild]"
   - "<Parameter> element [MSBuild]"
 ms.assetid: b273afff-b500-4e97-8cfd-31f39fa64a51

diff --git a/license.md b/license.md