diff --git a/docs/sources/auth/auth-proxy.md b/docs/sources/auth/auth-proxy.md index 0189b38ae42..8a09ba85c4c 100644 --- a/docs/sources/auth/auth-proxy.md +++ b/docs/sources/auth/auth-proxy.md @@ -13,7 +13,7 @@ weight = 2 # Auth Proxy Authentication -You can configure Grafana to let a http reverse proxy handling authentication. Popular web servers have a very +You can configure Grafana to let a HTTP reverse proxy handling authentication. Popular web servers have a very extensive list of pluggable authentication modules, and any of them can be used with the AuthProxy feature. Below we detail the configuration options for auth proxy. diff --git a/docs/sources/features/datasources/influxdb.md b/docs/sources/features/datasources/influxdb.md index 32b12972636..63482eec4c7 100644 --- a/docs/sources/features/datasources/influxdb.md +++ b/docs/sources/features/datasources/influxdb.md @@ -27,7 +27,7 @@ Name | Description ------------ | ------------- *Name* | The data source name. This is how you refer to the data source in panels & queries. *Default* | Default data source means that it will be pre-selected for new panels. -*Url* | The http protocol, ip and port of you influxdb api (influxdb api port is by default 8086) +*Url* | The HTTP protocol, ip and port of you influxdb api (influxdb api port is by default 8086) *Access* | Server (default) = URL needs to be accessible from the Grafana backend/server, Browser = URL needs to be accessible from the browser. *Database* | Name of your influxdb database *User* | Name of your database user diff --git a/docs/sources/features/datasources/opentsdb.md b/docs/sources/features/datasources/opentsdb.md index 0088b097ad4..ef73f5b07c2 100644 --- a/docs/sources/features/datasources/opentsdb.md +++ b/docs/sources/features/datasources/opentsdb.md @@ -27,7 +27,7 @@ Name | Description ------------ | ------------- *Name* | The data source name. This is how you refer to the data source in panels & queries. *Default* | Default data source means that it will be pre-selected for new panels. -*Url* | The http protocol, ip and port of you opentsdb server (default port is usually 4242) +*Url* | The HTTP protocol, ip and port of you opentsdb server (default port is usually 4242) *Access* | Server (default) = URL needs to be accessible from the Grafana backend/server, Browser = URL needs to be accessible from the browser. *Version* | Version = opentsdb version, either <=2.1 or 2.2 *Resolution* | Metrics from opentsdb may have datapoints with either second or millisecond resolution. diff --git a/docs/sources/features/datasources/prometheus.md b/docs/sources/features/datasources/prometheus.md index 9abb48e08b0..1874ceac730 100644 --- a/docs/sources/features/datasources/prometheus.md +++ b/docs/sources/features/datasources/prometheus.md @@ -29,7 +29,7 @@ Grafana includes built-in support for Prometheus. | ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | | _Name_ | The data source name. This is how you refer to the data source in panels & queries. | | _Default_ | Default data source means that it will be pre-selected for new panels. | -| _Url_ | The http protocol, ip and port of you Prometheus server (default port is usually 9090) | +| _Url_ | The HTTP protocol, ip and port of you Prometheus server (default port is usually 9090) | | _Access_ | Server (default) = URL needs to be accessible from the Grafana backend/server, Browser = URL needs to be accessible from the browser. | | _Basic Auth_ | Enable basic authentication to the Prometheus data source. | | _User_ | Name of your Prometheus user | diff --git a/docs/sources/guides/getting_started.md b/docs/sources/guides/getting_started.md index 27957990265..3daecd98c27 100644 --- a/docs/sources/guides/getting_started.md +++ b/docs/sources/guides/getting_started.md @@ -17,7 +17,7 @@ This guide will help you get started and acquainted with Grafana. It assumes you ## Logging in for the first time -To run Grafana open your browser and go to http://localhost:3000/. 3000 is the default http port that Grafana listens to if you haven't [configured a different port](/installation/configuration/#http-port). +To run Grafana open your browser and go to http://localhost:3000/. 3000 is the default HTTP port that Grafana listens to if you haven't [configured a different port](/installation/configuration/#http-port). There you will see the login page. Default username is admin and default password is admin. When you log in for the first time you will be asked to change your password. We strongly encourage you to follow Grafana’s best practices and change the default administrator password. You can later go to user preferences and change your user name. diff --git a/docs/sources/http_api/org.md b/docs/sources/http_api/org.md index 00bbe4cd363..0d08d327a77 100644 --- a/docs/sources/http_api/org.md +++ b/docs/sources/http_api/org.md @@ -337,7 +337,7 @@ Accept: application/json Content-Type: application/json ``` Note: The api will only work when you pass the admin name and password -to the request http url, like http://admin:admin@localhost:3000/api/orgs +to the request HTTP url, like http://admin:admin@localhost:3000/api/orgs **Example Response**: @@ -417,7 +417,7 @@ Accept: application/json Content-Type: application/json ``` Note: The api will only work when you pass the admin name and password -to the request http url, like http://admin:admin@localhost:3000/api/orgs/1/users +to the request HTTP url, like http://admin:admin@localhost:3000/api/orgs/1/users **Example Response**: diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 8b2ecbcb513..89b9845a524 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -347,7 +347,7 @@ mitigate the risk of [Clickjacking](https://www.owasp.org/index.php/Clickjacking ### strict_transport_security -Set to `true` if you want to enable http `Strict-Transport-Security` (HSTS) response header. This is only sent when HTTPS is enabled in this configuration. HSTS tells browsers that the site should only be accessed using HTTPS. The default value is `false` until the next minor release, `6.3`. +Set to `true` if you want to enable HTTP `Strict-Transport-Security` (HSTS) response header. This is only sent when HTTPS is enabled in this configuration. HSTS tells browsers that the site should only be accessed using HTTPS. The default value is `false` until the next minor release, `6.3`. ### strict_transport_security_max_age_seconds diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index 842323ad313..e95234fc60e 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -163,5 +163,5 @@ binary and the `public` folder is located). ## Logging in for the first time -To run Grafana open your browser and go to http://localhost:3000/. 3000 is the default http port that Grafana listens to if you haven't [configured a different port](/installation/configuration/#http-port). +To run Grafana open your browser and go to http://localhost:3000/. 3000 is the default HTTP port that Grafana listens to if you haven't [configured a different port](/installation/configuration/#http-port). Then follow the instructions [here](/guides/getting_started/). diff --git a/docs/sources/installation/docker.md b/docs/sources/installation/docker.md index 52353ede8c2..294f3bc54ae 100644 --- a/docs/sources/installation/docker.md +++ b/docs/sources/installation/docker.md @@ -248,5 +248,5 @@ chown -R root:root /etc/grafana && \ ## Logging in for the first time -To run Grafana open your browser and go to http://localhost:3000/. 3000 is the default http port that Grafana listens to if you haven't [configured a different port](/installation/configuration/#http-port). -Then follow the instructions [here](/guides/getting_started/). \ No newline at end of file +To run Grafana open your browser and go to http://localhost:3000/. 3000 is the default HTTP port that Grafana listens to if you haven't [configured a different port](/installation/configuration/#http-port). +Then follow the instructions [here](/guides/getting_started/). diff --git a/docs/sources/installation/mac.md b/docs/sources/installation/mac.md index 336e46c895d..a02cff35560 100644 --- a/docs/sources/installation/mac.md +++ b/docs/sources/installation/mac.md @@ -96,5 +96,5 @@ binary and the `public` folder is located). ## Logging in for the first time -To run Grafana open your browser and go to http://localhost:3000/. 3000 is the default http port that Grafana listens to if you haven't [configured a different port](/installation/configuration/#http-port). -Then follow the instructions [here](/guides/getting_started/). \ No newline at end of file +To run Grafana open your browser and go to http://localhost:3000/. 3000 is the default HTTP port that Grafana listens to if you haven't [configured a different port](/installation/configuration/#http-port). +Then follow the instructions [here](/guides/getting_started/). diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md index 34fe6e53d96..3a7025288cf 100644 --- a/docs/sources/installation/rpm.md +++ b/docs/sources/installation/rpm.md @@ -194,5 +194,5 @@ binary and the `public` folder is located). ## Logging in for the first time -To run Grafana open your browser and go to http://localhost:3000/. 3000 is the default http port that Grafana listens to if you haven't [configured a different port](/installation/configuration/#http-port). +To run Grafana open your browser and go to http://localhost:3000/. 3000 is the default HTTP port that Grafana listens to if you haven't [configured a different port](/installation/configuration/#http-port). Then follow the instructions [here](/guides/getting_started/).