docs(config): add note about poodle vulnerabillity in <3.0

doc fix: add "Read Only Editor" option to users.auto_assign_org_role …

docs/sources/installation/configuration.md

@@ -82,6 +82,8 @@ Another way is put a webserver like Nginx or Apache in front of Grafana and have
 
 `http` or `https`
 
+> **Note** Grafana versions earlier than 3.0 are vulnerable to [POODLE](https://en.wikipedia.org/wiki/POODLE). So we strongly recommend to upgrade to 3.x or use a reverse proxy for ssl termination.
+
 ### domain
 
 This setting is only used in as a part of the `root_url` setting (see below). Important if you
@@ -209,7 +211,7 @@ organization to be created for that new user.
 
 The role new users will be assigned for the main organization (if the
 above setting is set to true).  Defaults to `Viewer`, other valid
-options are `Admin` and `Editor`.
+options are `Read Only Editor`, `Editor` and `Admin`.
 
 <hr>
 
@@ -228,7 +230,7 @@ to be updated to match the new name.
 ### org_role
 
 Specify role for anonymous users. Defaults to `Viewer`, other valid
-options are `Editor` and `Admin`.
+options are `Read Only Editor`, `Editor` and `Admin`.
 
 ## [auth.github]
 

package.json

@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "repository": {
     "type": "git",
     "url": "http://github.com/torkelo/grafana.git"