From f88d2a42d88b592395c075c472ba523458da0a72 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Mon, 20 Oct 2014 19:53:56 +1300
Subject: [PATCH] -Documentation

---
 Doc/Samples/Json/CustomJsonReader.aml | 15 +++++++++++++++
 Doc/Samples/Json/CustomJsonWriter.aml | 15 +++++++++++++++
 Doc/doc.content                       |  8 +++++---
 Doc/doc.shfbproj                      | 16 +++++++++-------
 4 files changed, 44 insertions(+), 10 deletions(-)
 create mode 100644 Doc/Samples/Json/CustomJsonReader.aml
 create mode 100644 Doc/Samples/Json/CustomJsonWriter.aml

diff --git a/Doc/Samples/Json/CustomJsonReader.aml b/Doc/Samples/Json/CustomJsonReader.aml
new file mode 100644
index 00000000..428c4fc0
--- /dev/null
+++ b/Doc/Samples/Json/CustomJsonReader.aml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<topic id="CustomJsonReader" revisionNumber="1">
+  <developerConceptualDocument xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <introduction>
+      <para>This sample creates a custom <codeEntityReference>T:Newtonsoft.Json.JsonReader</codeEntityReference>.</para>
+    </introduction>
+    <section>
+      <title>Sample</title>
+      <content>
+        <code lang="cs" source="..\Src\Newtonsoft.Json.Tests\Documentation\Samples\Json\CustomJsonReader.cs" region="Types" title="Types" />
+        <code lang="cs" source="..\Src\Newtonsoft.Json.Tests\Documentation\Samples\Json\CustomJsonReader.cs" region="Usage" title="Usage" />
+      </content>
+    </section>
+  </developerConceptualDocument>
+</topic>
\ No newline at end of file
diff --git a/Doc/Samples/Json/CustomJsonWriter.aml b/Doc/Samples/Json/CustomJsonWriter.aml
new file mode 100644
index 00000000..f98a060f
--- /dev/null
+++ b/Doc/Samples/Json/CustomJsonWriter.aml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<topic id="CustomJsonWriter" revisionNumber="1">
+  <developerConceptualDocument xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <introduction>
+      <para>This sample creates a custom <codeEntityReference>T:Newtonsoft.Json.JsonWriter</codeEntityReference>.</para>
+    </introduction>
+    <section>
+      <title>Sample</title>
+      <content>
+        <code lang="cs" source="..\Src\Newtonsoft.Json.Tests\Documentation\Samples\Json\CustomJsonWriter.cs" region="Types" title="Types" />
+        <code lang="cs" source="..\Src\Newtonsoft.Json.Tests\Documentation\Samples\Json\CustomJsonWriter.cs" region="Usage" title="Usage" />
+      </content>
+    </section>
+  </developerConceptualDocument>
+</topic>
\ No newline at end of file
diff --git a/Doc/doc.content b/Doc/doc.content
index 8ec6c65d..8b8462f9 100644
--- a/Doc/doc.content
+++ b/Doc/doc.content
@@ -81,7 +81,7 @@
       <Topic id="SerializationCallbackAttributes" visible="True" title="Serialization Callback Attributes" />
       <Topic id="DataContractAndDataMember" visible="True" title="DataContract and DataMember Attributes" />
     </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" />
@@ -93,7 +93,7 @@
       <Topic id="ParseJsonObject" visible="True" title="Parsing JSON Object using JObject.Parse" />
       <Topic id="ParseJsonAny" visible="True" title="Parsing all JSON using JToken.Parse" />
       <Topic id="DeserializeWithLinq" visible="True" title="Deserializing from JSON with LINQ" />
-      <Topic id="SerializeWithLinq" visible="True" isSelected="true" title="Serializing to JSON with LINQ" />
+      <Topic id="SerializeWithLinq" visible="True" title="Serializing to JSON with LINQ" />
       <Topic id="ModifyJson" visible="True" title="Modifying JSON" />
       <Topic id="QueryJson" visible="True" title="Querying JSON" />
       <Topic id="QueryJsonDynamic" visible="True" title="Querying JSON with dynamic" />
@@ -138,9 +138,11 @@
       <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="CustomJsonReader" visible="True" isSelected="true" title="Custom JsonReader" />
+      <Topic id="CustomJsonWriter" visible="True" title="Custom JsonWriter" />
     </Topic>
   </Topic>
 </Topics>
\ No newline at end of file
diff --git a/Doc/doc.shfbproj b/Doc/doc.shfbproj
index 4e3d6970..4b8741cc 100644
--- a/Doc/doc.shfbproj
+++ b/Doc/doc.shfbproj
@@ -8,7 +8,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{fd19f68e-72c8-4576-9775-b4480b0db686}</ProjectGuid>
-    <SHFBSchemaVersion>1.9.5.0</SHFBSchemaVersion>
+    <SHFBSchemaVersion>1.9.9.0</SHFBSchemaVersion>
     <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
          Studio adds them anyway -->
     <AssemblyName>Documentation</AssemblyName>
@@ -57,12 +57,12 @@
     <ComponentConfigurations>
       <ComponentConfig id="Code Block Component" enabled="True">
         <component id="Code Block Component" type="SandcastleBuilder.Components.CodeBlockComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
-  <basePath value="{@HtmlEncProjectFolder}" />
-  <outputPaths>{@HelpFormatOutputPaths}</outputPaths>
-  <allowMissingSource value="false" />
-  <removeRegionMarkers value="false" />
-  <colorizer syntaxFile="{@SHFBFolder}Colorizer\highlight.xml" styleFile="{@SHFBFolder}Colorizer\highlight.xsl" stylesheet="{@SHFBFolder}Colorizer\highlight.css" scriptFile="{@SHFBFolder}Colorizer\highlight.js" language="cs" tabSize="0" numberLines="true" outlining="false" keepSeeTags="false" defaultTitle="true" />
-</component>
+          <basePath value="{@HtmlEncProjectFolder}" />
+          <outputPaths>{@HelpFormatOutputPaths}</outputPaths>
+          <allowMissingSource value="false" />
+          <removeRegionMarkers value="false" />
+          <colorizer syntaxFile="{@SHFBFolder}Colorizer\highlight.xml" styleFile="{@SHFBFolder}Colorizer\highlight.xsl" stylesheet="{@SHFBFolder}Colorizer\highlight.css" scriptFile="{@SHFBFolder}Colorizer\highlight.js" language="cs" tabSize="0" numberLines="true" outlining="false" keepSeeTags="false" defaultTitle="true" />
+        </component>
       </ComponentConfig>
     </ComponentConfigurations>
     <IndentHtml>False</IndentHtml>
@@ -95,6 +95,8 @@
     <Content Include="donate.gif" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Samples\Json\CustomJsonWriter.aml" />
+    <None Include="Samples\Json\CustomJsonReader.aml" />
     <None Include="Samples\Xml\ConvertXmlToJsonForceArray.aml" />
     <None Include="Samples\Xml\ConvertXmlToJson.aml" />
     <None Include="Samples\Xml\ConvertJsonToXml.aml" />