From: Brian Brazil <brian.brazil@robustperception.io>
Date: Tue, 1 Aug 2017 11:44:02 +0000 (+0100)
Subject: Merge branch 'master' into superq/readme
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2e6949d3f67eafbe2bafd9280feb3d01b6993f96;p=blackbox_exporter.git

Merge branch 'master' into superq/readme
---

2e6949d3f67eafbe2bafd9280feb3d01b6993f96
diff --cc README.md
index 31f8485,859d383..dc6065c
--- a/README.md
+++ b/README.md
@@@ -20,20 -20,21 +20,20 @@@ will return metrics for a HTTP probe ag
  ### Building with Docker
  
      docker build -t blackbox_exporter .
-     docker run -d -p 9115:9115 --name blackbox_exporter -v `pwd`:/config blackbox_exporter -config.file=/config/blackbox.yml
+     docker run -d -p 9115:9115 --name blackbox_exporter -v `pwd`:/config blackbox_exporter --config.file=/config/blackbox.yml
  
 -## Configuration
 +## [Configuration](CONFIGURATION.md)
  
 -Blackbox exporter is configured via a configuration file and command-line flags (such as what configuration file to load, what port to listen on, and the logging format and level).
 +Blackbox exporter is configured via a [configuration file](CONFIGURATION.md) and command-line flags (such as what configuration file to load, what port to listen on, and the logging format and level).
  
  Blackbox exporter can reload its configuration file at runtime. If the new configuration is not well-formed, the changes will not be applied.
  A configuration reload is triggered by sending a `SIGHUP` to the Blackbox exporter process or by sending a HTTP POST request to the `/-/reload` endpoint.
  
  To view all available command-line flags, run `./blackbox_exporter -h`.
  
- To specify which [configuration file](CONFIGURATION.md) to load, use the `-config.file` flag.
 -To specify which configuration file to load, use the `--config.file` flag.
 -The file is written in [YAML format](https://en.wikipedia.org/wiki/YAML), defined by the scheme described which can be found [here.](https://github.com/prometheus/blackbox_exporter/blob/master/CONFIGURATION.md)
++To specify which [configuration file](CONFIGURATION.md) to load, use the `--config.file` flag.
  
 -Additionally, an [example configuration](https://github.com/prometheus/blackbox_exporter/blob/master/example.yml) is also available.
 +Additionally, an [example configuration](example.yml) is also available.
  
  HTTP, HTTPS (via the `http` prober), DNS, TCP socket and ICMP (see permissions section) are currently supported.
  Additional modules can be defined to meet your needs.