diff --git a/Documentation/Examples/api-graph-change-edge b/Documentation/Examples/api-graph-change-edge
index 7d7b60996b..83b5b54cc3 100644
--- a/Documentation/Examples/api-graph-change-edge
+++ b/Documentation/Examples/api-graph-change-edge
@@ -3,6 +3,7 @@
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
+etag: 57595391
 
 {
   "edge": {
diff --git a/Documentation/Examples/api-graph-change-vertex b/Documentation/Examples/api-graph-change-vertex
index 977c61d06d..afe0720c4d 100644
--- a/Documentation/Examples/api-graph-change-vertex
+++ b/Documentation/Examples/api-graph-change-vertex
@@ -3,6 +3,7 @@
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
+etag: 24332190
 
 {
   "vertex": {
diff --git a/Documentation/Examples/api-graph-changep-edge b/Documentation/Examples/api-graph-changep-edge
index 7c5d1c4c67..49ed8b0c69 100644
--- a/Documentation/Examples/api-graph-changep-edge
+++ b/Documentation/Examples/api-graph-changep-edge
@@ -3,6 +3,7 @@
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
+etag: 57595398
 
 {
   "edge": {
diff --git a/Documentation/Examples/api-graph-changep-vertex b/Documentation/Examples/api-graph-changep-vertex
index 0137b4e38f..9cfce7dd94 100644
--- a/Documentation/Examples/api-graph-changep-vertex
+++ b/Documentation/Examples/api-graph-changep-vertex
@@ -3,6 +3,7 @@
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
+etag: 24332193
 
 {
   "vertex": {
@@ -21,6 +22,7 @@ content-type: application/json; charset=utf-8
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
+etag: 24332199
 
 {
   "vertex": {
diff --git a/Documentation/Examples/api-graph-create-edge b/Documentation/Examples/api-graph-create-edge
index cf473d52c7..543b2c7b1b 100644
--- a/Documentation/Examples/api-graph-create-edge
+++ b/Documentation/Examples/api-graph-create-edge
@@ -3,6 +3,7 @@
 
 HTTP/1.1 201 Created
 content-type: application/json; charset=utf-8
+etag: 57595366
 
 {
   "edge": {
diff --git a/Documentation/Examples/api-graph-create-graph b/Documentation/Examples/api-graph-create-graph
index f8181f2635..a6333c5dc7 100644
--- a/Documentation/Examples/api-graph-create-graph
+++ b/Documentation/Examples/api-graph-create-graph
@@ -3,6 +3,7 @@
 
 HTTP/1.1 201 Created
 content-type: application/json; charset=utf-8
+etag: 11767958
 
 {
   "graph": {
diff --git a/Documentation/Examples/api-graph-create-vertex b/Documentation/Examples/api-graph-create-vertex
index 0ecd55ff4b..bfb7fac895 100644
--- a/Documentation/Examples/api-graph-create-vertex
+++ b/Documentation/Examples/api-graph-create-vertex
@@ -3,6 +3,7 @@
 
 HTTP/1.1 201 Created
 content-type: application/json; charset=utf-8
+etag: 24332177
 
 {
   "vertex": {
diff --git a/Documentation/Examples/api-graph-get-edge b/Documentation/Examples/api-graph-get-edge
index b498e2f92e..1c39513c66 100644
--- a/Documentation/Examples/api-graph-get-edge
+++ b/Documentation/Examples/api-graph-get-edge
@@ -2,6 +2,7 @@
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
+etag: 57595366
 
 {
   "edge": {
diff --git a/Documentation/Examples/api-graph-get-graph b/Documentation/Examples/api-graph-get-graph
index 3da1b88c89..b70ac4e765 100644
--- a/Documentation/Examples/api-graph-get-graph
+++ b/Documentation/Examples/api-graph-get-graph
@@ -2,6 +2,7 @@
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
+etag: 11767958
 
 {
   "graph": {
diff --git a/Documentation/Examples/api-graph-get-vertex b/Documentation/Examples/api-graph-get-vertex
index 8af5c7e97e..f425170483 100644
--- a/Documentation/Examples/api-graph-get-vertex
+++ b/Documentation/Examples/api-graph-get-vertex
@@ -2,6 +2,7 @@
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
+etag: 24332177
 
 {
   "vertex": {
diff --git a/js/actions/system/api-graph.js b/js/actions/system/api-graph.js
index cc1e5576ca..0a75a9a7c9 100644
--- a/js/actions/system/api-graph.js
+++ b/js/actions/system/api-graph.js
@@ -680,7 +680,7 @@ function update_graph_vertex (req, res, g, isPatch) {
 /// @RESTQUERYPARAMETERS
 /// 
 /// @RESTQUERYPARAM{waitForSync,boolean,optional}
-/// Wait until document has been sync to disk.
+/// Wait until vertex has been sync to disk.
 ///
 /// @RESTQUERYPARAM{rev,string,optional}
 /// Revision of a vertex
@@ -733,7 +733,7 @@ function put_graph_vertex (req, res, g) {
 /// @RESTQUERYPARAMETERS
 /// 
 /// @RESTQUERYPARAM{waitForSync,boolean,optional}
-/// Wait until document has been sync to disk.
+/// Wait until vertex has been sync to disk.
 ///
 /// @RESTQUERYPARAM{rev,string,optional}
 /// Revision of a vertex
@@ -892,6 +892,11 @@ function process_labels_filter (data, labels) {
 /// - @LIT{value}: the value of the @LIT{key}
 /// - @LIT{compare}: a compare operator
 //
+/// @RESTRETURNCODES
+/// 
+/// @RESTRETURNCODE{201}
+/// is returned if the cursor was created
+///
 /// @EXAMPLES
 ///
 /// Select all vertices
@@ -950,8 +955,7 @@ function post_graph_all_vertices (req, res, g) {
 ///
 /// @RESTHEADER{POST /_api/graph/@FA{graph-name}/vertices/@FA{vertice-name},get vertices}
 ///
-/// @REST{POST /_api/graph/@FA{graph-name}/vertices/@FA{vertice-name}}
-///
+/// @RESTDESCRIPTION
 /// Returns a cursor.
 ///
 /// The call expects a JSON hash array as body to filter the result:
@@ -972,6 +976,11 @@ function post_graph_all_vertices (req, res, g) {
 /// - @LIT{value}: the value of the @LIT{key}
 /// - @LIT{compare}: a compare operator
 ///
+/// @RESTRETURNCODES
+/// 
+/// @RESTRETURNCODE{201}
+/// is returned if the cursor was created
+///
 /// @EXAMPLES
 ///
 /// Select all vertices
@@ -1076,7 +1085,7 @@ function post_graph_vertex_vertices (req, res, g) {
 /// @RESTQUERYPARAMETERS
 /// 
 /// @RESTQUERYPARAM{waitForSync,boolean,optional}
-/// Wait until document has been sync to disk.
+/// Wait until edge has been sync to disk.
 ///
 /// @RESTDESCRIPTION
 /// Creates an edge in a graph.
@@ -1217,7 +1226,7 @@ function get_graph_edge (req, res, g) {
 /// @RESTQUERYPARAMETERS
 /// 
 /// @RESTQUERYPARAM{waitForSync,boolean,optional}
-/// Wait until document has been sync to disk.
+/// Wait until edge has been sync to disk.
 ///
 /// @RESTQUERYPARAM{rev,string,optional}
 /// Revision of an edge
@@ -1352,7 +1361,7 @@ function update_graph_edge (req, res, g, isPatch) {
 /// @RESTQUERYPARAMETERS
 /// 
 /// @RESTQUERYPARAM{waitForSync,boolean,optional}
-/// Wait until document has been sync to disk.
+/// Wait until edge has been sync to disk.
 ///
 /// @RESTQUERYPARAM{rev,string,optional}
 /// Revision of an edge
@@ -1405,7 +1414,7 @@ function put_graph_edge (req, res, g) {
 /// @RESTQUERYPARAMETERS
 /// 
 /// @RESTQUERYPARAM{waitForSync,boolean,optional}
-/// Wait until document has been sync to disk.
+/// Wait until edge has been sync to disk.
 ///
 /// @RESTQUERYPARAM{rev,string,optional}
 /// Revision of an edge
@@ -1466,8 +1475,7 @@ function patch_graph_edge (req, res, g) {
 ///
 /// @RESTHEADER{POST /_api/graph/@FA{graph-name}/edges,get edges}
 ///
-/// @REST{POST /_api/graph/@FA{graph-name}/edges}
-///
+/// @RESTDESCRIPTION
 /// Returns a cursor.
 ///
 /// The call expects a JSON hash array as body to filter the result:
@@ -1486,6 +1494,11 @@ function patch_graph_edge (req, res, g) {
 /// - @LIT{value}: the value of the @LIT{key}
 /// - @LIT{compare}: a compare operator
 ///
+/// @RESTRETURNCODES
+/// 
+/// @RESTRETURNCODE{201}
+/// is returned if the cursor was created
+///
 /// @EXAMPLES
 ///
 /// Select all edges
@@ -1577,6 +1590,11 @@ function post_graph_all_edges (req, res, g) {
 /// - @LIT{value}: the value of the @LIT{key}
 /// - @LIT{compare}: a compare operator
 ///
+/// @RESTRETURNCODES
+/// 
+/// @RESTRETURNCODE{201}
+/// is returned if the cursor was created
+///
 /// @EXAMPLES
 ///
 /// Select all edges