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

…-fix/optimization-of-nested-collect * 'devel' of https://github.com/arangodb/arangodb: fix asan issue (#9540) Docs: Add missing Cookbook placeholder folder Remove documentation, now here: github.com/arangodb/docs (#8918) Revert "Fix name of example graph in k Shortest Paths documentation (#8972)" Docs: Revert more accidental changes fixed an issue with smart joins if both collections were restricted to a (#9535) Remove some minReplicationFactor doc changes, fix indent Bug fix/internal issue #566 (#9497)
arangodb · Jul 23, 2019 · 64f1810 · 64f1810
2 parents 75c9151 + 2f3c12e
commit 64f1810
Show file tree

Hide file tree

Showing 1,594 changed files with 1,070 additions and 141,415 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,8 +5,6 @@ scripts/unittest eol=lf
 *.groovy eol=lf
 *.csv binary
 *.json eol=lf
-Documentation/Books/SummaryBlacklist.txt eol=lf
-Documentation/Examples/*.generated merge=ours
 VERSION merge=ours
 STARTER_REV merge=ours
 lib/V8/v8-json.cpp merge=ours

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,12 @@
 devel
 -----
 
+* removed content from Documentation/Books, but keeping the subfolders.
+  The documentation is in a separate repository (except DocuBlocks and Scripts):
+  https://github.com/arangodb/docs.git
+
+* TOKENS function updated to deal with primitive types and arrays
+
 * MinReplicationFactor:
   Collections can now be created with a minimal replication factor (minReplicationFactor) default 1.
   If minReplicationFactor > 1 a collection will go into "read-only" mode as soon as it has less then minReplicationFactor

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -296,18 +296,18 @@ set(ARANGODB_PACKAGE_VENDOR  "ArangoDB GmbH")
 set(ARANGODB_PACKAGE_CONTACT "info@arangodb.com")
 set(ARANGODB_DISPLAY_NAME    "ArangoDB")
 set(ARANGODB_URL_INFO_ABOUT  "https://www.arangodb.com")
-set(ARANGODB_HELP_LINK       "https://docs.arangodb.com/${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR}/")
+set(ARANGODB_HELP_LINK       "https://www.arangodb.com/docs/${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR}/")
 set(ARANGODB_CONTACT         "hackers@arangodb.com")
 set(ARANGODB_FRIENDLY_STRING "ArangoDB - the native multi-model NoSQL database")
 
 # MSVC
-set(ARANGO_BENCH_FRIENDLY_STRING   "arangobench - stress test program")
-set(ARANGO_DUMP_FRIENDLY_STRING    "arangodump - export")
-set(ARANGO_RESTORE_FRIENDLY_STRING "arangrestore - importer")
-set(ARANGO_EXPORT_FRIENDLY_STRING  "arangoexport - datae xporter")
-set(ARANGO_IMPORT_FRIENDLY_STRING  "arangoimport - TSV/CSV/JSON importer")
-set(ARANGOSH_FRIENDLY_STRING       "arangosh - commandline client")
-set(ARANGO_VPACK_FRIENDLY_STRING   "arangovpack - vpack printer")
+set(ARANGO_BENCH_FRIENDLY_STRING   "arangobench - stress test tool")
+set(ARANGO_DUMP_FRIENDLY_STRING    "arangodump - dump data and configuration")
+set(ARANGO_RESTORE_FRIENDLY_STRING "arangrestore - restore data and configuration")
+set(ARANGO_EXPORT_FRIENDLY_STRING  "arangoexport - data exporter")
+set(ARANGO_IMPORT_FRIENDLY_STRING  "arangoimport - data importer")
+set(ARANGOSH_FRIENDLY_STRING       "arangosh - command-line client")
+set(ARANGO_VPACK_FRIENDLY_STRING   "arangovpack - VelocyPack pretty-printer")
 
 # libraries
 set(LIB_ARANGO        arango)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -33,12 +33,8 @@ Contributing features, documentation, tests
   commit message so the issues will get updated automatically with comments.
 
 * If the modifications change any documented behavior or add new features,
-  document the changes. The documentation can be found in arangod/Documentation
-  directory. To recreate the documentation locally, run make doxygen. This will
-  re-create all documentation files in the Doxygen directory in your
-  repository. You can inspect the documentation in this folder using a text
-  editor or a browser. We recently agreed that future documentation should be
-  written in American English (AE).
+  document the changes. It should be written in American English.
+  The documentation can be found at https://github.com/arangodb/docs
 
 * When done, run the complete test suite and make sure all tests pass. You can
   check [README_maintainers.md](README_maintainers.md) for test run instructions.

diff --git a/Documentation/Books/.gitignore b/Documentation/Books/.gitignore
diff --git a/Documentation/Books/AQL/.gitkeep b/Documentation/Books/AQL/.gitkeep
@@ -0,0 +1,5 @@
+Git can not track empty repositories.
+This file ensures that the directory is kept.
+
+Some of the old documentation building scripts are still
+used by the new system which copy files into this folder.
diff --git a/Documentation/Books/AQL/Advanced/ArrayOperators.md b/Documentation/Books/AQL/Advanced/ArrayOperators.md
diff --git a/Documentation/Books/AQL/Advanced/README.md b/Documentation/Books/AQL/Advanced/README.md