Merge branch 'csv_enhancements' of https://github.com/danielaparker/jsoncons

danielaparker · danielaparker · commit aa0eda7bba94 · 2015-10-12T07:09:37.000-04:00
diff --git a/README.html b/README.html
@@ -498,7 +498,7 @@ <h1>jsoncons: a C++ library for json construction</h1>
 <li>Handles JSON texts of arbitrarily large depth, a limit can be set if desired</li>
 </ul>
 
-<h2>What's new on Master</h2>
+<h2>What's new in Release 0.98</h2>
 
 <ul>
 <li><p>Fixes the noexcept specification (required for Visual Studio 2015 and later.) Fix<br>
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ The library has a number of features, which are listed below:
 - 100 percent pass of test suite files from http://www.json.org/JSON_checker/
 - Handles JSON texts of arbitrarily large depth, a limit can be set if desired
 
-## What's new on Master
+## What's new in Release 0.98
 
 - Fixes the noexcept specification (required for Visual Studio 2015 and later.) Fix
   contributed by Rupert Steel.
diff --git a/doc/Changelog b/doc/Changelog
@@ -468,7 +468,7 @@ vertical-align:1px;
 </style>
 </head>
 <body>
-<h2>Targeting 0.98 Release</h2>
+<h2>0.98 Release</h2>
 
 <p>Bug fixes:</p>
 
@@ -497,6 +497,7 @@ it is arbitrarily large (limited by heap memory.)</p></li>
 <li>Changes the top level namespace for the extensions from <code>jsoncons_ext</code> to <code>jsoncons</code>, e.g. <code>jsoncons_ext::csv::csv_reader</code> becomes <code>jsoncons::csv::csv_reader</code>
 </li>
 <li>Modifies csv_reader and csv_serializer so that the constructors are passed parameters in a <code>csv_parameters</code> object rather than a <code>json</code> object.</li>
+<li>Adds more options to csv_reader</li>
 </ul>
 
 <h2>0.97.2 Release</h2>
diff --git a/src/doc/Changelog.md b/src/doc/Changelog.md
@@ -1,5 +1,5 @@
-Targeting 0.98 Release
-----------------------
+0.98 Release
+------------
 
 Bug fixes:
 
@@ -26,6 +26,7 @@ Changes to extensions:
 
 - Changes the top level namespace for the extensions from `jsoncons_ext` to `jsoncons`, e.g. `jsoncons_ext::csv::csv_reader` becomes `jsoncons::csv::csv_reader`
 - Modifies csv_reader and csv_serializer so that the constructors are passed parameters in a `csv_parameters` object rather than a `json` object.
+- Adds more options to csv_reader
 
 0.97.2 Release
 --------------
