Fix typos in comments

Closes #16592

93 files changed, 119 insertions, 119 deletions

diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchException.java b/core/src/main/java/org/elasticsearch/ElasticsearchException.java
index 483b732fe0..dbfebd9aa8 100644
--- a/core/src/main/java/org/elasticsearch/ElasticsearchException.java
+++ b/core/src/main/java/org/elasticsearch/ElasticsearchException.java
@@ -257,7 +257,7 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
     }
 
     /**
-     * Retruns <code>true</code> iff the given class is a registered for an exception to be read.
+     * Returns <code>true</code> iff the given class is a registered for an exception to be read.
      */
     public static boolean isRegistered(Class<? extends Throwable> exception) {
         return CLASS_TO_ELASTICSEARCH_EXCEPTION_HANDLE.containsKey(exception);
@@ -372,7 +372,7 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
     }
 
     /**
-     * Returns the root cause of this exception or mupltiple if different shards caused different exceptions
+     * Returns the root cause of this exception or multiple if different shards caused different exceptions
      */
     public ElasticsearchException[] guessRootCauses() {
         final Throwable cause = getCause();
@@ -383,7 +383,7 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
     }
 
     /**
-     * Returns the root cause of this exception or mupltiple if different shards caused different exceptions.
+     * Returns the root cause of this exception or multiple if different shards caused different exceptions.
      * If the given exception is not an instance of {@link org.elasticsearch.ElasticsearchException} an empty array
      * is returned.
      */
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java
index 42d69794f0..d73b3d47df 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java
@@ -40,7 +40,7 @@ public class NodesInfoRequestBuilder extends NodesOperationRequestBuilder<NodesI
     }
 
     /**
-     * Sets to reutrn all the data.
+     * Sets to return all the data.
      */
     public NodesInfoRequestBuilder all() {
         request.all();
diff --git a/core/src/main/java/org/elasticsearch/action/fieldstats/IndexConstraint.java b/core/src/main/java/org/elasticsearch/action/fieldstats/IndexConstraint.java
index 19e274e785..681b7d7a44 100644
--- a/core/src/main/java/org/elasticsearch/action/fieldstats/IndexConstraint.java
+++ b/core/src/main/java/org/elasticsearch/action/fieldstats/IndexConstraint.java
@@ -73,7 +73,7 @@ public class IndexConstraint {
     }
 
     /**
-     * @return On what property of a field the contraint is going to be applied on (min or max value)
+     * @return On what property of a field the constraint is going to be applied on (min or max value)
      */
     public Property getProperty() {
         return property;
diff --git a/core/src/main/java/org/elasticsearch/action/index/IndexRequest.java b/core/src/main/java/org/elasticsearch/action/index/IndexRequest.java
index f21b805299..336782d16f 100644
--- a/core/src/main/java/org/elasticsearch/action/index/IndexRequest.java
+++ b/core/src/main/java/org/elasticsearch/action/index/IndexRequest.java
@@ -372,7 +372,7 @@ public class IndexRequest extends ReplicationRequest<IndexRequest> implements Do
     }
 
     /**
-     * The source of the document to index, recopied to a new array if it is unsage.
+     * The source of the document to index, recopied to a new array if it is unsafe.
      */
     public BytesReference source() {
         return source;
diff --git a/core/src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptRequest.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptRequest.java
index 82d0f9b7bb..765331fd1e 100644
--- a/core/src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptRequest.java
+++ b/core/src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptRequest.java
@@ -164,7 +164,7 @@ public class PutIndexedScriptRequest extends ActionRequest<PutIndexedScriptReque
     }
 
     /**
-     * The source of the document to index, recopied to a new array if it is unsage.
+     * The source of the document to index, recopied to a new array if it is unsafe.
      */
     public BytesReference source() {
         return source;
diff --git a/core/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java b/core/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java
index 3540daa255..2b3cd804fc 100644
--- a/core/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java
+++ b/core/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java
@@ -55,7 +55,7 @@ public class ClearScrollResponse extends ActionResponse implements StatusToXCont
     }
 
     /**
-     * @return The number of seach contexts that were freed. If this is <code>0</code> the assumption can be made,
+     * @return The number of search contexts that were freed. If this is <code>0</code> the assumption can be made,
      * that the scroll id specified in the request did not exist. (never existed, was expired, or completely consumed)
      */
     public int getNumFreed() {
diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java
index 07d7b2fa3d..ca4a8e59c9 100644
--- a/core/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java
+++ b/core/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java
@@ -223,7 +223,7 @@ public class SearchRequestBuilder extends ActionRequestBuilder<SearchRequest, Se
     }
 
     /**
-     * Sets the boost a specific index will receive when the query is executeed against it.
+     * Sets the boost a specific index will receive when the query is executed against it.
      *
      * @param index      The index to apply the boost against
      * @param indexBoost The boost to apply to the index
diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java b/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java
index 0b4152fed5..9c745adf86 100644
--- a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java
+++ b/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java
@@ -486,7 +486,7 @@ public final class TermVectorsFields extends Fields {
 
     // read a vInt. this is used if the integer might be negative. In this case,
     // the writer writes a 0 for -1 or value +1 and accordingly we have to
-    // substract 1 again
+    // subtract 1 again
     // adds one to mock not existing term freq
     int readPotentiallyNegativeVInt(StreamInput stream) throws IOException {
         return stream.readVInt() - 1;
@@ -494,7 +494,7 @@ public final class TermVectorsFields extends Fields {
 
     // read a vLong. this is used if the integer might be negative. In this
     // case, the writer writes a 0 for -1 or value +1 and accordingly we have to
-    // substract 1 again
+    // subtract 1 again
     // adds one to mock not existing term freq
     long readPotentiallyNegativeVLong(StreamInput stream) throws IOException {
         return stream.readVLong() - 1;
diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JNANatives.java b/core/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
index 78dbc00ae3..64b685c415 100644
--- a/core/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
+++ b/core/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
@@ -108,7 +108,7 @@ class JNANatives {
         if (value == JNACLibrary.RLIM_INFINITY) {
             return "unlimited";
         } else {
-            // TODO, on java 8 use Long.toUnsignedString, since thats what it is.
+            // TODO, on java 8 use Long.toUnsignedString, since that's what it is.
             return Long.toString(value);
         }
     }
diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Seccomp.java b/core/src/main/java/org/elasticsearch/bootstrap/Seccomp.java
index 00f60a70a2..4325c5b7ae 100644
--- a/core/src/main/java/org/elasticsearch/bootstrap/Seccomp.java
+++ b/core/src/main/java/org/elasticsearch/bootstrap/Seccomp.java
@@ -104,7 +104,7 @@ final class Seccomp {
         int prctl(int option, NativeLong arg2, NativeLong arg3, NativeLong arg4, NativeLong arg5);
         /**
          * used to call seccomp(2), its too new...
-         * this is the only way, DONT use it on some other architecture unless you know wtf you are doing
+         * this is the only way, DON'T use it on some other architecture unless you know wtf you are doing
          */
         NativeLong syscall(NativeLong number, Object... args);
     };
diff --git a/core/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java b/core/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java
index 7016718b30..a293428192 100644
--- a/core/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java
+++ b/core/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java
@@ -93,7 +93,7 @@ public class PageCacheRecycler extends AbstractComponent implements Releasable {
         // because they would make obtain/release too costly: we really need constant-time
         // operations.
         // Ultimately a better solution would be to only store one kind of data and have the
-        // ability to intepret it either as a source of bytes, doubles, longs, etc. eg. thanks
+        // ability to interpret it either as a source of bytes, doubles, longs, etc. eg. thanks
         // to direct ByteBuffers or sun.misc.Unsafe on a byte[] but this would have other issues
         // that would need to be addressed such as garbage collection of native memory or safety
         // of Unsafe writes.
diff --git a/core/src/main/java/org/elasticsearch/client/Requests.java b/core/src/main/java/org/elasticsearch/client/Requests.java
index 2f3e3f8bc3..c3dd77a3e4 100644
--- a/core/src/main/java/org/elasticsearch/client/Requests.java
+++ b/core/src/main/java/org/elasticsearch/client/Requests.java
@@ -107,7 +107,7 @@ public class Requests {
     }
 
     /**
-     * Creats a new bulk request.
+     * Creates a new bulk request.
      */
     public static BulkRequest bulkRequest() {
         return new BulkRequest();
diff --git a/core/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java b/core/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java
index ebea8b84f1..9f7fb00e19 100644
--- a/core/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java
+++ b/core/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java
@@ -38,9 +38,9 @@ public interface LocalNodeMasterListener {
      * The name of the executor that the implementation of the callbacks of this lister should be executed on. The thread
      * that is responsible for managing instances of this lister is the same thread handling the cluster state events. If
      * the work done is the callbacks above is inexpensive, this value may be {@link org.elasticsearch.threadpool.ThreadPool.Names#SAME SAME}
-     * (indicating that the callbaks will run on the same thread as the cluster state events are fired with). On the other hand,
+     * (indicating that the callbacks will run on the same thread as the cluster state events are fired with). On the other hand,
      * if the logic in the callbacks are heavier and take longer to process (or perhaps involve blocking due to IO operations),
-     * prefer to execute them on a separte more appropriate executor (eg. {@link org.elasticsearch.threadpool.ThreadPool.Names#GENERIC GENERIC}
+     * prefer to execute them on a separate more appropriate executor (eg. {@link org.elasticsearch.threadpool.ThreadPool.Names#GENERIC GENERIC}
      * or {@link org.elasticsearch.threadpool.ThreadPool.Names#MANAGEMENT MANAGEMENT}).
      *
      * @return The name of the executor that will run the callbacks of this listener.
diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java
index 9fb526b740..8ba78979f3 100644
--- a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java
+++ b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java
@@ -959,7 +959,7 @@ public class MetaData implements Iterable<IndexMetaData>, Diffable<MetaData>, Fr
 
         public MetaData build() {
             // TODO: We should move these datastructures to IndexNameExpressionResolver, this will give the following benefits:
-            // 1) The datastructures will only be rebuilded when needed. Now during serailizing we rebuild these datastructures
+            // 1) The datastructures will only be rebuilded when needed. Now during serializing we rebuild these datastructures
             //    while these datastructures aren't even used.
             // 2) The aliasAndIndexLookup can be updated instead of rebuilding it all the time.
 
diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java
index 99b1974f5d..8b10c4aead 100644
--- a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java
+++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java
@@ -611,7 +611,7 @@ public class AllocationService extends AbstractComponent {
         return routingNodes;
     }
 
-    /** ovrride this to control time based decisions during allocation */
+    /** override this to control time based decisions during allocation */
     protected long currentNanoTime() {
         return System.nanoTime();
     }
diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedRerouteAllocation.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedRerouteAllocation.java
index 835556a265..7232e15f03 100644
--- a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedRerouteAllocation.java
+++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedRerouteAllocation.java
@@ -30,7 +30,7 @@ import java.util.List;
 
 /**
  * This {@link RoutingAllocation} keeps a shard which routing
- * allocation has faild
+ * allocation has failed.
  */
 public class FailedRerouteAllocation extends RoutingAllocation {
 
diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
index 574f12265a..15c303a2f7 100644
--- a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
+++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
@@ -571,7 +571,7 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
         }
 
         /**
-         * Allocates all given shards on the minimal eligable node for the shards index
+         * Allocates all given shards on the minimal eligible node for the shards index
          * with respect to the weight function. All given shards must be unassigned.
          */
         private boolean allocateUnassigned(RoutingNodes.UnassignedShards unassigned) {
@@ -611,7 +611,7 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
              * The arrays are sorted by primaries first and then by index and shard ID so a 2 indices with 2 replica and 1 shard would look like:
              * [(0,P,IDX1), (0,P,IDX2), (0,R,IDX1), (0,R,IDX1), (0,R,IDX2), (0,R,IDX2)]
              * if we allocate for instance (0, R, IDX1) we move the second replica to the secondary array and proceed with
-             * the next replica. If we could not find a node to allocate (0,R,IDX1) we move all it's replicas to ingoreUnassigned.
+             * the next replica. If we could not find a node to allocate (0,R,IDX1) we move all it's replicas to ignoreUnassigned.
              */
             ShardRouting[] primary = unassigned.drain();
             ShardRouting[] secondary = new ShardRouting[primary.length];
@@ -733,7 +733,7 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
                 secondary = tmp;
                 secondaryLength = 0;
             } while (primaryLength > 0);
-            // clear everything we have either added it or moved to ingoreUnassigned
+            // clear everything we have either added it or moved to ignoreUnassigned
             return changed;
         }
 
diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java
index 19047bcb0d..9859a9b658 100644
--- a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java
+++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java
@@ -54,7 +54,7 @@ import java.util.Map;
  * <p>
  * Awareness can also be used to prevent over-allocation in the case of node or
  * even "zone" failure. For example in cloud-computing infrastructures like
- * Amazone AWS a cluster might span over multiple "zones". Awareness can be used
+ * Amazon AWS a cluster might span over multiple "zones". Awareness can be used
  * to distribute replicas to individual zones by setting:
  * <pre>
  * cluster.routing.allocation.awareness.attributes: zone
diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java
index a9ad35fd52..d39b960406 100644
--- a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java
+++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java
@@ -30,7 +30,7 @@ import org.elasticsearch.common.settings.Settings;
  * Similar to the {@link ClusterRebalanceAllocationDecider} this
  * {@link AllocationDecider} controls the number of currently in-progress
  * re-balance (relocation) operations and restricts node allocations if the
- * configured threashold is reached. The default number of concurrent rebalance
+ * configured threshold is reached. The default number of concurrent rebalance
  * operations is set to <tt>2</tt>
  * <p>
  * Re-balance operations can be controlled in real-time via the cluster update API using
diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java
index c012017976..821fa55d70 100644
--- a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java
+++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java
@@ -282,7 +282,7 @@ public class DiskThresholdDecider extends AllocationDecider {
 
     /**
      * Returns the size of all shards that are currently being relocated to
-     * the node, but may not be finished transfering yet.
+     * the node, but may not be finished transferring yet.
      *
      * If subtractShardsMovingAway is set then the size of shards moving away is subtracted from the total size
      * of all shards
diff --git a/core/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java b/core/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java
index 6689d9c868..dec856992b 100644
--- a/core/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java
+++ b/core/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java
@@ -41,7 +41,7 @@ public class DiscoverySettings extends AbstractComponent {
     public final static ClusterBlock NO_MASTER_BLOCK_WRITES = new ClusterBlock(NO_MASTER_BLOCK_ID, "no master", true, false, RestStatus.SERVICE_UNAVAILABLE, EnumSet.of(ClusterBlockLevel.WRITE, ClusterBlockLevel.METADATA_WRITE));
     /**
      * sets the timeout for a complete publishing cycle, including both sending and committing. the master
-     * will continute to process the next cluster state update after this time has elapsed
+     * will continue to process the next cluster state update after this time has elapsed
      **/
     public static final Setting<TimeValue> PUBLISH_TIMEOUT_SETTING = Setting.positiveTimeSetting("discovery.zen.publish_timeout", TimeValue.timeValueSeconds(30), true, Setting.Scope.CLUSTER);
 
diff --git a/core/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java b/core/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java
index cd4a6a5ba9..10fe432ff1 100644
--- a/core/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java
+++ b/core/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java
@@ -328,7 +328,7 @@ public class LocalDiscovery extends AbstractLifecycleComponent<Discovery> implem
                 ClusterState newNodeSpecificClusterState = null;
                 synchronized (this) {
                     // we do the marshaling intentionally, to check it works well...
-                    // check if we publsihed cluster state at least once and node was in the cluster when we published cluster state the last time
+                    // check if we published cluster state at least once and node was in the cluster when we published cluster state the last time
                     if (discovery.lastProcessedClusterState != null && clusterChangedEvent.previousState().nodes().nodeExists(discovery.localNode().id())) {
                         // both conditions are true - which means we can try sending cluster state as diffs
                         if (clusterStateDiffBytes == null) {
diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/elect/ElectMasterService.java b/core/src/main/java/org/elasticsearch/discovery/zen/elect/ElectMasterService.java
index 9cca1edfc5..1482fb92a2 100644
--- a/core/src/main/java/org/elasticsearch/discovery/zen/elect/ElectMasterService.java
+++ b/core/src/main/java/org/elasticsearch/discovery/zen/elect/ElectMasterService.java
@@ -79,7 +79,7 @@ public class ElectMasterService extends AbstractComponent {
     }
 
     /**
-     * Returns the given nodes sorted by likelyhood of being elected as master, most likely first.
+     * Returns the given nodes sorted by likelihood of being elected as master, most likely first.
      * Non-master nodes are not removed but are rather put in the end
      */
     public List<DiscoveryNode> sortByMasterLikelihood(Iterable<DiscoveryNode> nodes) {
diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java b/core/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java
index e661002e64..427abca8d8 100644
--- a/core/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java
+++ b/core/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java
@@ -342,7 +342,7 @@ public class UnicastZenPing extends AbstractLifecycleComponent<ZenPing> implemen
         // sort the nodes by likelihood of being an active master
         List<DiscoveryNode> sortedNodesToPing = electMasterService.sortByMasterLikelihood(nodesToPingSet);
 
-        // new add the the unicast targets first
+        // new add the unicast targets first
         List<DiscoveryNode> nodesToPing = CollectionUtils.arrayAsArrayList(configuredTargetNodes);
         nodesToPing.addAll(sortedNodesToPing);
 
diff --git a/core/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java b/core/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java
index 4524222d5a..757a78c3b5 100644
--- a/core/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java
+++ b/core/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java
@@ -166,7 +166,7 @@ public abstract class AsyncShardFetch<T extends BaseNodeResponse> implements Rel
     /**
      * Called by the response handler of the async action to fetch data. Verifies that its still working
      * on the same cache generation, otherwise the results are discarded. It then goes and fills the relevant data for
-     * the shard (response + failures), issueing a reroute at the end of it to make sure there will be another round
+     * the shard (response + failures), issuing a reroute at the end of it to make sure there will be another round
      * of allocations taking this new data into account.
      */
     protected synchronized void processAsyncFetch(ShardId shardId, T[] responses, FailedNodeException[] failures) {
diff --git a/core/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java b/core/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java
index 5c7b31de23..f714c641ca 100644
--- a/core/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java
+++ b/core/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java
@@ -255,7 +255,7 @@ public abstract class MetaDataStateFormat<T> {
         List<PathAndStateId> files = new ArrayList<>();
         long maxStateId = -1;
         boolean maxStateIdIsLegacy = true;
-        if (dataLocations != null) { // select all eligable files first
+        if (dataLocations != null) { // select all eligible files first
             for (Path dataLocation : dataLocations) {
                 final Path stateDir = dataLocation.resolve(STATE_DIR_NAME);
                 // now, iterate over the current versions, and find latest one
diff --git a/core/src/main/java/org/elasticsearch/http/netty/ESHttpContentDecompressor.java b/core/src/main/java/org/elasticsearch/http/netty/ESHttpContentDecompressor.java
index 79e845606c..0d1e46cf06 100644
--- a/core/src/main/java/org/elasticsearch/http/netty/ESHttpContentDecompressor.java
+++ b/core/src/main/java/org/elasticsearch/http/netty/ESHttpContentDecompressor.java
@@ -39,7 +39,7 @@ public class ESHttpContentDecompressor extends HttpContentDecompressor {
             // compression is enabled so handle the request according to the headers (compressed and uncompressed)
             return super.newContentDecoder(contentEncoding);
         } else {
-            // if compression is disabled only allow "indentity" (uncompressed) requests
+            // if compression is disabled only allow "identity" (uncompressed) requests
             if (HttpHeaders.Values.IDENTITY.equals(contentEncoding)) {
                 // nothing to handle here
                 return null;
@@ -48,4 +48,4 @@ public class ESHttpContentDecompressor extends HttpContentDecompressor {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/elasticsearch/http/netty/cors/CorsConfig.java b/core/src/main/java/org/elasticsearch/http/netty/cors/CorsConfig.java
index 33a06537aa..bd1c2ec316 100644
--- a/core/src/main/java/org/elasticsearch/http/netty/cors/CorsConfig.java
+++ b/core/src/main/java/org/elasticsearch/http/netty/cors/CorsConfig.java
@@ -132,7 +132,7 @@ public final class CorsConfig {
      * xhr.withCredentials = true;
      * </pre>
      * The default value for 'withCredentials' is false in which case no cookies are sent.
-     * Settning this to true will included cookies in cross origin requests.
+     * Setting this to true will included cookies in cross origin requests.
      *
      * @return {@code true} if cookies are supported.
      */
@@ -205,7 +205,7 @@ public final class CorsConfig {
      * and this setting will check that the Origin is valid and if it is not valid no
      * further processing will take place, and a error will be returned to the calling client.
      *
-     * @return {@code true} if a CORS request should short-curcuit upon receiving an invalid Origin header.
+     * @return {@code true} if a CORS request should short-circuit upon receiving an invalid Origin header.
      */
     public boolean isShortCircuit() {
         return shortCircuit;
diff --git a/core/src/main/java/org/elasticsearch/http/netty/cors/CorsConfigBuilder.java b/core/src/main/java/org/elasticsearch/http/netty/cors/CorsConfigBuilder.java
index 7331ed9a42..05aa1e6a85 100644
--- a/core/src/main/java/org/elasticsearch/http/netty/cors/CorsConfigBuilder.java
+++ b/core/src/main/java/org/elasticsearch/http/netty/cors/CorsConfigBuilder.java
@@ -133,7 +133,7 @@ public final class CorsConfigBuilder {
     /**
      * Web browsers may set the 'Origin' request header to 'null' if a resource is loaded
      * from the local file system. Calling this method will enable a successful CORS response
-     * with a wildcard for the the CORS response header 'Access-Control-Allow-Origin'.
+     * with a wildcard for the CORS response header 'Access-Control-Allow-Origin'.
      *
      * @return {@link CorsConfigBuilder} to support method chaining.
      */
diff --git a/core/src/main/java/org/elasticsearch/index/IndexModule.java b/core/src/main/java/org/elasticsearch/index/IndexModule.java
index fada5f4283..b45f29f752 100644
--- a/core/src/main/java/org/elasticsearch/index/IndexModule.java
+++ b/core/src/main/java/org/elasticsearch/index/IndexModule.java
@@ -143,7 +143,7 @@ public final class IndexModule {
     }
 
     /**
-     * Adds an {@link IndexStore} type to this index module. Typically stores are registered with a refrence to
+     * Adds an {@link IndexStore} type to this index module. Typically stores are registered with a reference to
      * it's constructor:
      * <pre>
      *     indexModule.addIndexStore("my_store_type", MyStore::new);
diff --git a/core/src/main/java/org/elasticsearch/index/IndexService.java b/core/src/main/java/org/elasticsearch/index/IndexService.java
index 543a5fc0d2..9ffb6c4d56 100644
--- a/core/src/main/java/org/elasticsearch/index/IndexService.java
+++ b/core/src/main/java/org/elasticsearch/index/IndexService.java
@@ -691,7 +691,7 @@ public final class IndexService extends AbstractIndexComponent implements IndexC
         }
 
         boolean mustReschedule() {
-            // don't re-schedule if its closed or if we dont' have a single shard here..., we are done
+            // don't re-schedule if its closed or if we don't have a single shard here..., we are done
             return indexService.closed.get() == false
                 && closed.get() == false && interval.millis() > 0;
         }
diff --git a/core/src/main/java/org/elasticsearch/index/IndexSettings.java b/core/src/main/java/org/elasticsearch/index/IndexSettings.java
index da15d29d19..b17b8ab7ed 100644
--- a/core/src/main/java/org/elasticsearch/index/IndexSettings.java
+++ b/core/src/main/java/org/elasticsearch/index/IndexSettings.java
@@ -329,7 +329,7 @@ public final class IndexSettings {
     public boolean isShadowReplicaIndex() { return isShadowReplicaIndex; }
 
     /**
-     * Returns the node settings. The settings retured from {@link #getSettings()} are a merged version of the
+     * Returns the node settings. The settings returned from {@link #getSettings()} are a merged version of the
      * index settings and the node settings where node settings are overwritten by index settings.
      */
     public Settings getNodeSettings() {
diff --git a/core/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java b/core/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java
index 1bb75a2bf0..5a7f481eaa 100644
--- a/core/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java
+++ b/core/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java
@@ -22,7 +22,7 @@ package org.elasticsearch.index.engine;
 import org.apache.lucene.util.RamUsageEstimator;
 import org.elasticsearch.index.translog.Translog;
 
-/** Holds a deleted version, which just adds a timestmap to {@link VersionValue} so we know when we can expire the deletion. */
+/** Holds a deleted version, which just adds a timestamp to {@link VersionValue} so we know when we can expire the deletion. */
 
 class DeleteVersionValue extends VersionValue {
     private final long time;
diff --git a/core/src/main/java/org/elasticsearch/index/engine/EngineClosedException.java b/core/src/main/java/org/elasticsearch/index/engine/EngineClosedException.java
index 062e79eac1..3ecae762a2 100644
--- a/core/src/main/java/org/elasticsearch/index/engine/EngineClosedException.java
+++ b/core/src/main/java/org/elasticsearch/index/engine/EngineClosedException.java
@@ -29,7 +29,7 @@ import java.io.IOException;
  * An engine is already closed.
  * <p>
  * Note, the relationship between shard and engine indicates that engine closed is shard closed, and
- * we might get something slipping through the the shard and into the engine while the shard is closing.
+ * we might get something slipping through the shard and into the engine while the shard is closing.
  *
  *
  */
diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java b/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java
index d17a9fd07f..04e1ff1697 100644
--- a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java
+++ b/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java
@@ -321,7 +321,7 @@ public final class OrdinalsBuilder implements Closeable {
     }
 
     /**
-     * Retruns the current ordinal or <tt>0</tt> if this build has not been advanced via
+     * Returns the current ordinal or <tt>0</tt> if this build has not been advanced via
      * {@link #nextOrdinal()}.
      */
     public long currentOrdinal() {
@@ -457,7 +457,7 @@ public final class OrdinalsBuilder implements Closeable {
      * This method iterates all terms in the given {@link TermsEnum} and
      * associates each terms ordinal with the terms documents. The caller must
      * exhaust the returned {@link BytesRefIterator} which returns all values
-     * where the first returned value is associted with the ordinal <tt>1</tt>
+     * where the first returned value is associated with the ordinal <tt>1</tt>
      * etc.
      * <p>
      * If the {@link TermsEnum} contains prefix coded numerical values the terms
diff --git a/core/src/main/java/org/elasticsearch/index/percolator/ExtractQueryTermsService.java b/core/src/main/java/org/elasticsearch/index/percolator/ExtractQueryTermsService.java
index 7dc6e51a75..2dfc9407fe 100644
--- a/core/src/main/java/org/elasticsearch/index/percolator/ExtractQueryTermsService.java
+++ b/core/src/main/java/org/elasticsearch/index/percolator/ExtractQueryTermsService.java
@@ -85,7 +85,7 @@ public final class ExtractQueryTermsService {
     /**
      * Extracts all query terms from the provided query and adds it to specified list.
      *
-     * From boolean query with no should clauses or phrase queries only the the longest term are selected,
+     * From boolean query with no should clauses or phrase queries only the longest term are selected,
      * since that those terms are likely to be the rarest. Boolean query's must_not clauses are always ignored.
      *
      * If from part of the query, no query terms can be extracted then term extraction is stopped and
diff --git a/core/src/main/java/org/elasticsearch/index/percolator/PercolateStats.java b/core/src/main/java/org/elasticsearch/index/percolator/PercolateStats.java
index f927a42761..f4c899dff9 100644
--- a/core/src/main/java/org/elasticsearch/index/percolator/PercolateStats.java
+++ b/core/src/main/java/org/elasticsearch/index/percolator/PercolateStats.java
@@ -41,7 +41,7 @@ public class PercolateStats implements Streamable, ToXContent {
     private long numQueries;
 
     /**
-     * Noop constructor for serialazation purposes.
+     * Noop constructor for serialization purposes.
      */
     public PercolateStats() {
     }
diff --git a/core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java
index 550ffe8988..a0fc9ee7e7 100644
--- a/core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java
+++ b/core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java
@@ -165,7 +165,7 @@ public class CommonTermsQueryBuilder extends AbstractQueryBuilder<CommonTermsQue
 
     /**
      * Sets the minimum number of high frequent query terms that need to match in order to
-     * produce a hit when there are no low frequen terms.
+     * produce a hit when there are no low frequent terms.
      */
     public CommonTermsQueryBuilder highFreqMinimumShouldMatch(String highFreqMinimumShouldMatch) {
         this.highFreqMinimumShouldMatch = highFreqMinimumShouldMatch;
diff --git a/core/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java
index 2031abc007..4b2427817a 100644
--- a/core/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java
+++ b/core/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java
@@ -154,7 +154,7 @@ public class FuzzyQueryBuilder extends AbstractQueryBuilder<FuzzyQueryBuilder> i
     }
 
     private FuzzyQueryBuilder() {
-        // for protoype
+        // for prototype
         this.fieldName = null;
         this.value = null;
     }
diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java
index 9f1187ea78..a0246f1f83 100644
--- a/core/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java
+++ b/core/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java
@@ -251,7 +251,7 @@ public class GeoBoundingBoxQueryBuilder extends AbstractQueryBuilder<GeoBounding
         GeoPoint luceneBottomRight = new GeoPoint(bottomRight);
         if (GeoValidationMethod.isCoerce(validationMethod)) {
             // Special case: if the difference between the left and right is 360 and the right is greater than the left, we are asking for
-            // the complete longitude range so need to set longitude to the complete longditude range
+            // the complete longitude range so need to set longitude to the complete longitude range
             double right = luceneBottomRight.getLon();
             double left = luceneTopLeft.getLon();
 
diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java
index ff5b9d9001..43f55dc034 100644
--- a/core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java
+++ b/core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java
@@ -197,7 +197,7 @@ public class GeoDistanceQueryBuilder extends AbstractQueryBuilder<GeoDistanceQue
         return this.optimizeBbox;
     }
 
-    /** Set validaton method for geo coordinates. */
+    /** Set validation method for geo coordinates. */
     public void setValidationMethod(GeoValidationMethod method) {
         this.validationMethod = method;
     }
diff --git a/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java
index 8b4af09c2b..0e98b2042a 100644
--- a/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java
+++ b/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java
@@ -634,7 +634,7 @@ public class MoreLikeThisQueryBuilder extends AbstractQueryBuilder<MoreLikeThisQ
     }
 
     /**
-     * The analyzer that will be used to analyze the text. Defaults to the analyzer associated with the fied.
+     * The analyzer that will be used to analyze the text. Defaults to the analyzer associated with the field.
      */
     public MoreLikeThisQueryBuilder analyzer(String analyzer) {
         this.analyzer = analyzer;
@@ -703,7 +703,7 @@ public class MoreLikeThisQueryBuilder extends AbstractQueryBuilder<MoreLikeThisQ
      * Converts an array of String ids to and Item[].
      * @param ids the ids to convert
      * @return the new items array
-     * @deprecated construct the items array externaly and use it in the constructor / setter
+     * @deprecated construct the items array externally and use it in the constructor / setter
      */
     @Deprecated
     public static Item[] ids(String... ids) {
diff --git a/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java
index f7c1945313..bc629d8382 100644
--- a/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java
+++ b/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java
@@ -29,7 +29,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Parser for the The More Like This Query (MLT Query) which finds documents that are "like" a given set of documents.
+ * Parser for the More Like This Query (MLT Query) which finds documents that are "like" a given set of documents.
  *
  * The documents are provided as a set of strings and/or a list of {@link Item}.
  */
diff --git a/core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java b/core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java
index dbe4de5ad8..17ba74aeef 100644
--- a/core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java
+++ b/core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java
@@ -284,7 +284,7 @@ public class MultiMatchQuery extends MatchQuery {
             } catch (RuntimeException ex) {
                 // we can't parse it just use the incoming value -- it will
                 // just have a DF of 0 at the end of the day and will be ignored
-                // Note that this is like lenient = true allways
+                // Note that this is like lenient = true always
             }
             return new Term(field, value);
         }
diff --git a/core/src/main/java/org/elasticsearch/index/shard/ShardPath.java b/core/src/main/java/org/elasticsearch/index/shard/ShardPath.java
index e870057a14..3d6fbf0810 100644
--- a/core/src/main/java/org/elasticsearch/index/shard/ShardPath.java
+++ b/core/src/main/java/org/elasticsearch/index/shard/ShardPath.java
@@ -176,7 +176,7 @@ public final class ShardPath {
             totFreeSpace += nodePath.fileStore.getUsableSpace();
         }
 
-        // Very rough heurisic of how much disk space we expect the shard will use over its lifetime, the max of current average
+        // Very rough heuristic of how much disk space we expect the shard will use over its lifetime, the max of current average
         // shard size across the cluster and 5% of the total available free space on this node:
         long estShardSizeInBytes = Math.max(avgShardSizeInBytes, (long) (totFreeSpace/20.0));
 
@@ -215,7 +215,7 @@ public final class ShardPath {
             // TODO: this is a hack!!  We should instead keep track of incoming (relocated) shards since we know
             // how large they will be once they're done copying, instead of a silly guess for such cases:
 
-            // Very rough heurisic of how much disk space we expect the shard will use over its lifetime, the max of current average
+            // Very rough heuristic of how much disk space we expect the shard will use over its lifetime, the max of current average
             // shard size across the cluster and 5% of the total available free space on this node:
             long estShardSizeInBytes = Math.max(avgShardSizeInBytes, (long) (totFreeSpace/20.0));
 
diff --git a/core/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java b/core/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java
index aaa30c147c..e057349223 100644
--- a/core/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java
+++ b/core/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java
@@ -64,7 +64,7 @@ final class StoreRecovery {
      * @param indexShard the index shard instance to recovery the shard into
      * @param indexShouldExists <code>true</code> iff the index should exist on disk ie. has the shard been allocated previously on the shards store.
      * @param localNode the reference to the local node
-     * @return  <code>true</code> if the the shard has been recovered successfully, <code>false</code> if the recovery
+     * @return  <code>true</code> if the shard has been recovered successfully, <code>false</code> if the recovery
      * has been ignored due to a concurrent modification of if the clusters state has changed due to async updates.
      * @see Store
      */
@@ -86,7 +86,7 @@ final class StoreRecovery {
      * previously created index snapshot into an existing initializing shard.
      * @param indexShard the index shard instance to recovery the snapshot from
      * @param repository the repository holding the physical files the shard should be recovered from
-     * @return <code>true</code> if the the shard has been recovered successfully, <code>false</code> if the recovery
+     * @return <code>true</code> if the shard has been recovered successfully, <code>false</code> if the recovery
      * has been ignored due to a concurrent modification of if the clusters state has changed due to async updates.
      */
     boolean recoverFromRepository(final IndexShard indexShard, IndexShardRepository repository, DiscoveryNode localNode) {
diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardRepository.java b/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardRepository.java
index c2a134b08e..604ac1b2d1 100644
--- a/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardRepository.java
+++ b/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardRepository.java
@@ -728,7 +728,7 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
     }
 
     /**
-     * This is a BWC layer to ensure we update the snapshots metdata with the corresponding hashes before we compare them.
+     * This is a BWC layer to ensure we update the snapshots metadata with the corresponding hashes before we compare them.
      * The new logic for StoreFileMetaData reads the entire <tt>.si</tt> and <tt>segments.n</tt> files to strengthen the
      * comparison of the files on a per-segment / per-commit level.
      */
diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java b/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java
index 8f05572bed..1e0d55f2f6 100644
--- a/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java
+++ b/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java
@@ -42,7 +42,7 @@ import static java.util.Collections.unmodifiableMap;
 /**
  * Contains information about all snapshot for the given shard in repository
  * <p>
- * This class is used to find files that were already snapshoted and clear out files that no longer referenced by any
+ * This class is used to find files that were already snapshotted and clear out files that no longer referenced by any
  * snapshots
  */
 public class BlobStoreIndexShardSnapshots implements Iterable<SnapshotFiles>, ToXContent, FromXContentBuilder<BlobStoreIndexShardSnapshots> {
diff --git a/core/src/main/java/org/elasticsearch/index/translog/Translog.java b/core/src/main/java/org/elasticsearch/index/translog/Translog.java
index 7579f55f0e..5a4438f426 100644
--- a/core/src/main/java/org/elasticsearch/index/translog/Translog.java
+++ b/core/src/main/java/org/elasticsearch/index/translog/Translog.java
@@ -97,7 +97,7 @@ public class Translog extends AbstractIndexShardComponent implements IndexShardC
     /*
      * TODO
      *  - we might need something like a deletion policy to hold on to more than one translog eventually (I think sequence IDs needs this) but we can refactor as we go
-     *  - use a simple BufferedOuputStream to write stuff and fold BufferedTranslogWriter into it's super class... the tricky bit is we need to be able to do random access reads even from the buffer
+     *  - use a simple BufferedOutputStream to write stuff and fold BufferedTranslogWriter into it's super class... the tricky bit is we need to be able to do random access reads even from the buffer
      *  - we need random exception on the FileSystem API tests for all this.
      *  - we need to page align the last write before we sync, we can take advantage of ensureSynced for this since we might have already fsynced far enough
      */
diff --git a/core/src/main/java/org/elasticsearch/indices/IndicesService.java b/core/src/main/java/org/elasticsearch/indices/IndicesService.java
index 876411964b..f092789ae3 100644
--- a/core/src/main/java/org/elasticsearch/indices/IndicesService.java
+++ b/core/src/main/java/org/elasticsearch/indices/IndicesService.java
@@ -515,7 +515,7 @@ public class IndicesService extends AbstractLifecycleComponent<IndicesService> i
             if (success == false) {
                 addPendingDelete(index, indexSettings);
             }
-            // this is a pure protection to make sure this index doesn't get re-imported as a dangeling index.
+            // this is a pure protection to make sure this index doesn't get re-imported as a dangling index.
             // we should in the future rather write a tombstone rather than wiping the metadata.
             MetaDataStateFormat.deleteMetaState(nodeEnv.indexPaths(index.getName()));
         }
diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java
index 26c288cfbc..adb775df27 100644
--- a/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java
+++ b/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java
@@ -403,7 +403,7 @@ public class RecoverySourceHandler {
             } catch (IllegalIndexShardStateException e) {
                 // we can ignore this exception since, on the other node, when it moved to phase3
                 // it will also send shard started, which might cause the index shard we work against
-                // to move be closed by the time we get to the the relocated method
+                // to move be closed by the time we get to the relocated method
             }
         }
         stopWatch.stop();
diff --git a/core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java b/core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java
index 6d225af43d..d0aec817ee 100644
--- a/core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java
+++ b/core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java
@@ -68,7 +68,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 public class IndicesStore extends AbstractComponent implements ClusterStateListener, Closeable {
 
-    // TODO this class can be foled into either IndicesService and partially into IndicesClusterStateService there is no need for a seperate public service
+    // TODO this class can be foled into either IndicesService and partially into IndicesClusterStateService there is no need for a separate public service
     public static final Setting<TimeValue> INDICES_STORE_DELETE_SHARD_TIMEOUT = Setting.positiveTimeSetting("indices.store.delete.shard.timeout", new TimeValue(30, TimeUnit.SECONDS), false, Setting.Scope.CLUSTER);
     public static final String ACTION_SHARD_EXISTS = "internal:index/shard/exists";
     private static final EnumSet<IndexShardState> ACTIVE_STATES = EnumSet.of(IndexShardState.STARTED, IndexShardState.RELOCATED);
diff --git a/core/src/main/java/org/elasticsearch/ingest/core/IngestDocument.java b/core/src/main/java/org/elasticsearch/ingest/core/IngestDocument.java
index 4b0f6ac866..23d36c9486 100644
--- a/core/src/main/java/org/elasticsearch/ingest/core/IngestDocument.java
+++ b/core/src/main/java/org/elasticsearch/ingest/core/IngestDocument.java
@@ -254,7 +254,7 @@ public final class IngestDocument {
      * If the path identifies a list, the value will be appended to the existing list.
      * If the path identifies a scalar, the scalar will be converted to a list and
      * the provided value will be added to the newly created list.
-     * Supports multiple values too provided in forms of list, in that case all the values will be appeneded to the
+     * Supports multiple values too provided in forms of list, in that case all the values will be appended to the
      * existing (or newly created) list.
      * @param path The path within the document in dot-notation
      * @param value The value or values to append to the existing ones
@@ -270,7 +270,7 @@ public final class IngestDocument {
      * If the path identifies a list, the value will be appended to the existing list.
      * If the path identifies a scalar, the scalar will be converted to a list and
      * the provided value will be added to the newly created list.
-     * Supports multiple values too provided in forms of list, in that case all the values will be appeneded to the
+     * Supports multiple values too provided in forms of list, in that case all the values will be appended to the
      * existing (or newly created) list.
      * @param fieldPathTemplate Resolves to the path with dot-notation within the document
      * @param valueSource The value source that will produce the value or values to append to the existing ones
diff --git a/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java b/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java
index aeff769acc..767f6d4217 100644
--- a/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java
+++ b/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java
@@ -284,7 +284,7 @@ class InstallPluginCommand extends CliTool.Command {
         List<PluginsService.Bundle> bundles = PluginsService.getPluginBundles(pluginsDir);
 
         // if we aren't isolated, we need to jarhellcheck against any other non-isolated plugins
-        // thats always the first bundle
+        // that's always the first bundle
         if (isolated == false) {
             jars.addAll(bundles.get(0).urls);
         }
diff --git a/core/src/main/java/org/elasticsearch/plugins/PluginsService.java b/core/src/main/java/org/elasticsearch/plugins/PluginsService.java
index ac3e61689a..3e36c5d8f0 100644
--- a/core/src/main/java/org/elasticsearch/plugins/PluginsService.java
+++ b/core/src/main/java/org/elasticsearch/plugins/PluginsService.java
@@ -159,7 +159,7 @@ public class PluginsService extends AbstractComponent {
             }
         }
 
-        // we don't log jars in lib/ we really shouldnt log modules,
+        // we don't log jars in lib/ we really shouldn't log modules,
         // but for now: just be transparent so we can debug any potential issues
         Set<String> moduleNames = new HashSet<>();
         Set<String> jvmPluginNames = new HashSet<>();
diff --git a/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java b/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
index 59812f908f..552e6aaf2e 100644
--- a/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
+++ b/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
@@ -528,7 +528,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent<Rep
     }
 
     /**
-     * In v2.0.0 we changed the matadata file format
+     * In v2.0.0 we changed the metadata file format
      * @return true if legacy version should be used false otherwise
      */
     public static boolean legacyMetaData(Version version) {
diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java
index ce1e7811da..f11efeca87 100644
--- a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java
+++ b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java
@@ -88,7 +88,7 @@ public class RestNodesInfoAction extends BaseRestHandler {
 
         final NodesInfoRequest nodesInfoRequest = new NodesInfoRequest(nodeIds);
         nodesInfoRequest.timeout(request.param("timeout"));
-        // shortcut, dont do checks if only all is specified
+        // shortcut, don't do checks if only all is specified
         if (metrics.size() == 1 && metrics.contains("_all")) {
             nodesInfoRequest.all();
         } else {
diff --git a/core/src/main/java/org/elasticsearch/script/ScriptModule.java b/core/src/main/java/org/elasticsearch/script/ScriptModule.java
index 11bc2b58a9..0a386a4a8d 100644
--- a/core/src/main/java/org/elasticsearch/script/ScriptModule.java
+++ b/core/src/main/java/org/elasticsearch/script/ScriptModule.java
@@ -66,7 +66,7 @@ public class ScriptModule extends AbstractModule {
     }
 
     /**
-     * This method is called after all modules have been processed but before we actually validate all settings. This allwos the
+     * This method is called after all modules have been processed but before we actually validate all settings. This allows the
      * script extensions to add all their settings.
      */
     public void prepareSettings(SettingsModule settingsModule) {
diff --git a/core/src/main/java/org/elasticsearch/script/ScriptService.java b/core/src/main/java/org/elasticsearch/script/ScriptService.java
index d0104656d5..d21283d9cf 100644
--- a/core/src/main/java/org/elasticsearch/script/ScriptService.java
+++ b/core/src/main/java/org/elasticsearch/script/ScriptService.java
@@ -247,7 +247,7 @@ public class ScriptService extends AbstractComponent implements Closeable {
             throw new ScriptException("scripts of type [" + script.getType() + "], operation [" + scriptContext.getKey() + "] and lang [" + lang + "] are disabled");
         }
 
-        // TODO: fix this through some API or something, thats wrong
+        // TODO: fix this through some API or something, that's wrong
         // special exception to prevent expressions from compiling as update or mapping scripts
         boolean expression = "expression".equals(script.getLang());
         boolean notSupported = scriptContext.getKey().equals(ScriptContext.Standard.UPDATE.getKey());
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java
index a44d01b1a5..e70780ec48 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java
@@ -133,7 +133,7 @@ public abstract class AggregatorBase extends Aggregator {
     }
 
     /**
-     * Can be overriden by aggregator implementation to be called back when the collection phase starts.
+     * Can be overridden by aggregator implementation to be called back when the collection phase starts.
      */
     protected void doPreCollection() throws IOException {
     }
@@ -252,7 +252,7 @@ public abstract class AggregatorBase extends Aggregator {
     protected void doClose() {}
 
     /**
-     * Can be overriden by aggregator implementation to be called back when the collection phase ends.
+     * Can be overridden by aggregator implementation to be called back when the collection phase ends.
      */
     protected void doPostCollection() throws IOException {
     }
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java
index fa23cf8dd9..daad51076b 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java
@@ -92,7 +92,7 @@ public class NestedAggregator extends SingleBucketAggregator {
                     // So the trick is to set at the last moment just before needed and we can use its child filter as the
                     // parent filter.
 
-                    // Additional NOTE: Before this logic was performed in the setNextReader(...) method, but the the assumption
+                    // Additional NOTE: Before this logic was performed in the setNextReader(...) method, but the assumption
                     // that aggs instances are constructed in reverse doesn't hold when buckets are constructed lazily during
                     // aggs execution
                     Query parentFilterNotCached = findClosestNestedPath(parent());
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java
index 1b2d5fc101..8fff0437d7 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java
@@ -66,7 +66,7 @@ final class CardinalityAggregatorFactory extends ValuesSourceAggregatorFactory.L
         int precision = HyperLogLogPlusPlus.DEFAULT_PRECISION;
         while (parent != null) {
             if (parent instanceof SingleBucketAggregator == false) {
-                // if the parent creates buckets, we substract 5 to the precision,
+                // if the parent creates buckets, we subtract 5 to the precision,
                 // which will effectively divide the memory usage of each counter by 32
                 precision -= 5;
             }
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java
index 6b389182fc..2e8ce4563c 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java
@@ -47,7 +47,7 @@ import java.nio.ByteOrder;
  * requires more space and makes hyperloglog (which is less accurate) used sooner,
  * this is also considerably faster.
  *
- * Trying to understand what this class does whithout having read the paper is
+ * Trying to understand what this class does without having read the paper is
  * considered adventurous.
  */
 public final class HyperLogLogPlusPlus implements Releasable {
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java
index 55cf6be073..afdd67ee2c 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java
@@ -169,7 +169,7 @@ public class HoltWintersModel extends MovAvgModel {
         this.pad = pad;
 
         // Only pad if we are multiplicative and padding is enabled
-        // The padding amount is not currently user-configurable...i dont see a reason to expose it?
+        // The padding amount is not currently user-configurable...i don't see a reason to expose it?
         this.padding = seasonalityType.equals(SeasonalityType.MULTIPLICATIVE) && pad ? 0.0000000001 : 0;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
index 16c00a0cca..6a9d95deb3 100644
--- a/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
+++ b/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
@@ -442,7 +442,7 @@ public final class SearchSourceBuilder extends ToXContentToBytes implements Writ
     }
 
     /**
-     * Gets the hightlighter builder for this request.
+     * Gets the highlighter builder for this request.
      */
     public HighlightBuilder highlighter() {
         return highlightBuilder;
@@ -679,7 +679,7 @@ public final class SearchSourceBuilder extends ToXContentToBytes implements Writ
     }
 
     /**
-     * Sets the boost a specific index will receive when the query is executeed
+     * Sets the boost a specific index will receive when the query is executed
      * against it.
      *
      * @param index
@@ -697,7 +697,7 @@ public final class SearchSourceBuilder extends ToXContentToBytes implements Writ
 
     /**
      * Gets the boost a specific indices will receive when the query is
-     * executeed against them.
+     * executed against them.
      */
     public ObjectFloatHashMap<String> indexBoost() {
         return indexBoost;
diff --git a/core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/FragmentBuilderHelper.java b/core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/FragmentBuilderHelper.java
index 363a3b9137..b3175e6c22 100644
--- a/core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/FragmentBuilderHelper.java
+++ b/core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/FragmentBuilderHelper.java
@@ -41,7 +41,7 @@ import java.util.Comparator;
 import java.util.List;
 
 /**
- * Simple helper class for {@link FastVectorHighlighter} {@link FragmentsBuilder} implemenations.
+ * Simple helper class for {@link FastVectorHighlighter} {@link FragmentsBuilder} implementations.
  */
 public final class FragmentBuilderHelper {
 
diff --git a/core/src/main/java/org/elasticsearch/search/lookup/CachedPositionIterator.java b/core/src/main/java/org/elasticsearch/search/lookup/CachedPositionIterator.java
index 3e7d66aaca..82604b1e0d 100644
--- a/core/src/main/java/org/elasticsearch/search/lookup/CachedPositionIterator.java
+++ b/core/src/main/java/org/elasticsearch/search/lookup/CachedPositionIterator.java
@@ -27,7 +27,7 @@ import java.io.IOException;
 import java.util.Iterator;
 
 /*
- * Can iterate over the positions of a term an arbotrary number of times. 
+ * Can iterate over the positions of a term an arbitrary number of times.
  * */
 public class CachedPositionIterator extends PositionIterator {
 
diff --git a/core/src/main/java/org/elasticsearch/search/lookup/IndexFieldTerm.java b/core/src/main/java/org/elasticsearch/search/lookup/IndexFieldTerm.java
index 09c78d250f..fbca4f435b 100644
--- a/core/src/main/java/org/elasticsearch/search/lookup/IndexFieldTerm.java
+++ b/core/src/main/java/org/elasticsearch/search/lookup/IndexFieldTerm.java
@@ -236,7 +236,7 @@ public class IndexFieldTerm implements Iterable<TermPosition> {
     /*
      * A user might decide inside a script to call get with _POSITIONS and then
      * a second time with _PAYLOADS. If the positions were recorded but the
-     * payloads were not, the user will not have access to them. Therfore, throw
+     * payloads were not, the user will not have access to them. Therefore, throw
      * exception here explaining how to call get().
      */
     public void validateFlags(int flags2) {
diff --git a/core/src/main/java/org/elasticsearch/search/profile/InternalProfileCollector.java b/core/src/main/java/org/elasticsearch/search/profile/InternalProfileCollector.java
index 33d11a1aad..48d165e309 100644
--- a/core/src/main/java/org/elasticsearch/search/profile/InternalProfileCollector.java
+++ b/core/src/main/java/org/elasticsearch/search/profile/InternalProfileCollector.java
@@ -34,7 +34,7 @@ import java.util.List;
  * - doSetNextReader()
  * - needsScores()
  *
- * InternalProfiler facilitates the linking of the the Collector graph
+ * InternalProfiler facilitates the linking of the Collector graph
  */
 public class InternalProfileCollector implements Collector {
 
diff --git a/core/src/main/java/org/elasticsearch/search/profile/ProfileBreakdown.java b/core/src/main/java/org/elasticsearch/search/profile/ProfileBreakdown.java
index 55ad77b693..a992f81987 100644
--- a/core/src/main/java/org/elasticsearch/search/profile/ProfileBreakdown.java
+++ b/core/src/main/java/org/elasticsearch/search/profile/ProfileBreakdown.java
@@ -51,7 +51,7 @@ public final class ProfileBreakdown {
      */
     private final long[] timings;
 
-    /** Scrach to store the current timing type. */
+    /** Scratch to store the current timing type. */
     private TimingType currentTimingType;
 
     /**
diff --git a/core/src/main/java/org/elasticsearch/search/profile/Profilers.java b/core/src/main/java/org/elasticsearch/search/profile/Profilers.java
index 0fb7d9ac1c..69a4544ccd 100644
--- a/core/src/main/java/org/elasticsearch/search/profile/Profilers.java
+++ b/core/src/main/java/org/elasticsearch/search/profile/Profilers.java
@@ -31,7 +31,7 @@ public final class Profilers {
     private final ContextIndexSearcher searcher;
     private final List<Profiler> profilers;
 
-    /** Sole constructor. This {@link Profilers} instance will initiall wrap one {@link Profiler}. */
+    /** Sole constructor. This {@link Profilers} instance will initially wrap one {@link Profiler}. */
     public Profilers(ContextIndexSearcher searcher) {
         this.searcher = searcher;
         this.profilers = new ArrayList<>();
diff --git a/core/src/main/java/org/elasticsearch/search/rescore/Rescorer.java b/core/src/main/java/org/elasticsearch/search/rescore/Rescorer.java
index e3465a4df8..b475ca90db 100644
--- a/core/src/main/java/org/elasticsearch/search/rescore/Rescorer.java
+++ b/core/src/main/java/org/elasticsearch/search/rescore/Rescorer.java
@@ -45,7 +45,7 @@ public interface Rescorer {
      * Modifies the result of the previously executed search ({@link TopDocs})
      * in place based on the given {@link RescoreSearchContext}.
      *
-     * @param topDocs        the result of the previously exectued search
+     * @param topDocs        the result of the previously executed search
      * @param context        the current {@link SearchContext}. This will never be <code>null</code>.
      * @param rescoreContext the {@link RescoreSearchContext}. This will never be <code>null</code>
      * @throws IOException if an {@link IOException} occurs during rescoring
@@ -66,7 +66,7 @@ public interface Rescorer {
             Explanation sourceExplanation) throws IOException;
 
     /**
-     * Parses the {@link RescoreSearchContext} for this impelementation
+     * Parses the {@link RescoreSearchContext} for this implementation
      *
      * @param parser  the parser to read the context from
      * @param context the current shard context
@@ -76,7 +76,7 @@ public interface Rescorer {
     public RescoreSearchContext parse(XContentParser parser, QueryShardContext context) throws IOException;
 
     /**
-     * Extracts all terms needed to exectue this {@link Rescorer}. This method
+     * Extracts all terms needed to execute this {@link Rescorer}. This method
      * is executed in a distributed frequency collection roundtrip for
      * {@link SearchType#DFS_QUERY_AND_FETCH} and
      * {@link SearchType#DFS_QUERY_THEN_FETCH}
@@ -84,8 +84,8 @@ public interface Rescorer {
     public void extractTerms(SearchContext context, RescoreSearchContext rescoreContext, Set<Term> termsSet);
 
     /*
-     * TODO: At this point we only have one implemenation which modifies the
-     * TopDocs given. Future implemenations might return actual resutls that
+     * TODO: At this point we only have one implementation which modifies the
+     * TopDocs given. Future implementations might return actual results that
      * contain information about the rescore context. For example a pair wise
      * reranker might return the feature vector for the top N window in order to
      * merge results on the callers side. For now we don't have a return type at
diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
index 8517216d20..09b4012d5b 100644
--- a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
+++ b/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
@@ -85,10 +85,10 @@ public final class PhraseSuggestionBuilder extends SuggestionBuilder<PhraseSugge
      * Sets the maximum percentage of the terms that at most considered to be
      * misspellings in order to form a correction. This method accepts a float
      * value in the range [0..1) as a fraction of the actual query terms a
-     * number <tt>&gt;=1</tt> as an absolut number of query terms.
+     * number <tt>&gt;=1</tt> as an absolute number of query terms.
      *
      * The default is set to <tt>1.0</tt> which corresponds to that only
-     * corrections with at most 1 missspelled term are returned.
+     * corrections with at most 1 misspelled term are returned.
      */
     public PhraseSuggestionBuilder maxErrors(Float maxErrors) {
         this.maxErrors = maxErrors;
@@ -288,7 +288,7 @@ public final class PhraseSuggestionBuilder extends SuggestionBuilder<PhraseSugge
     }
 
     /**
-     * A "stupid-backoff" smoothing model simialr to <a
+     * A "stupid-backoff" smoothing model similar to <a
      * href="http://en.wikipedia.org/wiki/Katz's_back-off_model"> Katz's
      * Backoff</a>. This model is used as the default if no model is configured.
      * <p>
diff --git a/core/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java b/core/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java
index 8b174ecb19..685fdeda68 100644
--- a/core/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java
+++ b/core/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java
@@ -704,7 +704,7 @@ public class NettyTransport extends AbstractLifecycleComponent<Transport> implem
 
     // this code is a take on guava's HostAndPort, like a HostAndPortRange
 
-    // pattern for validating ipv6 bracked addresses.
+    // pattern for validating ipv6 bracket addresses.
     // not perfect, but PortsRange should take care of any port range validation, not a regex
     private static final Pattern BRACKET_PATTERN = Pattern.compile("^\\[(.*:.*)\\](?::([\\d\\-]*))?$");
 
diff --git a/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java b/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java
index e838989e2a..11d176b456 100644
--- a/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java
+++ b/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java
@@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.is;
 
 /**
- * Checking simple filtering capabilites of the cluster state
+ * Checking simple filtering capabilities of the cluster state
  *
  */
 public class SimpleClusterStateIT extends ESIntegTestCase {
diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java
index 74ff900ccc..1ba0c06325 100644
--- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java
+++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java
@@ -51,7 +51,7 @@ import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING;
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 
 /**
- * A base testscase that allows to run tests based on the output of the CAT API
+ * A base testcase that allows to run tests based on the output of the CAT API
  * The input is a line based cat/shards output like:
  *   kibana-int           0 p STARTED       2  24.8kb 10.202.245.2 r5-9-35
  *
diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java
index beb7c134c1..d37aee16a1 100644
--- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java
@@ -755,7 +755,7 @@ public class ClusterRebalanceRoutingTests extends ESAllocationTestCase {
                 .put(IndexMetaData.builder("test1").settings(settings(Version.CURRENT).put(IndexMetaData.INDEX_ROUTING_EXCLUDE_GROUP_SETTING.getKey() + "_id", "node1,node2")).numberOfShards(2).numberOfReplicas(0))
                 .build();
 
-        // we use a second index here (test1) that never gets assigned otherwise allocateUnassinged is never called if we don't have unassigned shards.
+        // we use a second index here (test1) that never gets assigned otherwise allocateUnassigned is never called if we don't have unassigned shards.
         RoutingTable routingTable = RoutingTable.builder()
                 .addAsNew(metaData.index("test"))
                 .addAsNew(metaData.index("test1"))
diff --git a/core/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java b/core/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java
index d0e03cedda..06fadffc80 100644
--- a/core/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java
+++ b/core/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java
@@ -163,7 +163,7 @@ public class ShapeBuilderTests extends ESTestCase {
             )
             .build();
 
-        // LineString that needs to be wrappped
+        // LineString that needs to be wrapped
         ShapeBuilders.newMultiLinestring()
             .linestring(new LineStringBuilder(new CoordinatesBuilder()
                 .coordinate(150.0, 60.0)
diff --git a/core/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java b/core/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java
index 5cb30a15f1..c4775b6cbf 100644
--- a/core/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java
+++ b/core/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java
@@ -332,7 +332,7 @@ public class SimpleJodaTests extends ESTestCase {
         Joda.EpochTimePrinter epochTimePrinter = new Joda.EpochTimePrinter(false);
         epochTimePrinter.printTo(buffer, now, Locale.ROOT);
         assertThat(buffer.length(), is(10));
-        // only check the last digit, as seconds go from 0-99 in the unix timestamp and dont stop at 60
+        // only check the last digit, as seconds go from 0-99 in the unix timestamp and don't stop at 60
         assertThat(buffer.toString(), endsWith(String.valueOf(now.getSecondOfMinute() % 10)));
 
         buffer = new StringBuffer();
diff --git a/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java b/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java
index 739e07df4a..1bc861bbe3 100644
--- a/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java
+++ b/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java
@@ -754,7 +754,7 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase {
     }
 
     /**
-     * A 4 node cluster with m_m_n set to 3 and each node has one unicast enpoint. One node partitions from the master node.
+     * A 4 node cluster with m_m_n set to 3 and each node has one unicast endpoint. One node partitions from the master node.
      * The temporal unicast responses is empty. When partition is solved the one ping response contains a master node.
      * The rejoining node should take this master node and connect.
      */
@@ -971,7 +971,7 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase {
     }
 
     /**
-     * Adds an asymetric break between a master and one of the nodes and makes
+     * Adds an asymmetric break between a master and one of the nodes and makes
      * sure that the node is removed form the cluster, that the node start pinging and that
      * the cluster reforms when healed.
      */
diff --git a/core/src/test/java/org/elasticsearch/index/mapper/core/MultiFieldCopyToMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/core/MultiFieldCopyToMapperTests.java
index 821eaeb836..b9bcaf2f1c 100644
--- a/core/src/test/java/org/elasticsearch/index/mapper/core/MultiFieldCopyToMapperTests.java
+++ b/core/src/test/java/org/elasticsearch/index/mapper/core/MultiFieldCopyToMapperTests.java
@@ -56,7 +56,7 @@ public class MultiFieldCopyToMapperTests extends ESTestCase {
             assertThat(e.getMessage(), equalTo("copy_to in multi fields is not allowed. Found the copy_to in field [c] which is within a multi field."));
         }
 
-        // now test that with an older version the pasring just works
+        // now test that with an older version the parsing just works
         indexVersion = randomFrom(versionsWithAndWithoutExpectedExceptions.v2());
         mapperService = MapperTestUtils.newMapperService(createTempDir(), Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, indexVersion).build());
         DocumentMapper documentMapper = mapperService.parse("type", new CompressedXContent(mapping.string()), true);
@@ -86,8 +86,8 @@ public class MultiFieldCopyToMapperTests extends ESTestCase {
         return mapping;
     }
 
-    // returs a tuple where
-    // v1 is a list of versions for which we expect an excpetion when a copy_to in multi fields is found and
+    // returns a tuple where
+    // v1 is a list of versions for which we expect an exception when a copy_to in multi fields is found and
     // v2 is older versions where we throw no exception and we just log a warning
     private static Tuple<List<Version>, List<Version>> versionsWithAndWithoutExpectedExceptions() {
         List<Version> versionsWithException = new ArrayList<>();
diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java b/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java
index b9d157fbb4..06374a931d 100644
--- a/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java
+++ b/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java
@@ -212,7 +212,7 @@ public class MultiFieldTests extends ESSingleNodeTestCase {
         }
     }
 
-    // The fielddata settings need to be the same after deserializing/re-serialsing, else unneccesary mapping sync's can be triggered
+    // The fielddata settings need to be the same after deserializing/re-serialsing, else unnecessary mapping sync's can be triggered
     public void testMultiFieldsFieldDataSettingsInConsistentOrder() throws Exception {
         final String MY_MULTI_FIELD = "multi_field";
 
diff --git a/core/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java
index e26c07d1ce..f16e00416b 100644
--- a/core/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java
+++ b/core/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java
@@ -143,7 +143,7 @@ public class GeoBoundingBoxQueryBuilderTests extends AbstractQueryTestCase<GeoBo
                 tester.invalidateCoordinate(builder, true);
                 fail("expected exception for broken " + tester.getClass().getName() + " coordinate");
             } catch (IllegalArgumentException e) {
-                // exptected
+                // expected
             }
         }
     }
diff --git a/core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java b/core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java
index cd4ca35bbc..8175eb7a65 100644
--- a/core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java
+++ b/core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java
@@ -111,7 +111,7 @@ public class PreBuiltAnalyzerIntegrationIT extends ESIntegTestCase {
         // check that all above configured analyzers have been loaded
         assertThatAnalyzersHaveBeenLoaded(loadedAnalyzers);
 
-        // check that all of the prebuiltanalyzers are still open
+        // check that all of the prebuilt analyzers are still open
         assertLuceneAnalyzersAreNotClosed(loadedAnalyzers);
     }
 
diff --git a/core/src/test/java/org/elasticsearch/indices/flush/FlushIT.java b/core/src/test/java/org/elasticsearch/indices/flush/FlushIT.java
index 60a56c1125..1a858c3e60 100644
--- a/core/src/test/java/org/elasticsearch/indices/flush/FlushIT.java
+++ b/core/src/test/java/org/elasticsearch/indices/flush/FlushIT.java
@@ -65,7 +65,7 @@ public class FlushIT extends ESIntegTestCase {
                     @Override
                     public void onResponse(FlushResponse flushResponse) {
                         try {
-                            // dont' use assertAllSuccesssful it uses a randomized context that belongs to a different thread
+                            // don't use assertAllSuccessful it uses a randomized context that belongs to a different thread
                             assertThat("Unexpected ShardFailures: " + Arrays.toString(flushResponse.getShardFailures()), flushResponse.getFailedShards(), equalTo(0));
                             latch.countDown();
                         } catch (Throwable ex) {
diff --git a/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java b/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java
index 129c499192..948c005bf3 100644
--- a/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java
+++ b/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java
@@ -192,7 +192,7 @@ public class IndicesStoreIntegrationIT extends ESIntegTestCase {
         assertThat(Files.exists(indexDirectory(node_2, "test")), equalTo(false));
 
         // add a transport delegate that will prevent the shard active request to succeed the first time after relocation has finished.
-        // node_1 will then wait for the next cluster state change before it tries a next attempt to delet the shard.
+        // node_1 will then wait for the next cluster state change before it tries a next attempt to delete the shard.
         MockTransportService transportServiceNode_1 = (MockTransportService) internalCluster().getInstance(TransportService.class, node_1);
         TransportService transportServiceNode_2 = internalCluster().getInstance(TransportService.class, node_2);
         final CountDownLatch shardActiveRequestSent = new CountDownLatch(1);
diff --git a/core/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java b/core/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java
index 181932513d..8e6016f6f9 100644
--- a/core/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java
+++ b/core/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java
@@ -63,7 +63,7 @@ public class ProcessProbeTests extends ESTestCase {
         // CPU percent can be negative if the system recent cpu usage is not available
         assertThat(cpu.getPercent(), anyOf(lessThan((short) 0), allOf(greaterThanOrEqualTo((short) 0), lessThanOrEqualTo((short) 100))));
 
-        // CPU time can return -1 if the the platform does not support this operation, let's see which platforms fail
+        // CPU time can return -1 if the platform does not support this operation, let's see which platforms fail
         assertThat(cpu.total, greaterThan(0L));
 
         ProcessStats.Mem mem = stats.getMem();
diff --git a/core/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorIT.java b/core/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorIT.java
index 5c04666375..42750a7f1d 100644
--- a/core/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorIT.java
+++ b/core/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorIT.java
@@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.nullValue;
  */
 public class ConcurrentPercolatorIT extends ESIntegTestCase {
     public void testSimpleConcurrentPercolator() throws Exception {
-        // We need to index a document / define mapping, otherwise field1 doesn't get reconized as number field.
+        // We need to index a document / define mapping, otherwise field1 doesn't get recognized as number field.
         // If we don't do this, then 'test2' percolate query gets parsed as a TermQuery and not a RangeQuery.
         // The percolate api doesn't parse the doc if no queries have registered, so it can't lazily create a mapping
         assertAcked(prepareCreate("index").addMapping("type", "field1", "type=long", "field2", "type=string")); // random # shards better has a mapping!
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java
index f240960c40..e1167ceffc 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java
@@ -166,7 +166,7 @@ public class DateHistogramOffsetIT extends ESIntegTestCase {
     }
 
     /**
-     * @param bucket the bucket to check asssertions for
+     * @param bucket the bucket to check assertions for
      * @param key the expected key
      * @param expectedSize the expected size of the bucket
      */
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java
index 3dd578a0af..9ccc033b78 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java
@@ -273,7 +273,7 @@ public class MovAvgIT extends ESIntegTestCase {
     }
 
     /**
-     * Exponentionally weighted (EWMA, Single exponential) moving avg
+     * Exponentially weighted (EWMA, Single exponential) moving avg
      *
      * @param window Window of values to compute movavg for
      */
diff --git a/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java b/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java
index eaad1536e2..25dd81aecd 100644
--- a/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java
+++ b/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java
@@ -1727,7 +1727,7 @@ public class HighlighterSearchIT extends ESIntegTestCase {
         response = search.get();
         assertHighlight(response, 0, "text", 0, hlQueryMatcher);
 
-        // Make sure the the highlightQuery is taken into account when it is set on the highlight context instead of the field
+        // Make sure the highlightQuery is taken into account when it is set on the highlight context instead of the field
         highlightBuilder.highlightQuery(matchQuery("text", "query"));
         field.highlighterType("fvh").highlightQuery(null);
         response = search.get();
diff --git a/core/src/test/java/org/elasticsearch/search/innerhits/InnerHitsIT.java b/core/src/test/java/org/elasticsearch/search/innerhits/InnerHitsIT.java
index 05ff048b42..be0fd8a2d4 100644
--- a/core/src/test/java/org/elasticsearch/search/innerhits/InnerHitsIT.java
+++ b/core/src/test/java/org/elasticsearch/search/innerhits/InnerHitsIT.java
@@ -115,7 +115,7 @@ public class InnerHitsIT extends ESIntegTestCase {
         InnerHitsBuilder innerHitsBuilder = new InnerHitsBuilder();
         innerHitsBuilder.addNestedInnerHits("comment", "comments",
                 new InnerHitsBuilder.InnerHit().setQuery(matchQuery("comments.message", "fox")));
-        // Inner hits can be defined in two ways: 1) with the query 2) as seperate inner_hit definition
+        // Inner hits can be defined in two ways: 1) with the query 2) as separate inner_hit definition
         SearchRequest[] searchRequests = new SearchRequest[]{
                 client().prepareSearch("articles").setQuery(nestedQuery("comments", matchQuery("comments.message", "fox")).innerHit(new QueryInnerHits("comment", null))).request(),
                 client().prepareSearch("articles").setQuery(nestedQuery("comments", matchQuery("comments.message", "fox")))
@@ -142,7 +142,7 @@ public class InnerHitsIT extends ESIntegTestCase {
         innerHitsBuilder.addNestedInnerHits("comment", "comments",
                 new InnerHitsBuilder.InnerHit().setQuery(matchQuery("comments.message", "elephant")));
         // Inner hits can be defined in two ways: 1) with the query 2) as
-        // seperate inner_hit definition
+        // separate inner_hit definition
         searchRequests = new SearchRequest[] {
                 client().prepareSearch("articles")
                         .setQuery(nestedQuery("comments", matchQuery("comments.message", "elephant")))
diff --git a/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java b/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java
index 7b4cafe716..8254c7b8f1 100644
--- a/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java
+++ b/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java
@@ -30,7 +30,7 @@ import java.io.IOException;
 public class QueryRescoreModeTests extends ESTestCase {
 
     /**
-     * Test @link {@link QueryRescoreMode} enum ordinals and names, since serilaization relies on it
+     * Test @link {@link QueryRescoreMode} enum ordinals and names, since serialization relies on it
      */
     public void testQueryRescoreMode() throws IOException {
         float primary = randomFloat();