diff --git a/docs/Makefile b/docs/Makefile
index 0dc223c6130..e5c555f8019 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -24,7 +24,7 @@ docs-watch: docs-build
 	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs && grunt connect --port=3004 & grunt watch --port=3004 --env=dev-docs"
 
 publish: docs-build
-	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh prod-docs v3.1"
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh staging-docs root"
 
 publish-prod: docs-build
 	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh prod-docs root"
diff --git a/docs/sources/alerting/rules.md b/docs/sources/alerting/rules.md
index aa38367b4aa..a2688de3100 100644
--- a/docs/sources/alerting/rules.md
+++ b/docs/sources/alerting/rules.md
@@ -33,7 +33,7 @@ of core Grafana. Only some data soures are supported right now. They include `Gr
 ### Clustering
 
 We have not implemented clustering yet. So if you run multiple instances of grafana-server
-you have to make sure [execute_alerts]({{< relref "docs/installation/configuration.md#alerting" >}})
+you have to make sure [execute_alerts]({{< relref "installation/configuration.md#alerting" >}})
 is true on only one instance or otherwise you will get duplicated notifications.
 
 <div class="clearfix"></div>
diff --git a/docs/sources/guides/basic_concepts.md b/docs/sources/guides/basic_concepts.md
index 0411db6caf2..112b004ec92 100644
--- a/docs/sources/guides/basic_concepts.md
+++ b/docs/sources/guides/basic_concepts.md
@@ -16,7 +16,7 @@ This document is a “bottom up” introduction to basic concepts in Grafana, an
 ### Data Source
 Grafana supports many different storage backends for your time series data (Data Source). Each Data Source has a specific Query Editor that is customized for the features and capabilities that the particular Data Source exposes.
 
-The following datasources are officially supported: [Graphite]({{< relref "docs/features/datasources/graphite.md" >}}), [InfluxDB]({{< relref "docs/features/datasources/influxdb.md" >}}), [OpenTSDB]({{< relref "docs/features/datasources/opentsdb.md" >}}), [Prometheus]({{< relref "docs/features/datasources/prometheus.md" >}}), [Elasticsearch]({{< relref "docs/features/datasources/elasticsearch.md" >}}), [CloudWatch]({{< relref "docs/features/datasources/cloudwatch.md" >}}).
+The following datasources are officially supported: [Graphite]({{< relref "features/datasources/graphite.md" >}}), [InfluxDB]({{< relref "features/datasources/influxdb.md" >}}), [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}}), [Prometheus]({{< relref "features/datasources/prometheus.md" >}}), [Elasticsearch]({{< relref "features/datasources/elasticsearch.md" >}}), [CloudWatch]({{< relref "features/datasources/cloudwatch.md" >}}).
 
 The query language and capabilities of each Data Source are obviously very different. You can combine data from multiple Data Sources onto a single Dashboard, but each Panel is tied to a specific Data Source that belongs to a particular Organization.
 
diff --git a/docs/sources/index.md b/docs/sources/index.md
index ab2e0f882b8..eb2c491d78e 100644
--- a/docs/sources/index.md
+++ b/docs/sources/index.md
@@ -24,27 +24,27 @@ other domains including industrial sensors, home automation, weather, and proces
 - [Installing using Provisioning (Chef, Puppet, Salt, Ansible, etc)](installation/provisioning)
 - [Nightly Builds](http://grafana.org/builds)
 
-For other platforms Read the [build from source]({{< relref "docs/project/building_from_source.md" >}})
+For other platforms Read the [build from source]({{< relref "project/building_from_source.md" >}})
 instructions for more information.
 
 ## Configuring Grafana
 
 The back-end web server has a number of configuration options. Go the
-[Configuration]({{< relref "docs/installation/configuration.md" >}}) page for details on all
+[Configuration]({{< relref "installation/configuration.md" >}}) page for details on all
 those options.
 
 
 ## Getting started
 
-- [Getting Started]({{< relref "docs/guides/getting_started.md" >}})
-- [Basic Concepts]({{< relref "docs/guides/basic_concepts.md" >}})
-- [Screencasts]({{< relref "docs/tutorials/screencasts.md" >}})
+- [Getting Started]({{< relref "guides/getting_started.md" >}})
+- [Basic Concepts]({{< relref "guides/basic_concepts.md" >}})
+- [Screencasts]({{< relref "tutorials/screencasts.md" >}})
 
 ## Data sources guides
 
-- [Graphite]({{< relref "docs/features/datasources/graphite.md" >}})
-- [Elasticsearch]({{< relref "docs/features/datasources/elasticsearch.md" >}})
-- [InfluxDB]({{< relref "docs/features/datasources/influxdb.md" >}})
-- [OpenTSDB]({{< relref "docs/features/datasources/opentsdb.md" >}})
+- [Graphite]({{< relref "features/datasources/graphite.md" >}})
+- [Elasticsearch]({{< relref "features/datasources/elasticsearch.md" >}})
+- [InfluxDB]({{< relref "features/datasources/influxdb.md" >}})
+- [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}})
 
 
diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md
index 7dd97e69810..9c6140c0c6d 100644
--- a/docs/sources/installation/debian.md
+++ b/docs/sources/installation/debian.md
@@ -114,10 +114,10 @@ those options.
 
 ### Adding data sources
 
-- [Graphite]({{< relref "docs/features/datasources/graphite.md" >}})
-- [InfluxDB]({{< relref "docs/features/datasources/influxdb.md" >}})
-- [OpenTSDB]({{< relref "docs/features/datasources/opentsdb.md" >}})
-- [Prometheus]({{< relref "docs/features/datasources/prometheus.md" >}})
+- [Graphite]({{< relref "features/datasources/graphite.md" >}})
+- [InfluxDB]({{< relref "features/datasources/influxdb.md" >}})
+- [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}})
+- [Prometheus]({{< relref "features/datasources/prometheus.md" >}})
 
 ## Installing from binary tar file
 
diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md
index 561cff69b46..63181fc535d 100644
--- a/docs/sources/installation/rpm.md
+++ b/docs/sources/installation/rpm.md
@@ -121,10 +121,10 @@ those options.
 
 ### Adding data sources
 
-- [Graphite]({{< relref "docs/features/datasources/graphite.md" >}})
-- [InfluxDB]({{< relref "docs/features/datasources/influxdb.md" >}})
-- [OpenTSDB]({{< relref "docs/features/datasources/opentsdb.md" >}})
-- [Prometheus]({{< relref "docs/features/datasources/prometheus.md" >}})
+- [Graphite]({{< relref "features/datasources/graphite.md" >}})
+- [InfluxDB]({{< relref "features/datasources/influxdb.md" >}})
+- [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}})
+- [Prometheus]({{< relref "features/datasources/prometheus.md" >}})
 
 ### Server side image rendering
 
diff --git a/docs/sources/plugins/development.md b/docs/sources/plugins/development.md
index edb959e97bc..b4573743a39 100644
--- a/docs/sources/plugins/development.md
+++ b/docs/sources/plugins/development.md
@@ -40,7 +40,7 @@ and [apps](./apps.md) plugins in the documentation.
 There are three ways that you can start developing a Grafana plugin.
 
 1. Setup a Grafana development environment. [(described here)](http://docs.grafana.org/project/building_from_source/) and place your plugin in the ```data/plugins``` folder.
-2. Install Grafana and place your plugin in the plugins directory which is set in your [config file]({{< relref "docs/installation/configuration.md" >}}). By default this is `/var/lib/grafana/plugins` on Linux systems.
+2. Install Grafana and place your plugin in the plugins directory which is set in your [config file]({{< relref "installation/configuration.md" >}}). By default this is `/var/lib/grafana/plugins` on Linux systems.
 3. Place your plugin directory anywhere you like and specify it grafana.ini.
 
 We encourage people to setup the full Grafana environment so that you can get inspiration from the rest of grafana code base.