From 417c5163dd62a2ec7af0ec5f910119fafdf014cb Mon Sep 17 00:00:00 2001 From: Cedric Cellier Date: Mon, 31 Jul 2017 12:12:28 +0200 Subject: [PATCH] Fix typos (#8954) Some being user visible. --- docs/sources/alerting/notifications.md | 4 ++-- docs/sources/features/datasources/influxdb.md | 4 ++-- public/app/features/admin/partials/settings.html | 2 +- public/dashboards/scripted.js | 4 ++-- public/dashboards/scripted_async.js | 6 +++--- public/dashboards/scripted_templated.js | 4 ++-- public/vendor/lodash/vendor/underscore/test/objects.js | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/sources/alerting/notifications.md b/docs/sources/alerting/notifications.md index f3becf18d78..359315650d9 100644 --- a/docs/sources/alerting/notifications.md +++ b/docs/sources/alerting/notifications.md @@ -22,7 +22,7 @@ to add and configure a `notification` channel (can be email, Pagerduty or other {{< imgbox max-width="40%" img="/img/docs/v43/alert_notifications_menu.png" caption="Alerting Notification Channels" >}} -On the Notification Channels page hit the `New Channel` button to go the the page where you +On the Notification Channels page hit the `New Channel` button to go the page where you can configure and setup a new Notification Channel. You specify name and type, and type specific options. You can also test the notification to make @@ -134,7 +134,7 @@ Grafana also supports the following Notification Channels: # Enable images in notifications {#external-image-store} -Grafana can render the panel associated with the alert rule and include that in the notification. Most Notification Channels require that this image be publicly accessable (Slack and PagerDuty for example). In order to include images in alert notifications, Grafana can upload the image to an image store. It currently supports +Grafana can render the panel associated with the alert rule and include that in the notification. Most Notification Channels require that this image be publicly accessible (Slack and PagerDuty for example). In order to include images in alert notifications, Grafana can upload the image to an image store. It currently supports Amazon S3 and Webdav for this. So to set that up you need to configure the [external image uploader](/installation/configuration/#external-image-storage) in your grafana-server ini config file. Currently only the Email Channels attaches images if no external image store is specified. To include images in alert notifications for other channels then you need to set up an external image store. diff --git a/docs/sources/features/datasources/influxdb.md b/docs/sources/features/datasources/influxdb.md index 39a22085d93..3f86b9ee703 100644 --- a/docs/sources/features/datasources/influxdb.md +++ b/docs/sources/features/datasources/influxdb.md @@ -36,7 +36,7 @@ Name | Description ### Proxy vs Direct access Proxy access means that the Grafana backend will proxy all requests from the browser. So requests to InfluxDB will be channeled through -`grafana-server`. This means that the URL you specify needs to be accessable from the server you are running Grafana on. Proxy access +`grafana-server`. This means that the URL you specify needs to be accessible from the server you are running Grafana on. Proxy access mode is also more secure as the username & password will never reach the browser. ## Query Editor @@ -132,7 +132,7 @@ You can fetch key names for a given measurement. SHOW TAG KEYS [FROM ] ``` -If you have a variable with key names you can use this variable in a group by clause. This will allow you to change group by using the variable dropdown a the top +If you have a variable with key names you can use this variable in a group by clause. This will allow you to change group by using the variable dropdown at the top of the dashboard. ### Using variables in queries diff --git a/public/app/features/admin/partials/settings.html b/public/app/features/admin/partials/settings.html index 150d3145f45..c8aa4fd3790 100644 --- a/public/app/features/admin/partials/settings.html +++ b/public/app/features/admin/partials/settings.html @@ -6,7 +6,7 @@
- These system settings are defined in grafana.ini or custom.ini (or overriden in ENV variables). + These system settings are defined in grafana.ini or custom.ini (or overridden in ENV variables). To change these you currently need to restart grafana.
diff --git a/public/dashboards/scripted.js b/public/dashboards/scripted.js index a42417047c0..d78e2a688d8 100644 --- a/public/dashboards/scripted.js +++ b/public/dashboards/scripted.js @@ -22,7 +22,7 @@ var dashboard; // All url parameters are available via the ARGS object var ARGS; -// Intialize a skeleton with nothing but a rows array and service object +// Initialize a skeleton with nothing but a rows array and service object dashboard = { rows : [], }; @@ -31,7 +31,7 @@ dashboard = { dashboard.title = 'Scripted dash'; // Set default time -// time can be overriden in the url using from/to parameters, but this is +// time can be overridden in the url using from/to parameters, but this is // handled automatically in grafana core during dashboard initialization dashboard.time = { from: "now-6h", diff --git a/public/dashboards/scripted_async.js b/public/dashboards/scripted_async.js index 17a2a6bd74b..7a1ab1e12e3 100644 --- a/public/dashboards/scripted_async.js +++ b/public/dashboards/scripted_async.js @@ -5,7 +5,7 @@ * This script generates a dashboard object that Grafana can load. It also takes a number of user * supplied URL parameters (in the ARGS variable) * - * Global accessable variables + * Global accessible variables * window, document, $, jQuery, ARGS, moment * * Return a dashboard object, or a function @@ -24,7 +24,7 @@ return function(callback) { // Setup some variables var dashboard; - // Intialize a skeleton with nothing but a rows array and service object + // Initialize a skeleton with nothing but a rows array and service object dashboard = { rows : [], services : {} @@ -34,7 +34,7 @@ return function(callback) { dashboard.title = 'Scripted dash'; // Set default time - // time can be overriden in the url using from/to parameters, but this is + // time can be overridden in the url using from/to parameters, but this is // handled automatically in grafana core during dashboard initialization dashboard.time = { from: "now-6h", diff --git a/public/dashboards/scripted_templated.js b/public/dashboards/scripted_templated.js index a6431f15973..5a05aa55b5d 100644 --- a/public/dashboards/scripted_templated.js +++ b/public/dashboards/scripted_templated.js @@ -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 @@ -33,7 +33,7 @@ dashboard = { dashboard.title = 'Scripted and templated dash'; // Set default time -// time can be overriden in the url using from/to parameteres, but this is +// time can be overridden in the url using from/to parameters, but this is // handled automatically in grafana core during dashboard initialization dashboard.time = { from: "now-6h", diff --git a/public/vendor/lodash/vendor/underscore/test/objects.js b/public/vendor/lodash/vendor/underscore/test/objects.js index aaa1db94d5b..be39aa17b37 100644 --- a/public/vendor/lodash/vendor/underscore/test/objects.js +++ b/public/vendor/lodash/vendor/underscore/test/objects.js @@ -109,7 +109,7 @@ var result; assert.equal(_.extend({}, {a: 'b'}).a, 'b', 'can extend an object with the attributes of another'); assert.equal(_.extend({a: 'x'}, {a: 'b'}).a, 'b', 'properties in source override destination'); - assert.equal(_.extend({x: 'x'}, {a: 'b'}).x, 'x', "properties not in source don't get overriden"); + assert.equal(_.extend({x: 'x'}, {a: 'b'}).x, 'x', "properties not in source don't get overridden"); result = _.extend({x: 'x'}, {a: 'a'}, {b: 'b'}); assert.deepEqual(result, {x: 'x', a: 'a', b: 'b'}, 'can extend from multiple source objects'); result = _.extend({x: 'x'}, {a: 'a', x: 2}, {a: 'b'}); @@ -140,7 +140,7 @@ var result; assert.equal(_.extendOwn({}, {a: 'b'}).a, 'b', 'can extend an object with the attributes of another'); assert.equal(_.extendOwn({a: 'x'}, {a: 'b'}).a, 'b', 'properties in source override destination'); - assert.equal(_.extendOwn({x: 'x'}, {a: 'b'}).x, 'x', "properties not in source don't get overriden"); + assert.equal(_.extendOwn({x: 'x'}, {a: 'b'}).x, 'x', "properties not in source don't get overridden"); result = _.extendOwn({x: 'x'}, {a: 'a'}, {b: 'b'}); assert.deepEqual(result, {x: 'x', a: 'a', b: 'b'}, 'can extend from multiple source objects'); result = _.extendOwn({x: 'x'}, {a: 'a', x: 2}, {a: 'b'});