From d125d51baa87baefb2f644df84853fc2ff406d25 Mon Sep 17 00:00:00 2001
From: Ales Komarek <ales.komarek@tcpcloud.eu>
Date: Mon, 24 Oct 2016 11:00:40 +0200
Subject: [PATCH] Fixed commented problems

---
 README.rst                | 12 +++++++-----
 grafana/files/grafana.ini |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.rst b/README.rst
index 7f97dc1..1aae1e1 100644
--- a/README.rst
+++ b/README.rst
@@ -82,8 +82,6 @@ Client enforced data sources
             type: elasticsearch
             host: log01.domain.com
             port: 80
-            user: admin
-            password: password
             index: grafana-dash
 
 Client defined and enforced dashboard
@@ -124,7 +122,10 @@ Client enforced dashboards defined in salt-mine
 Usage
 =====
 
-There's a difference between JSON dashboard representation and models we us. Lists are replaced by dictionaries to support mergings and interpolations.
+There's a difference between JSON dashboard representation and models we us.
+The lists used in JSON format [for rows, panels and target] were replaced by
+dictionaries. This form of serialization allows better merging and overrides
+of hierarchical data structures that dashboard models are.
 
 The default format of Grafana dashboards with lists for rows, panels and targets.
 
@@ -149,8 +150,9 @@ The default format of Grafana dashboards with lists for rows, panels and targets
           renderer: flot
         showTitle: true
 
-
-The modified version of Grafana dashboard format that supports character interpolation.
+The modified version of Grafana dashboard format with dictionary declarations.
+Please note that dictionary keys are only for logical separation and are not
+displayed in generated dashboards.
 
 .. code-block:: yaml
 
diff --git a/grafana/files/grafana.ini b/grafana/files/grafana.ini
index dd249b4..2c0969d 100644
--- a/grafana/files/grafana.ini
+++ b/grafana/files/grafana.ini
@@ -66,7 +66,7 @@ password = {{ server.database.password }}
 ;ssl_mode = disable
 
 # For "sqlite3" only, path relative to data_path setting
-{%- if server.database.engine in ["postgresql"] %}
+{%- if server.database.engine in ["sqlite"] %}
 path = grafana.db
 {%- endif %}