From 1652767ec82cb5c024a169ea1096a58cf1ab9637 Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Thu, 9 Jan 2014 11:22:49 +0100
Subject: [PATCH] [DOCS] Added documentation for SameShardAllocationDecider

Closes #4615
---
 docs/reference/modules/cluster.asciidoc                   | 4 ++++
 .../allocation/decider/SameShardAllocationDecider.java    | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/reference/modules/cluster.asciidoc b/docs/reference/modules/cluster.asciidoc
index f39ec8ed672..f089e2dad90 100644
--- a/docs/reference/modules/cluster.asciidoc
+++ b/docs/reference/modules/cluster.asciidoc
@@ -68,6 +68,10 @@ added[1.0.0.RC1]
       cluster update settings API. This setting has been deprecated in
       favour for `cluster.routing.allocation.enable`.
 
+`cluster.routing.allocation.same_shard.host`::
+      Prevents that multiple instances of the same shard are allocated
+      on a single host. Defaults to `false`. This setting only applies 
+      if multiple nodes are started on the same machine.
 
 `indices.recovery.concurrent_streams`::
        The number of streams to open (on a *node* level) to recover a 
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java
index b8b8e854101..322c9d9815f 100644
--- a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java
+++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java
@@ -27,10 +27,10 @@ import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 
 /**
- * An allocation decider that prevents the more than prevents multiple instances
- * of the same shard to be allocated on a single <tt>host</tt>. The cluster setting can
- * be modified in real-time by updating the {@value #SAME_HOST_SETTING} value of
- * cluster setting API. The default is <code>false</code>.
+ * An allocation decider that prevents multiple instances of the same shard to be
+ * allocated on a single <tt>host</tt>. The cluster setting can be modified in
+ * real-time by updating the {@value #SAME_HOST_SETTING} value of cluster setting
+ * API. The default is <code>false</code>.
  * <p>
  * Note: this setting only applies if multiple nodes are started on the same
  * <tt>host</tt>. Multiple allocations of the same shard on the same <tt>node</tt> are