summaryrefslogtreecommitdiff
path: root/gr-zeromq/include/gnuradio/zeromq/pull_source.h
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2017-09-22 15:08:36 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2017-09-22 15:08:36 -0700
commit30848c05e64b2f17d7889c5ef6a979079718f652 (patch)
tree17eb121e68875119de13704049b980170c9c40de /gr-zeromq/include/gnuradio/zeromq/pull_source.h
parentb29f5d3bef660a083e077237ffe5e4e47bab7cdb (diff)
parentbbed667ecc7ff1ced67fbc87ac66f2b5299a4dc0 (diff)
Merge branch 'maint'
Diffstat (limited to 'gr-zeromq/include/gnuradio/zeromq/pull_source.h')
-rw-r--r--gr-zeromq/include/gnuradio/zeromq/pull_source.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-zeromq/include/gnuradio/zeromq/pull_source.h b/gr-zeromq/include/gnuradio/zeromq/pull_source.h
index 07cf6af128..ecfe508b0a 100644
--- a/gr-zeromq/include/gnuradio/zeromq/pull_source.h
+++ b/gr-zeromq/include/gnuradio/zeromq/pull_source.h
@@ -48,7 +48,7 @@ namespace gr {
* \param itemsize Size of a stream item in bytes.
* \param vlen Vector length of the input items. Note that one vector is one item.
* \param address ZMQ socket address specifier.
- * \param timeout Receive timeout in seconds, default is 100ms, 1us increments.
+ * \param timeout Receive timeout in milliseconds, default is 100ms, 1us increments.
* \param pass_tags Whether source will look for and deserialize tags.
* \param hwm High Watermark to configure the socket to (-1 => zmq's default)
*/