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

.editorconfig

@@ -1,38 +0,0 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-
-[*.{c,cpp,h,hpp}]
-charset = utf-8
-indent_style = space
-indent_size = 2
-
-# Matches multiple files with brace expansion notation
-# Set default charset
-[*.{js,py}]
-charset = utf-8
-
-# 4 space indentation
-[*.py]
-indent_style = space
-indent_size = 4
-
-# Tab indentation (no size specified)
-[Makefile]
-indent_style = tab
-
-# Indentation override for all JS under lib directory
-[lib/**.js]
-indent_style = space
-indent_size = 2
-
-# Matches the exact files either package.json or .travis.yml
-[{package.json,.travis.yml}]
-indent_style = space
-indent_size = 2

CHANGELOG

@@ -74,7 +74,14 @@ devel
 
 * all lambdas in ClusterInfo might have been left with dangling references.
 
-v3.0.8 (XXXX-XX-XX)
+
+v3.0.9 (XXXX-XX-XX)
+-------------------
+
+* speed up `collection.any()` and skiplist index creation
+
+
+v3.0.8 (2016-09-14)
 -------------------
 
 * fixed issue #2052

Documentation/Books/Manual/Administration/Arangosh/README.mdpp

@@ -67,7 +67,8 @@ For a list of available methods for the *db* object, type
     @END_EXAMPLE_ARANGOSH_OUTPUT
     @endDocuBlock shellHelp
 
-you can paste multiple lines into arangosh, given the first line ends with an opening brace:
+you can paste multiple lines into arangosh, given the first line ends with an
+opening brace:
 
     @startDocuBlockInline shellPaste
     @EXAMPLE_ARANGOSH_OUTPUT{shellPaste}
@@ -78,22 +79,27 @@ you can paste multiple lines into arangosh, given the first line ends with an op
     @endDocuBlock shellPaste
 
 
-To load your own JavaScript code into the current JavaScript interpreter context, use the load command:
+To load your own JavaScript code into the current JavaScript interpreter context,
+use the load command:
 
     require("internal").load("/tmp/test.js")     // <- Linux / MacOS
     require("internal").load("c:\\tmp\\test.js") // <- Windows
 
-Exiting arangosh can be done using the key combination ```<CTRL> + D``` or by typing ```quit<CR>```
-
+Exiting arangosh can be done using the key combination ```<CTRL> + D``` or by
+typing ```quit<CR>```
 
 !SUBSECTION Escaping
-In Arangosh as in AQL escaping is done traditionaly with the backslash character: `\`.
-As seen above, this leads to double backslashes when specifying windows paths.
-If you want to then execute an AQL command, you need to double the escaping:
 
-     db._query('RETURN "c:\\\\tmp\\\\test.js"')
+In AQL, escaping is done traditionally with the backslash character: `\`.
+As seen above, this leads to double backslashes when specifying Windows paths.
+Arangosh requires another level of escaping, also with the backslash character.
+It adds up to four backslashes that need to be written in Arangosh for a single
+literal backslash (`c:\tmp\test.js`):
 
-You can use [bind variables](../../../AQL/Invocation/WithArangosh.html) to work around this:
+    db._query('RETURN "c:\\\\tmp\\\\test.js"')
+
+You can use [bind variables](../../../AQL/Invocation/WithArangosh.html) to
+mitigate this:
 
     var somepath = "c:\\tmp\\test.js"
     db._query(aql`RETURN ${somepath}`)