Removed obsolete utility application 'ujson-merge'. Updated man pages.

README

@@ -5,7 +5,7 @@ libujson - A Json library for C++ developers.
 Utility applications for handling JSON documents:
 
 ujson-verify - Verify the syntax of one or more JSON documents.
-ujson-get    - Get a specific value from a JSON document.
+ujson-get    - Get a specific value from a JSON document using a JSON pointer. JSON pointers are described in RFC 6901.
 ujson-cmp    - Check if two JSON documents are equal.
 ujson-print  - Print a JSON document to standard output in a few different ways.
-ujson-merge  - Merge two or more JSON documents.
+ujson-patch  - Patch JSON documents. JSON patches are described in RFC 6902.

utils/Makefile.am

@@ -38,9 +38,6 @@ ujson_cmp_SOURCES = ujson-cmp.cpp
 bin_PROGRAMS += ujson-get
 ujson_get_SOURCES = ujson-get.cpp
 
-bin_PROGRAMS += ujson-merge
-ujson_merge_SOURCES = ujson-merge.cpp
-
 bin_PROGRAMS += ujson-patch
 ujson_patch_SOURCES = ujson-patch.cpp
 
@@ -49,7 +46,6 @@ dist_man1_MANS += ujson-verify.man
 dist_man1_MANS += ujson-print.man
 dist_man1_MANS += ujson-cmp.man
 dist_man1_MANS += ujson-get.man
-dist_man1_MANS += ujson-merge.man
-#dist_man1_MANS += ujson-patch.man
+dist_man1_MANS += ujson-patch.man
 
 endif

utils/ujson-cmp.man

@@ -73,7 +73,7 @@ Example of a JSON document that is allowed in relaxed mode:
 .EE
 
 .SH SEE ALSO
-ujson-verify(1) ujson-print(1) ujson-get(1) ujson-merge(1)
+ujson-print(1) ujson-get(1) ujson-verify(1) ujson-patch(1)
 
 
 .SH AUTHOR

utils/ujson-get.man

@@ -36,7 +36,7 @@ A JSON Pointer as described in RFC 6901.
 A pointer specifies a specific value in a JSON document. Is is a string containing zero or more reference tokens separated by '/'. If a '/' is part of a token it is encoded as '~1'. And if a '~' is parf of a token it is encoded as '~0'.
 
 .SH SEE ALSO
-ujson-verify(1) ujson-cmp(1) ujson-print(1) ujson-merge(1)
+ujson-print(1) ujson-verify(1) ujson-cmp(1) ujson-patch(1)
 
 
 .SH AUTHOR