diff --git a/Documentation/Books/AQL/HEADER.html b/Documentation/Books/AQL/HEADER.html
deleted file mode 100644
index 970dc9e9a6..0000000000
--- a/Documentation/Books/AQL/HEADER.html
+++ /dev/null
@@ -1,60 +0,0 @@
-
\ No newline at end of file
diff --git a/Documentation/Books/Cookbook/HEADER.html b/Documentation/Books/Cookbook/HEADER.html
deleted file mode 100644
index e42bbd6336..0000000000
--- a/Documentation/Books/Cookbook/HEADER.html
+++ /dev/null
@@ -1,61 +0,0 @@
-
diff --git a/Documentation/Books/Cookbook/book.json b/Documentation/Books/Cookbook/book.json
index 7a7b48c0e6..25a7adfcb3 100644
--- a/Documentation/Books/Cookbook/book.json
+++ b/Documentation/Books/Cookbook/book.json
@@ -36,7 +36,7 @@
"css": ["styles/header.css"]
},
"sitemap-general": {
- "prefix": "https://docs.arangodb.com/devel/cookbook/",
+ "prefix": "https://docs.arangodb.com/devel/Cookbook/",
"changefreq": "@GCHANGE_FREQ@",
"priority": @GPRIORITY@
},
diff --git a/Documentation/Books/Cookbook/styles/website.css b/Documentation/Books/Cookbook/styles/website.css
index 39c4f8d439..7be2b58f9f 100755
--- a/Documentation/Books/Cookbook/styles/website.css
+++ b/Documentation/Books/Cookbook/styles/website.css
@@ -1,55 +1,55 @@
-div.example_show_button {
- border: medium solid lightgray;
- text-align: center;
- position: relative;
- top: -10px;
-}
-
-.book .book-body .navigation.navigation-next {
- right: 10px !important;
-}
-
-.book .book-summary ul.summary li.active>a,.book .book-summary ul.summary li a:hover {
- color: #fff !important;
- background: #80A54D !important;
- text-decoration: none;
-}
-
-.book .book-body .page-wrapper .page-inner section.normal .deprecated{
- background-color: rgba(240,240,0,0.4);
-}
-
-.book .book-body li:last-child {
- margin-bottom: 0.85em;
-}
-
-.book .book-body .alert p:last-child {
- margin-bottom: 0;
-}
-
-.columns-3 {
- -webkit-column-count: 3;
- -moz-column-count: 3;
- -ms-column-count: 3;
- -o-column-count: 3;
- column-count: 3;
- columns: 3;
-}
-
-.localized-footer {
- opacity: 0.5;
-}
-
-.gsib_a {
-padding: 0px !important;
-}
-
-.gsc-control-cse {
-border: 0px !important;
-background-color: transparent !important;
-}
-
-
-.gsc-input {
-margin: 0px !important;
-}
+div.example_show_button {
+ border: medium solid lightgray;
+ text-align: center;
+ position: relative;
+ top: -10px;
+}
+
+.book .book-body .navigation.navigation-next {
+ right: 10px !important;
+}
+
+.book .book-summary ul.summary li.active>a,.book .book-summary ul.summary li a:hover {
+ color: #fff !important;
+ background: #80A54D !important;
+ text-decoration: none;
+}
+
+.book .book-body .page-wrapper .page-inner section.normal .deprecated{
+ background-color: rgba(240,240,0,0.4);
+}
+
+.book .book-body li:last-child {
+ margin-bottom: 0.85em;
+}
+
+.book .book-body .alert p:last-child {
+ margin-bottom: 0;
+}
+
+.columns-3 {
+ -webkit-column-count: 3;
+ -moz-column-count: 3;
+ -ms-column-count: 3;
+ -o-column-count: 3;
+ column-count: 3;
+ columns: 3;
+}
+
+.localized-footer {
+ opacity: 0.5;
+}
+
+.gsib_a {
+padding: 0px !important;
+}
+
+.gsc-control-cse {
+border: 0px !important;
+background-color: transparent !important;
+}
+
+
+.gsc-input {
+margin: 0px !important;
+}
diff --git a/Documentation/Books/HTTP/HEADER.html b/Documentation/Books/HTTP/HEADER.html
deleted file mode 100644
index a2474a911b..0000000000
--- a/Documentation/Books/HTTP/HEADER.html
+++ /dev/null
@@ -1,60 +0,0 @@
-
\ No newline at end of file
diff --git a/Documentation/Books/Manual/Administration/Replication/Asynchronous/DatabaseSetup.md b/Documentation/Books/Manual/Administration/Replication/Asynchronous/DatabaseSetup.md
index 103a3c79ac..36e8a099a3 100644
--- a/Documentation/Books/Manual/Administration/Replication/Asynchronous/DatabaseSetup.md
+++ b/Documentation/Books/Manual/Administration/Replication/Asynchronous/DatabaseSetup.md
@@ -1,5 +1,5 @@
-Database Setup
-=============
+Per-Database Setup
+==================
This page describes the replication process based on a specific database within an ArangoDB instance.
That means that only the specified database will be replicated.
diff --git a/Documentation/Books/Manual/Administration/Replication/Asynchronous/ServerLevelSetup.md b/Documentation/Books/Manual/Administration/Replication/Asynchronous/ServerLevelSetup.md
index 7ee9163b9c..e2e08783c0 100644
--- a/Documentation/Books/Manual/Administration/Replication/Asynchronous/ServerLevelSetup.md
+++ b/Documentation/Books/Manual/Administration/Replication/Asynchronous/ServerLevelSetup.md
@@ -1,5 +1,5 @@
-Global Setup
-=============
+Server-level Setup
+==================
This page describes the replication process based on a complete ArangoDB instance. That means that
all included databases will be replicated.
diff --git a/Documentation/Books/Manual/HEADER.html b/Documentation/Books/Manual/HEADER.html
deleted file mode 100644
index eb0bb74770..0000000000
--- a/Documentation/Books/Manual/HEADER.html
+++ /dev/null
@@ -1,60 +0,0 @@
-
\ No newline at end of file
diff --git a/Documentation/Books/Manual/Highlights.md b/Documentation/Books/Manual/Highlights.md
index c8351f0d6f..86ceb3a78c 100644
--- a/Documentation/Books/Manual/Highlights.md
+++ b/Documentation/Books/Manual/Highlights.md
@@ -6,13 +6,13 @@ Version 3.3
### Enterprise Edition
-- [**Datacenter-to-Datacenter Replication**](Deployment/DC2DC.md): Replicate
+- [**Datacenter to Datacenter Replication**](Deployment/DC2DC.md): Replicate
the entire structure and content of an ArangoDB cluster asynchronously to
another cluster in a different datacenter with ArangoSync. Multi-datacenter
support means you can fallback to a replica of your cluster in case of a
disaster in one datacenter.
-- [**Encrypted Backups**](ReleaseNotes/NewFeatures33.md#encrypted-backups):
+- [**Encrypted Backups**](Administration/Arangodump.md#encryption):
Arangodump can create backups encrypted with a secret key using AES256
block cipher.
diff --git a/Documentation/Books/Manual/ReleaseNotes/NewFeatures33.md b/Documentation/Books/Manual/ReleaseNotes/NewFeatures33.md
index b86388d38c..74f0666afe 100644
--- a/Documentation/Books/Manual/ReleaseNotes/NewFeatures33.md
+++ b/Documentation/Books/Manual/ReleaseNotes/NewFeatures33.md
@@ -80,7 +80,8 @@ Note that encrypted backups can be used together with the already existing
RocksDB encryption-at-rest feature, but they can also be used for the MMFiles
engine, which does not have encryption-at-rest.
-Encrypted backups are available in the *Enterprise* edition.
+[Encrypted backups](../Administration/Arangodump.md#encryption) are available
+in the *Enterprise* edition.
Server-level replication
------------------------
diff --git a/Documentation/Books/build.sh b/Documentation/Books/build.sh
index 8bb5f7b970..959580f602 100755
--- a/Documentation/Books/build.sh
+++ b/Documentation/Books/build.sh
@@ -396,9 +396,6 @@ function build-book()
if ! test -L SUMMARY.md; then
ln -s "../../${NAME}/SUMMARY.md" .
fi
- if ! test -f HEADER.html ; then
- cp "../../${NAME}/HEADER.html" .
- fi
if ! test -f FOOTER.html ; then
cp "../../${NAME}/FOOTER.html" .
fi
@@ -445,7 +442,7 @@ function build-book()
cp "${NAME}/book.json" "ppbooks/${NAME}"
fi
- for facilityfile in book.json styles/header.js HEADER.html README.md; do
+ for facilityfile in book.json styles/header.js README.md; do
export facilityfile
export RELEASE_DIRECTORY
(
@@ -463,7 +460,7 @@ function build-book()
echo "${STD_COLOR} - Building Version ${VERSION}${RESET}"
- if test -n "${NODE_MODULES_DIR}"; then
+ if test -d "${NODE_MODULES_DIR}"; then
echo "${STD_COLOR}#### Installing plugins from ${NODE_MODULES_DIR}${RESET}"
cp -a "${NODE_MODULES_DIR}" "ppbooks/${NAME}"
else
@@ -472,7 +469,6 @@ function build-book()
fi
echo "${STD_COLOR} - Building Book ${NAME} ${RESET}"
(cd "ppbooks/${NAME}" && gitbook "${GITBOOK_ARGS[@]}" build "./" "./../../books/${NAME}")
- rm -f "./books/${NAME}/HEADER.html"
rm -f "./books/${NAME}/FOOTER.html"
echo "${STD_COLOR} - deleting markdown files in output (gitbook 3.x bug)"
find "./books/${NAME}/" -type f -name "*.md" -delete
@@ -548,7 +544,7 @@ function check-docublocks()
sed -e "s;.*ck ;;" -e "s;.*ne ;;" < /tmp/rawindoc.txt |sort -u > /tmp/indoc.txt
set +e
- grep -R '^@startDocuBlock' ../DocuBlocks --include "*.md" --include "*.md" |grep -v aardvark > /tmp/rawinprog.txt
+ grep -R '^@startDocuBlock' ../DocuBlocks --include "*.md" |grep -v aardvark > /tmp/rawinprog.txt
# searching the Inline docublocks needs some more blacklisting:
grep -R '@startDocuBlockInline' --include "*.h" --include "*.cpp" --include "*.js" --include "*.md" . |\
grep -v ppbook |\
diff --git a/Documentation/Scripts/codeBlockReader.py b/Documentation/Scripts/codeBlockReader.py
index 4fac2506f0..305c11d3f4 100644
--- a/Documentation/Scripts/codeBlockReader.py
+++ b/Documentation/Scripts/codeBlockReader.py
@@ -7,7 +7,7 @@ validExtensions = (".cpp", ".h", ".js", ".md")
# specify the paths in which docublocks are searched. note that js/apps/* must not be included because it contains js/apps/system/
# and that path also contains copies of some files present in js/ anyway.
-searchMDPPPaths = [
+searchMDPaths = [
"Manual",
"AQL",
"HTTP",
@@ -38,10 +38,10 @@ def file_content(filepath):
if "@startDocuBlock" in line[1]:
# in the unprocessed md files we have non-terminated startDocuBlocks, else it is an error:
if ((_start != None) and
- (not searchMDPPPaths[0] in filepath) and
- (not searchMDPPPaths[1] in filepath) and
- (not searchMDPPPaths[2] in filepath) and
- (not searchMDPPPaths[3] in filepath)):
+ (not searchMDPaths[0] in filepath) and
+ (not searchMDPaths[1] in filepath) and
+ (not searchMDPaths[2] in filepath) and
+ (not searchMDPaths[3] in filepath)):
print "next startDocuBlock found without endDocuBlock inbetween in file %s [%s]" %(filepath, line)
raise
_start = line[0]
-
- 
-
- 
-