Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

Documentation/Books/Users/Foxx/FoxxController.mdpp

@@ -215,7 +215,7 @@ system collection are allowed to use the applications.
 
 Since ArangoDB 1.4, there is an extra option to restrict the authentication to 
 just system API calls, such as */_api/...* and */_admin/...*. This option can be 
-turned on using the @ref CommandLineArangoAuthenticateSystemOnly 
+turned on using the  
 "server.authenticate-system-only" configuration option. If it is turned on, 
 then only system API requests need authentication whereas all requests to Foxx 
 applications and routes will not require authentication. 

js/actions/api-cluster.js

@@ -583,7 +583,6 @@ actions.defineHttp({
 });
 
 ////////////////////////////////////////////////////////////////////////////////
-/// @startDocuBlock JSF_cluster_statistics_GET
 /// @brief allows to query the statistics of a DBserver in the cluster
 ///
 /// @RESTHEADER{GET /_admin/clusterStatistics, Queries statistics of DBserver}
@@ -602,7 +601,6 @@ actions.defineHttp({
 /// ID of a DBserver
 ///
 /// @RESTRETURNCODE{403} server is not a coordinator.
-/// @endDocuBlock
 ////////////////////////////////////////////////////////////////////////////////
 
 actions.defineHttp({

js/server/modules/org/arangodb/ahuacatl.js

@@ -5949,11 +5949,14 @@ function GENERAL_GRAPH_EDGES (
 
   var neighbors = GENERAL_GRAPH_NEIGHBORS(graphName,
     vertexExample,
-    options), result = [];
+    options), result = [],ids = [];
 
   neighbors.forEach(function (n) {
     n.path.edges.forEach(function (e) {
-      result = result.concat(e);
+      if (ids.indexOf(e._id) === -1) {
+        result.push(e);
+        ids.push(e._id);
+      }
     });
   });
 

js/server/modules/org/arangodb/foxx/request_context.js

@@ -323,13 +323,10 @@ extend(RequestContext.prototype, {
   },
 
 ////////////////////////////////////////////////////////////////////////////////
-/// @startDocuBlock JSF_foxx_RequestContext_summary
-///
 /// `FoxxController::summary(description)`
 ///
 /// Set the summary for this route in the documentation. Can't be longer than 60.
 /// characters
-/// @endDocuBlock
 ////////////////////////////////////////////////////////////////////////////////
 
   summary: function (summary) {
@@ -342,12 +339,9 @@ extend(RequestContext.prototype, {
   },
 
 ////////////////////////////////////////////////////////////////////////////////
-/// @startDocuBlock JSF_foxx_RequestContext_notes
-///
 /// `FoxxController::notes(description)`
 ///
 /// Set the notes for this route in the documentation
-/// @endDocuBlock
 ////////////////////////////////////////////////////////////////////////////////
 
   notes: function (notes) {

js/server/tests/ahuacatl-general-graph.js

@@ -132,14 +132,11 @@ function ahuacatlQueryGeneralEdgesTestSuite() {
       actual = getQueryResults("FOR e IN GRAPH_EDGES('bla3', [{hugo : true}, {heinz : 1}], {direction : 'any'}) " +
         "SORT e.what RETURN e.what");
       assertEqual(actual, [ "v1->v2",
-        "v1->v2",
         "v1->v5",
         "v2->v1",
-        "v2->v1",
         "v2->v5",
         "v3->v5",
         "v3->v6",
-        "v3->v8",
         "v3->v8" ]);
 
       actual = getRawQueryResults("FOR e IN GRAPH_VERTICES('bla3', [{hugo : true}, {heinz : 1}], {direction : 'any'}) SORT e._id RETURN e");