Merge remote-tracking branch 'origin/develop' into develop

.gitignore

@@ -13,6 +13,7 @@ src/css/*.min.css
 *.sublime-workspace
 *.swp
 .idea/
+*.iml
 
 /data/*
 /bin/*

src/dashboards/scripted.js

@@ -3,7 +3,7 @@
 /*
  * Complex scripted dashboard
  * This script generates a dashboard object that Grafana can load. It also takes a number of user
- * supplied URL parameters (int ARGS variable)
+ * supplied URL parameters (in the ARGS variable)
  *
  * Return a dashboard object, or a function
  *
@@ -13,7 +13,7 @@
 
 'use strict';
 
-// accessable variables in this scope
+// accessible variables in this scope
 var window, document, ARGS, $, jQuery, moment, kbn;
 
 // Setup some variables
@@ -31,7 +31,7 @@ dashboard = {
 dashboard.title = 'Scripted dash';
 
 // Set default time
-// time can be overriden in the url using from/to parameteres, but this is
+// time can be overriden in the url using from/to parameters, but this is
 // handled automatically in grafana core during dashboard initialization
 dashboard.time = {
   from: "now-6h",

src/dashboards/scripted_async.js

@@ -3,7 +3,7 @@
 /*
  * Complex scripted dashboard
  * This script generates a dashboard object that Grafana can load. It also takes a number of user
- * supplied URL parameters (int ARGS variable)
+ * supplied URL parameters (in the ARGS variable)
  *
  * Global accessable variables
  * window, document, $, jQuery, ARGS, moment
@@ -11,12 +11,12 @@
  * Return a dashboard object, or a function
  *
  * For async scripts, return a function, this function must take a single callback function,
- * call this function with the dasboard object
+ * call this function with the dashboard object
  */
 
 'use strict';
 
-// accessable variables in this scope
+// accessible variables in this scope
 var window, document, ARGS, $, jQuery, moment, kbn;
 
 return function(callback) {
@@ -34,7 +34,7 @@ return function(callback) {
   dashboard.title = 'Scripted dash';
 
   // Set default time
-  // time can be overriden in the url using from/to parameteres, but this is
+  // time can be overriden in the url using from/to parameters, but this is
   // handled automatically in grafana core during dashboard initialization
   dashboard.time = {
       from: "now-6h",

src/dashboards/scripted_gen_and_save.js

@@ -3,7 +3,7 @@
 /*
  * Complex scripted dashboard
  * This script generates a dashboard object that Grafana can load. It also takes a number of user
- * supplied URL parameters (int ARGS variable)
+ * supplied URL parameters (in the ARGS variable)
  *
  * Return a dashboard object, or a function
  *
@@ -13,7 +13,7 @@
 
 'use strict';
 
-// accessable variables in this scope
+// accessible variables in this scope
 var window, document, ARGS, $, jQuery, moment, kbn, services, _;
 
 // default datasource