1 files changed, 47 insertions, 14 deletions

diff --git a/manual.txt b/manual.txt
index a3e12cf..810d3d1 100644
--- a/manual.txt
+++ b/manual.txt
@@ -16,8 +16,6 @@ Lua CJSON provides fast JSON parsing and encoding support for Lua.
 
 .Caveats
 - UTF-16 and UTF-32 are not supported.
-- Multi-threading within a single Lua state is not supported
-  (+lua_lock+ / +lua_unlock+).
 
 Lua CJSON is covered by the MIT license. Review the file +LICENSE+ for
 details.
@@ -32,7 +30,7 @@ comments.
 Installation Methods
 --------------------
 
-Lua CJSON requires either http://www.lua.org[Lua] or
+Lua CJSON requires either http://www.lua.org[Lua] 5.1, Lua 5.2, or
 http://www.luajit.org[LuaJIT] to build.
 
 There are 4 build methods available:
@@ -44,11 +42,13 @@ RPM:: Linux
 LuaRocks:: Unix, Windows
 
 
-Build options (#define)
+Build Options (#define)
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 [horizontal]
 USE_INTERNAL_ISINF:: Workaround for Solaris platforms missing isinf().
+DISABLE_CJSON_GLOBAL:: Do not store module table in global "cjson"
+  variable.
 
 
 Make
@@ -125,9 +125,9 @@ Synopsis
 
 [source,lua]
 ------------
-require "cjson"
--- Or:
+-- Module initalisation methods
 local cjson = require "cjson"
+local cjson2 = cjson.new()
  
 -- Translate Lua value to/from JSON
 text = cjson.encode(value)
@@ -141,6 +141,34 @@ keep = cjson.encode_keep_buffer([keep])
 ------------
 
 
+Module Instantiation
+~~~~~~~~~~~~~~~~~~~~
+
+[source,lua]
+------------
+local cjson = require "cjson"
+local cjson2 = cjson.new()
+------------
+
+Lua CJSON can be loaded via +require+. A global +cjson+ table is
+registered under Lua 5.1 to maintain backward compatibility. Lua CJSON
+does not register a global table under Lua 5.2 since this practice is
+discouraged.
+
++cjson.new+ can be used to instantiate an independent copy of the Lua
+CJSON module. The new module has a separate persistent encoding
+buffer, and default settings.
+
+Lua CJSON can support Lua implementations using multiple pre-emptive
+threads within a single Lua state provided the persistent encoding
+buffer is not shared. This can be achieved by one of the following
+methods:
+
+- Disabling the persistent encoding buffer with +encode_keep_buffer+.
+- Ensuring only a single thread calls +encode+ at a time.
+- Using a separate +cjson+ instantiation per pre-emptive thread.
+
+
 decode
 ~~~~~~
 
@@ -423,6 +451,18 @@ Disabled for decoding:: All numbers supported by +strtod+(3) will be parsed.
 API (Variables)
 ---------------
 
+_NAME
+~~~~~
+
+The name of the Lua CJSON module (+"cjson"+).
+
+
+_VERSION
+~~~~~~~~
+
+The version number of the Lua CJSON module (Eg, +"1.0devel"+).
+
+
 null
 ~~~~
 
@@ -430,13 +470,6 @@ Lua CJSON decodes JSON +null+ as a Lua +lightuserdata+ NULL pointer.
 +cjson.null+ is provided for comparison.
 
 
-version
-~~~~~~~
-
-The version number of the Lua CJSON module in use can be found in
-+cjson.version+.
-
-
 [sect1]
 References
 ----------
@@ -445,4 +478,4 @@ References
 - http://www.json.org/[JSON website]
 
 
-// vi:tw=70:
+// vi:ft=asciidoc tw=70: