diff --git a/Documentation/Books/Makefile b/Documentation/Books/Makefile index 3336d70720..b59350cb6b 100644 --- a/Documentation/Books/Makefile +++ b/Documentation/Books/Makefile @@ -299,7 +299,7 @@ clean-book-intermediate: # Check docublocks - checks whether docublock are # - files in intermediate output directories and temporary # files are excludes (with # in their names) -# - uniq in the source +# - unique in the source # - all docublocks are used somewhere in the documentation # check-docublocks: diff --git a/Documentation/Books/Manual/Administration/Sharding/README.mdpp b/Documentation/Books/Manual/Administration/Sharding/README.mdpp index b94a8eb453..5725608723 100644 --- a/Documentation/Books/Manual/Administration/Sharding/README.mdpp +++ b/Documentation/Books/Manual/Administration/Sharding/README.mdpp @@ -21,4 +21,4 @@ To configure the hashing: 127.0.0.1:8529@_system> db._create("sharded_collection", {"numberOfShards": 4, "shardKeys": ["country"]}); ``` -This would be useful to keep data of every country in one shard which would result in better performance for queries working on a per country base. You can also specify multiple `shardKeys`. Note however that if you change the shard keys from their defailt `["_key"]`, then finding a document in the collection by its primary key involves a request to every single shard. Furthermore, in this case one can no longer prescribe the primary key value of a new document but must use the automatically generated one. This latter restriction comes from the fact that ensuring uniqueness of the primary key would be very inefficient if the user could specify the primary key. +This would be useful to keep data of every country in one shard which would result in better performance for queries working on a per country base. You can also specify multiple `shardKeys`. Note however that if you change the shard keys from their default `["_key"]`, then finding a document in the collection by its primary key involves a request to every single shard. Furthermore, in this case one can no longer prescribe the primary key value of a new document but must use the automatically generated one. This latter restriction comes from the fact that ensuring uniqueness of the primary key would be very inefficient if the user could specify the primary key. diff --git a/Documentation/Books/Manual/DataModeling/Documents/DocumentAddress.mdpp b/Documentation/Books/Manual/DataModeling/Documents/DocumentAddress.mdpp index 9a78e5e974..dea69702e7 100644 --- a/Documentation/Books/Manual/DataModeling/Documents/DocumentAddress.mdpp +++ b/Documentation/Books/Manual/DataModeling/Documents/DocumentAddress.mdpp @@ -59,9 +59,10 @@ a collection's primary index. Thus looking up a document by its key is a fast operation. The _key value of a document is immutable once the document has been created. By default, ArangoDB will auto-generate a document key if no _key attribute is specified, and use -the user-specified _key otherwise. The generateed _key is guaranteed to -be unique in the collection it was generated for. It can't be guaranteed -that this _key is uniq across the whole installation. +the user-specified _key otherwise. The generated _key is guaranteed to +be unique in the collection it was generated for. This also applies to +sharded collections in a cluster. It can't be guaranteed that the _key is +unique within a database or across a whole node or instance however. This behavior can be changed on a per-collection level by creating collections with the `keyOptions` attribute. diff --git a/Documentation/DocuBlocks/Rest/Replication/JSF_put_api_replication_serverID.md b/Documentation/DocuBlocks/Rest/Replication/JSF_put_api_replication_serverID.md index cdca31312c..724c24369c 100644 --- a/Documentation/DocuBlocks/Rest/Replication/JSF_put_api_replication_serverID.md +++ b/Documentation/DocuBlocks/Rest/Replication/JSF_put_api_replication_serverID.md @@ -1,6 +1,6 @@ @startDocuBlock JSF_put_api_replication_serverID -@brief fetch this servers uniq identifier +@brief fetch this server's unique identifier @RESTHEADER{GET /_api/replication/server-id, Return server id}