mergo branch 'mb-issue-306' of github.com:mikeblome/cpp-docs-pr into mb-issue-306

merge remote commit

Author: mikeblome

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

@@ -13,7 +13,7 @@ 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.  The marshaling library is 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:
+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|  
 |---------------|-----------------|
@@ -71,4 +71,4 @@ This example shows how to include the msclr directory in an include header decla
 
 ## 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)