Merge pull request #1003 from mikeblome/mb-issue-306

github issue 306

Author: v-shils

docs/dotnet/overview-of-marshaling-in-cpp.md

@@ -1,7 +1,7 @@
 ---
 title: "Overview of Marshaling in C++ | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "06/28/2018"
 ms.technology: ["cpp-cli"]
 ms.topic: "reference"
 f1_keywords: ["marshaling", "marshalling"]
@@ -13,8 +13,22 @@ ms.author: "mblome"
 ms.workload: ["cplusplus", "dotnet"]
 ---
 # Overview of Marshaling in C++
-In mixed mode, you sometimes must marshal your data between native and managed types. [!INCLUDE[vs_orcas_long](../atl/reference/includes/vs_orcas_long_md.md)] introduced the marshaling library to help you marshal and convert data in a simple way.  
-  
+In mixed mode, you sometimes must marshal your data between native and managed types. Visual Studio 2008 introduced the *marshaling library* to help you marshal and convert data in a simple way.  The marshaling library consists of a set of functions and a `marshal_context` class that perform marshaling for common types. The library is defined in these headers in the **include/msclr** directory for your Visual Studio edition:
+
+|Header|Description|  
+|---------------|-----------------|
+|marshal.h|`marshal_context` class and context-free marshaling functions|
+|marshal_atl.h| Functions for marshaling ATL types|
+|marshal_cppstd.h|Functions for marshaling standard C++ types|
+|marshal_windows.h|Functions for marshaling Windows types|
+
+
+The default path for **msclr** folder is something like this depending on which edition you have and the build number:
+
+```cmd
+C:\\Program Files (x86)\\Microsoft Visual Studio\\Preview\\Enterprise\\VC\\Tools\\MSVC\\14.15.26528\\include\\msclr
+```
+
  You can use the marshaling library with or without a [marshal_context Class](../dotnet/marshal-context-class.md). Some conversions require a context. Other conversions can be implemented using the [marshal_as](../dotnet/marshal-as.md) function. The following table lists the current conversions supported, whether they require a context, and what marshal file you have to include:  
 
 |From type|To type|Marshal method|Include file|  
@@ -47,7 +61,7 @@ In mixed mode, you sometimes must marshal your data between native and managed t
 > [!NOTE]
 >  If you have embedded `NULL`s in your string, the result of marshaling the string is not guaranteed. The embedded `NULL`s can cause the string to be truncated or they might be preserved.  
   
- The marshaling library headers are located in the include directory in the msclr subdirectory. This example shows how to include the msclr directory in an include header declaration:  
+This example shows how to include the msclr directory in an include header declaration:  
 
  `#include "msclr\marshal_cppstd.h"`  
 
@@ -57,4 +71,4 @@ In mixed mode, you sometimes must marshal your data between native and managed t
 
 ## See Also  
  [C++ Support Library](../dotnet/cpp-support-library.md)   
- [How to: Extend the Marshaling Library](../dotnet/how-to-extend-the-marshaling-library.md)
+ [How to: Extend the Marshaling Library](../dotnet/how-to-extend-the-marshaling-library.md)

docs/mfc/interface-elements.md

@@ -12,7 +12,7 @@ ms.author: "mblome"
 ms.workload: ["cplusplus"]
 ---
 # Interface Elements
-This document describes interface elements that were introduced in [!INCLUDE[vs_orcas_long](../atl/reference/includes/vs_orcas_long_md.md)] SP1, and also describes differences with the earlier version of the library.  
+This document describes interface elements that were introduced in Visual Studio 2008 SP1, and also describes differences with the earlier version of the library.  
 
  The following illustration shows an application that was built by using the new interface elements.