1
0
Fork 0

Proper links for new features, correct sitemap URL of Cookbook (#4118)

* Proper links for new features, correct sitemap URL of Cookbook

* Update CSS, remove HEADER.html, remove traces of MDPP
This commit is contained in:
Simran 2017-12-21 11:34:05 +01:00 committed by Jan
parent ba74203be6
commit efa75d345c
12 changed files with 72 additions and 316 deletions

View File

@ -1,60 +0,0 @@
<div class="arangodb-header">
<div class="arangodb-logo">
<a href="https://arangodb.com/">
<img src="https://docs.arangodb.com/assets/arangodb_logo_2016.png">
</a>
</div>
<div class="arangodb-logo-small">
<a href="https://arangodb.com/">
<img src="https://docs.arangodb.com/assets/arangodb_logo_small_2016.png">
</a>
</div>
<select class="arangodb-version-switcher">
<option value="devel">devel</option>
<option value="3.1">v3.1</option>
<option value="3.0">v3.0</option>
<option value="2.8">v2.8</option>
</select>
<div class="google-search">
<gcse:searchbox-only></gcse:searchbox-only>
</div>
<ul class="arangodb-navmenu">
<li>
<a href="#" data-book="Manual">Manual</a>
</li>
<li class="active-tab">
<a href="#" data-book="AQL">AQL</a>
</li>
<li>
<a href="#" data-book="HTTP">HTTP</a>
</li>
<li>
<a href="#" data-book="cookbook">Cookbook</a>
</li>
<li class="downloadIcon" title="Download">
<a href="https://www.arangodb.com/download-arangodb-docs" target="_blank">
<i class="fa fa-download"></i>
</a>
</li>
<li class="socialIcons" title="GitHub">
<a href="https://github.com/ArangoDB/ArangoDB/issues" target="_blank">
<i class="fa fa-github"></i>
</a>
</li>
<li class="socialIcons" title="StackOverflow">
<a href="http://stackoverflow.com/questions/tagged/arangodb" target="_blank">
<i class="fa fa-stack-overflow"></i>
</a>
</li>
<li class="socialIcons socialIcons-googlegroups" title="Google Groups">
<a href="https://groups.google.com/forum/#!forum/arangodb" target="_blank">
<img alt="Google Groups" src="https://docs.arangodb.com/assets/googlegroupsIcon.png" />
</a>
</li>
<li class="socialIcons" title="Slack">
<a href="https://slack.arangodb.com" target="_blank">
<i class="fa fa-slack"></i>
</a>
</li>
</ul>
</div>

View File

@ -1,61 +0,0 @@
<div class="arangodb-header">
<div class="arangodb-logo">
<a href="https://www.arangodb.com/">
<img src="https://docs.arangodb.com/assets/arangodb_logo_2016.png">
</a>
</div>
<div class="arangodb-logo-small">
<a href="https://www.arangodb.com/">
<img src="https://docs.arangodb.com/assets/arangodb_logo_small_2016.png">
</a>
</div>
<select class="arangodb-version-switcher">
<option value="devel">devel</option>
<option value="3.0">v3.0</option>
<option value="2.8">v2.8</option>
<option value="2.7">v2.7</option>
<option value="2.6">v2.6</option>
<option value="2.5">v2.5</option>
<option value="2.4">v2.4</option>
<option value="2.3">v2.3</option>
<option value="2.2">v2.2</option>
<option value="2.1">v2.1</option>
</select>
<div class="google-search">
<gcse:searchbox-only></gcse:searchbox-only>
</div>
<ul class="arangodb-navmenu">
<li>
<a href="#" data-book="Manual">Manual</a>
</li>
<li>
<a href="#" data-book="AQL">AQL</a>
</li>
<li>
<a href="#" data-book="HTTP">HTTP</a>
</li>
<li class="active-tab">
<a href="#" data-book="cookbook">Cookbook</a>
</li>
<li class="socialIcons" title="GitHub">
<a href="https://github.com/ArangoDB/ArangoDB/issues" target="_blank">
<i class="fa fa-github"></i>
</a>
</li>
<li class="socialIcons" title="StackOverflow">
<a href="http://stackoverflow.com/questions/tagged/arangodb" target="_blank">
<i class="fa fa-stack-overflow"></i>
</a>
</li>
<li class="socialIcons socialIcons-googlegroups" title="Google Groups">
<a href="https://groups.google.com/forum/#!forum/arangodb" target="_blank">
<img alt="Google Groups" src="https://docs.arangodb.com/assets/googlegroupsIcon.png" />
</a>
</li>
<li class="socialIcons" title="Slack">
<a href="https://slack.arangodb.com" target="_blank">
<i class="fa fa-slack"></i>
</a>
</li>
</ul>
</div>

View File

@ -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@
},

View File

@ -1,60 +0,0 @@
<div class="arangodb-header">
<div class="arangodb-logo">
<a href="https://arangodb.com/">
<img src="https://docs.arangodb.com/assets/arangodb_logo_2016.png">
</a>
</div>
<div class="arangodb-logo-small">
<a href="https://arangodb.com/">
<img src="https://docs.arangodb.com/assets/arangodb_logo_small_2016.png">
</a>
</div>
<select class="arangodb-version-switcher">
<option value="devel">devel</option>
<option value="3.1">v3.1</option>
<option value="3.0">v3.0</option>
<option value="2.8">v2.8</option>
</select>
<div class="google-search">
<gcse:searchbox-only></gcse:searchbox-only>
</div>
<ul class="arangodb-navmenu">
<li>
<a href="#" data-book="Manual">Manual</a>
</li>
<li>
<a href="#" data-book="AQL">AQL</a>
</li>
<li class="active-tab">
<a href="#" data-book="HTTP">HTTP</a>
</li>
<li>
<a href="#" data-book="cookbook">Cookbook</a>
</li>
<li class="downloadIcon" title="Download">
<a href="https://www.arangodb.com/download-arangodb-docs" target="_blank">
<i class="fa fa-download"></i>
</a>
</li>
<li class="socialIcons" title="GitHub">
<a href="https://github.com/ArangoDB/ArangoDB/issues" target="_blank">
<i class="fa fa-github"></i>
</a>
</li>
<li class="socialIcons" title="StackOverflow">
<a href="http://stackoverflow.com/questions/tagged/arangodb" target="_blank">
<i class="fa fa-stack-overflow"></i>
</a>
</li>
<li class="socialIcons socialIcons-googlegroups" title="Google Groups">
<a href="https://groups.google.com/forum/#!forum/arangodb" target="_blank">
<img alt="Google Groups" src="https://docs.arangodb.com/assets/googlegroupsIcon.png" />
</a>
</li>
<li class="socialIcons" title="Slack">
<a href="https://slack.arangodb.com" target="_blank">
<i class="fa fa-slack"></i>
</a>
</li>
</ul>
</div>

View File

@ -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.

View File

@ -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.

View File

@ -1,60 +0,0 @@
<div class="arangodb-header">
<div class="arangodb-logo">
<a href="https://arangodb.com/">
<img src="https://docs.arangodb.com/assets/arangodb_logo_2016.png">
</a>
</div>
<div class="arangodb-logo-small">
<a href="https://arangodb.com/">
<img src="https://docs.arangodb.com/assets/arangodb_logo_small_2016.png">
</a>
</div>
<select class="arangodb-version-switcher">
<option value="devel">devel</option>
<option value="3.1">v3.1</option>
<option value="3.0">v3.0</option>
<option value="2.8">v2.8</option>
</select>
<div class="google-search">
<gcse:searchbox-only></gcse:searchbox-only>
</div>
<ul class="arangodb-navmenu">
<li class="active-tab">
<a href="#" data-book="Manual">Manual</a>
</li>
<li>
<a href="#" data-book="AQL">AQL</a>
</li>
<li>
<a href="#" data-book="HTTP">HTTP</a>
</li>
<li>
<a href="#" data-book="cookbook">Cookbook</a>
</li>
<li class="downloadIcon" title="Download">
<a href="https://www.arangodb.com/download-arangodb-docs" target="_blank">
<i class="fa fa-download"></i>
</a>
</li>
<li class="socialIcons" title="GitHub">
<a href="https://github.com/ArangoDB/ArangoDB/issues" target="_blank">
<i class="fa fa-github"></i>
</a>
</li>
<li class="socialIcons" title="StackOverflow">
<a href="http://stackoverflow.com/questions/tagged/arangodb" target="_blank">
<i class="fa fa-stack-overflow"></i>
</a>
</li>
<li class="socialIcons socialIcons-googlegroups" title="Google Groups">
<a href="https://groups.google.com/forum/#!forum/arangodb" target="_blank">
<img alt="Google Groups" src="https://docs.arangodb.com/assets/googlegroupsIcon.png" />
</a>
</li>
<li class="socialIcons" title="Slack">
<a href="https://slack.arangodb.com" target="_blank">
<i class="fa fa-slack"></i>
</a>
</li>
</ul>
</div>

View File

@ -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.

View File

@ -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
------------------------

View File

@ -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 |\

View File

@ -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]