-Documentation

Doc/Samples/Json/ReadMultipleContentWithJsonReader.aml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<topic id="ReadMultipleContentWithJsonReader" revisionNumber="1">
+  <developerConceptualDocument xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <introduction>
+      <para>This sample sets <codeEntityReference>P:Newtonsoft.Json.JsonReader.SupportMultipleContent</codeEntityReference>
+      to true so that multiple JSON fragments can be read from a <codeEntityReference>T:System.IO.Stream</codeEntityReference> or
+      <codeEntityReference>T:System.IO.TextReader</codeEntityReference>.</para>
+    </introduction>
+    <section>
+      <title>Sample</title>
+      <content>
+        <code lang="cs" source="..\Src\Newtonsoft.Json.Tests\Documentation\Samples\Json\ReadMultipleContentWithJsonReader.cs" region="Types" title="Types" />
+        <code lang="cs" source="..\Src\Newtonsoft.Json.Tests\Documentation\Samples\Json\ReadMultipleContentWithJsonReader.cs" region="Usage" title="Usage" />
+      </content>
+    </section>
+  </developerConceptualDocument>
+</topic>

Doc/SerializationAttributes.aml

@@ -20,6 +20,7 @@
   <listItem><para><codeEntityReference>T:Newtonsoft.Json.JsonDictionaryAttribute</codeEntityReference> - Placed on dictionaries to control how they should be serialized as a JSON object.</para></listItem>
   <listItem><para><codeEntityReference>T:Newtonsoft.Json.JsonPropertyAttribute</codeEntityReference> - Placed on fields and properties to control how they should be serialized as a property in a JSON object.</para></listItem>
   <listItem><para><codeEntityReference>T:Newtonsoft.Json.JsonConverterAttribute</codeEntityReference> - Placed on either classes or fields and properties to specify which JsonConverter should be used during serialization.</para></listItem>
+  <listItem><para><codeEntityReference>T:Newtonsoft.Json.JsonExtensionDataAttribute</codeEntityReference> - Placed on a collection field or property to deserialize properties with no matching class member into the specified collection and write values during serialization.</para></listItem>
 </list>
 
     </introduction>
@@ -101,10 +102,8 @@
     <section>
       <title>JsonIgnoreAttribute</title>
       <content>
-        <!-- Uncomment this to create a sub-section outline
-        <autoOutline /> -->
         <para>Excludes a field or property from serialization.</para>
-        <para>The <codeEntityReference>T:System.NonSerializedAttribute</codeEntityReference> can be used as substitute for JsonIgnoreAttribute.</para>
+        <para>The <codeEntityReference>T:System.NonSerializedAttribute</codeEntityReference> can be used as a substitute for JsonIgnoreAttribute.</para>
       </content>
     </section>
         
@@ -132,6 +131,17 @@
         and set the ItemConverterType property to the converter type you want to use.</para>
       </content>
     </section>
+        
+    <section>
+      <title>JsonExtensionDataAttribute</title>
+      <content>
+        <para>Instructs the <codeEntityReference>T:Newtonsoft.Json.JsonSerializer</codeEntityReference> to deserialize properties with no matching class member
+        into the specified collection and write values during serialization.</para>
+        <code lang="cs" source="..\Src\Newtonsoft.Json.Tests\Documentation\Samples\Serializer\DeserializeExtensionData.cs" region="Types" title="Types" />
+        <code lang="cs" source="..\Src\Newtonsoft.Json.Tests\Documentation\Samples\Serializer\DeserializeExtensionData.cs" region="Usage" title="Usage" />
+      </content>
+    </section>
+    
     </sections>
     </section>
     <relatedTopics>

Doc/doc.content

@@ -30,7 +30,7 @@
   <Topic id="JsonNetVsDotNetSerializers" visible="True" title="Json.NET vs .NET Serializers" />
   <Topic id="JsonNetVsWindowsDataJson" visible="True" title="Json.NET vs Windows.Data.Json" />
   <Topic id="Samples" visible="True" isExpanded="true" title="Samples">
-    <Topic id="d6e185d5-c992-44fc-8d8f-d9acc2bbec2f" visible="True" noFile="true" isExpanded="true" title="Serializing JSON">
+    <Topic id="d6e185d5-c992-44fc-8d8f-d9acc2bbec2f" visible="True" noFile="true" title="Serializing JSON">
       <Topic id="SerializeObject" visible="True" title="Serialize an Object" />
       <Topic id="SerializeCollection" visible="True" title="Serialize a Collection" />
       <Topic id="SerializeDictionary" visible="True" title="Serialize a Dictionary" />
@@ -82,7 +82,7 @@
       <Topic id="SerializationCallbackAttributes" visible="True" title="Serialization Callback Attributes" />
       <Topic id="DataContractAndDataMember" visible="True" title="DataContract and DataMember Attributes" />
       <Topic id="DeserializeWithDependencyInjection" visible="True" title="Deserialize with dependency injection" />
-      <Topic id="DefaultSettings" visible="True" isSelected="true" title="Serialize with DefaultSettings" />
+      <Topic id="DefaultSettings" visible="True" title="Serialize with DefaultSettings" />
       <Topic id="SerializeImmutableCollections" visible="True" title="Serialize an immutable collection" />
       <Topic id="DeserializeImmutableCollections" visible="True" title="Deserialize an immutable collection" />
       <Topic id="SerializeExtensionData" visible="True" title="Serialize ExtensionData" />
@@ -90,7 +90,7 @@
       <Topic id="DeserializeDateFormatString" visible="True" title="Deserialize DateFormatString" />
       <Topic id="SerializeDateFormatString" visible="True" title="Serialize DateFormatString" />
     </Topic>
-    <Topic id="68b9fad2-5436-4e35-a734-9b9d751cc3e5" visible="True" noFile="true" isExpanded="true" title="LINQ to JSON">
+    <Topic id="68b9fad2-5436-4e35-a734-9b9d751cc3e5" visible="True" noFile="true" title="LINQ to JSON">
       <Topic id="CreateJsonManually" visible="True" title="Create JSON manually" />
       <Topic id="CreateJsonCollectionInitializer" visible="True" title="Create JSON using Collection Initializers" />
       <Topic id="CreateJsonDeclaratively" visible="True" title="Create JSON declaratively with LINQ" />
@@ -150,9 +150,10 @@
       <Topic id="DeserializeFromBson" visible="True" title="Deserialize from BSON" />
       <Topic id="DeserializeFromBsonCollection" visible="True" title="Deserialize a Collection from BSON" />
     </Topic>
-    <Topic id="ca145ed0-f377-4f1c-9479-d1629082fc6e" visible="True" noFile="true" title="Reading and Writing JSON">
+    <Topic id="ca145ed0-f377-4f1c-9479-d1629082fc6e" visible="True" noFile="true" isExpanded="true" title="Reading and Writing JSON">
       <Topic id="ReadJsonWithJsonTextReader" visible="True" title="Read JSON with JsonTextReader" />
       <Topic id="WriteJsonWithJsonTextWriter" visible="True" title="Write JSON with JsonTextWriter" />
+      <Topic id="ReadMultipleContentWithJsonReader" visible="True" isSelected="true" title="Read Multiple Content With JsonReader" />
       <Topic id="CustomJsonReader" visible="True" title="Custom JsonReader" />
       <Topic id="CustomJsonWriter" visible="True" title="Custom JsonWriter" />
     </Topic>

Doc/doc.shfbproj

@@ -100,6 +100,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="icons\favicon.ico" />
+    <None Include="Samples\Json\ReadMultipleContentWithJsonReader.aml" />
     <None Include="Samples\Serializer\SerializeImmutableCollections.aml" />
     <None Include="Samples\Serializer\SerializeExtensionData.aml" />
     <None Include="Samples\Serializer\SerializeDateFormatString.aml" />