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

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

This commit is contained in:
jsteemann 2016-05-30 14:45:20 +02:00
parent 3d831b2e2b 27c868dfe7
commit a143f256e2
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/Books/AQL/book.json
View File

@ -1,10 +1,10 @@
{
"gitbook": ">=2.0.0",
"gitbook": ">=2.6.0",
"title": "ArangoDB VERSION_NUMBER AQL Documentation",
"author": "ArangoDB GmbH",
"description": "Official AQL manual for ArangoDB - the multi-model NoSQL database",
"language": "en",
"plugins":["-search", "-sharing", "toggle-chapters", "addcssjs", "heading-anchors", "add-header"],
"plugins":["-search", "-sharing", "toggle-chapters", "addcssjs", "heading-anchors", "add-header", "piwik"],
"pdf": {
"fontSize": 12,
"toc": true,
@ -25,6 +25,10 @@
},
"add-header": {
"BASE_PATH": "https://docs.arangodb.com/devel"
},
"piwik": {
"URL": "www.arangodb.com/piwik/",
"siteId": 12
}
}
}

6
Documentation/Books/HTTP/book.json
View File

@ -4,7 +4,7 @@
"author": "ArangoDB GmbH",
"description": "Official HTTP API manual for ArangoDB - the multi-model NoSQL database",
"language": "en",
"plugins":["-search", "-sharing", "toggle-chapters", "addcssjs", "heading-anchors", "add-header"],
"plugins":["-search", "-sharing", "toggle-chapters", "addcssjs", "heading-anchors", "add-header", "piwik"],
"pdf": {
"fontSize": 12,
"toc": true,
@ -25,6 +25,10 @@
},
"add-header": {
"BASE_PATH": "https://docs.arangodb.com/devel"
},
"piwik": {
"URL": "www.arangodb.com/piwik/",
"siteId": 12
}
}
}

6
Documentation/Books/Manual/book.json
View File

@ -4,7 +4,7 @@
"author": "ArangoDB GmbH",
"description": "Official manual for ArangoDB - the multi-model NoSQL database",
"language": "en",
"plugins":["-search", "-sharing", "toggle-chapters", "addcssjs", "heading-anchors", "add-header"],
"plugins":["-search", "-sharing", "toggle-chapters", "addcssjs", "heading-anchors", "add-header", "piwik"],
"pdf": {
"fontSize": 12,
"toc": true,
@ -25,6 +25,10 @@
},
"add-header": {
"BASE_PATH": "https://docs.arangodb.com/devel"
},
"piwik": {
"URL": "www.arangodb.com/piwik/",
"siteId": 12
}
}
}

10
Installation/Windows/Templates/NSIS.template.in
View File

@ -1,9 +1,9 @@
; CPack install script designed for a nmake build
!addplugindir '@CPACK_PLUGIN_PATH@\Plugins\NSIS_Simple_Service_Plugin_1.30'
!addplugindir '@CPACK_PLUGIN_PATH@\Plugins\UAC-plug-in-NSIS\Ansi'
!addplugindir '@CPACK_PLUGIN_PATH@\Plugins\AccessControl\Plugins'
!addplugindir '@CPACK_PLUGIN_PATH@\Plugins\SharedMemory\Plugins'
!addincludedir '@CPACK_PLUGIN_PATH@\Plugins\UAC-plug-in-NSIS'
!addplugindir '@CPACK_PLUGIN_PATH@/NSIS_Simple_Service_Plugin_1.30'
!addplugindir '@CPACK_PLUGIN_PATH@/UAC-plug-in-NSIS/Ansi'
!addplugindir '@CPACK_PLUGIN_PATH@/AccessControl/Plugins'
!addplugindir '@CPACK_PLUGIN_PATH@/SharedMemory/Plugins'
!addincludedir '@CPACK_PLUGIN_PATH@/UAC-plug-in-NSIS'
;--------------------------------
; Include LogicLib for more readable code