Merge pull request #2128 from mikeblome/mb-744

PRMerger19 · web-flow · commit ded3387b165b · 2019-07-12T08:52:31.000-07:00
fixes #744
diff --git a/docs/dotnet/marshal-as.md b/docs/dotnet/marshal-as.md
@@ -1,6 +1,6 @@
 ---
 title: "marshal_as"
-ms.date: "11/04/2016"
+ms.date: "07/12/2019"
 ms.topic: "reference"
 f1_keywords: ["marshal_as", "msclr.interop.marshal_as", "msclr::interop::marshal_as"]
 helpviewer_keywords: ["marshal_as template [C++]"]
@@ -35,6 +35,8 @@ If you try to marshal a pair of data types that are not supported, `marshal_as`
 
 The marshaling library consists of several header files. Any conversion requires only one file, but you can include additional files if you need to for other conversions. To see which conversions are associated with which files, look in the table in `Marshaling Overview`. Regardless of what conversion you want to do, the namespace requirement is always in effect.
 
+Throws `System::ArgumentNullException(_EXCEPTION_NULLPTR)` if the input parameter is null.
+
 ## Example
 
 This example marshals from a `const char*` to a `System::String` variable type.
diff --git a/docs/dotnet/overview-of-marshaling-in-cpp.md b/docs/dotnet/overview-of-marshaling-in-cpp.md
@@ -1,14 +1,14 @@
 ---
 title: "Overview of Marshaling in C++"
-ms.date: "06/28/2018"
+ms.date: "07/12/2019"
 ms.topic: "reference"
 f1_keywords: ["marshaling", "marshalling"]
 helpviewer_keywords: ["Visual C++, marshaling", "C++ Support Library, marshaling", "marshaling, about marshaling"]
 ms.assetid: 997dd4bc-5f98-408f-b890-f35de9ce3bb8
 ---
-# Overview of Marshaling in C++
+# Overview of Marshaling in C++/CLI
 
-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:
+In mixed mode, you sometimes must marshal your data between native and managed types. The *marshaling library* helps 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|
 |---------------|-----------------|
@@ -61,8 +61,6 @@ This example shows how to include the msclr directory in an include header decla
 
 The marshaling library is extensible so that you can add your own marshaling types. For more information about extending the marshaling library, see [How to: Extend the Marshaling Library](../dotnet/how-to-extend-the-marshaling-library.md).
 
-In earlier versions, you could marshal data by using [Platform Invoke](/dotnet/framework/interop/consuming-unmanaged-dll-functions). For more information about `PInvoke`, see [Calling Native Functions from Managed Code](../dotnet/calling-native-functions-from-managed-code.md).
-
 ## See also
 
 [C++ Support Library](../dotnet/cpp-support-library.md)<br/>
