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

Documentation/Books/AQL/Functions/Miscellaneous.mdpp

@@ -123,6 +123,8 @@ DOCUMENT("users/john")
 DOCUMENT( [ "users/john", "users/amy" ] )
 ```
 
+Please also consider [to use `DOCUMENT` in conjunction with `WITH`](../Operations/With.md)
+
 ### LENGTH()
 
 `LENGTH(coll) → documentCount`

Documentation/Books/AQL/Graphs/ShortestPath.mdpp

@@ -117,6 +117,8 @@ shortest path where all edges are of type *X*". If you want to do this, use a
 normal [Traversal](Traversals.md) instead with the option `{bfs: true}` in
 combination with `LIMIT 1`.
 
+Please also consider [to use `WITH`](../Operations/With.md) to specify the collections you expect to be involved.
+
 Examples
 --------
 We will create a simple symmetric traversal demonstration graph:

Documentation/Books/AQL/Graphs/Traversals.mdpp

@@ -402,6 +402,8 @@ have edges in other directions and they will be traversed.
 if it walks from **E** to **F**, it will continue to walk from **F** to **E**
 using the same edge once again. Due to this we will see duplicate nodes in the result.
 
+Please also consider [to use `WITH`](../Operations/With.md) to specify the collections you expect to be involved.
+
 Please note that the direction can't be passed in by a bind parameter.
 
 Use the AQL explainer for optimizations

Documentation/Books/Makefile

@@ -425,12 +425,11 @@ build-books:
 
 
 build-dist-books:
+	set -x ; set -e ; \
 	PIDFILE=/tmp/xvfb_20_0.pid; \
 	if test -z "$${DISPLAY}"; then \
 		make start_X11_display PIDFILE=$${PIDFILE} DISP=':20.0'; \
-	fi; \
-	set -x ; \
-	if test -z "$${DISPLAY}"; then \
+		trap 'make stop_X11_display PIDFILE="$${PIDFILE}"' 0; \
 		DISP=:20.0; \
 	else \
 		DISPL="$${DISPLAY}"; \
@@ -438,7 +437,7 @@ build-dist-books:
 	make build-books DISPLAY="$${DISP}"; \
 	mkdir -p ${OUTPUT_DIR} ; \
 	( \
-		mv books ArangoDB-${newVersionNumber} ; \
+		mv books ArangoDB-${newVersionNumber} ; pwd; \
 		if test -n "${COOKBOOK_DIR}" ; then \
 			cp -a ${COOKBOOK_DIR} ArangoDB-${newVersionNumber}/cookbook ; \
 		fi ; \
@@ -446,8 +445,6 @@ build-dist-books:
 		mv ArangoDB-${newVersionNumber} books ; \
 	) ; \
 	for book in $(ALLBOOKS); do \
-		make build-book-dist NAME=$${book} DISPLAY="$${DISP}" ; \
+	    make build-book-dist NAME=$${book} DISPLAY="$${DISP}" ; \
 	done; \
-	if test -z "$${DISPLAY}"; then \
-		make stop_X11_display PIDFILE="$${PIDFILE}"; \
-	fi
+	exit $$rc

arangod/V8Server/v8-collection.cpp

@@ -1983,7 +1983,7 @@ static void JS_PregelStart(v8::FunctionCallbackInfo<v8::Value> const& args) {
   c->start();
   c.release();
   
-  TRI_V8_RETURN(v8::Number::New(isolate, en));
+  TRI_V8_RETURN(v8::Number::New(isolate, static_cast<double>(en)));
   TRI_V8_TRY_CATCH_END
 }