From d7f81c47951bc832061c726060c75fd587fb136e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 30 Jan 2019 17:14:42 +0100
Subject: [PATCH] Updated version and made some changes to changelog and what's
 new article

---
 CHANGELOG.md                             |  1 +
 docs/sources/guides/whats-new-in-v6-0.md | 10 ++++++----
 package.json                             |  2 +-
 scripts/build/publish.sh                 |  4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 364a33cfb5b..54d22ae7b99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * **Influxdb**: Add support for time zone (`tz`) clause [#10322](https://github.com/grafana/grafana/issues/10322), thx [@cykl](https://github.com/cykl)
 * **Snapshots**: Enable deletion of public snapshot [#14109](https://github.com/grafana/grafana/issues/14109)
 * **Provisioning**: Provisioning support for alert notifiers [#10487](https://github.com/grafana/grafana/issues/10487), thx [@pbakulev](https://github.com/pbakulev)
+* **Explore**: A whole new way to do ad-hoc metric queries and exploration. Split view in half and compare metrics & logs and much much more. [Read more here](http://docs.grafana.org/features/explore/)
 
 ### Minor
 
diff --git a/docs/sources/guides/whats-new-in-v6-0.md b/docs/sources/guides/whats-new-in-v6-0.md
index a2969b32197..184e038fc88 100644
--- a/docs/sources/guides/whats-new-in-v6-0.md
+++ b/docs/sources/guides/whats-new-in-v6-0.md
@@ -16,11 +16,13 @@ This update to Grafana introduces a new way of exploring your data, support for
 
 The main highlights are:
 
-- The new query-focused [Explore]({{< relref "#explore" >}}) workflow for troubleshooting and/or for data exploration.
-- [Support for Grafana Loki]({{< relref "#explore-and-grafana-loki" >}}) - a new open source log aggregation system from Grafana Labs.
-- [Easily Switch Visualization with the Panel Edit UX Update]({{< relref "#easily-switch-visualization-with-panel-edit-ux-update" >}})
+- [Explore]({{< relref "#explore" >}}) - A new query focused workflow for ad hoc data exploration and troubleshooting.
+- [Grafana Loki]({{< relref "#explore-and-grafana-loki" >}}) - Integration with the new open source log aggregation system from Grafana Labs.
+- [Gauge Panel]({{< relref "#gauge-panel" >}}) - A new standalone panel for gauges.
+- [New Panel Editor UX]({{< relref "#easily-switch-visualization-with-panel-edit-ux-update" >}}) improves panel editing
+    and enables easy switch between different visualizations.
 - [Google Stackdriver Datasource]({{< relref "#google-stackdriver-datasource" >}}) is out of beta and is officially released.
-- The [Azure Monitor]({{< relref "#azure-monitor-datasource" >}}) plugin is ported from being an external plugin to being a core datasource
+- [Azure Monitor]({{< relref "#azure-monitor-datasource" >}}) plugin is ported from being an external plugin to being a core datasource
 
 ## Explore
 
diff --git a/package.json b/package.json
index d2b7effbf68..12c36e610b0 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "company": "Grafana Labs"
   },
   "name": "grafana",
-  "version": "6.0.0-pre1",
+  "version": "6.0.0-beta1",
   "repository": {
     "type": "git",
     "url": "http://github.com/grafana/grafana.git"
diff --git a/scripts/build/publish.sh b/scripts/build/publish.sh
index 264d930e51b..785f46f22a0 100755
--- a/scripts/build/publish.sh
+++ b/scripts/build/publish.sh
@@ -6,8 +6,8 @@ EXTRA_OPTS="$@"
 
 # Right now we hack this in into the publish script.
 # Eventually we might want to keep a list of all previous releases somewhere.
-_releaseNoteUrl="https://community.grafana.com/t/release-notes-v5-4-x/12215"
-_whatsNewUrl="http://docs.grafana.org/guides/whats-new-in-v5-4/"
+_releaseNoteUrl="https://community.grafana.com/t/release-notes-v6-0-x/14010"
+_whatsNewUrl="http://docs.grafana.org/guides/whats-new-in-v6-0/"
 
 ./scripts/build/release_publisher/release_publisher \
     --wn ${_whatsNewUrl} \