From 60cce16d4317223a4e0882b7182616d702bfeb41 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Sun, 13 Dec 2015 20:40:33 +1300
Subject: [PATCH] -Documentation

---
 Doc/SerializationSettings.aml                       | 13 +++++++++++--
 Doc/doc.shfbproj                                    |  2 +-
 .../Serialization/MissingMemberHandlingTests.cs     | 10 ++++++++++
 Src/Newtonsoft.Json/JsonSerializer.cs               |  5 +++++
 Src/Newtonsoft.Json/JsonSerializerSettings.cs       |  5 +++++
 Src/Newtonsoft.Json/TypeNameHandling.cs             |  6 ++++++
 6 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/Doc/SerializationSettings.aml b/Doc/SerializationSettings.aml
index 945ae811..98a227a5 100644
--- a/Doc/SerializationSettings.aml
+++ b/Doc/SerializationSettings.aml
@@ -180,16 +180,25 @@ or a property's object properties or collection items using
 <section>
  <title>TypeNameHandling</title>
  <content>
+ <alert class="caution">
+  <para>
+ <codeEntityReference>T:Newtonsoft.Json.TypeNameHandling</codeEntityReference> should be used with caution when your application deserializes JSON from an external source.
+  </para>
+  <para>
+    Incoming types should be validated with a custom <codeEntityReference>T:System.Runtime.Serialization.SerializationBinder</codeEntityReference> when deserializing with a value other than <c>TypeNameHandling.None</c>.
+  </para>
+ </alert>
+ 
  <para>
    <codeEntityReference>T:Newtonsoft.Json.TypeNameHandling</codeEntityReference> controls whether Json.NET includes .NET type names
    during serialization with a $type property and reads .NET type names from that property to determine what type to create during
    deserialization.
  </para>
  <para>
-   The value of the $type property can be customized by creating your own 
+   The value of the $type property can be customized and validated by creating your own 
    <codeEntityReference>T:System.Runtime.Serialization.SerializationBinder</codeEntityReference>.
  </para>
- 
+
 <table>
   <tableHeader>
     <row>
diff --git a/Doc/doc.shfbproj b/Doc/doc.shfbproj
index 52724974..8263bced 100644
--- a/Doc/doc.shfbproj
+++ b/Doc/doc.shfbproj
@@ -36,7 +36,7 @@
     <HelpTitle>Json.NET Documentation</HelpTitle>
     <PresentationStyle>VS2013</PresentationStyle>
     <NamingMethod>MemberName</NamingMethod>
-    <DocumentationSourcePath>..\Src\Newtonsoft.Json\bin\Release\Net45</DocumentationSourcePath>
+    <DocumentationSourcePath>..\Working\Src\Newtonsoft.Json\bin\Release\Net45</DocumentationSourcePath>
     <DocumentationSources>
       <DocumentationSource sourceFile="$(DocumentationSourcePath)\Newtonsoft.Json.dll" />
       <DocumentationSource sourceFile="$(DocumentationSourcePath)\Newtonsoft.Json.xml" />
diff --git a/Src/Newtonsoft.Json.Tests/Serialization/MissingMemberHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/MissingMemberHandlingTests.cs
index 551da37c..c206a697 100644
--- a/Src/Newtonsoft.Json.Tests/Serialization/MissingMemberHandlingTests.cs
+++ b/Src/Newtonsoft.Json.Tests/Serialization/MissingMemberHandlingTests.cs
@@ -125,6 +125,16 @@ namespace Newtonsoft.Json.Tests.Serialization
             Assert.AreEqual(2, myClass.PostProperty);
         }
 
+        [Test]
+        public void CaseInsensitive()
+        {
+            string json = @"{""height"":1}";
+
+            DoubleClass c = JsonConvert.DeserializeObject<DoubleClass>(json, new JsonSerializerSettings { MissingMemberHandling = MissingMemberHandling.Error });
+
+            Assert.AreEqual(1d, c.Height);
+        }
+
         [Test]
         public void MissingMemeber()
         {
diff --git a/Src/Newtonsoft.Json/JsonSerializer.cs b/Src/Newtonsoft.Json/JsonSerializer.cs
index b487ddc8..b9768403 100644
--- a/Src/Newtonsoft.Json/JsonSerializer.cs
+++ b/Src/Newtonsoft.Json/JsonSerializer.cs
@@ -138,6 +138,11 @@ namespace Newtonsoft.Json
         /// <summary>
         /// Gets or sets how type name writing and reading is handled by the serializer.
         /// </summary>
+        /// <remarks>
+        /// <see cref="TypeNameHandling"/> should be used with caution when your application deserializes JSON from an external source.
+        /// Incoming types should be validated with a custom <see cref="T:System.Runtime.Serialization.SerializationBinder"/>
+        /// when deserializing with a value other than <c>TypeNameHandling.None</c>.
+        /// </remarks>
         public virtual TypeNameHandling TypeNameHandling
         {
             get { return _typeNameHandling; }
diff --git a/Src/Newtonsoft.Json/JsonSerializerSettings.cs b/Src/Newtonsoft.Json/JsonSerializerSettings.cs
index aa996c37..d3b9b49c 100644
--- a/Src/Newtonsoft.Json/JsonSerializerSettings.cs
+++ b/Src/Newtonsoft.Json/JsonSerializerSettings.cs
@@ -156,6 +156,11 @@ namespace Newtonsoft.Json
         /// <summary>
         /// Gets or sets how type name writing and reading is handled by the serializer.
         /// </summary>
+        /// <remarks>
+        /// <see cref="TypeNameHandling"/> should be used with caution when your application deserializes JSON from an external source.
+        /// Incoming types should be validated with a custom <see cref="T:System.Runtime.Serialization.SerializationBinder"/>
+        /// when deserializing with a value other than <c>TypeNameHandling.None</c>.
+        /// </remarks>
         /// <value>The type name handling.</value>
         public TypeNameHandling TypeNameHandling
         {
diff --git a/Src/Newtonsoft.Json/TypeNameHandling.cs b/Src/Newtonsoft.Json/TypeNameHandling.cs
index deb0c88e..9a5a8cfe 100644
--- a/Src/Newtonsoft.Json/TypeNameHandling.cs
+++ b/Src/Newtonsoft.Json/TypeNameHandling.cs
@@ -24,12 +24,18 @@
 #endregion
 
 using System;
+using System.Runtime.Serialization;
 
 namespace Newtonsoft.Json
 {
     /// <summary>
     /// Specifies type name handling options for the <see cref="JsonSerializer"/>.
     /// </summary>
+    /// <remarks>
+    /// <see cref="TypeNameHandling"/> should be used with caution when your application deserializes JSON from an external source.
+    /// Incoming types should be validated with a custom <see cref="T:System.Runtime.Serialization.SerializationBinder"/>
+    /// when deserializing with a value other than <c>TypeNameHandling.None</c>.
+    /// </remarks>
     [Flags]
     public enum TypeNameHandling
     {