Commit 417c5163 by Cedric Cellier Committed by Torkel Ödegaard

Fix typos (#8954)

Some being user visible.
parent 55423091
......@@ -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.
......
......@@ -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 <measurement_name>]
```
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
......
......@@ -6,7 +6,7 @@
</div>
<div class="grafana-info-box span8" style="margin: 20px 0 25px 0">
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.
</div>
......
......@@ -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",
......
......@@ -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",
......
......@@ -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",
......
......@@ -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'});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment