link web docs
diff --git a/README.md b/README.md
index cf8b3db..a74693a 100644
--- a/README.md
+++ b/README.md
@@ -7,17 +7,20 @@
[json-org]: http://json.org/
-JsonCpp is a C++ library that allows manipulating JSON values, including
+[JsonCpp][] is a C++ library that allows manipulating JSON values, including
serialization and deserialization to and from strings. It can also preserve
existing comment in unserialization/serialization steps, making it a convenient
format to store user input files.
+[JsonCpp]: http://open-source-parsers.github.io/jsoncpp-docs/doxygen/index.html
+
## A note on backward-compatibility
-Very soon, we are switching to C++11 only. For older compilers, try the `pre-C++11` branch.
+* `1.y.z` is built with C++11.
+* `0.8.z` can be used with older compilers.
+* Major versions maintain binary-compatibility.
Using JsonCpp in your project
-----------------------------
-
The recommended approach to integrating JsonCpp in your project is to build
the amalgamated source (a single `.cpp` file) with your own build system. This
ensures consistency of compilation flags and ABI compatibility. See the section
@@ -28,13 +31,11 @@
#include <json/json.h>
-If JsonCpp was build as a dynamic library on Windows, then your project needs to
+If JsonCpp was built as a dynamic library on Windows, then your project needs to
define the macro `JSON_DLL`.
-
-Building and testing with new CMake
------------------------------------
-
+Building and testing with CMake
+-------------------------------
[CMake][] is a C++ Makefiles/Solution generator. It is usually available on most
Linux system as package. On Ubuntu:
@@ -75,10 +76,8 @@
By default CMake hides compilation commands. This can be modified by specifying
`-DCMAKE_VERBOSE_MAKEFILE=true` when generating makefiles.
-
Building and testing with SCons
-------------------------------
-
**Note:** The SCons-based build system is deprecated. Please use CMake; see the
section above.
@@ -107,14 +106,7 @@
environment by running `vcvars32.bat` (e.g. MSVC 2008 command prompt) before
running SCons.
-
-Running the tests manually
---------------------------
-
-Note that test can be run using SCons using the `check` target:
-
- scons platform=$PLATFORM check
-
+# Running the tests manually
You need to run tests manually only if you are troubleshooting an issue.
In the instructions below, replace `path/to/jsontest` with the path of the
@@ -137,20 +129,21 @@
# You can run the tests using valgrind:
python rununittests.py --valgrind path/to/test_lib_json
+## Running the tests using scons
+Note that tests can be run using SCons using the `check` target:
+
+ scons platform=$PLATFORM check
Building the documentation
--------------------------
-
Run the Python script `doxybuild.py` from the top directory:
python doxybuild.py --doxygen=$(which doxygen) --open --with-dot
See `doxybuild.py --help` for options.
-
Generating amalgamated source and header
----------------------------------------
-
JsonCpp is provided with a script to generate a single header and a single
source file to ease inclusion into an existing project. The amalgamated source
can be generated at any time by running the following command from the
@@ -172,10 +165,8 @@
correct order and defining the macro `JSON_IS_AMALGAMATION` to prevent inclusion
of other headers.
-
Adding a reader/writer test
---------------------------
-
To add a test, you need to create two files in test/data:
* a `TESTNAME.json` file, that contains the input document in JSON format.
@@ -195,10 +186,8 @@
See the examples `test_complex_01.json` and `test_complex_01.expected` to better
understand element paths.
-
Understanding reader/writer test output
---------------------------------------
-
When a test is run, output files are generated beside the input test files.
Below is a short description of the content of each file:
@@ -215,10 +204,7 @@
* `test_complex_01.process-output`: `jsontest` output, typically useful for
understanding parsing errors.
-
License
-------
-
See the `LICENSE` file for details. In summary, JsonCpp is licensed under the
MIT license, or public domain if desired and recognized in your jurisdiction.
-
diff --git a/doc/jsoncpp.dox b/doc/jsoncpp.dox
index bf29778..86bd24f 100644
--- a/doc/jsoncpp.dox
+++ b/doc/jsoncpp.dox
@@ -152,6 +152,7 @@
and recognized in your jurisdiction.
\author Baptiste Lepilleur <blep@users.sourceforge.net> (originator)
+\author Christopher Dunn <cdunn2001@gmail.com> (primary maintainer)
\version \include version
We make strong guarantees about binary-compatibility, consistent with
<a href="http://apr.apache.org/versioning.html">the Apache versioning scheme</a>.