diff --git a/conf/defaults.ini b/conf/defaults.ini
index 0a4b61fbe78..b652286e218 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -143,7 +143,7 @@ cookie_remember_name = grafana_remember
 # disable gravatar profile images
 disable_gravatar = false
 
-# data source proxy whitelist (ip_or_domain:port seperated by spaces)
+# data source proxy whitelist (ip_or_domain:port separated by spaces)
 data_source_proxy_whitelist =
 
 [snapshots]
diff --git a/conf/sample.ini b/conf/sample.ini
index 7f358b07199..822d1770169 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -129,7 +129,7 @@ check_for_updates = true
 # disable gravatar profile images
 ;disable_gravatar = false
 
-# data source proxy whitelist (ip_or_domain:port seperated by spaces)
+# data source proxy whitelist (ip_or_domain:port separated by spaces)
 ;data_source_proxy_whitelist =
 
 [snapshots]
diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index 19f9c25715b..dd5aa6fa543 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -147,7 +147,7 @@
 			<div ng-show="current.type === 'custom'" class="gf-form-group">
         <h5 class="section-heading">Custom Options</h5>
 				<div class="gf-form">
-					<span class="gf-form-label width-13">Values seperated by comma</span>
+					<span class="gf-form-label width-13">Values separated by comma</span>
 					<input type="text" class="gf-form-input" ng-model='current.query' ng-blur="runQuery()" placeholder="1, 10, 20, myvalue"></input>
 				</div>
 			</div>
diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js
index 7bbb921735a..fb751a2ce3a 100644
--- a/public/app/features/templating/templateValuesSrv.js
+++ b/public/app/features/templating/templateValuesSrv.js
@@ -173,7 +173,7 @@ function (angular, _, kbn) {
         return;
       }
 
-      // extract options in comma seperated string
+      // extract options in comma separated string
       variable.options = _.map(variable.query.split(/[,]+/), function(text) {
         return { text: text.trim(), value: text.trim() };
       });
diff --git a/public/app/plugins/panel/table/editor.html b/public/app/plugins/panel/table/editor.html
index c9e0bad5d9a..f0fc3d70abc 100644
--- a/public/app/plugins/panel/table/editor.html
+++ b/public/app/plugins/panel/table/editor.html
@@ -119,7 +119,7 @@
 							></select>
 					</li>
 					<li class="tight-form-item">
-						Thresholds<tip>Comma seperated values</tip>
+						Thresholds<tip>Comma separated values</tip>
 					</li>
 					<li>
 						<input type="text" class="input-small tight-form-input" style="width: 150px" ng-model="style.thresholds" ng-blur="editor.render()" placeholder="50,80" array-join></input>