updated documentation

CHANGELOG

@@ -14,6 +14,9 @@ v1.2.beta4 (XXXX-XX-XX)
  
 * fixed issue #426: arangoimp should be able to import edges into edge collections
 
+* fixed issue #425: In case of conflict ArangoDB returns HTTP 400 Bad request 
+  (with 1207 Error) instead of HTTP 409 Conflict
+
 * fixed too greedy token consumption in AQL for negative values:
   e.g. in the statement `RETURN { a: 1 -2 }` the minus token was consumed as part 
   of the value `-2`, and not interpreted as the binary arithmetic operator

Documentation/ImplementorManual/HttpImportTOC.md

@@ -4,3 +4,4 @@ TOC {#HttpImportTOC}
 - @ref HttpImport
   - @ref HttpImportSelfContained
   - @ref HttpImportHeaderData
+  - @ref HttpImportEdges

Documentation/Manual/NewFeatures12.md

@@ -419,6 +419,14 @@ option to an appropriate value. To set the buffer to 16 MB:
 
     > arangoimp --file "input.json" --type json --max-upload-size 16777216 --collection myimport --create-collection true
 
+### Importing into edge collections
+
+ArangoDB 1.2 also allows to import documents into edge collections. Previous versions
+only supported importing documents into document collections.
+
+When importing data into edge collections, it is mandatory that all imported documents
+contain the `_from` and `_to` attributes containing valid references.
+
 ### Logging of import failures
 
 When documents are imported via the REST bulk import API (@ref HttpImport), ArangoDB 

Documentation/Manual/Upgrading12.md

@@ -29,7 +29,7 @@ As the GCC uses a different padding for C structure under 32bit systems compared
 to 64bit systems, the 1.1 datafiles were not interchangeable. 1.2 fixes this
 problem.
 
-There is however one cave-at: If you already installed 1.2.beta1 on a 32bit
+There is however one caveat: If you already installed 1.2.beta1 on a 32bit
 system, the upgrade will no longer worker. In this case you need to export the
 data first, upgrade ArangoDB, and import the data again. There is no problem, if
 you upgrade from 1.1 to 1.2.beta2.
@@ -367,6 +367,11 @@ will instead return the standard error code `1203` (```Collection not found```),
 which is also returned by other parts of ArangoDB in case a non-existing collection
 is accessed.
 
+When a collection was created with a name that was already in use for another 
+collection, ArangoDB 1.1 returned an error code `1207` (```Duplicate name```) with
+an HTTP status code of `400` (```Bad request```). For this case, the HTTP status
+code has been changed to HTTP `409` (```Conflict```) in ArangoDB 1.2.
+
 Changes in available global variables and functions
 ===================================================