From 968b1b430827472057195c798282649982392801 Mon Sep 17 00:00:00 2001
From: aibou <aibou7251@gmail.com>
Date: Thu, 23 Apr 2015 17:42:04 +0900
Subject: [PATCH] Fix and update documents

---
 conf/defaults.ini                          | 5 +++--
 conf/sample.ini                            | 4 ++--
 docs/sources/installation/configuration.md | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 042f1a5574c..6bb3fb80857 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -7,7 +7,7 @@ app_mode = production
 
 #################################### Paths ####################################
 [paths]
-# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is useD)
+# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
 #
 data = data
 #
@@ -62,7 +62,7 @@ path = grafana.db
 
 #################################### Session ####################################
 [session]
-# Either "memory", "file", "redis", "mysql", default is "memory"
+# Either "memory", "file", "redis", "mysql", "postgresql", default is "file"
 provider = file
 
 # Provider config options
@@ -70,6 +70,7 @@ provider = file
 # file: session dir path, is relative to grafana data_path
 # redis: config like redis server addr, poolSize, password, e.g. `127.0.0.1:6379,100,grafana`
 # mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1)/database_name`
+
 provider_config = sessions
 
 # Session cookie name
diff --git a/conf/sample.ini b/conf/sample.ini
index 6aaa69f7314..68bd3eb3a1d 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -7,7 +7,7 @@
 
 #################################### Paths ####################################
 [paths]
-# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is useD)
+# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
 #
 ;data = /var/lib/grafana
 #
@@ -62,7 +62,7 @@
 
 #################################### Session ####################################
 [session]
-# Either "memory", "file", "redis", "mysql", default is "memory"
+# Either "memory", "file", "redis", "mysql", "postgresql", default is "file"
 ;provider = file
 
 # Provider config options
diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index d727f9ced41..a79a8494d73 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -219,7 +219,7 @@ set to true, any user successfully authenticating via google auth will be automa
 ## [session]
 
 ### provider
-Valid values are "memory", "file", "mysql", 'postgres'. Default is "memory".
+Valid values are "memory", "file", "mysql", 'postgres'. Default is "file".
 
 ### provider_config
 This option should be configured differently depending on what type of session provider you have configured.