diff --git a/CMakeLists.txt b/CMakeLists.txt index 33d88e1073..cb98745ff6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,7 +88,7 @@ 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_CONTACT "hackers@arangodb.com") -set(ARANGODB_FRIENDLY_STRING "ArangoDB - the multi-model database") +set(ARANGODB_FRIENDLY_STRING "ArangoDB - the native multi-model NoSQL database") # MSVC set(ARANGO_BENCH_FRIENDLY_STRING "arangobench - stress test program") diff --git a/Documentation/Books/AQL/FOOTER.html b/Documentation/Books/AQL/FOOTER.html new file mode 100644 index 0000000000..239869bfaf --- /dev/null +++ b/Documentation/Books/AQL/FOOTER.html @@ -0,0 +1 @@ +© ArangoDB - the native multi-model NoSQL database \ No newline at end of file diff --git a/Documentation/Books/AQL/book.json b/Documentation/Books/AQL/book.json index 9346be0e63..abe74fef98 100644 --- a/Documentation/Books/AQL/book.json +++ b/Documentation/Books/AQL/book.json @@ -2,9 +2,9 @@ "gitbook": "^3.2.2", "title": "ArangoDB VERSION_NUMBER AQL Documentation", "author": "ArangoDB GmbH", - "description": "Official AQL manual for ArangoDB - the multi-model NoSQL database", + "description": "Official AQL manual for ArangoDB - the native multi-model NoSQL database", "language": "en", - "plugins":["-search", "-lunr", "-sharing", "toggle-chapters", "addcssjs", "anchorjs", "sitemap-general", "ga", "edit-link"], + "plugins":["-search", "-lunr", "-sharing", "toggle-chapters", "addcssjs", "anchorjs", "sitemap-general", "ga", "edit-link", "localized-footer"], "pdf": { "fontSize": 12, "toc": true, @@ -32,6 +32,9 @@ "edit-link": { "base": "https://github.com/arangodb/arangodb/edit/devel/Documentation/Books/AQL", "label": "Edit Page" + }, + "localized-footer": { + "filename": "FOOTER.html" } } } diff --git a/Documentation/Books/AQL/styles/website.css b/Documentation/Books/AQL/styles/website.css index 0c646cc6f9..840957d0d4 100644 --- a/Documentation/Books/AQL/styles/website.css +++ b/Documentation/Books/AQL/styles/website.css @@ -32,6 +32,10 @@ div.example_show_button { columns: 3; } +.page-footer { + opacity: 0.5; +} + .gsib_a { padding: 0px !important; } diff --git a/Documentation/Books/HTTP/FOOTER.html b/Documentation/Books/HTTP/FOOTER.html new file mode 100644 index 0000000000..239869bfaf --- /dev/null +++ b/Documentation/Books/HTTP/FOOTER.html @@ -0,0 +1 @@ +© ArangoDB - the native multi-model NoSQL database \ No newline at end of file diff --git a/Documentation/Books/HTTP/book.json b/Documentation/Books/HTTP/book.json index f951c8cb39..bbfa78fe5a 100644 --- a/Documentation/Books/HTTP/book.json +++ b/Documentation/Books/HTTP/book.json @@ -2,9 +2,9 @@ "gitbook": "^3.2.2", "title": "ArangoDB VERSION_NUMBER HTTP API Documentation", "author": "ArangoDB GmbH", - "description": "Official HTTP API manual for ArangoDB - the multi-model NoSQL database", + "description": "Official HTTP API manual for ArangoDB - the native multi-model NoSQL database", "language": "en", - "plugins":["-search", "-lunr", "-sharing", "toggle-chapters", "addcssjs", "anchorjs", "sitemap-general", "ga", "edit-link"], + "plugins":["-search", "-lunr", "-sharing", "toggle-chapters", "addcssjs", "anchorjs", "sitemap-general", "ga", "edit-link", "localized-footer"], "pdf": { "fontSize": 12, "toc": true, @@ -32,6 +32,9 @@ "edit-link": { "base": "https://github.com/arangodb/arangodb/edit/devel/Documentation/Books/HTTP", "label": "Edit Page" + }, + "localized-footer": { + "filename": "FOOTER.html" } } } diff --git a/Documentation/Books/HTTP/styles/website.css b/Documentation/Books/HTTP/styles/website.css index 0c646cc6f9..840957d0d4 100644 --- a/Documentation/Books/HTTP/styles/website.css +++ b/Documentation/Books/HTTP/styles/website.css @@ -32,6 +32,10 @@ div.example_show_button { columns: 3; } +.page-footer { + opacity: 0.5; +} + .gsib_a { padding: 0px !important; } diff --git a/Documentation/Books/Manual/FOOTER.html b/Documentation/Books/Manual/FOOTER.html new file mode 100644 index 0000000000..239869bfaf --- /dev/null +++ b/Documentation/Books/Manual/FOOTER.html @@ -0,0 +1 @@ +© ArangoDB - the native multi-model NoSQL database \ No newline at end of file diff --git a/Documentation/Books/Manual/GettingStarted/Installing/Windows.md b/Documentation/Books/Manual/GettingStarted/Installing/Windows.md index dbb6c4722e..5e81a95791 100644 --- a/Documentation/Books/Manual/GettingStarted/Installing/Windows.md +++ b/Documentation/Books/Manual/GettingStarted/Installing/Windows.md @@ -36,7 +36,7 @@ as administrator (search for *cmd* and right click *run as administrator*). cmd> arangod --install-service - INFO: adding service 'ArangoDB - the multi-model database' (internal 'ArangoDB') + INFO: adding service 'ArangoDB - the native multi-model NoSQL database' (internal 'ArangoDB') INFO: added service with command line '"C:\Program Files (x86)\ArangoDB 3.x.x\bin\arangod.exe" --start-service' Open the service manager and start ArangoDB. In order to enable logging diff --git a/Documentation/Books/Manual/README.md b/Documentation/Books/Manual/README.md index 7903921189..3c7eac30c3 100644 --- a/Documentation/Books/Manual/README.md +++ b/Documentation/Books/Manual/README.md @@ -30,7 +30,7 @@ some of the samples are re-implemented. ### Overview -ArangoDB is a multi-model, open-source database with flexible data models for documents, graphs, and key-values. Build high performance applications using a convenient SQL-like query language or JavaScript extensions. Use ACID transactions if you require them. Scale horizontally and vertically with a few mouse clicks. +ArangoDB is a native multi-model, open-source database with flexible data models for documents, graphs, and key-values. Build high performance applications using a convenient SQL-like query language or JavaScript extensions. Use ACID transactions if you require them. Scale horizontally and vertically with a few mouse clicks. Key features include: diff --git a/Documentation/Books/Manual/book.json b/Documentation/Books/Manual/book.json index 75bedbedaf..844553a048 100644 --- a/Documentation/Books/Manual/book.json +++ b/Documentation/Books/Manual/book.json @@ -2,9 +2,9 @@ "gitbook": "^3.2.2", "title": "ArangoDB VERSION_NUMBER Documentation", "author": "ArangoDB GmbH", - "description": "Official manual for ArangoDB - the multi-model NoSQL database", + "description": "Official manual for ArangoDB - the native multi-model NoSQL database", "language": "en", - "plugins":["-search", "-lunr", "-sharing", "toggle-chapters", "addcssjs", "anchorjs", "sitemap-general", "ga", "callouts@git+https://github.com/Simran-B/gitbook-plugin-callouts.git", "edit-link"], + "plugins":["-search", "-lunr", "-sharing", "toggle-chapters", "addcssjs", "anchorjs", "sitemap-general", "ga", "callouts@git+https://github.com/Simran-B/gitbook-plugin-callouts.git", "edit-link","localized-footer"], "pdf": { "fontSize": 12, "toc": true, @@ -32,6 +32,9 @@ "edit-link": { "base": "https://github.com/arangodb/arangodb/edit/devel/Documentation/Books/Manual", "label": "Edit Page" + }, + "localized-footer": { + "filename": "FOOTER.html" } } } diff --git a/Documentation/Books/Manual/styles/website.css b/Documentation/Books/Manual/styles/website.css index 0c646cc6f9..840957d0d4 100644 --- a/Documentation/Books/Manual/styles/website.css +++ b/Documentation/Books/Manual/styles/website.css @@ -32,6 +32,10 @@ div.example_show_button { columns: 3; } +.page-footer { + opacity: 0.5; +} + .gsib_a { padding: 0px !important; } diff --git a/lib/ApplicationFeatures/WindowsServiceFeature.cpp b/lib/ApplicationFeatures/WindowsServiceFeature.cpp index ee886f94dd..5ddf9dab1d 100644 --- a/lib/ApplicationFeatures/WindowsServiceFeature.cpp +++ b/lib/ApplicationFeatures/WindowsServiceFeature.cpp @@ -59,7 +59,7 @@ static std::string ServiceName = "ArangoDB"; /// @brief Windows service name for the user. //////////////////////////////////////////////////////////////////////////////// -static std::string FriendlyServiceName = "ArangoDB - the multi-model database"; +static std::string FriendlyServiceName = "ArangoDB - the native multi-model NoSQL database"; //////////////////////////////////////////////////////////////////////////////// /// @brief service status handler