Merge branch 'v3.1.x'

docs/sources/guides/gettingstarted.md

@@ -5,7 +5,7 @@ page_keywords: grafana, guide, documentation
 ---
 
 # Getting started
-This guide will help you get started and acquainted with Grafana. It assumes you have a working Grafana 2.x instance, and have added at least one [Data Source](/datasources/overview).
+This guide will help you get started and acquainted with Grafana. It assumes you have a working Grafana server up and running and have added at least one [Data Source](/datasources/overview).
 
 ## Beginner guides
 Watch the 10min [beginners guide to building dashboards](https://www.youtube.com/watch?v=sKNZMtoSHN4&index=7&list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2) to get a quick intro to setting up Dashboards and Panels.

docs/sources/installation/configuration.md

@@ -76,7 +76,7 @@ The IP address to bind to. If empty will bind to all interfaces
 The port to bind to, defaults to `3000`. To use port 80 you need to
 either give the Grafana binary permission for example:
 
-    $ sudo setcap 'cap_net_bind_service=+ep' /opt/grafana/current/grafana
+    $ sudo setcap 'cap_net_bind_service=+ep' /usr/sbin/grafana-server
 
 Or redirect port 80 to the Grafana port using:
 
@@ -477,3 +477,14 @@ Format `<Hostname or ip>`:port
 ### prefix
 Graphite metric prefix. Defaults to `prod.grafana.%(instance_name)s.`
 
+## [snapshots]
+
+### external_enabled
+Set to false to disable external snapshot publish endpoint (default true)
+
+### external_snapshot_url
+Set root url to a Grafana instance where you want to publish external snapshots (defaults to https://snapshots-origin.raintank.io)
+
+### external_snapshot_name
+Set name for external snapshot button. Defaults to `Publish to snapshot.raintank.io`
+

docs/sources/installation/mac.md

@@ -11,28 +11,17 @@ Installation can be done using [homebrew](http://brew.sh/)
 Install latest stable:
 
 ```
-brew install grafana/grafana/grafana
-```
-
-To start grafana look at the command printed after the homebrew install completes.
-
-You can also add the grafana as tap.
-
-```
-brew tap grafana/grafana
+brew update
 brew install grafana
 ```
 
-Install latest unstable from master:
-
-```
-brew install --HEAD grafana/grafana/grafana
-```
+To start grafana look at the command printed after the homebrew install completes.
 
 To upgrade use the reinstall command
 
 ```
-brew reinstall --HEAD grafana/grafana/grafana
+brew update
+brew reinstall grafana
 ```
 
 

docs/sources/reference/playlist.md

@@ -14,7 +14,7 @@ Since Grafana automatically scales Dashboards to any resolution they're perfect
 
 The Playlist feature can be accessed from Grafana's sidemenu. Click the 'Playlist' button from the sidemenu to access the Playlist functionality. When 'Playlist' button is clicked, playlist view will open up showing saved playlists and an option to create new playlists.
 
-<img src="/img/v2/dashboard_search.png" class="no-shadow">
+<img src="/img/v3/playlist.png" class="no-shadow">
 
 Click on "New Playlist" button to create a new playlist. Firstly, name your playlist and configure a time interval for Grafana to wait on a particular Dashboard before advancing to the next one on the Playlist.