diff --git a/.gitignore b/.gitignore
index 0a59fd81900..d8622e55ca2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,13 @@ awsconfig
 /dist
 /tmp
 
+docs/AWS_S3_BUCKET
+docs/GIT_BRANCH
+docs/VERSION
+docs/GITCOMMIT
+docs/changed-files
+docs/changed-files
+
 # locally required config files
 web.config
 config.js
diff --git a/docs/Makefile b/docs/Makefile
index 5a111e2eff4..b2698402e6e 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -44,4 +44,7 @@ docs-test: docs-build
 	$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" ./test.sh
 
 docs-build:
+  git fetch https://github.com/grafana/grafana.git docs-1.x && git diff --name-status FETCH_HEAD...HEAD -- . > /changed-files
+	echo "$(GIT_BRANCH)" > docs/GIT_BRANCH
+	echo "$(GITCOMMIT)" > docs/GITCOMMIT
 	docker build -t "$(DOCKER_DOCS_IMAGE)" .
diff --git a/docs/sources/index.md b/docs/sources/index.md
index 26bdbb33993..ca463496947 100644
--- a/docs/sources/index.md
+++ b/docs/sources/index.md
@@ -9,7 +9,7 @@ rich ways to visualize time series metrics, mainly though graphs but supports ot
 a pluggable panel architecture. It currently has rich support for for [Graphite](http://graphite.readthedocs.org/en/latest/),
 [InfluxDB](http://influxdb.org) and [OpenTSDB](http://opentsdb.net). But supports other data sources via plugins.
 
-It is most common usage is for infrastructure monitoring, application monitoring and metric analytics. But Grafana
+It is most commonly used for infrastructure monitoring, application monitoring and metric analytics. But Grafana
 has an open architecture and design that enabled is to be used in other domains as well, like home automation,
 weather and industrial sensors analytics.