From 953d5efa7ae8fc725cb8601b341ab8a6ee787a11 Mon Sep 17 00:00:00 2001
From: Tomas Bosak <bosak.tomas@gmail.com>
Date: Wed, 10 Dec 2014 23:24:32 +0100
Subject: [PATCH] Add 'mergeObjects' description to edge API docs.

Description of 'mergeObjects' parameter was missing in edge update
(PATCH) operation.
---
 arangod/RestHandler/RestEdgeHandler.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arangod/RestHandler/RestEdgeHandler.cpp b/arangod/RestHandler/RestEdgeHandler.cpp
index 1af5347de9..937f1c662b 100644
--- a/arangod/RestHandler/RestEdgeHandler.cpp
+++ b/arangod/RestHandler/RestEdgeHandler.cpp
@@ -627,6 +627,12 @@ bool RestEdgeHandler::createDocumentCoordinator (string const& collname,
 /// from the existing edge document that are contained in the patch document with an
 /// attribute value of *null*.
 ///
+/// @RESTQUERYPARAM{mergeObjects,boolean,optional}
+/// Controls whether objects (not arrays) will be merged if present in both the
+/// existing and the patch edge. If set to *false*, the value in the
+/// patch edge will overwrite the existing edge's value. If set to
+/// *true*, objects will be merged. The default is *true*.
+///
 /// @RESTQUERYPARAM{waitForSync,boolean,optional}
 /// Wait until edge document has been synced to disk.
 ///