Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

Documentation/Books/Users/Aql/GraphFunctions.mdpp

@@ -72,7 +72,10 @@ with the option *includeVertices* set to true.
       NEIGHBORS(users, usersrelations, "users/john", "any", [ { "$label": "recommends" } ], {includeData: true})
 
 
-!SECTION General-purpose traversals
+!SECTION General Purpose Traversals
+
+General purpose traversals with its extendability by visitor functions offer more possibilities over the newer [AQL graph traversals](../Aql/GraphTraversals.md),
+however unless you need some of these features you should [prefer AQL graph traversals](../Aql/GraphTraversals.md).
 
 !SUBSECTION Traversal
 *TRAVERSAL(vertexcollection, edgecollection, startVertex, direction, options)*: 
@@ -529,7 +532,7 @@ In order to keep the result set consistent between *includeData* enabled or disa
 
 When using any of AQL's general purpose traversal functions, please make sure that the graph 
 does not contain cycles, or that you at least specify some maximum depth or uniqueness 
-criteria for a traversal. 
+criteria for a traversal. In contrast [AQL graph traversals](../Aql/GraphTraversals.md) won't trap on cycles.
 
 If no bounds are set, a traversal may run into an endless loop in a cyclic graph or sub-graph.
 Even in a non-cyclic graph, traversing far into the graph may consume a lot of processing
@@ -542,5 +545,3 @@ process is specified by the optional *maxIterations* configuration value. If the
 vertices processed in a traversal reaches this cap will, the traversal will abort and throw
 a *too many iterations* exception.
 
-
-

Documentation/Books/Users/Aql/GraphTraversals.mdpp

@@ -34,6 +34,7 @@ Now it walks to one of the direct neighbors of **A**, say **B** (NOTE: ordering
 ![traversal graph step 2](../Graphs/traversal_graph2.png)
 
 The query will remember the state (red circle) and will emit the first result **A** -> **B** (black box).
+This will also prevent the traverser to be trapped in cycles.
 Now again it will visit one of the direct neighbors of **B**, say **E**:
 
 ![traversal graph step 3](../Graphs/traversal_graph3.png)

arangod/RestServer/WindowsServiceUtils.cpp

@@ -632,8 +632,10 @@ static void WINAPI ServiceMain(DWORD dwArgc, LPSTR* lpszArgv) {
 bool TRI_ParseMoreArgs(int argc, char* argv[]) {
   SetUnhandledExceptionFilter(unhandledExceptionHandler);
 
+#if 0
+  /// this is slower than valgrind: 
   _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF | _CRTDBG_CHECK_ALWAYS_DF );
-
+#endif
   if (1 < argc) {
     if (TRI_EqualString(argv[1], "--install-service")) {
       InstallService(argc, argv);