8000 Merge branch 'devel' of github.com:arangodb/arangodb into devel · ezhangle/arangodb@ad15967 · GitHub
[go: up one dir, main page]
Skip to content

Commit ad15967

Browse files
dothebartdothebart
committed
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2 parents 6a9f213 + a871127 commit ad15967

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+431
-4016
lines changed

‎Documentation/Books/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ build-book:
2929
@test -d books/$(NAME) || mkdir books/$(NAME)
3030
python codeBlockReader.py
3131
python bot.py
32-
cd $(NAME) && gitbook build -o ../books/$(NAME)
32+
cd $(NAME) && gitbook build ./ ./../books/$(NAME)
3333
cp Users/arangodbLogo.png books/Users/
3434
cp Users/cookbookLogo.png books/Users/
3535
cp Users/googlegroupsIcon.png books/Users/

‎Documentation/Books/Users/book.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2+
"gitbook": ">=2.0.0",
3+
"title": "ArangoDB Documentation",
4+
"language": "en",
25
"theme": "./localtheme",
36
"plugins":["-mathjax"],
47
"pdf": {

‎Documentation/Books/Users/localtheme/assets/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Documentation/Books/Users/localtheme/assets/images/apple-touch-icon-precomposed-152.png

86.6 KB
Loading

‎Documentation/Books/Users/localtheme/assets/images/favicon.ico

100755100644
0 Bytes
Binary file not shown.

‎Documentation/Books/Users/localtheme/assets/print.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
0