Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

Documentation/Books/HTTP/Edge/WorkingWithEdges.mdpp

@@ -8,7 +8,7 @@ These attributes are mandatory and must contain the document-handle
 of the from and to vertices of an edge.
 
 Use the general document
-[REST api](../Document/WorkingWithDocuments.html)
+[REST api](../Document/WorkingWithDocuments.md)
 for create/read/update/delete.
 
 <!-- Rest/Graph edges -->

Documentation/Books/Makefile

@@ -55,7 +55,7 @@ ppbook-precheck-bad-code-sections:
 
 ppbook-check-html-link:
 	@echo "##### checking for invalid HTML links in $(NAME)"
-	@echo "$(ALLBOOKS)" |sed -e 's; ;\n;g' |sed -e 's;^;/;' -e 's;$$;/;' > /tmp/books.regex
+	@echo "$(ALLBOOKS)" | tr " " "\n" | sed -e 's;^;/;' -e 's;$$;/;' > /tmp/books.regex
 
 	@egrep -r '\[.*\]\(.*\)' ppbooks/$(NAME)|grep '\.md:'| grep 'html'| grep -v 'http://' | grep -v 'https://' | grep -v 'header.css' | grep -v -f /tmp/books.regex > /tmp/relative_html_links.txt ||true
 	@if test "`cat /tmp/relative_html_links.txt |wc -l`" -gt 0; then \

Documentation/Books/Manual/Appendix/References/CollectionObject.mdpp

@@ -0,0 +1,50 @@
+!CHAPTER The "collection" Object
+
+The following methods exists on the collection object (returned by *db.name*):
+
+*Collection*
+
+* [collection.checksum()](../../DataModeling/Collections/CollectionMethods.md#checksum)
+* [collection.count()](../../DataModeling/Collections/CollectionMethods.md#count)
+* [collection.drop()](../../DataModeling/Collections/CollectionMethods.md#drop)
+* [collection.figures()](../../DataModeling/Collections/CollectionMethods.md#figures)
+* [collection.load()](../../DataModeling/Collections/CollectionMethods.md#load)
+* [collection.properties()](../../DataModeling/Collections/CollectionMethods.md#properties)
+* [collection.reserve()](../../DataModeling/Collections/CollectionMethods.md#reserve)
+* [collection.revision()](../../DataModeling/Collections/CollectionMethods.md#revision)
+* [collection.rotate()](../../DataModeling/Collections/CollectionMethods.md#rotate)
+* [collection.toArray()](../../DataModeling/Collections/CollectionMethods.md#toarray)
+* [collection.truncate()](../../DataModeling/Collections/CollectionMethods.md#truncate)
+* [collection.type()](../../DataModeling/Collections/CollectionMethods.md#type)
+* [collection.unload()](../../DataModeling/Collections/CollectionMethods.md#unload)
+
+*Indexes*
+
+* [collection.dropIndex(index)](../../Indexing/WorkingWithIndexes.md#dropping-an-index)
+* [collection.ensureIndex(description)](../../Indexing/WorkingWithIndexes.md#creating-an-index)
+* [collection.getIndexes(name)](../../Indexing/WorkingWithIndexes.md#listing-all-indexes-of-a-collection)
+* [collection.index(index)](../../Indexing/WorkingWithIndexes.md#index-identifiers-and-handles)
+
+*Document*
+
+* [collection.all()](../../DataModeling/Collections/CollectionMethods.md#all)
+* [collection.any()](../../DataModeling/Collections/CollectionMethods.md#any)
+* [collection.closedRange(attribute, left, right)](../../DataModeling/Collections/CollectionMethods.md#closed-range)
+* [collection.document(object)](../../DataModeling/Collections/CollectionMethods.md#document)
+* [collection.documents(keys)](../../DataModeling/Collections/CollectionMethods.md#lookup-by-keys)
+* [collection.edges(vertex-id)](../../DataModeling/Collections/CollectionMethods.md#misc)
+* [collection.exists(object)](../../DataModeling/Collections/CollectionMethods.md#exists)
+* [collection.firstExample(example)](../../DataModeling/Collections/CollectionMethods.md#first-example)
+* [collection.inEdges(vertex-id)](../../DataModeling/Collections/CollectionMethods.md#misc)
+* [collection.insert(data)](../../DataModeling/Collections/CollectionMethods.md#insert)
+* [collection.iterate(iterator,options)](../../DataModeling/Collections/CollectionMethods.md#misc)
+* [collection.outEdges(vertex-id)](../../DataModeling/Collections/CollectionMethods.md#misc)
+* [collection.queryByExample(example)](../../DataModeling/Collections/CollectionMethods.md#query-by-example)
+* [collection.range(attribute, left, right)](../../DataModeling/Collections/CollectionMethods.md#range)
+* [collection.remove(selector)](../../DataModeling/Collections/CollectionMethods.md#remove)
+* [collection.removeByKeys(keys)](../../DataModeling/Collections/CollectionMethods.md#remove-by-keys)
+* [collection.rename()](../../DataModeling/Collections/CollectionMethods.md#rename)
+* [collection.replace(selector, data)](../../DataModeling/Collections/CollectionMethods.md#replace)
+* [collection.replaceByExample(example, data)](../../DataModeling/Collections/CollectionMethods.md#replace-by-example)
+* [collection.update(selector, data)](../../DataModeling/Collections/CollectionMethods.md#update)
+* [collection.updateByExample(example, data)](../../DataModeling/Collections/CollectionMethods.md#update-by-example)

Documentation/Books/Manual/Appendix/References/DBObject.mdpp

@@ -0,0 +1,40 @@
+!CHAPTER The "db" Object
+
+*db.name* returns a [collection object](CollectionObject.md) for the collection *name*.
+
+The following methods exists on the *_db* object:
+
+*Database*
+
+* [db._createDatabase(name, options, users)](../../DataModeling/Databases/WorkingWith.md#create-database)
+* [db._databases()](../../DataModeling/Databases/WorkingWith.md#list-databases)
+* [db._dropDatabase(name, options, users)](../../DataModeling/Databases/WorkingWith.md#drop-database)
+* [db._useDatabase(name)](../../DataModeling/Databases/WorkingWith.md#use-database)
+
+*Indexes*
+
+* [db._index(index)](../../Indexing/WorkingWithIndexes.md#fetching-an-index-by-handle)
+* [db._dropIndex(index)](../../Indexing/WorkingWithIndexes.md#dropping-an-index)
+
+*Properties*
+
+* [db._id()](../../DataModeling/Databases/WorkingWith.md#id)
+* [db._isSystem()](../../DataModeling/Databases/WorkingWith.md#issystem)
+* [db._name()](../../DataModeling/Databases/WorkingWith.md#name)
+* [db._path()](../../DataModeling/Databases/WorkingWith.md#path)
+* [db._version()](../../DataModeling/Documents/DocumentMethods.md#get-the-version-of-arangodb)
+
+*Collection*
+
+* [db._collection(name)](../../DataModeling/Collections/DatabaseMethods.md#collection)
+* [db._create(name)](../../DataModeling/Collections/DatabaseMethods.md#create)
+* [db._drop(name)](../../DataModeling/Collections/DatabaseMethods.md#drop)
+* [db._truncate(name)](../../DataModeling/Collections/DatabaseMethods.md#truncate)
+
+*Document*
+
+* [db._document(object)](../../DataModeling/Documents/DatabaseMethods.md#document)
+* [db._exists(object)](../../DataModeling/Documents/DatabaseMethods.md#exists)
+* [db._remove(selector)](../../DataModeling/Documents/DatabaseMethods.md#remove)
+* [db._replace(selector,data)](../../DataModeling/Documents/DatabaseMethods.md#replace)
+* [db._update(selector,data)](../../DataModeling/Documents/DatabaseMethods.md#update)

Documentation/Books/Manual/Appendix/References/README.mdpp

@@ -0,0 +1 @@
+!CHAPTER References

Documentation/Books/Manual/DataModeling/Documents/DocumentMethods.mdpp

@@ -1224,9 +1224,3 @@ as second argument.
     ~ db._drop("example");
     @END_EXAMPLE_ARANGOSH_OUTPUT
     @endDocuBlock accessViaGeoIndex
-
-`edge.setProperty(name, value)`
-
-Changes or sets the property *name* an *edges* to *value*.
-
-

Documentation/Books/Manual/SUMMARY.md

@@ -169,6 +169,9 @@
   * [Incompatible changes in 2.3](ReleaseNotes/UpgradingChanges23.md)
 #
 * [Appendix](Appendix/README.md)
+  * [References](Appendix/References/README.md)
+    * [db](Appendix/References/DBObject.md)
+    * [collection](Appendix/References/CollectionObject.md)
   * [JavaScript Modules](Appendix/JavaScriptModules/README.md)
     * ["console"](Appendix/JavaScriptModules/Console.md)
     * ["fs"](Appendix/JavaScriptModules/FS.md)

Documentation/DocuBlocks/Rest/Graph Edges/API_EDGE_READ_ALL.md

@@ -1,23 +0,0 @@
-@startDocuBlock API_EDGE_READ_ALL
-@brief reads all edges from collection
-
-@RESTHEADER{GET /_api/document, Read all edges from collection}
-
-@RESTQUERYPARAMETERS
-
-@RESTQUERYPARAM{collection,string,required}
-The name of the collection.
-
-@RESTDESCRIPTION
-Returns an array of all URIs for all edges from the collection identified
-by *collection*.
-
-@RESTRETURNCODES
-
-@RESTRETURNCODE{200}
-All went good.
-
-@RESTRETURNCODE{404}
-The collection does not exist.
-@endDocuBlock
-