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

Documentation/Books/HTTP/Traversal/README.mdpp

@@ -20,4 +20,4 @@ are offered.
 
 All examples were using this graph:
 
-![Persons relation Example Graph](../../Graphs/knows_graph.png)
+![Persons relation Example Graph](knows_graph.png)

Documentation/Books/HTTP/Traversal/knows_graph.png

@@ -0,0 +1 @@
+../../Manual/Graphs/knows_graph.png

Documentation/Books/Manual/Foxx/Assets.mdpp

@@ -1,6 +1,6 @@
 !CHAPTER Static file assets
 
-The most flexible way to serve files in your Foxx service is to simply pass them through in your router using [the context object's `fileName` method][CONTEXT] and [the response object's `sendFile` method][RESPONSE]:
+The most flexible way to serve files in your Foxx service is to simply pass them through in your router using [the context object's `fileName` method](../Foxx/Context.md) and [the response object's `sendFile` method](../Foxx/Router/Response.md):
 
 ```js
 router.get('/some/filename.png', function (req, res) {
@@ -11,7 +11,7 @@ router.get('/some/filename.png', function (req, res) {
 
 While allowing for greater control of how the file should be sent to the client and who should be able to access it, doing this for all your static assets can get tedious.
 
-Alternatively you can specify file assets that should be served by your Foxx service directly in the [service manifest][MANIFEST] using the `files` attribute:
+Alternatively you can specify file assets that should be served by your Foxx service directly in the [service manifest](../Foxx/Manifest.md) using the `files` attribute:
 
 ```json
 "files": {
@@ -43,6 +43,3 @@ Each entry in the `files` attribute can represent either a single file or a dire
 
 If a string is provided instead of an object, it will be interpreted as the *path* option.
 
-[CONTEXT]: './Context.md'
-[MANIFEST]: './Manifest.md'
-[RESPONSE]: './Response.md'

Documentation/Books/Manual/GettingStarted/README.mdpp

@@ -27,7 +27,7 @@ For startup parameters, installation in a cluster and so on, see
 
 The server itself speaks REST and VelocyStream, but you can use the
 graphical web interface to keep it simple. There's also
-[../Administration/Arangosh/README.md](arangosh), a synchronous shell for
+[arangosh](../Administration/Arangosh/README.md), a synchronous shell for
 interaction with the server. If you're a developer, you might prefer the shell
 over the GUI. It does not provide features like syntax highlighting however.
 

Documentation/DocuBlocks/Rest/Simple Queries/JSA_put_api_simple_near.md

@@ -45,7 +45,7 @@ Returns a cursor containing the result, see [Http Cursor](../HttpAqlQueryCursor/
 Note: the *near* simple query is **deprecated** as of ArangoDB 2.6. 
 This API may be removed in future versions of ArangoDB. The preferred
 way for retrieving documents from a collection using the near operator is
-to issue an [AQL query](../Aql/GeoFunctions.md) using the *NEAR* function as follows: 
+to issue an [AQL query](../../AQL/Functions/Geo.html) using the *NEAR* function as follows: 
 
 
     FOR doc IN NEAR(@@collection, @latitude, @longitude, @limit)

Documentation/DocuBlocks/Rest/Simple Queries/JSA_put_api_simple_within.md

@@ -46,7 +46,7 @@ Returns a cursor containing the result, see [Http Cursor](../HttpAqlQueryCursor/
 Note: the *within* simple query is **deprecated** as of ArangoDB 2.6. 
 This API may be removed in future versions of ArangoDB. The preferred
 way for retrieving documents from a collection using the near operator is
-to issue an [AQL query](../Aql/GeoFunctions.md) using the *WITHIN* function as follows: 
+to issue an [AQL query](../../AQL/Functions/Geo.html) using the *WITHIN* function as follows: 
 
 
     FOR doc IN WITHIN(@@collection, @latitude, @longitude, @radius, @distanceAttributeName)

Documentation/DocuBlocks/collectionNear.md

@@ -37,7 +37,7 @@ contains the distance between the given point and the document in meters.
 Note: the *near* simple query function is **deprecated** as of ArangoDB 2.6. 
 The function may be removed in future versions of ArangoDB. The preferred
 way for retrieving documents from a collection using the near operator is
-to use the AQL *NEAR* function in an [AQL query](../../AQL/GeoFunctions.html) as follows: 
+to use the AQL *NEAR* function in an [AQL query](../../AQL/Functions/Geo.html) as follows: 
 
     FOR doc IN NEAR(@@collection, @latitude, @longitude, @limit) 
       RETURN doc

Documentation/DocuBlocks/collectionWithin.md

@@ -26,7 +26,7 @@ contains the distance between the given point and the document in meters.
 Note: the *within* simple query function is **deprecated** as of ArangoDB 2.6. 
 The function may be removed in future versions of ArangoDB. The preferred
 way for retrieving documents from a collection using the within operator  is
-to use the AQL *WITHIN* function in an [AQL query](../../AQL//GeoFunctions.html) as follows: 
+to use the AQL *WITHIN* function in an [AQL query](../../AQL/Functions/Geo.html) as follows: 
 
     FOR doc IN WITHIN(@@collection, @latitude, @longitude, @radius, @distanceAttributeName)
       RETURN doc

Documentation/DocuBlocks/serverEndpoint.md

@@ -36,7 +36,7 @@ business
 the path to a server certificate using the \-\-server.keyfile option.
 
 Endpoints can also be changed at runtime.
-Please refer to [HTTP Interface for Endpoints](../../HTTP/HttpEndpoints/index.html)
+Please refer to [HTTP Interface for Endpoints](../../../HTTP/Endpoints/index.html)
 for more details.
 @endDocuBlock