diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-06 10:00:36 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-06 10:00:51 +0200 |
| commit | 5d98e0fa14969daac3c0da2bdf207d2025a6c8af (patch) | |
| tree | 8a9eaf74b649c6a939213364e8c988ce67671547 /doc | |
| parent | 3b2d37c61963d423c9147d342a0985ced33ae4f1 (diff) | |
| parent | 9f5c641a4006bd71bf4c2d76c7446cb6e6bfce49 (diff) | |
| download | bitcoin-5d98e0fa14969daac3c0da2bdf207d2025a6c8af.tar.xz | |
Merge pull request #6768
9f5c641 zmq: update docs to reflect feature is compiled in automatically if possible (Johnathan Corgan)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/zmq.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/zmq.md b/doc/zmq.md index 358d29d046..484b005cf4 100644 --- a/doc/zmq.md +++ b/doc/zmq.md @@ -43,14 +43,14 @@ operation. ## Enabling -By default, the ZeroMQ port functionality is enabled. Two steps are -required to enable--compiling in the ZeroMQ code, and configuring -runtime operation on the command-line or configuration file. +By default, the ZeroMQ feature is automatically compiled in if the +necessary prerequisites are found. To disable, use --disable-zmq +during the *configure* step of building bitcoind: - $ ./configure --enable-zmq (other options) + $ ./configure --disable-zmq (other options) -This will produce a binary that is capable of providing the ZeroMQ -facility, but will not do so until also configured properly. +To actually enable operation, one must set the appropriate options on +the commandline or in the configuration file. ## Usage |