Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

Documentation/Books/Users/Aql/Basics.mdpp

@@ -321,9 +321,7 @@ parameters can be used everywhere in a query where literals can be used.
 
 The syntax for bind parameters is *@nameparameter* where *nameparameter* is the
 actual parameter name. The bind parameter values need to be passed along with
-the query when it is executed, but not as part of the query text itself. Please
+the query when it is executed, but not as part of the query text itself.
-refer to the @ref HttpCursorHttp manual section for information about how to
-pass the bind parameter values to the server.
 
     FOR u IN users
       FILTER u.id == @id && u.name == @nameparameter
@@ -413,7 +411,6 @@ result is defined as follows:
 - boolean: *false* is less than *true*
 - number: numeric values are ordered by their cardinal value
 - string: string values are ordered using a localized comparison,
-  see @ref CommandLineDefaultLanguage "--default-language"
 
 Note: unlike in SQL, *null* can be compared to any value, including *null*
 itself, without the result being converted into *null* automatically.

Documentation/Books/Users/Aql/Functions.mdpp

@@ -416,7 +416,7 @@ AQL supports the following functions to operate on list values:
   will return *[ 1, 2, 3 ]*
 
 - *UNIQUE(list)*: Returns all unique elements in *list*. To determine
-  uniqueness, the function will use the comparison order defined in @ref AqlTypeOrder.
+  uniqueness, the function will use the comparison order.
   Calling this function might return the unique elements in any order.
 
 - *UNION(list1, list2, ...)*: Returns the union of all lists specified.

Documentation/Books/Users/Arangoimp/README.mdpp

@@ -208,8 +208,8 @@ Attributes whose names start with an underscore are treated in a special way by
 ArangoDB:
 
 - the optional *_key* attribute contains the document's key. If specified, the value
-  must be formally valid (e.g. must be a string and conform to the naming conventions 
+  must be formally valid (e.g. must be a string and conform to the naming conventions). 
-  for @ref DocumentKeys). Additionally, the key value must be unique within the 
+  Additionally, the key value must be unique within the 
   collection the import is run for.
 - *_from*: when importing into an edge collection, this attribute contains the id
   of one of the documents connected by the edge. The value of *_from* must be a

Documentation/Books/Users/Foxx/FoxxController.mdpp

@@ -207,8 +207,7 @@ present in ArangoDB. The server can be run with or without HTTP authentication.
 If authentication is turned on, 
 then every access to the server is authenticated via HTTP authentication. This 
 includes Foxx applications. The global authentication can be toggled 
-via the configuration option @ref CommandLineArangoDisableAuthentication 
+via the configuration option.
-"server.disable-authentication".
 
 If global HTTP authentication is turned on, requests to Foxx applications will 
 require HTTP authentication too, and only valid users present in the *_users*

Documentation/Books/Users/Traversals/UsingTraversalObjects.mdpp

@@ -325,10 +325,10 @@ This will traverse edges of the same vertex in backward *_key* order:
 ]
 ```
 
-Note that this attribute only works for the usual expanders
+**Note**: This attribute only works for the usual expanders
 *traversal.inboundExpander*, *traversal.outboundExpander*,
 *traversal.anyExpander* and their corresponding "WithLabels" variants.
-If you are using custom expanders (see @ref TraversalsCustomExpanders)
+If you are using custom expanders
 you have to organize the sorting within the specified expander.
 
 !SUBSUBSECTION Writing Custom Visitors

Documentation/Books/bot.py

@@ -37,6 +37,7 @@ def replaceText(text, pathOfFile, searchText):
   f=open(pathOfFile,'w')
 
   replaced = re.sub("@startDocuBlock\s+"+ searchText + "(?:\s+|$)",text,s)
+  replaced = re.sub("<!-- (\.*)","",replaced)
 
   # HTTP API changing code
   replaced = replaced.replace("@brief","")