Merge branch 'docs-2.6'

docs/Makefile

@@ -44,7 +44,7 @@ docs-test: docs-build
 	$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" ./test.sh
 	$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" ./test.sh
 
 
 docs-build:
 docs-build:
-	git fetch https://github.com/grafana/grafana.git docs-2.1 && git diff --name-status FETCH_HEAD...HEAD -- . > changed-files
+	git fetch https://github.com/grafana/grafana.git docs-2.5 && git diff --name-status FETCH_HEAD...HEAD -- . > changed-files
 	echo "$(GIT_BRANCH)" > GIT_BRANCH
 	echo "$(GIT_BRANCH)" > GIT_BRANCH
 	echo "$(GITCOMMIT)" > GITCOMMIT
 	echo "$(GITCOMMIT)" > GITCOMMIT
 	docker build -t "$(DOCKER_DOCS_IMAGE)" .
 	docker build -t "$(DOCKER_DOCS_IMAGE)" .

docs/sources/project/building_from_source.md

@@ -11,7 +11,7 @@ dev environment. Grafana ships with its own required backend server; also comple
 
 
 ## Dependencies
 ## Dependencies
 
 
-- [Go 1.4](https://golang.org/dl/)
+- [Go 1.5](https://golang.org/dl/)
 - [NodeJS](https://nodejs.org/download/)
 - [NodeJS](https://nodejs.org/download/)
 
 
 ## Get Code
 ## Get Code