diff --git a/Doc/CreatingLINQtoJSON.aml b/Doc/CreatingLINQtoJSON.aml index 55fe758e..f4f3ca69 100644 --- a/Doc/CreatingLINQtoJSON.aml +++ b/Doc/CreatingLINQtoJSON.aml @@ -38,11 +38,7 @@ - - LINQ to JSON - LINQtoJSON.htm - _self - + Overload:Newtonsoft.Json.Linq.JObject.FromObject diff --git a/Doc/Introduction.aml b/Doc/Introduction.aml index 25e4b875..b9ac9480 100644 --- a/Doc/Introduction.aml +++ b/Doc/Introduction.aml @@ -105,21 +105,9 @@ and write from your objects. - - Serializing and Deserializing JSON - SerializingJSON.htm - _self - - - LINQ to JSON - LINQtoJSON.htm - _self - - - Samples - Samples.htm - _self - + + + diff --git a/Doc/ParsingLINQtoJSON.aml b/Doc/ParsingLINQtoJSON.aml index 8a2efc11..ac52629c 100644 --- a/Doc/ParsingLINQtoJSON.aml +++ b/Doc/ParsingLINQtoJSON.aml @@ -24,12 +24,8 @@ - - LINQ to JSON - LINQtoJSON.htm - _self - - + + M:Newtonsoft.Json.Linq.JToken.Parse(System.String) M:Newtonsoft.Json.Linq.JToken.ReadFrom(Newtonsoft.Json.JsonReader) diff --git a/Doc/QueryingLINQtoJSON.aml b/Doc/QueryingLINQtoJSON.aml index bf2f8710..c8a7a95a 100644 --- a/Doc/QueryingLINQtoJSON.aml +++ b/Doc/QueryingLINQtoJSON.aml @@ -47,11 +47,7 @@ - - LINQ to JSON - LINQtoJSON.htm - _self - + P:Newtonsoft.Json.Linq.JToken.Item(System.Object) M:Newtonsoft.Json.Linq.JToken.Children diff --git a/Doc/Samples/Samples.aml b/Doc/Samples/Samples.aml index 4cf68133..49e2d1f3 100644 --- a/Doc/Samples/Samples.aml +++ b/Doc/Samples/Samples.aml @@ -16,7 +16,12 @@ LINQ to JSON - Parsing, querying, modifying and writing JSON - JSON Schema - Loading schemas and validating JSON + JSON Schema - Loading schemas and validating JSON. Note that JSON Schema validation has been moved to its own package. See + http://www.newtonsoft.com + http://www.newtonsoft.com + _blank + + for more details. Converting XML - Converting JSON to XML and XML to JSON diff --git a/Doc/SelectToken.aml b/Doc/SelectToken.aml index 28207058..b83bdf18 100644 --- a/Doc/SelectToken.aml +++ b/Doc/SelectToken.aml @@ -34,11 +34,7 @@ - - LINQ to JSON - LINQtoJSON.htm - _self - + Overload:Newtonsoft.Json.Linq.JToken.SelectToken diff --git a/Doc/SerializationErrorHandling.aml b/Doc/SerializationErrorHandling.aml index cf00dcbf..2716a0e2 100644 --- a/Doc/SerializationErrorHandling.aml +++ b/Doc/SerializationErrorHandling.aml @@ -91,11 +91,7 @@ - - Serialization Attributes - SerializationAttributes.htm - _self - + E:Newtonsoft.Json.JsonSerializer.Error T:Newtonsoft.Json.Serialization.OnErrorAttribute diff --git a/Doc/SerializationGuide.aml b/Doc/SerializationGuide.aml index e71c1604..92d46182 100644 --- a/Doc/SerializationGuide.aml +++ b/Doc/SerializationGuide.aml @@ -282,21 +282,9 @@ - - Serialization Settings - SerializationSettings.htm - _self - - - Serialization Attributes - SerializationAttributes.htm - _self - - - Serializing Dates in JSON - DatesInJSON.htm - _self - + + + T:Newtonsoft.Json.JsonSerializer T:Newtonsoft.Json.JsonSerializerSettings diff --git a/Doc/SerializationSettings.aml b/Doc/SerializationSettings.aml index 86d76763..945ae811 100644 --- a/Doc/SerializationSettings.aml +++ b/Doc/SerializationSettings.aml @@ -340,21 +340,9 @@ or a property's object properties or collection items using - - Serialization Guide - SerializationGuide.htm - _self - - - Serialization Attributes - SerializationAttributes.htm - _self - - - Serializing Dates in JSON - DatesInJSON.htm - _self - + + + T:Newtonsoft.Json.JsonSerializer T:Newtonsoft.Json.JsonSerializerSettings diff --git a/Doc/SerializingCollections.aml b/Doc/SerializingCollections.aml index d870f03e..dae29437 100644 --- a/Doc/SerializingCollections.aml +++ b/Doc/SerializingCollections.aml @@ -54,11 +54,7 @@ - - Serialization Guide - SerializationGuide.htm - _self - + T:Newtonsoft.Json.JsonConvert T:Newtonsoft.Json.JsonSerializer diff --git a/Doc/SerializingJSON.aml b/Doc/SerializingJSON.aml index 014f657a..a0de987a 100644 --- a/Doc/SerializingJSON.aml +++ b/Doc/SerializingJSON.aml @@ -46,26 +46,10 @@ LINQ to JSON objects or - - Serialization Guide - SerializationGuide.htm - _self - - - Serialization Settings - SerializationSettings.htm - _self - - - Serialization Attributes - SerializationAttributes.htm - _self - - - Serializing Partial JSON Fragments - SerializingJSONFragments.htm - _self - + + + + T:Newtonsoft.Json.JsonConvert T:Newtonsoft.Json.JsonSerializer diff --git a/Doc/doc.shfbproj b/Doc/doc.shfbproj index 6fb3b33d..ea74c888 100644 --- a/Doc/doc.shfbproj +++ b/Doc/doc.shfbproj @@ -47,7 +47,8 @@ The <b>Newtonsoft.Json.Converters</b> namespace provides classes that inherit from <a href="T_Newtonsoft_Json_JsonConverter.htm">JsonConverter</a>. The <b>Newtonsoft.Json.Linq</b> namespace provides classes that are used to implement LINQ to JSON. The <b>Newtonsoft.Json.Linq.ComponentModel</b> namespace provides classes for LINQ to JSON databinding. - The <b>Newtonsoft.Json.Schema</b> namespace provides classes that are used to implement JSON schema. + <para>The <b>Newtonsoft.Json.Schema</b> namespace provides classes that are used to implement JSON schema.</para> + <para><b>Obsolete.</b> JSON Schema validation has been moved to its own package. See <a href="http://www.newtonsoft.com">http://www.newtonsoft.com</a> for more details.</para> The <b>Newtonsoft.Json.Linq</b> namespace provides classes that are used when serializing and deserializing JSON. The <b>Newtonsoft.Json.Linq</b> namespace provides classes that are used to implement BSON. diff --git a/Doc/doc.sitemap b/Doc/doc.sitemap deleted file mode 100644 index 8d7f3a3e..00000000 --- a/Doc/doc.sitemap +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file