From b51b3aa20a845e5d8ed35269f9516950750de9f4 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Sat, 3 Nov 2012 12:54:05 +1300
Subject: [PATCH] -Documentation

---
 Doc/ConditionalProperties.aml                 |  2 +-
 Doc/ContractResolver.aml                      | 27 +++++++++----------
 Doc/JsonNetVsWindowsDataJson.aml              |  6 ++---
 Doc/doc.content                               |  6 ++---
 .../Properties/AssemblyInfo.cs                |  2 +-
 .../Properties/AssemblyInfo.cs                |  2 +-
 6 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/Doc/ConditionalProperties.aml b/Doc/ConditionalProperties.aml
index ba904a51..d87357b9 100644
--- a/Doc/ConditionalProperties.aml
+++ b/Doc/ConditionalProperties.aml
@@ -35,7 +35,7 @@
     <relatedTopics>
       <codeEntityReference>T:Newtonsoft.Json.JsonSerializer</codeEntityReference>
       <codeEntityReference>T:Newtonsoft.Json.Serialization.IContractResolver</codeEntityReference>
-      <codeEntityReference>M:Newtonsoft.Json.Serialization.JsonProperty.ShouldSerialize</codeEntityReference>
+      <codeEntityReference>P:Newtonsoft.Json.Serialization.JsonProperty.ShouldSerialize</codeEntityReference>
     </relatedTopics>
   </developerConceptualDocument>
 </topic>
\ No newline at end of file
diff --git a/Doc/ContractResolver.aml b/Doc/ContractResolver.aml
index 6c628322..db6ecf7e 100644
--- a/Doc/ContractResolver.aml
+++ b/Doc/ContractResolver.aml
@@ -9,11 +9,10 @@
     <introduction>
       <para>The <codeEntityReference>T:Newtonsoft.Json.Serialization.IContractResolver</codeEntityReference>
       interface provides a way to customize how the
-      JsonSerializer serializes and deserializes .NET objects to JSON without placing attributes on your classes.</para>
-      <para>Implementing the IContractResolver interface and then assigning an
-      instance to a JsonSerializer lets you control whether the object is
-      serialized as a JSON object or JSON array, what object members should be
-      serialized, how they are serialized and what they are called.</para>
+      JsonSerializer serializes and deserializes .NET objects to JSON without placing attributes on your classes.
+      </para>
+      <para>Anything that can be set on an object, collection, property, etc, using attributes or methods to control serialization
+      can also be set using an IContractResolver.</para>
     </introduction>
     <!-- Add one or more top-level section elements.  These are collapsible.
          If using <autoOutline />, add an address attribute to identify it
@@ -46,20 +45,20 @@
       </content>
     </section>
     <section>
-      <title>Custom Examples</title>
+      <title>Custom IContractResolver Examples</title>
       <content>
-        <para>Setting a <codeEntityReference>T:Newtonsoft.Json.JsonConverter</codeEntityReference> on a type
-        using an IContractResolver.</para>
-
 <code lang="cs" source="..\Src\Newtonsoft.Json.Tests\Documentation\PerformanceTests.cs" region="JsonConverterContractResolver" title="Use JsonConverter with IContractResolver" />
 
-        <para><externalLink>
-        <linkText>Conditionally serializing properties</linkText>
-        <linkUri>ConditionalProperties.htm</linkUri>
-        <linkTarget>_self</linkTarget>
-      </externalLink> using an IContractResolver.</para>
+        <para>This example sets a <codeEntityReference>T:Newtonsoft.Json.JsonConverter</codeEntityReference> for a type
+        using an IContractResolver. Using a contract resolver here is useful because DateTime is not your own type and it is not possible to place a JsonConverterAttribute on it.</para>
 
 <code lang="cs" source="..\Src\Newtonsoft.Json.Tests\Documentation\ConditionalPropertiesTests.cs" region="ShouldSerializeContractResolver" title="Conditional properties with IContractResolver" />
+
+        <para>This example sets up <externalLink>
+        <linkText>conditional serialization for a property</linkText>
+        <linkUri>ConditionalProperties.htm</linkUri>
+        <linkTarget>_self</linkTarget>
+      </externalLink> using an IContractResolver. This is useful if you want to conditional serialize a property but don't want to add additional methods to your type.</para>
       </content>
     </section>
     <relatedTopics>
diff --git a/Doc/JsonNetVsWindowsDataJson.aml b/Doc/JsonNetVsWindowsDataJson.aml
index 33e0a5ea..6a17032a 100644
--- a/Doc/JsonNetVsWindowsDataJson.aml
+++ b/Doc/JsonNetVsWindowsDataJson.aml
@@ -22,7 +22,7 @@
    </listItem>
    <listItem>
      <para>
-       Supports dynamic programming
+       Dynamic programming
      </para>
    </listItem>
    <listItem>
@@ -71,7 +71,7 @@
       </content>
     </section>
     <section>
-      <title>Performance</title>
+      <title>Benchmarks</title>
       <content>
         <para>Json.NET is slightly slower at writing JSON than Windows.Data.Json but considerably faster at parsing JSON.</para>
         
@@ -86,7 +86,7 @@
       <title>Converting Between LINQ to JSON and Windows.Data.Json</title>
       <content>
         <para>Json.NET supports converting between the types of the two libraries.
-        This feature is useful if you are working with another API but you want to use Json.NET inside your own code.</para>
+        This feature is useful if you are working with another API that uses Windows.Data.Json types but you want to use Json.NET inside your own code.</para>
         <para>Use <codeEntityReference>Overload:Newtonsoft.Json.Linq.JToken.FromObject</codeEntityReference> to convert a Windows.Data.Json
         value to LINQ to JSON and use <codeEntityReference>Overload:Newtonsoft.Json.Linq.JToken.ToObject</codeEntityReference> to convert LINQ to JSON to Windows.Data.Json.</para>
 
diff --git a/Doc/doc.content b/Doc/doc.content
index 73eae1ee..51d02d79 100644
--- a/Doc/doc.content
+++ b/Doc/doc.content
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Topics>
   <Topic id="Introduction" visible="True" isDefault="true" />
-  <Topic id="SerializingJSON" visible="True" title="Serializing and Deserializing JSON">
+  <Topic id="SerializingJSON" visible="True" isExpanded="true" title="Serializing and Deserializing JSON">
     <Topic id="SerializationSettings" visible="True" title="Serialization Settings" />
     <Topic id="SerializationGuide" visible="True" title="Serialization Guide" />
     <Topic id="SerializationAttributes" visible="True" title="Serialization Attributes" />
@@ -13,7 +13,7 @@
     <Topic id="DatesInJSON" visible="True" title="Serializing Dates in JSON" />
     <Topic id="ReducingSerializedJSONSize" visible="True" title="Reducing Serialized JSON Size" />
     <Topic id="SerializingJSONFragments" visible="True" title="Serializing Partial JSON Fragments" />
-    <Topic id="ConditionalProperties" visible="True" title="Conditional Properties" />
+    <Topic id="ConditionalProperties" visible="True" isSelected="true" title="Conditional Property Serialization" />
     <Topic id="ContractResolver" visible="True" title="Serialization using ContractResolver" />
   </Topic>
   <Topic id="LINQtoJSON" visible="True" title="LINQ to JSON">
@@ -26,6 +26,6 @@
   <Topic id="JsonSchema" visible="True" title="Validating JSON" />
   <Topic id="ReadingWritingJSON" visible="True" title="Basic Reading and Writing JSON" />
   <Topic id="ConvertingJSONandXML" visible="True" title="Converting between JSON and XML" />
-  <Topic id="JsonNetVsDotNetSerializers" visible="True" isSelected="true" title="Json.NET vs .NET Serializers" />
+  <Topic id="JsonNetVsDotNetSerializers" visible="True" title="Json.NET vs .NET Serializers" />
   <Topic id="JsonNetVsWindowsDataJson" visible="True" title="Json.NET vs Windows.Data.Json" />
 </Topics>
\ No newline at end of file
diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
index ed93bdd7..2bb55b06 100644
--- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
+++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
@@ -76,5 +76,5 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("4.5.0.0")]
 #if !PocketPC
-[assembly: AssemblyFileVersion("4.5.10.15502")]
+[assembly: AssemblyFileVersion("4.5.10.15503")]
 #endif
diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
index 69b3195e..6ecec87c 100644
--- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
+++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
@@ -90,7 +90,7 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("4.5.0.0")]
 #if !PocketPC
-[assembly: AssemblyFileVersion("4.5.10.15502")]
+[assembly: AssemblyFileVersion("4.5.10.15503")]
 #endif
 
 [assembly: CLSCompliant(true)]