aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2020-09-11 13:12:43 +0800
committerfanquake <fanquake@gmail.com>2020-09-11 13:12:54 +0800
commitdffefda21de00ceb564763e7afa9bbffbb1f3df5 (patch)
tree13f93f641f4a050d616aa615d273f68994b86607
parenta47e5964861dfb98d61719c9852e12fd6da84c31 (diff)
parent062e6699c4ac48c3d46516190ec411dec3680a0d (diff)
Merge #19870: doc: update PyZMQ install instructions, fix zmq_sub.py file permissions
062e6699c4ac48c3d46516190ec411dec3680a0d script: fix zmq_sub.py file permissions (Jon Atack) 36f8e0cce700576865e61035626e08c5e845a38a doc: update PyZMQ installation instructions, ZeroMQ link (Jon Atack) Pull request description: Seen while reviewing #19572. ACKs for top commit: theStack: ACK 062e6699c4ac48c3d46516190ec411dec3680a0d 🧷 fanquake: ACK 062e6699c4ac48c3d46516190ec411dec3680a0d Tree-SHA512: 2210d92385377d066984d0a83882c3ece9f0f41c901b7eb375af9cdb57296f50f227c68193ccf35926073c2b788d58976442791a9fce2fc0f76452804d5cee6a
-rwxr-xr-x[-rw-r--r--]contrib/zmq/zmq_sub.py0
-rw-r--r--doc/zmq.md7
2 files changed, 4 insertions, 3 deletions
diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py
index 06893407f5..06893407f5 100644..100755
--- a/contrib/zmq/zmq_sub.py
+++ b/contrib/zmq/zmq_sub.py
diff --git a/doc/zmq.md b/doc/zmq.md
index ac26fc0a48..835dea23f2 100644
--- a/doc/zmq.md
+++ b/doc/zmq.md
@@ -1,6 +1,6 @@
# Block and Transaction Broadcasting with ZeroMQ
-[ZeroMQ](http://zeromq.org/) is a lightweight wrapper around TCP
+[ZeroMQ](https://zeromq.org/) is a lightweight wrapper around TCP
connections, inter-process communication, and shared-memory,
providing various message-oriented semantics such as publish/subscribe,
request/reply, and push/pull.
@@ -39,8 +39,9 @@ For version information, see [dependencies.md](dependencies.md).
Typically, it is packaged by distributions as something like
*libzmq3-dev*. The C++ wrapper for ZeroMQ is *not* needed.
-In order to run the example Python client scripts in contrib/ one must
-also install *python3-zmq*, though this is not necessary for daemon
+In order to run the example Python client scripts in the `contrib/zmq/`
+directory, one must also install [PyZMQ](https://github.com/zeromq/pyzmq)
+(generally with `pip install pyzmq`), though this is not necessary for daemon
operation.
## Enabling