Merge pull request #108 from sdurrheimer/master

Docs adjustments with latest changes

content/docs/introduction/faq.md

@@ -79,15 +79,29 @@ Prometheus is released under the
 After extensive research it has been determined that the correct plural of
 'Prometheus' is 'Prometheis'.
 
+### Can I reload Prometheus's configuration?
+
+Yes, sending SIGHUP to the Prometheus process will reload
+and apply the configuration file. The different components attempt
+to handle failing changes gracefully.
+
 ### Can I send alerts?
 
 Yes, with the experimental [Alertmanager](https://github.com/prometheus/alertmanager).
-[PagerDuty](http://www.pagerduty.com/) and email are supported.
+
+Currently, the following external systems are supported:
+
+* Email
+* Generic Webhooks
+* [PagerDuty](http://www.pagerduty.com/)
+* [HipChat](https://www.hipchat.com/)
+* [Slack](https://slack.com/)
+* [Pushover](https://pushover.net/)
+* [Flowdock](https://www.flowdock.com/)
 
 ### Can I create dashboards?
 
-Yes, with [PromDash](/docs/visualization/promdash/) and [Console
-templates](/docs/visualization/consoles/).
+Yes, with [PromDash](/docs/visualization/promdash/) and [Console templates](/docs/visualization/consoles/). There is also a early support for querying Prometheus servers from [Grafana](/docs/visualization/grafana/).
 
 ### Can I change the timezone? Why is everything in UTC?
 
@@ -103,7 +117,7 @@ for the current state of this effort.
 
 ### Which languages have instrumentation libraries?
 
-Currently there are client libraries for:
+Currently, there are client libraries for:
 
 * [Go](https://github.com/prometheus/client_golang)
 * [Java or Scala](https://github.com/prometheus/client_java)

content/docs/introduction/install.md

@@ -47,10 +47,10 @@ two examples.
 
 ### Volumes & bind-mount
 
-Bind-mount your prometheus.conf from the host by running:
+Bind-mount your prometheus.yml from the host by running:
 
 ```
-docker run -p 9090:9090 -v /tmp/prometheus.conf:/etc/prometheus/prometheus.conf \
+docker run -p 9090:9090 -v /tmp/prometheus.yml:/etc/prometheus/prometheus.yml \
        prom/prometheus
 ```
 
@@ -58,7 +58,7 @@ Or use an additional volume for the config:
 
 ```
 docker run -p 9090:9090 -v /prometheus-data \
-       prom/prometheus -config.file=/prometheus-data/prometheus.conf
+       prom/prometheus -config.file=/prometheus-data/prometheus.yml
 ```
 
 ### Custom image
@@ -73,7 +73,7 @@ Dockerfile like this:
 
 ```
 FROM prom/prometheus
-ADD prometheus.conf /etc/prometheus/
+ADD prometheus.yml /etc/prometheus/
 ```
 
 Now build and run it:

content/docs/introduction/roadmap.md

@@ -27,19 +27,8 @@ GitHub issue: [#9](https://github.com/prometheus/prometheus/issues/9)
 
 Currently Prometheus supports configuring static HTTP targets, as well as
 discovering targets dynamically via [DNS SRV
-records](http://en.wikipedia.org/wiki/SRV_record). We plan to support more
-types of service discovery (e.g. Consul or Zookeeper) in the future. Some will
-be implemented natively, but we may also add a plugin system for arbitrary
-discovery mechanisms.
-
-### Restartless configuration changes
-
-Currently Prometheus requires a restart after any configuration or rule file
-change. This can mean monitoring interruptions for short periods of time. In
-the future, we want to support reloading configuration changes without having
-to restart Prometheus.
-
-GitHub issue: [#108](https://github.com/prometheus/prometheus/issues/108)
+records](http://en.wikipedia.org/wiki/SRV_record) and [Consul](https://www.consul.io/). There is also a file-based interface that allows you to connect your own discovery mechanisms. We plan to natively support more
+types of service discovery (e.g. Zookeeper) in the future.
 
 ### Long-term storage