From a5610c8895b4f364ec2a1b3b4fbc1439f08c9af8 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Tue, 30 Aug 2016 21:19:13 +0300 Subject: [PATCH 1/4] Set documentation version to 2.8 --- doc/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index 7dba933..d12087d 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -48,7 +48,7 @@ copyright = u'2009-2014, Petri Lehtinen' # built documents. # # The short X.Y version. -version = '2.8-dev' +version = '2.8' # The full version, including alpha/beta/rc tags. release = version From b45745118daa81a7b70689e117720fb6091806a8 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Wed, 31 Aug 2016 12:17:03 +0300 Subject: [PATCH 2/4] doc: Fix json_error_t::position type Fixes #300 --- doc/apiref.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/apiref.rst b/doc/apiref.rst index 0ab2348..a01e352 100644 --- a/doc/apiref.rst +++ b/doc/apiref.rst @@ -808,7 +808,7 @@ this struct. *character column*, not the byte column, i.e. a multibyte UTF-8 character counts as one column. - .. member:: size_t position + .. member:: int position The position in bytes from the start of the input. This is useful for debugging Unicode encoding problems. From 811a30691ee46fe18b5e1654e7bea857bbd4b886 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Thu, 1 Sep 2016 08:44:08 +0800 Subject: [PATCH 3/4] Fix typo --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 5f81c5e..0cdb25c 100644 --- a/CHANGES +++ b/CHANGES @@ -80,7 +80,7 @@ Released 2016-08-30 - Other minor fixes (#221, #248). -* Ohter changes: +* Other changes: - List all unrecognized object keys when strict unpacking fails (#263). From ada5372cffa7707d82a81878558f47dfa1437a05 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Thu, 1 Sep 2016 07:06:25 +0300 Subject: [PATCH 4/4] Fix another typo --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 0cdb25c..cb4ef03 100644 --- a/CHANGES +++ b/CHANGES @@ -7,7 +7,7 @@ Released 2016-08-30 - Always preserve insertion order of object items. `json_object_iter()` and friends, `json_object_foreach()` and - json_dumps() and friends now always work in the insertion order of + `json_dumps()` and friends now always work in the insertion order of object items (#293). - Add `json_object_foreach_safe()` macro that allows