From 3d82c848ddea706d3f0a0352eb32220117c0e20a Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Tue, 9 Apr 2019 17:30:21 +0200
Subject: [PATCH] docs: fixes and update current version

---
 docs/sources/http_api/index.md              | 2 +-
 docs/sources/http_api/playlist.md           | 5 +++--
 docs/sources/reference/dashboard_folders.md | 2 +-
 docs/sources/reference/playlist.md          | 1 +
 docs/sources/reference/sharing.md           | 2 +-
 docs/versions.json                          | 3 ++-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/sources/http_api/index.md b/docs/sources/http_api/index.md
index b29722548cb..b75f8d9384d 100644
--- a/docs/sources/http_api/index.md
+++ b/docs/sources/http_api/index.md
@@ -30,7 +30,7 @@ dashboards, creating users and updating data sources.
 * [Snapshot API]({{< relref "http_api/snapshot.md" >}})
 * [Annotations API]({{< relref "http_api/annotations.md" >}})
 * [Alerting API]({{< relref "http_api/alerting.md" >}})
-* [Alert Notification Channels API]({{< relref "http_api/alert_notification_channels.md" >}})
+* [Alert Notification Channels API]({{< relref "http_api/alerting_notification_channels.md" >}})
 * [User API]({{< relref "http_api/user.md" >}})
 * [Team API]({{< relref "http_api/team.md" >}})
 * [Admin API]({{< relref "http_api/admin.md" >}})
diff --git a/docs/sources/http_api/playlist.md b/docs/sources/http_api/playlist.md
index 7c33900969b..18b9ac540c2 100644
--- a/docs/sources/http_api/playlist.md
+++ b/docs/sources/http_api/playlist.md
@@ -7,6 +7,7 @@ type = "docs"
 [menu.docs]
 name = "Playlist"
 parent = "http_api"
+identifier = "http_api_playlist"
 +++
 
 # Playlist API
@@ -28,7 +29,7 @@ Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
   Querystring Parameters:
 
   These parameters are used as querystring parameters.
-  
+
   - **query** - Limit response to playlist having a name like this value.
   - **limit** - Limit response to *X* number of playlist.
 
@@ -153,7 +154,7 @@ Content-Type: application/json
     "id": 5,
     "title":"my other dasboard"
     "order": 2,
-    
+
   }
 ]
 ```
diff --git a/docs/sources/reference/dashboard_folders.md b/docs/sources/reference/dashboard_folders.md
index 2c287c6891b..2f7f3980561 100644
--- a/docs/sources/reference/dashboard_folders.md
+++ b/docs/sources/reference/dashboard_folders.md
@@ -47,6 +47,6 @@ The Dashboard Folder Page is similar to the Manage Dashboards page and is where
 
 Permissions can assigned to a folder and inherited by the containing dashboards. An Access Control List (ACL) is used where
 **Organization Role**, **Team** and Individual **User** can be assigned permissions. Read the
- [Dashboard & Folder Permissions]({{< relref "administration/permissions.md#dashboard-folder-permissions" >}}) docs for more detail
+ [Dashboard & Folder Permissions]({{< relref "permissions/dashboard_folder_permissions.md" >}}) docs for more detail
  on the permission system.
 
diff --git a/docs/sources/reference/playlist.md b/docs/sources/reference/playlist.md
index 182e69eebd0..2a633f258fe 100644
--- a/docs/sources/reference/playlist.md
+++ b/docs/sources/reference/playlist.md
@@ -4,6 +4,7 @@ keywords = ["grafana", "dashboard", "documentation", "playlist"]
 type = "docs"
 [menu.docs]
 parent = "dashboard_features"
+identifier = "feature_playlist"
 weight = 4
 +++
 
diff --git a/docs/sources/reference/sharing.md b/docs/sources/reference/sharing.md
index 118fd3676df..209f69e26dd 100644
--- a/docs/sources/reference/sharing.md
+++ b/docs/sources/reference/sharing.md
@@ -58,7 +58,7 @@ http://play.grafana.org/render/dashboard-solo/db/grafana-play-home?orgId=1&panel
 
 You can embed a panel using an iframe on another web site. This tab will show you the html that you need to use.
 
-> *Notice* This sharing require either anonymous access or setting [cookie_samesite]({{< relref "installation/configuration/#cookie-samesite" >}}) to none
+> *Notice* This sharing require either anonymous access or setting [cookie_samesite]({{< relref "installation/configuration.md#cookie-samesite" >}}) to none
 
 Example:
 
diff --git a/docs/versions.json b/docs/versions.json
index d1eab9afa51..a0857a7f3af 100644
--- a/docs/versions.json
+++ b/docs/versions.json
@@ -1,5 +1,6 @@
 [
-  { "version": "v6.0", "path": "/", "archived": false, "current": true },
+  { "version": "v6.1", "path": "/", "archived": false, "current": true },
+  { "version": "v6.0", "path": "/v6.0", "archived": true },
   { "version": "v5.4", "path": "/v5.4", "archived": true },
   { "version": "v5.3", "path": "/v5.3", "archived": true },
   { "version": "v5.2", "path": "/v5.2", "archived": true },