Torkel Ödegaard f36a44c49a Merge branch 'master' into alerting_definitions ...

Conflicts:
	conf/defaults.ini
	pkg/api/dashboard.go

2016-06-06 08:43:01 +02:00

..

alerting

docs(alerting): change api url layout

2016-05-11 14:08:45 +02:00

datasources

(cloudwatch) update changelog (#5080)

2016-05-18 13:27:19 +02:00

guides

feat(docs): updated what's new article

2016-05-10 20:33:42 +02:00

http_api

docs(preferences): Document user and org preferences (#5087)

2016-05-18 18:31:59 +02:00

installation

feat(instrumentation): documented instrumentation options, closes #4696

2016-06-03 18:38:19 +02:00

plugins

fix broken link to grafana.net, standardize on https://grafana.net for links

2016-04-22 12:13:39 -04:00

project

Fix typo in docs

2016-02-02 17:47:06 +05:30

reference

Update admin.md

2016-03-17 14:31:55 -04:00

tutorials

Fixed some more typos in docs

2015-10-30 02:07:08 -07:00

index.md

Update index.md (#4956)

2016-05-10 08:44:18 +02:00

jsearch.md

Added grafana 1.x docs to main repo

2015-03-10 08:56:03 +01:00

search.md

Added grafana 1.x docs to main repo

2015-03-10 08:56:03 +01:00

test.md

Added grafana 1.x docs to main repo

2015-03-10 08:56:03 +01:00

versions.html_fragment

docs(): updated

2016-03-30 08:01:54 -07:00