diff --git a/docs/sources/guides/whats-new-in-v5-2.md b/docs/sources/guides/whats-new-in-v5-2.md
index 8cff353ff45..554f8f073d8 100644
--- a/docs/sources/guides/whats-new-in-v5-2.md
+++ b/docs/sources/guides/whats-new-in-v5-2.md
@@ -17,9 +17,11 @@ Grafana v5.2 brings new features, many enhancements and bug fixes. This article
 * [Elasticsearch alerting]({{< relref "#elasticsearch-alerting" >}}) it's finally here!
 * [Cross platform build support]({{< relref "#cross-platform-build-support" >}}) enables native builds of Grafana for many more platforms!
 * [Improved Docker image]({{< relref "#improved-docker-image" >}}) with support for docker secrets
+* [Security]({{< relref "#security" >}}) make your Grafana instance more secure
 * [Prometheus]({{< relref "#prometheus" >}}) with alignment enhancements
+* [InfluxDB]({{< relref "#influxdb" >}}) with support for a new function
 * [Alerting]({{< relref "#alerting" >}}) with alert notification channel type for Discord
-* [Dashboards & Panels]({{< relref "#dashboards-panels" >}})
+* [Dashboards & Panels]({{< relref "#dashboards-panels" >}}) with save & import enhancements
 
 ## Elasticsearch alerting
 
@@ -42,11 +44,24 @@ We've been longing for native ARM build support for a long time. With the help f
 The Grafana docker image now includes support for Docker secrets which enables you to supply Grafana with configuration through files. More
 information in the [Installing using Docker documentation](/installation/docker/#reading-secrets-from-files-support-for-docker-secrets).
 
+## Security
+
+{{< docs-imagebox img="/img/docs/v52/login_change_password.png" max-width="800px" class="docs-image--right" >}}
+
+Starting from Grafana v5.2, when you login with the administrator account using the default password you'll be presented with a form to change the password.
+By this we hope to encourage users to follow Grafana's best practices and change the default administrator password.
+
+<div class="clearfix"></div>
+
 ## Prometheus
 
 The Prometheus datasource now aligns the start/end of the query sent to Prometheus with the step, which ensures PromQL expressions with *rate*
 functions get consistent results, and thus avoid graphs jumping around on reload.
 
+## InfluxDB
+
+The InfluxDB datasource now includes support for the *mode* function which allows to return the most frequent value in a list of field values.
+
 ## Alerting
 
 By popular demand Grafana now includes support for an alert notification channel type for [Discord](https://discordapp.com/).
@@ -64,6 +79,20 @@ when you actually want to overwrite those settings.
 
 <div class="clearfix"></div>
 
+### Import dashboard enhancements
+
+{{< docs-imagebox img="/img/docs/v52/dashboard_import.png" max-width="800px" class="docs-image--right" >}}
+
+Grafana v5.2 adds support for specifying an existing folder or create a new one when importing a dashboard, a long awaited feature since
+Grafana v5.0 introduced support for dashboard folders and permissions. The import dashboard page have also got some general improvements
+and should now make it more clear if a possible import will overwrite an existing dashboard, or not.
+
+This release also adds some improvements for those users only having editor or admin permissions in certain folders. Now the links to
+*Create Dashboard* and *Import Dashboard* is available in side navigation, dashboard search and manage dashboards/folder page for a
+user that has editor role in an organization or edit permission in at least one folder.
+
+<div class="clearfix"></div>
+
 ## Changelog
 
 Checkout the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list
diff --git a/docs/sources/installation/docker.md b/docs/sources/installation/docker.md
index aad76c3fb2f..1f755625699 100644
--- a/docs/sources/installation/docker.md
+++ b/docs/sources/installation/docker.md
@@ -52,7 +52,7 @@ $ docker run \
 ## Running of the master branch
 
 For every successful commit we publish a Grafana container to [`grafana/grafana`](https://hub.docker.com/r/grafana/grafana/tags/) and [`grafana/grafana-dev`](https://hub.docker.com/r/grafana/grafana-dev/tags/). In `grafana/grafana` container we will always overwrite the `master` tag with the latest version. In `grafana/grafana-dev` we will include
-the git commit in the tag. If you run Grafana master in production we **strongly** recommend that you use the later since different machines might run different version of grafana if they pull the master tag at different times. 
+the git commit in the tag. If you run Grafana master in production we **strongly** recommend that you use the later since different machines might run different version of grafana if they pull the master tag at different times.
 
 ## Installing Plugins for Grafana
 
@@ -137,16 +137,16 @@ docker run -d --user $ID --volume "$PWD/data:/var/lib/grafana" -p 3000:3000 graf
 
 ## Reading secrets from files (support for Docker Secrets)
 
-> Available in v5.2.0 and later
+> Only available in Grafana v5.2+.
 
 It's possible to supply Grafana with configuration through files. This works well with [Docker Secrets](https://docs.docker.com/engine/swarm/secrets/) as the secrets by default gets mapped into `/run/secrets/<name of secret>` of the container.
 
-You can do this with any of the configuration options in conf/grafana.ini by setting `GF_<SectionName>_<KeyName>_FILE` to the path of the file holding the secret.
+You can do this with any of the configuration options in conf/grafana.ini by setting `GF_<SectionName>_<KeyName>__FILE` to the path of the file holding the secret.
 
 Let's say you want to set the admin password this way.
 
 - Admin password secret: `/run/secrets/admin_password`
-- Environment variable: `GF_SECURITY_ADMIN_PASSWORD_FILE=/run/secrets/admin_password`
+- Environment variable: `GF_SECURITY_ADMIN_PASSWORD__FILE=/run/secrets/admin_password`
 
 
 ## Migration from a previous version of the docker container to 5.1 or later
@@ -166,7 +166,7 @@ The docker container for Grafana has seen a major rewrite for 5.1.
 
 Previously `/var/lib/grafana`, `/etc/grafana` and `/var/log/grafana` were defined as volumes in the `Dockerfile`. This led to the creation of three volumes each time a new instance of the Grafana container started, whether you wanted it or not.
 
-You should always be careful to define your own named volume for storage, but if you depended on these volumes you should be aware that an upgraded container will no longer have them. 
+You should always be careful to define your own named volume for storage, but if you depended on these volumes you should be aware that an upgraded container will no longer have them.
 
 **Warning**: when migrating from an earlier version to 5.1 or later using docker compose and implicit volumes you need to use `docker inspect` to find out which volumes your container is mapped to so that you can map them to the upgraded container as well. You will also have to change file ownership (or user) as documented below.
 
@@ -201,7 +201,7 @@ services:
 
 #### Modifying permissions
 
-The commands below will run bash inside the Grafana container with your volume mapped in. This makes it possible to modify the file ownership to match the new container. Always be careful when modifying permissions. 
+The commands below will run bash inside the Grafana container with your volume mapped in. This makes it possible to modify the file ownership to match the new container. Always be careful when modifying permissions.
 
 ```bash
 $ docker run -ti --user root --volume "<your volume mapping here>" --entrypoint bash grafana/grafana:5.1.0