From 09cec3118fe4da5c873368f3dcaa74d58dea36fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Wed, 12 Apr 2017 06:38:37 +0200
Subject: [PATCH] docs: updated go and node version requirements for building,
 fixes #8097

---
 README.md                                    | 33 ++++++++++----------
 docs/sources/project/building_from_source.md |  4 +--
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 35bfad353fc..9b5b02dec54 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[Grafana](https://grafana.com) [![Circle CI](https://circleci.com/gh/grafana/grafana.svg?style=svg)](https://circleci.com/gh/grafana/grafana) 
+[Grafana](https://grafana.com) [![Circle CI](https://circleci.com/gh/grafana/grafana.svg?style=svg)](https://circleci.com/gh/grafana/grafana)
 ================
 [Website](https://grafana.com) |
 [Twitter](https://twitter.com/grafana) |
@@ -19,12 +19,6 @@ Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.
 - [What's New in Grafana 4.2](http://docs.grafana.org/guides/whats-new-in-v4-2/)
 
 ## Features
-### Graphite Target Editor
-- Graphite target expression parser
-- Feature rich query composer
-- Quickly add and edit functions & parameters
-- Templated queries
-- [See it in action](http://docs.grafana.org/datasources/graphite/)
 
 ### Graphing
 - Fast rendering, even over large timespans
@@ -48,16 +42,23 @@ Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.
 - [Time range controls](http://docs.grafana.org/reference/timerange/)
 - [Share snapshots publicly](http://docs.grafana.org/v2.0/reference/sharing/)
 
-### Elasticsearch
-- Feature rich query editor UI
-
 ### InfluxDB
 - Use InfluxDB as a metric data source, annotation source
-- Query editor with series and column typeahead, easy group by and function selection
+- Query editor with field and tag typeahead, easy group by and function selection
 
-### OpenTSDB
-- Use as metric data source
-- Query editor with metric name typeahead and tag filtering
+### Graphite
+- Graphite target expression parser
+- Feature rich query composer
+- Quickly add and edit functions & parameters
+- Templated queries
+- [See it in action](http://docs.grafana.org/datasources/graphite/)
+
+### Elasticsearch, Prometheus & OpenTSDB
+- Feature rich query editor UI
+
+### Alerting
+- Define alert rules using graphs & query conditions
+- Schedule & evalute alert rules, send notifications to Slack, Hipchat, Email, PagerDuty, etc.
 
 ## Requirements
 There are no dependencies except an external time series data store. For dashboards and user accounts Grafana can use an embedded
@@ -78,8 +79,8 @@ the latest master builds [here](https://grafana.com/grafana/download)
 
 ### Dependencies
 
-- Go 1.8
-- NodeJS v4+
+- Go 1.8.1
+- NodeJS LTS
 
 ### Get Code
 
diff --git a/docs/sources/project/building_from_source.md b/docs/sources/project/building_from_source.md
index 4b5291dc887..3d6673d2fb0 100644
--- a/docs/sources/project/building_from_source.md
+++ b/docs/sources/project/building_from_source.md
@@ -13,8 +13,8 @@ dev environment. Grafana ships with its own required backend server; also comple
 
 ## Dependencies
 
-- [Go 1.8](https://golang.org/dl/)
-- [NodeJS](https://nodejs.org/download/)
+- [Go 1.8.1](https://golang.org/dl/)
+- [NodeJS LTS](https://nodejs.org/download/)
 
 ## Get Code
 Create a directory for the project and set your path accordingly. Then download and install Grafana into your $GOPATH directory