From a31d0df8973422e73d2ad5690c7274b093b96d12 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Mon, 21 Aug 2017 21:04:20 +0200
Subject: [PATCH 1/3] shortcuts: fixes expand/collapse all rows

Fixes #9069
---
 public/app/core/services/keybindingSrv.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index f03ca8c8003..fb317fb7a68 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -180,14 +180,14 @@ export class KeybindingSrv {
     });
 
     // collapse all rows
-    this.bind('d C', () => {
+    this.bind('d shift+c', () => {
       for (let row of dashboard.rows) {
         row.collapse = true;
       }
     });
 
     // expand all rows
-    this.bind('d E', () => {
+    this.bind('d shift+e', () => {
       for (let row of dashboard.rows) {
         row.collapse = false;
       }

From d19aa89ec0152cce49e334fa5079dff1dc0a4255 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Mon, 21 Aug 2017 21:28:05 +0200
Subject: [PATCH 2/3] docs: .ini file semicolon is comment

ref #7725
---
 docs/sources/installation/configuration.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index 2eaa3018639..ae2541b4a7f 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -15,6 +15,12 @@ weight = 1
 The Grafana back-end has a number of configuration options that can be
 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
 
 - Default configuration from `$WORKING_DIR/conf/defaults.ini`

From 0ba5706400d237b82df44e2a8d833681b03aa804 Mon Sep 17 00:00:00 2001
From: jenlersadnie <jenlersadnie@gmail.com>
Date: Wed, 23 Aug 2017 02:50:22 -0400
Subject: [PATCH 3/3] Fixing a minor typo under Selection Options (#9082)

Mulit => Multi
---
 docs/sources/reference/templating.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/reference/templating.md b/docs/sources/reference/templating.md
index 40b8984cd94..36308adf52f 100644
--- a/docs/sources/reference/templating.md
+++ b/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
 ------- | --------
-*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.
 *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.