Skip to content

Commit

Permalink
Merge branch 'master' of github.com:JamesNK/Newtonsoft.Json
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesNK committed Aug 5, 2012
2 parents 6441416 + 4af00c7 commit 7359433
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 10 deletions.
23 changes: 14 additions & 9 deletions Doc/Introduction.aml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<para>Convert JSON to and from XML</para>
</listItem>
<listItem>
<para>Supports .NET 2, .NET 3.5, .NET 4, Silverlight, Windows Phone and Windows 8 Metro</para>
<para>Supports .NET 2, .NET 3.5, .NET 4, Silverlight, Windows Phone and Windows 8</para>
</listItem>

</list>
Expand Down Expand Up @@ -66,25 +66,30 @@ and write from your objects.</para>
<title>History</title>
<content><para>Json.NET grew out of projects I was working on in late 2005 involving JavaScript,
AJAX and .NET. At the time there were no libraries for working with JavaScript in
.NET so I began to grow my own.</para>
.NET so I made my own.</para>
<para>Starting out as a couple of static methods for escaping JavaScript strings, Json.NET
evolved as features were added. To add support for reading JSON a major refactor
was required and Json.NET will split into the three major classes it still uses
today, JsonReader, JsonWriter and JsonSerializer.</para>
<para>Json.NET was first released in June 2006. Since then Json.NET has been downloaded
thousands of times by developers and is used in a number of major projects open
hundreds of thousands of times by developers and is used in a number of major open
source projects including <externalLink>
<linkText>MonoRail</linkText>
<linkUri>https://www.castleproject.org/projects/monorail</linkUri>
<linkTarget>_blank</linkTarget>
</externalLink>,
Castle Project's MVC web framework, and <externalLink>
<linkText>Mono</linkText>
<linkUri>https://www.mono-project.com/</linkUri>
<linkTarget>_blank</linkTarget>
</externalLink>,
an open source implementation
of the .NET framework.</para>
of the .NET framework, <externalLink>
<linkText>RavenDB</linkText>
<linkUri>https://ravendb.net/</linkUri>
<linkTarget>_blank</linkTarget>
</externalLink>,
a JSON based documentat database, and <externalLink>
<linkText>ASP.NET Web API</linkText>
<linkUri>https://www.asp.net/web-api</linkUri>
<linkTarget>_blank</linkTarget>
</externalLink>,
Microsoft's HTTP service framework.</para>
<para><externalLink>
<linkText>James Newton-King</linkText>
<linkUri>https://twitter.com/jamesnk</linkUri>
Expand Down
6 changes: 5 additions & 1 deletion Doc/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ the JsonSerializer.
-Supports Silverlight and Windows Phone


Documentation:

https://james.newtonking.com/projects/json/help/


Versions:

Expand All @@ -38,7 +42,7 @@ Json.NET comes in different versions for the various .NET frameworks.
Windows Phone 7 & 7.1

-Metro
Windows 8 Metro, WinRT 4.5
Windows 8, WinRT 4.5

-Portable
Portable Class Library (.NET 4.0, WP7, SL4)
Expand Down

0 comments on commit 7359433

Please sign in to comment.