Merge pull request #202 from Microsoft/master

merge to live

Author: ghogen

LICENSE

@@ -0,0 +1,17 @@
+The MIT License (MIT)
+Copyright (c) Microsoft Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
+associated documentation files (the "Software"), to deal in the Software without restriction, 
+including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, 
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial 
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT 
+NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

LICENSE-CODE

@@ -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 for Visual C++
 
 Welcome! This repo contains source files for the work-in-progress Visual C++ technical documentation. The topics are published on the [Visual C++ documentation site](https://docs.microsoft.com/cpp).
@@ -11,4 +16,4 @@ We welcome your contributions to help us improve the Visual C++ docs. All the ar
 
 Several feature areas of Visual Studio have their own folders in this repo, such as **standard-library** for topics on the C++ Standard Library, **ide** for topics on the Visual Studio interactive development environment (IDE), and so forth. The **/media** subfolder in each folder contains art files for the topics. The [Contributing guide](CONTRIBUTING.md) has more information.
 
-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.
+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.

README.md

@@ -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.

ThirdPartyNotices

@@ -1,4 +1,24 @@
 # [C++ Language Reference](cpp-language-reference.md)
+## [Welcome Back to C++ (Modern C++)](welcome-back-to-cpp-modern-cpp.md)
+### [C++ Type System (Modern C++)](cpp-type-system-modern-cpp.md)
+#### [Value Types (Modern C++)](value-types-modern-cpp.md)
+#### [Type Conversions and Type Safety (Modern C++)](type-conversions-and-type-safety-modern-cpp.md)
+### [Uniform Initialization and Delegating Constructors](uniform-initialization-and-delegating-constructors.md)
+### [Object Lifetime And Resource Management (Modern C++)](object-lifetime-and-resource-management-modern-cpp.md)
+### [Objects Own Resources (RAII)](objects-own-resources-raii.md)
+### [Smart Pointers (Modern C++)](smart-pointers-modern-cpp.md)
+#### [How to: Create and Use unique_ptr Instances](how-to-create-and-use-unique-ptr-instances.md)
+#### [How to: Create and Use shared_ptr Instances](how-to-create-and-use-shared-ptr-instances.md)
+#### [How to: Create and Use weak_ptr Instances](how-to-create-and-use-weak-ptr-instances.md)
+#### [How to: Create and Use CComPtr and CComQIPtr Instances](how-to-create-and-use-ccomptr-and-ccomqiptr-instances.md)
+### [Pimpl For Compile-Time Encapsulation (Modern C++)](pimpl-for-compile-time-encapsulation-modern-cpp.md)
+### [Containers (Modern C++)](containers-modern-cpp.md)
+### [Algorithms (Modern C++)](algorithms-modern-cpp.md)
+### [String and I-O Formatting (Modern C++)](string-and-i-o-formatting-modern-cpp.md)
+### [Errors and Exception Handling (Modern C++)](errors-and-exception-handling-modern-cpp.md)
+#### [How to: Design for Exception Safety](how-to-design-for-exception-safety.md)
+#### [How to: Interface Between Exceptional and Non-Exceptional Code](how-to-interface-between-exceptional-and-non-exceptional-code.md)
+### [Portability At ABI Boundaries (Modern C++)](portability-at-abi-boundaries-modern-cpp.md)
 ## [Lexical Conventions](lexical-conventions.md)
 ### [Overview of File Translation](overview-of-file-translation.md)
 ### [Character Sets2](character-sets2.md)
@@ -398,23 +418,4 @@
 ## [Microsoft Extensions](microsoft-extensions.md)
 ## [Nonstandard Behavior](nonstandard-behavior.md)
 ### [Compiler Limits](compiler-limits.md)
-# [Welcome Back to C++ (Modern C++)](welcome-back-to-cpp-modern-cpp.md)
-## [C++ Type System (Modern C++)](cpp-type-system-modern-cpp.md)
-### [Value Types (Modern C++)](value-types-modern-cpp.md)
-### [Type Conversions and Type Safety (Modern C++)](type-conversions-and-type-safety-modern-cpp.md)
-## [Uniform Initialization and Delegating Constructors](uniform-initialization-and-delegating-constructors.md)
-## [Object Lifetime And Resource Management (Modern C++)](object-lifetime-and-resource-management-modern-cpp.md)
-## [Objects Own Resources (RAII)](objects-own-resources-raii.md)
-## [Smart Pointers (Modern C++)](smart-pointers-modern-cpp.md)
-### [How to: Create and Use unique_ptr Instances](how-to-create-and-use-unique-ptr-instances.md)
-### [How to: Create and Use shared_ptr Instances](how-to-create-and-use-shared-ptr-instances.md)
-### [How to: Create and Use weak_ptr Instances](how-to-create-and-use-weak-ptr-instances.md)
-### [How to: Create and Use CComPtr and CComQIPtr Instances](how-to-create-and-use-ccomptr-and-ccomqiptr-instances.md)
-## [Pimpl For Compile-Time Encapsulation (Modern C++)](pimpl-for-compile-time-encapsulation-modern-cpp.md)
-## [Containers (Modern C++)](containers-modern-cpp.md)
-## [Algorithms (Modern C++)](algorithms-modern-cpp.md)
-## [String and I-O Formatting (Modern C++)](string-and-i-o-formatting-modern-cpp.md)
-## [Errors and Exception Handling (Modern C++)](errors-and-exception-handling-modern-cpp.md)
-### [How to: Design for Exception Safety](how-to-design-for-exception-safety.md)
-### [How to: Interface Between Exceptional and Non-Exceptional Code](how-to-interface-between-exceptional-and-non-exceptional-code.md)
-## [Portability At ABI Boundaries (Modern C++)](portability-at-abi-boundaries-modern-cpp.md)
+

docs/cpp/TOC.md

@@ -66,7 +66,7 @@ Once the files are copied, use the **VC++ Directories** item in Project properti
 ## Copy Sources
 When building, the source files on your development PC are copied to the Linux computer and compiled there.  By default, all sources in the Visual Studio project are copied to the locations set in the settings above.  However, additional sources can also be added to the list, or copying sources can be turned off entirely, which is the default for a Makefile project.
 
-* **Sources to copy** determines which sources are copied to the remote computer.  By default, the **@(SourcesToCopyRemotely)** defaults to all files in the project.
+* **Sources to copy** determines which sources are copied to the remote computer.  By default, the **@(SourcesToCopyRemotely)** defaults to all source code files in the project, but does not include any asset/resource files, such as images.
 
 * **Copy sources** can be turned on and off to enable and disable the copying of source files to the remote computer.