From 6267ef1391b568477ee8520ab993f0d3e2bee1c9 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 1 Nov 2017 10:52:02 +0100
Subject: [PATCH] datasource as cfg: fixes typos

---
 conf/datasources/datasources.yaml | 4 ++--
 pkg/cmd/grafana-server/server.go  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/conf/datasources/datasources.yaml b/conf/datasources/datasources.yaml
index ed5d3aaa217..3364509d4aa 100644
--- a/conf/datasources/datasources.yaml
+++ b/conf/datasources/datasources.yaml
@@ -36,9 +36,9 @@ datasources:
 #   json_data: '{"graphiteVersion":"0.9"}'
 #   # <string> json object of data that will be encrypted in UI.
 #   secure_json_fields: ''
-#   # <int> including this value garantees that instance with old configs cannot
+#   # <int> including this value guarantees that instance with old configs cannot
 #   #       overwrite your last change.
 #   version: 1
 #   # <bool> allow users to edit datasources from the UI.
-#   editable: true
+#   editable: false
 
diff --git a/pkg/cmd/grafana-server/server.go b/pkg/cmd/grafana-server/server.go
index 9fa1c698bdd..1d3ac092734 100644
--- a/pkg/cmd/grafana-server/server.go
+++ b/pkg/cmd/grafana-server/server.go
@@ -66,7 +66,6 @@ func (g *GrafanaServerImpl) Start() {
 	social.NewOAuthService()
 	plugins.Init()
 
-	//if err := provisioning.StartUp(setting.HomePath); err != nil {
 	if err := provisioning.StartUp(setting.DatasourcesPath); err != nil {
 		logger.Error("Failed to provision Grafana from config", "error", err)
 		g.Shutdown(1, "Startup failed")