arangodb · KVS85 · Jul 22, 2019 · Jul 19, 2019 · Jul 19, 2019 · Jul 19, 2019
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,7 +2,7 @@ v3.5.0-rc.5 (2019-XX-XX)
 ------------------------
 
 * MinReplicationFactor:
-  Collections can now be created with a minimal replication factor (minReplicationFactor) default 1.
+  Collections can now be created with a minimal replication factor (minReplicationFactor), which defaults to 1.
   If minReplicationFactor > 1 a collection will go into "read-only" mode as soon as it has less then minReplicationFactor
   many insync followers. With this mechanism users can avoid to have collections diverge too much in case of failure scenarios.
   minReplicationFactor can have the values: 1 <= minReplicationFactor <= replicationFactor.

diff --git a/Documentation/Books/Manual/Architecture/Replication/README.md b/Documentation/Books/Manual/Architecture/Replication/README.md
@@ -39,7 +39,7 @@ factor. The number of _followers_ can be controlled using the
 kept, that is, it is one plus the number of _followers_. 
 
 In addition to the `replicationFactor` we have a `minReplicationFactor`
-the locks down a collection as soon as we have lost too many followers.
+that locks down a collection for writing as soon as we have lost too many followers.
 
 
 Asynchronous replication

diff --git a/Documentation/Books/Manual/DataModeling/Collections/DatabaseMethods.md b/Documentation/Books/Manual/DataModeling/Collections/DatabaseMethods.md
@@ -170,7 +170,7 @@ to the [naming conventions](../NamingConventions/README.md).
   many copies in the cluster a shard will refuse to write. The
   minReplicationFactor can not be larger than replicationFactor.
   Please note: during server failures this might lead to writes
-  not beeing possible until the failover is sorted out and might cause
+  not being possible until the failover is sorted out and might cause
   write slow downs in trade of data durability.
 
 - *distributeShardsLike*: distribute the shards of this collection

diff --git a/Documentation/Books/Manual/ReleaseNotes/NewFeatures35.md b/Documentation/Books/Manual/ReleaseNotes/NewFeatures35.md
@@ -221,7 +221,7 @@ Collections
 -----------
 
 All collections now support a minimum replication factor (minReplicationFactor) property.
-This is default set to `1`, which is identical to previous behaviour.
+This is default set to `1`, which is identical to previous behavior.
 If in a failover scenario a shard of a collection has less than minReplicationFactor many insync followers it will go into "read-only" mode and will reject writes until enough followers are insync again.
 In more detail:
 Having `minReplicationFactor == 1` means as soon as a "master-copy" is available of the data

diff --git a/Documentation/DocuBlocks/Rest/Collections/1_structs.md b/Documentation/DocuBlocks/Rest/Collections/1_structs.md
@@ -44,8 +44,8 @@ determine the target shard for documents; *Cluster specific attribute.*
 contains how many copies of each shard are kept on different DBServers.; *Cluster specific attribute.*
 
 @RESTSTRUCT{minReplicationFactor,collection_info,integer,optional,}
-contains how many minimal copies of each shard are kept on different DBServers.
-The shards will refuse to write, if we have less then these many copies in sync.; *Cluster specific attribute.*
+contains how many minimal copies of each shard need to be in sync on different DBServers.
+The shards will refuse to write, if we have less then these many copies in sync. *Cluster specific attribute.*
 
 @RESTSTRUCT{shardingStrategy,collection_info,string,optional,}
 the sharding strategy selected for the collection; *Cluster specific attribute.*

diff --git a/Documentation/DocuBlocks/Rest/Graph/1_structs.md b/Documentation/DocuBlocks/Rest/Graph/1_structs.md
@@ -27,7 +27,7 @@ The replication factor used for every new collection in the graph.
 
 @RESTSTRUCT{minReplicationFactor,graph_representation,integer,optional,}
 The minimal replication factor used for every new collection in the graph.
-If one shard has less then minimal replication factor copies, we cannot write
+If one shard has less than minReplicationFactor copies, we cannot write
 to this shard, but to all others.
 
 @RESTSTRUCT{isSmart,graph_representation,boolean,required,}

diff --git a/Documentation/DocuBlocks/Rest/Graph/general_graph_create_http_examples.md b/Documentation/DocuBlocks/Rest/Graph/general_graph_create_http_examples.md
@@ -44,7 +44,7 @@ The replication factor used when initially creating collections for this graph.
 
 @RESTSTRUCT{minReplicationFactor,post_api_gharial_create_opts,integer,optional,}
 The minimal replication factor used for every new collection in the graph.
-If one shard has less then minimal replication factor copies, we cannot write
+If one shard has less than minReplicationFactor copies, we cannot write
 to this shard, but to all others.
 
 @RESTRETURNCODES

diff --git a/Documentation/DocuBlocks/collectionProperties.md b/Documentation/DocuBlocks/collectionProperties.md
@@ -55,7 +55,7 @@ In a cluster setup, the result will also contain the following attributes:
   on different DBServers. Has to be in the range of 1-10 *(Cluster only)*
 
   * *minReplicationFactor* : determines the number of minimal shard copies kept on 
-  different DBServers, a shard will refuse to write, if less then this amount
+  different DBServers, a shard will refuse to write if less than this amount
   of copies are in sync. Has to be in the range of 1-replicationFactor *(Cluster only)*
 
 * *shardingStrategy*: the sharding strategy selected for the collection.
@@ -81,8 +81,8 @@ one or more of the following attribute(s):
   different DBServers, valid values are  integer numbers
   in the range of 1-10 *(Cluster only)*
 
-* *minReplicationFactor* : Change the number of minimal shard copies kept on 
-  different DBServers, a shard will refuse to write, if less then this amount
+* *minReplicationFactor* : Change the number of minimal shard copies to be in sync on 
+  different DBServers, a shard will refuse to write if less than this amount
   of copies are in sync. Has to be in the range of 1-replicationFactor *(Cluster only)*
 
 **Note**: some other collection properties, such as *type*, *isVolatile*,

diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsView.js
@@ -434,7 +434,7 @@
           try {
             if (Number.parseInt(minReplicationFactor) > Number.parseInt(replicationFactor)) {
               // validation here, as our Joi integration misses some core features
-              arangoHelper.arangoError("New Collection", "Minimal replication factor is not allowed to be greater then replication factor");
+              arangoHelper.arangoError("New Collection", "Minimal replication factor is not allowed to be greater than replication factor");
               abort = true;
             }
           } catch (ignore) {
@@ -602,7 +602,7 @@
                 'new-min-replication-factor',
                 'Mininum replication factor',
                 '',
-                'Numeric value. Must be at least 1 and must be smaller or equal compared to the replicationFactor. Minimal number of copies of the data in the cluster.',
+                'Numeric value. Must be at least 1 and must be smaller or equal compared to the replicationFactor. Minimal number of copies of the data in the cluster to be in sync in order to allow writes.',
                 '',
                 false,
                 [

diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js
@@ -897,7 +897,7 @@
             'new-minReplicationFactor',
             'Minimal Replication factor',
             '',
-                'Numeric value. Must be at least 1 and must be smaller or equal compared to the replicationFactor. Minimal number of copies of the data in the cluster.',
+                'Numeric value. Must be at least 1 and must be smaller or equal compared to the replicationFactor. Minimal number of copies of the data in the cluster to be in sync in order to allow writes.',
             '',
             false,
             [
@@ -967,7 +967,7 @@
             'general-minReplicationFactor',
             'Minimal replication factor',
             '',
-            'Numeric value. Must be at least 1. Must be smaller or equal compared to the replicationFactor. Total number of copies of the data in the cluster. If we get below this value the collection will be read-only until enough copies are created.',
+            'Numeric value. Must be at least 1. Must be smaller or equal compared to the replicationFactor. Total number of copies of the data in the cluster to be in sync. If we get below this value the collection will be read-only until enough copies are created.',
             '',
             false,
             [