Merge branch 'master' of github.com:grafana/grafana

docs/sources/installation/configuration.md

@@ -15,6 +15,12 @@ weight = 1
 The Grafana back-end has a number of configuration options that can be
 The Grafana back-end has a number of configuration options that can be
 specified in a `.ini` configuration file or specified using environment variables.
 specified in a `.ini` configuration file or specified using environment variables.
 
 
+## Comments In .ini Files
+
+Semicolons (the `;` char) are the standard way to comment out lines in a `.ini` file.
+
+A common problem is forgetting to uncomment a line in the `custom.ini` (or `grafana.ini`) file which causes the configuration option to be ignored.
+
 ## Config file locations
 ## Config file locations
 
 
 - Default configuration from `$WORKING_DIR/conf/defaults.ini`
 - Default configuration from `$WORKING_DIR/conf/defaults.ini`

docs/sources/reference/templating.md

@@ -97,7 +97,7 @@ Grafana will detect this and automatically refresh a variable when one of it's c
 
 
 Option | Description
 Option | Description
 ------- | --------
 ------- | --------
-*Mulit-value* | If enabled, the variable will support the selection of multiple options at the same time.
+*Multi-value* | If enabled, the variable will support the selection of multiple options at the same time.
 *Include All option* | Add a special `All` option whose value includes all options.
 *Include All option* | Add a special `All` option whose value includes all options.
 *Custom all value* | By default the `All` value will include all options in combined expression. This can become very long and can have performance problems. Many times it can be better to specify a custom all value, like a wildcard regex. To make it possible to have custom regex, globs or lucene syntax in the **Custom all value** option it is never escaped so you will have to think avbout what is a valid value for your data source.
 *Custom all value* | By default the `All` value will include all options in combined expression. This can become very long and can have performance problems. Many times it can be better to specify a custom all value, like a wildcard regex. To make it possible to have custom regex, globs or lucene syntax in the **Custom all value** option it is never escaped so you will have to think avbout what is a valid value for your data source.
 
 

public/app/core/services/keybindingSrv.ts

@@ -180,14 +180,14 @@ export class KeybindingSrv {
     });
     });
 
 
     // collapse all rows
     // collapse all rows
-    this.bind('d C', () => {
+    this.bind('d shift+c', () => {
       for (let row of dashboard.rows) {
       for (let row of dashboard.rows) {
         row.collapse = true;
         row.collapse = true;
       }
       }
     });
     });
 
 
     // expand all rows
     // expand all rows
-    this.bind('d E', () => {
+    this.bind('d shift+e', () => {
       for (let row of dashboard.rows) {
       for (let row of dashboard.rows) {
         row.collapse = false;
         row.collapse = false;
       }
       }