Merge branch 'docs-1.x' into develop

.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

docs/Dockerfile

@@ -11,6 +11,8 @@ COPY ./sources/ /docs/sources
 
 COPY ./VERSION /docs/VERSION
 
+COPY ./changed-files /docs/changed-files
+
 # adding the image spec will require Docker 1.5 and `docker build -f docs/Dockerfile .`
 #COPY ./image/spec/v1.md /docs/sources/reference/image-spec-v1.md
 

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)" > GIT_BRANCH
+	echo "$(GITCOMMIT)" > GITCOMMIT
 	docker build -t "$(DOCKER_DOCS_IMAGE)" .

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.