diff --git a/CHANGELOG b/CHANGELOG
index 6066a3a456..8c112b6eec 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 v2.6.0-beta4 (2015-06-16)
 -------------------------
 
+* using negative values for `SimpleQuery.skip()` is deprecated. 
+  This functionality will be removed in future versions of ArangoDB.
+
 * The following simple query functions are now deprecated:
 
   * collection.near
diff --git a/DEPRECATED.md b/DEPRECATED.md
index ab5b02658f..6a13069ff3 100644
--- a/DEPRECATED.md
+++ b/DEPRECATED.md
@@ -29,6 +29,7 @@ ArangoDB and shouldn't be used if possible.
 * Foxx: the Foxx sessions option `sessionStorageApp` is deprecated, it will raise a warning if you use it. Please use the option `sessionStorage` instead.
 * AQL: the AQL function `SKIPLIST` is deprecated. It will be removed in a future version of ArangoDB. Please use regular AQL constructs instead (e.g. `FOR doc IN collection FILTER doc.value >= @value SORT doc.value DESC LIMIT 1 RETURN doc`).
 * Simple queries: the following simple query functions are now deprecated: collection.near(), collection.within(), collection.geo(), collection.fulltext(), collection.range(), collection.closedRange(). It is recommended to replace calls to these functions with equivalent AQL queries, which are more flexible.
+* Simple queries: using negative values for SimpleQuery.skip() is deprecated. This functionality will be removed in future versions of ArangoDB.
 
 
 ## 2.7
@@ -41,6 +42,7 @@ ArangoDB and shouldn't be used if possible.
 * The module `org/arangodb/extend` is deprecated. Please use the module `extendible` instead.
 * AQL: the AQL function `SKIPLIST` has been removed.
 * Simple queries: the following simple query functions are now deprecated: collection.near(), collection.within(), collection.geo(), collection.fulltext(), collection.range(), collection.closedRange(). It is recommended to replace calls to these functions with equivalent AQL queries, which are more flexible.
+* Simple queries: using negative values for SimpleQuery.skip() is not supported any longer.
 
 
 ## 2.8
diff --git a/Documentation/Books/Users/Upgrading/UpgradingChanges26.mdpp b/Documentation/Books/Users/Upgrading/UpgradingChanges26.mdpp
index f3d791ed99..d216c50258 100644
--- a/Documentation/Books/Users/Upgrading/UpgradingChanges26.mdpp
+++ b/Documentation/Books/Users/Upgrading/UpgradingChanges26.mdpp
@@ -277,6 +277,9 @@ which are more flexible because they can be combined with other operations:
 The above simple query functions and REST API methods may be removed in future versions 
 of ArangoDB.
 
+Using negative values for `SimpleQuery.skip()` is also deprecated. 
+This functionality will be removed in future versions of ArangoDB.
+
 !SUBSECTION AQL functions
 
 The AQL `SKIPLIST` function has been deprecated because it is obsolete.
diff --git a/Documentation/Books/codeBlockReader.py b/Documentation/Books/codeBlockReader.py
index efc71ce5ac..35fdb99d2c 100644
--- a/Documentation/Books/codeBlockReader.py
+++ b/Documentation/Books/codeBlockReader.py
@@ -5,7 +5,9 @@ import inspect
 import cgi
 
 validExtensions = (".cpp", ".h", ".js")
-searchPaths = ["arangod/", "lib/", "js/"]
+# specify the paths in which docublocks are searched. note that js/apps/* must not be included because it contains js/apps/system/
+# and that path also contains copies of some files present in js/ anyway.
+searchPaths = ["arangod/", "lib/", "js/actions", "js/client", "js/apps/system/cerberus", "js/apps/system/gharial", "js/common", "js/server"]
 fullSuccess = True
 
 def file_content(filepath):
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/mimetypes.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/mimetypes.js
index 372b2bdf66..afc4107012 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/mimetypes.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/mimetypes.js
@@ -6,6 +6,7 @@ module.define("org/arangodb/mimetypes", function(exports, module) {
          vars: true,
          white: true,
          plusplus: true */
+/*global exports */
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief auto-generated file generated from mimetypes.dat
diff --git a/js/common/modules/org/arangodb/mimetypes.js b/js/common/modules/org/arangodb/mimetypes.js
index 6bb9e98b88..2f6b0b7edd 100644
--- a/js/common/modules/org/arangodb/mimetypes.js
+++ b/js/common/modules/org/arangodb/mimetypes.js
@@ -5,6 +5,7 @@
          vars: true,
          white: true,
          plusplus: true */
+/*global exports */
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief auto-generated file generated from mimetypes.dat