Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Multi -purpose- -> model

This commit is contained in:
Wilfried Goesgens 2015-12-11 18:22:23 +01:00
parent edde20c27d
commit 85f6ae2a95
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -44,7 +44,7 @@ set(ARANGODB_DISPLAY_NAME "ArangoDB")
set(ARANGODB_URL_INFO_ABOUT "http://www.arangodb.org") set(ARANGODB_URL_INFO_ABOUT "http://www.arangodb.org")
set(ARANGODB_CONTACT "hackers@arangodb.org") set(ARANGODB_CONTACT "hackers@arangodb.org")
set(ARANGODB_FRIENDLY_STRING "ArangoDB - the multi-purpose database") set(ARANGODB_FRIENDLY_STRING "ArangoDB - the multi-model database")
set(ARANGOB_FRIENDLY_STRING "ArangoBench - stresstester") set(ARANGOB_FRIENDLY_STRING "ArangoBench - stresstester")
set(ARANGO_DUMP_FRIENDLY_STRING "arangodump - export whole databases from ArangoDB to JSON") set(ARANGO_DUMP_FRIENDLY_STRING "arangodump - export whole databases from ArangoDB to JSON")
set(ARANGO_IMP_FRIENDLY_STRING "arangoimp - import CSV files into ArangoDB") set(ARANGO_IMP_FRIENDLY_STRING "arangoimp - import CSV files into ArangoDB")

2
Documentation/Books/Users/FirstSteps/README.mdpp
View File

@ -3,7 +3,7 @@
For installation instructions, please refer to the For installation instructions, please refer to the
[Installation Manual](../Installing/README.md). [Installation Manual](../Installing/README.md).
As you know from the introduction ArangoDB is a multi-purpose open-source As you know from the introduction ArangoDB is a multi-model open-source
Database. You can see the Key features below or look directly at the programs in Database. You can see the Key features below or look directly at the programs in
the ArangoDB package. the ArangoDB package.

4
Documentation/Books/Users/Installing/Windows.mdpp
View File

@ -29,7 +29,7 @@ a command line as administrator (search for *cmd* and right click *run as
administrator*). administrator*).
cmd> arangod --install-service cmd> arangod --install-service
INFO: adding service 'ArangoDB - the multi-purpose database' (internal 'ArangoDB') INFO: adding service 'ArangoDB - the multi-model database' (internal 'ArangoDB')
INFO: added service with command line '"C:\Program Files (x86)\ArangoDB 1.4.4\bin\arangod.exe" --start-service' INFO: added service with command line '"C:\Program Files (x86)\ArangoDB 1.4.4\bin\arangod.exe" --start-service'
Open the service manager and start ArangoDB. In order to enable logging Open the service manager and start ArangoDB. In order to enable logging
@ -142,4 +142,4 @@ method.
Please note that ArangoDB uses UTF-8 as its internal encoding and that the Please note that ArangoDB uses UTF-8 as its internal encoding and that the
system console must support a UTF-8 codepage (65001) and font. It may be system console must support a UTF-8 codepage (65001) and font. It may be
necessary to manually switch the console font to a font that supports UTF-8. necessary to manually switch the console font to a font that supports UTF-8.

5
GNUmakefile
View File

@ -295,6 +295,11 @@ pack-deb-cmake:
$(MOREOPTS) \ $(MOREOPTS) \
.. ..
${MAKE} .libev-build-64
${MAKE} .zlib-build-64
${MAKE} .v8-build-64
${MAKE} ${BUILT_SOURCES}
${MAKE} ${BUILT_SOURCES} ${MAKE} ${BUILT_SOURCES}
rm -f ./.file-list-js rm -f ./.file-list-js

4
arangod/RestServer/WindowsServiceUtils.cpp
View File

@ -71,7 +71,7 @@ static std::string ServiceName = "ArangoDB";
/// @brief Windows service name for the user. /// @brief Windows service name for the user.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static std::string FriendlyServiceName = "ArangoDB - the multi-purpose database"; static std::string FriendlyServiceName = "ArangoDB - the multi-model database";
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief service status handler /// @brief service status handler
@ -120,7 +120,7 @@ static void InstallServiceCommand (std::string command) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
SERVICE_DESCRIPTION description = { "multi-purpose NoSQL database (version " TRI_VERSION ")" }; SERVICE_DESCRIPTION description = { "multi-model NoSQL database (version " TRI_VERSION ")" };
ChangeServiceConfig2(schService, SERVICE_CONFIG_DESCRIPTION, &description); ChangeServiceConfig2(schService, SERVICE_CONFIG_DESCRIPTION, &description);
std::cout << "INFO: added service with command line '" << command << "'" << std::endl; std::cout << "INFO: added service with command line '" << command << "'" << std::endl;