jansson 2.14v2.14

4 files changed, 9 insertions, 9 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5069623..8186a7d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
-EXTRA_DIST = conf.py apiref.rst changes.rst conformance.rst		\
-	gettingstarted.rst github_commits.c index.rst portability.rst	\
+EXTRA_DIST = conf.py apiref.rst changes.rst conformance.rst  \
+	gettingstarted.rst github_commits.c index.rst threadsafety.rst  \
 	tutorial.rst upgrading.rst ext/refcounting.py
 
 SPHINXBUILD = sphinx-build
diff --git a/doc/apiref.rst b/doc/apiref.rst
index db58a8f..4bfb687 100644
--- a/doc/apiref.rst
+++ b/doc/apiref.rst
@@ -114,7 +114,7 @@ also cause errors.
 Type
 ----
 
-.. type:: enum json_type
+.. c:enum:: json_type
 
    The type of a JSON value. The following members are defined:
 
@@ -599,7 +599,7 @@ A JSON array is an ordered collection of other JSON values.
    Iterate over every element of ``array``, running the block
    of code that follows each time with the proper values set to
    variables ``index`` and ``value``, of types :type:`size_t` and
-   :type:`json_t *` respectively. Example::
+   :type:`json_t` pointer respectively. Example::
 
        /* array is a JSON array */
        size_t index;
@@ -781,7 +781,7 @@ allowed in object keys.
    Iterate over every key-value pair of ``object``, running the block
    of code that follows each time with the proper values set to
    variables ``key`` and ``value``, of types ``const char *`` and
-   :type:`json_t *` respectively. Example::
+   :type:`json_t` pointer respectively. Example::
 
        /* obj is a JSON object */
        const char *key;
@@ -1003,7 +1003,7 @@ success. See :ref:`apiref-decoding` for more info.
 All functions also accept *NULL* as the :type:`json_error_t` pointer,
 in which case no error information is returned to the caller.
 
-.. type:: enum json_error_code
+.. c:enum:: json_error_code
 
    An enumeration containing numeric error codes.  The following errors are
    currently defined:
diff --git a/doc/conf.py b/doc/conf.py
index 24dcdb5..2426171 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -48,7 +48,7 @@ copyright = u'2009-2020, Petri Lehtinen'
 # built documents.
 #
 # The short X.Y version.
-version = '2.13.1'
+version = '2.14'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/doc/threadsafety.rst b/doc/threadsafety.rst
index d9b881a..0eebb29 100644
--- a/doc/threadsafety.rst
+++ b/doc/threadsafety.rst
@@ -1,9 +1,9 @@
+.. _thread-safety:
+
 *************
 Thread safety
 *************
 
-.. _thread-safety:
-
 Jansson as a library is thread safe and has no mutable global state.
 The only exceptions are the hash function seed and memory allocation
 functions, see below.