#108 - fixed. #66 - done.

Author: dedok

Diff for: README.md

@@ -75,6 +75,8 @@ https://hub.docker.com/r/tarantool/tarantool
   * [tnt_select_limit_max](#tnt_select_limit_max)
   * [tnt_allowed_spaces](#tnt_allowed_spaces)
   * [tnt_allowed_indexes](#tnt_allowed_indexes)
+  * [tnt_update](#tnt_update)
+  * [tnt_upsert](#tnt_upsert)
 * [Performance tuning](#performance-tuning)
 * [Examples](#examples)
 * [Copyright & license](#copyright--license)
@@ -904,22 +906,45 @@ A good example is:
 HTTP GET ... /url?space_id=512&value=some+string
 it could be matched by using the following format 'space_id=%%space_id,value=%s'
 ```
+Also this works with HTTP forms, i.e. HTTP POST, HTTP PUT and so on.
 
 Here is a full list of {FMT_TYPE} types:
 
 ```
+TUPLES
+
 %n - int64
 %f - float
 %d - double
 %s - string
 %b - boolean
+
+Special types
+
 %%space_id - space_id
 %%idx_id - index_id
 %%off - [select](#tnt_select) offset
 %%lim - [select](#tnt_select) limit
 %%it - [select](#tnt_select) iterator type, allowed values are:
                              eq,req,all,lt,le,ge,gt,all_set,any_set,
                              all_non_set,overlaps,neighbor
+
+KEYS (for UPDATE)
+
+%kn - int64
+%kf - float
+%kd - double
+%ks - string
+%kb - boolean
+
+Operations (for UPSERT)
+
+%on - int64
+%of - float
+%od - double
+%os - string
+%ob - boolean
+
 ```
 
 Examples can be found at:
@@ -1059,6 +1084,38 @@ This directive works like [tnt_allowed_spaces], but for indexes.
 
 [Back to contents](#contents)
 
+tnt_update
+----------
+**syntax:** *tnt_update [SIZE or off] [KEYS] [FMT]*
+
+**default:** *None*
+
+**context:** *location, location if*
+
+This directive allows executing an update query with Tarantool.
+
+* The first argument is a space id.
+* The second argument is a [KEYS (for UPDATE)](#format) string.
+* The third argument is a [format](#format) string.
+
+[Back to contents](#contents)
+
+tnt_upsert
+----------
+**syntax:** *tnt_upsert [SIZE or off] [FMT] [OPERATIONS]*
+
+**default:** *None*
+
+**context:** *location, location if*
+
+This directive allows executing an upsert query with Tarantool.
+
+* The first argument is a space id.
+* The second argument is a [format](#format) string.
+* The third argument is a [OPERATIONS (for UPSERT)](#format) string.
+
+[Back to contents](#contents)
+
 ## Examples
 -----------
 

Diff for: src/debug.h

@@ -27,7 +27,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Copyright (C) 2015-2017 Tarantool AUTHORS:
+ * Copyright (C) 2015-2018 Tarantool AUTHORS:
  * please see AUTHORS file.
  */
 

Diff for: src/json_encoders.c

@@ -1,3 +1,4 @@
+
 /*
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
@@ -26,7 +27,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Copyright (C) 2016 Tarantool AUTHORS:
+ * Copyright (C) 2016 - 2018 Tarantool AUTHORS:
  * please see AUTHORS file.
  */
 

Diff for: src/json_encoders.h

@@ -1,3 +1,4 @@
+
 /*
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
@@ -26,7 +27,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Copyright (C) 2016 Tarantool AUTHORS:
+ * Copyright (C) 2016 - 2018 Tarantool AUTHORS:
  * please see AUTHORS file.
  */