Skip to content

Commit 69da8aa

Browse files
committed
docs: linkcheck, prune some stale text
1 parent 7e7f483 commit 69da8aa

File tree

11 files changed

+53
-61
lines changed

11 files changed

+53
-61
lines changed

docs/source/changelog.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ Changes:
473473
- catch EACCES on Windows
474474
- include libsodium when building bundled libzmq on Windows (includes wheels on PyPI)
475475
- pyzmq no longer bundles external libzmq when making a bdist.
476-
You can use `delocate <https://pypi.python.org/pypi/delocate>`_ to do this.
476+
You can use `delocate <https://pypi.org/project/delocate/>`_ to do this.
477477

478478
Bugfixes:
479479

@@ -584,7 +584,7 @@ security features.
584584
ensuring that libzmq security is available to users who install from wheels
585585
- New :mod:`zmq.auth`, implementing zeromq's ZAP authentication,
586586
modeled on czmq zauth.
587-
For more information, see the `examples <https://github.com/zeromq/pyzmq/tree/master/examples/>`_.
587+
For more information, see the `examples <https://github.com/zeromq/pyzmq/tree/HEAD/examples/>`_.
588588

589589

590590
Other New Stuff
@@ -769,8 +769,8 @@ both used under the LGPL.
769769
zmq.green
770770
*********
771771

772-
The excellent `gevent_zeromq <https://github.com/traviscline/gevent_zeromq>`_ socket
773-
subclass which provides `gevent <http://www.gevent.org/>`_ compatibility has been merged as
772+
The excellent `gevent_zeromq <https://github.com/tmc/gevent-zeromq>`_ socket
773+
subclass which provides `gevent <https://www.gevent.org/>`_ compatibility has been merged as
774774
:mod:`zmq.green`.
775775

776776
.. seealso::
@@ -914,7 +914,7 @@ set in stone, and may be removed or changed in incompatible ways in later releas
914914
:func:`~zmq.core.version.pyzmq_version_info` for getting libzmq and pyzmq versions as
915915
tuples of numbers. This helps with the fact that version string comparison breaks down
916916
once versions get into double-digits.
917-
* ioloop changes merged from upstream `Tornado <http://www.tornadoweb.org>`_ 2.1
917+
* ioloop changes merged from upstream `Tornado <https://www.tornadoweb.org>`_ 2.1
918918

919919
2.1.9
920920
=====

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
intersphinx_mapping = {
6161
'python': ('https://docs.python.org/3', None),
62-
'tornado': ('http://www.tornadoweb.org/en/stable', None),
62+
'tornado': ('https://www.tornadoweb.org/en/stable', None),
6363
}
6464
# The version info for the project you're documenting, acts as replacement for
6565
# |version| and |release|, also used in various other places throughout the

docs/source/devices.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Devices in PyZMQ
77

88
.. seealso::
99

10-
ØMQ Guide `Device coverage <http://zguide.zeromq.org/chapter:all#toc32>`_.
10+
ØMQ Guide `Device coverage <https://zguide.zeromq.org/docs/chapter2/#ZeroMQ-s-Built-In-Proxy-Function>`_.
1111

1212
ØMQ has a notion of Devices - simple programs that manage a send-recv pattern for
1313
connecting two or more sockets. Being full programs, devices include a ``while(True)``
@@ -32,7 +32,7 @@ objects created in the background thread or process, prefixed with 'in\_' or 'ou
3232
corresponding to the `in_socket` and `out_socket`::
3333

3434
from zmq.devices import ProcessDevice
35-
35+
3636
pd = ProcessDevice(zmq.QUEUE, zmq.ROUTER, zmq.DEALER)
3737
pd.bind_in('tcp://*:12345')
3838
pd.connect_out('tcp://127.0.0.1:12543')

docs/source/eventloop.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ You can also manually install this IOLoop as the global tornado instance, with:
249249
PyZMQ and gevent
250250
================
251251

252-
PyZMQ ≥ 2.2.0.1 ships with a `gevent <http://www.gevent.org/>`_ compatible API as :mod:`zmq.green`.
252+
PyZMQ ≥ 2.2.0.1 ships with a `gevent <https://www.gevent.org/>`_ compatible API as :mod:`zmq.green`.
253253
To use it, simply:
254254

255255
.. sourcecode:: python
@@ -280,7 +280,7 @@ though using two eventloops simultaneously (tornado + gevent) is not recommended
280280

281281
.. seealso::
282282

283-
zmq.green examples `on GitHub <https://github.com/zeromq/pyzmq/tree/master/examples/gevent>`_.
283+
zmq.green examples `on GitHub <https://github.com/zeromq/pyzmq/tree/HEAD/examples/gevent>`_.
284284

285-
:mod:`zmq.green` is simply `gevent_zeromq <https://github.com/traviscline/gevent_zeromq>`_,
285+
:mod:`zmq.green` began as `gevent_zeromq <https://github.com/tmc/gevent-zeromq>`_,
286286
merged into the pyzmq project.

docs/source/index.rst

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
.. PyZMQ documentation master file, created by
2-
sphinx-quickstart on Sat Feb 20 23:31:19 2010.
3-
You can adapt this file completely to your liking, but it should at least
4-
contain the root `toctree` directive.
5-
61
PyZMQ Documentation
72
===================
83

@@ -28,18 +23,17 @@ General questions about ØMQ are better sent to the `ØMQ tracker`_ or `mailing
2823
Supported LibZMQ
2924
================
3025

31-
PyZMQ aims to support all stable ( ≥2.1.4, ≥ 3.2.2, ≥ 4.0.1 ) and active development ( ≥ 4.2.0 )
26+
PyZMQ aims to support all stable (3.2.2, ≥ 4.0.1 )
3227
versions of libzmq. Building the same pyzmq against various versions of libzmq is supported,
3328
but only the functionality of the linked libzmq will be available.
3429

3530
.. note::
3631

37-
libzmq 3.0-3.1 are not, and will never be supported.
38-
There never was a stable release of either.
32+
libzmq 3.0-3.1 are not supported,
33+
as they never received a stable release.
3934

4035

41-
Binary distributions (wheels on `PyPI <http://pypi.python.org/pypi/pyzmq>`__
42-
or `GitHub <https://www.github.com/zeromq/pyzmq/downloads>`__) of PyZMQ ship with
36+
Binary distributions (wheels on `PyPI <https://pypi.org/project/pyzmq/>`__) of PyZMQ ship with
4337
the stable version of libzmq at the time of release, built with default configuration,
4438
and include CURVE support provided by tweetnacl.
4539
For pyzmq-|release|, this is |target_libzmq|.
@@ -87,17 +81,13 @@ Links
8781

8882
* ØMQ_ Home
8983
* The `ØMQ Guide`_
90-
* `PyZMQ Installation`_ notes on the ZeroMQ website
9184
* PyZMQ on GitHub_
9285
* Issue Tracker_
9386

94-
.. _ØMQ: http://www.zeromq.org
95-
.. _ØMQ Guide: http://zguide.zeromq.org
87+
.. _ØMQ: https://zeromq.org/
88+
.. _ØMQ Guide: https://zguide.zeromq.org
9689
.. _ØMQ Tracker: https://github.com/zeromq/libzmq/issues
97-
.. _mailing list: http://www.zeromq.org/docs:mailing-lists
98-
.. _IRC Channel: http://www.zeromq.org/chatroom
99-
.. _Cython: http://cython.org/
100-
.. _GitHub: https://www.github.com/zeromq/pyzmq
101-
.. _ØMQ Manual: http://www.zeromq.org/intro:read-the-manual
102-
.. _PyZMQ Installation: http://www.zeromq.org/bindings:python
103-
.. _tracker: https://www.github.com/zeromq/pyzmq/issues
90+
.. _mailing list: http://wiki.zeromq.org/docs:mailing-lists
91+
.. _Cython: https://cython.org/
92+
.. _GitHub: https://github.com/zeromq/pyzmq
93+
.. _tracker: https://github.com/zeromq/pyzmq/issues

docs/source/logging.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ Asynchronous Logging via PyZMQ
77

88
.. seealso::
99

10-
* The ØMQ guide `coverage <http://zguide.zeromq.org/chapter:all#toc7>`_ of PUB/SUB
10+
* The ØMQ guide `coverage <https://zguide.zeromq.org/docs/chapter5/>`_ of PUB/SUB
1111
messaging
12-
* Python logging module `documentation <http://docs.python.org/library/logging.html>`_
12+
* Python logging module `documentation <https://docs.python.org/3/library/logging.html>`_
1313

1414
Python provides extensible logging facilities through its :py:mod:`logging` module. This
1515
module allows for easily extensible logging functionality through the use of
1616
:py:class:`~logging.Handler` objects. The most obvious case for hooking up pyzmq to
1717
logging would be to broadcast log messages over a PUB socket, so we have provided a
1818
:class:`.PUBHandler` class for doing just that.
1919

20-
You can use PyZMQ as a log handler with no previous knowledge of how ZMQ works,
20+
You can use PyZMQ as a log handler with no previous knowledge of how ZMQ works,
2121
and without writing any ZMQ-specific code in your Python project.
2222

2323
Getting Started
2424
---------------
25-
Ensure you have installed the pyzmq package from pip, ideally in a
26-
`virtual environment <https://docs.python.org/3/library/venv.html>`_
25+
Ensure you have installed the pyzmq package from pip, ideally in a
26+
`virtual environment <https://docs.python.org/3/library/venv.html>`_
2727
you created for your project::
2828

2929
pip install pyzmq
@@ -40,7 +40,7 @@ Next, configure logging in your Python module and setup the ZMQ log handler::
4040
Usually, you will add the handler only once in the top-level module of your
4141
project, on the root logger, just as we did here.
4242

43-
You can choose any IP address and port number that works on your system. We
43+
You can choose any IP address and port number that works on your system. We
4444
used ``tcp://127.0.0.1:12345`` to broadcast events via TCP on the localhost
4545
interface at port 12345. Make note of what you choose here as you will need it
4646
later when you listen to the events.
@@ -81,29 +81,29 @@ Slow Joiner Problem
8181
*******************
8282
The great thing about using ZMQ sockets is that you can start the publisher
8383
and subscribers in any order, and you can start & stop any of them while
84-
you leave the others running.
84+
you leave the others running.
8585

8686
When using ZMQ for logging, this means you
8787
can leave the log watcher running while you start & stop your main
8888
Python module.
8989

9090
However, you need to be aware of what the ZMQ project calls the
91-
`"slow joiner problem" <http://zguide.zeromq.org/page:all#Getting-the-Message-Out>`_ .
91+
`"slow joiner problem" <https://zguide.zeromq.org/docs/chapter5/#Slow-Subscriber-Detection-Suicidal-Snail-Pattern>`_ .
9292
To oversimplify, it means it can take a bit of
9393
time for subscribers to re-connect to a publisher that has just
9494
started up again. If the publisher starts and immediately sends a
9595
message, subscribers will likely miss it.
9696

97-
The simplistic workaround when using PyZMQ for logging is to ``sleep()``
97+
The simplistic workaround when using PyZMQ for logging is to ``sleep()``
9898
briefly after startup, before sending any log messages. See the complete
9999
example below for more details.
100100

101101

102102
Custom Log Formats
103103
******************
104-
A common Python logging recipe encourages
104+
A common Python logging recipe encourages
105105
`use of the current module name
106-
<https://docs.python.org/howto/logging-cookbook.html#using-logging-in-multiple-modules>`_
106+
<https://docs.python.org/3/howto/logging-cookbook.html#using-logging-in-multiple-modules>`_
107107
as the name of the logger. This allows your log messages to reflect your
108108
code hierarchy in a larger project with minimal configuration.
109109

docs/source/morethanbindings.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,5 +202,5 @@ included in PyZMQ itself:
202202
with ØMQ sockets.
203203
* :ref:`zmq.ssh <ssh>` : Simple tools for tunneling zeromq connections via ssh.
204204

205-
.. _ØMQ: http://www.zeromq.org
206-
.. _Tornado: https://github.com/facebook/tornado
205+
.. _ØMQ: https://zeromq.org/
206+
.. _Tornado: https://www.tornadoweb.org

docs/source/pyversions.rst

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Explicit Type 2.x 3.x
6767
================= ================= ====================
6868

6969
.. Note::
70-
70+
7171
2.5 specific
7272

7373
Where we really noticed the issue of :class:`bytes` vs :obj:`strings` coming up for
@@ -123,9 +123,11 @@ We have a :file:`utils/buffers.pxd` file that defines our :func:`asbuffer` and
123123
:file:`asbuffer.pxi`. The :func:`frombuffer` functionality was added. These functions
124124
internally switch based on Python version to call the appropriate C-API functions.
125125

126-
.. seealso:: `Python Buffer API <bufferapi>`_
126+
.. seealso::
127+
128+
`Python Buffer API`_
127129

128-
.. _bufferapi: http://docs.python.org/c-api/buffer.html
130+
.. _Python Buffer API: https://docs.python.org/3/c-api/buffer.html
129131

130132

131133
``__str__``
@@ -153,7 +155,7 @@ Exceptions
153155

154156
This section is only relevant for supporting Python 2.5 and 3.x, not for 2.6-3.x.
155157

156-
The syntax for handling exceptions has `changed <PEP-3110>`_ in Python 3. The old syntax:
158+
The syntax for handling exceptions has `changed <https://www.python.org/dev/peps/pep-3110/>`_ in Python 3. The old syntax:
157159

158160
.. sourcecode:: py
159161

@@ -187,9 +189,10 @@ exception block:
187189
This is certainly not as elegant as either the old or new syntax, but it's the only way we
188190
have found to work everywhere.
189191

190-
.. seealso:: PEP-3110_
192+
.. seealso::
193+
194+
`PEP 3110 <https://www.python.org/dev/peps/pep-3110/>`_
191195

192-
.. _PEP-3110: http://www.python.org/dev/peps/pep-3110/
193196

194197

195-
.. _mpi4py: http://mpi4py.googlecode.com
198+
.. _mpi4py: https://mpi4py.readthedocs.io

docs/source/serialization.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ the array.
8585
return A.reshape(md['shape'])
8686

8787

88-
.. [msgpack] Message Pack serialization library http://msgpack.org
89-
.. [protobuf] Google Protocol Buffers http://code.google.com/p/protobuf
88+
.. [msgpack] Message Pack serialization library https://msgpack.org
89+
.. [protobuf] Google Protocol Buffers https://github.com/protocolbuffers/protobuf
9090
.. [zlib] Python stdlib module for zip compression: :py:mod:`zlib`
91-
.. [blosc] Blosc: A blocking, shuffling and loss-less (and crazy-fast) compression library http://www.blosc.org
91+
.. [blosc] Blosc: A blocking, shuffling and loss-less (and crazy-fast) compression library https://www.blosc.org

docs/source/ssh.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ using paramiko_ for tunnels, so it should work on Windows.
1818
An SSH tunnel has five basic components:
1919

2020
* server : the SSH server through which the tunnel will be created
21-
* remote ip : the IP of the remote machine *as seen from the server*
21+
* remote ip : the IP of the remote machine *as seen from the server*
2222
(remote ip may be, but is not not generally the same machine as server).
2323
* remote port : the port on the remote machine that you want to connect to.
2424
* local ip : the interface on your local machine you want to use (default: 127.0.0.1)
@@ -65,10 +65,9 @@ rather than the remote one that wouldn't actually work.
6565

6666
.. seealso::
6767

68-
A short discussion of ssh tunnels: http://www.revsys.com/writings/quicktips/ssh-tunnel.html
68+
A short discussion of ssh tunnels: https://www.revsys.com/writings/quicktips/ssh-tunnel.html
6969

7070

71-
.. _IPython: http://ipython.org
72-
.. _pexpect: http://www.noah.org/wiki/pexpect
73-
.. _pexpect-u: http://pypi.python.org/pypi/pexpect-u
74-
.. _paramiko: http://www.lag.net/paramiko/
71+
.. _IPython: https://ipython.org
72+
.. _pexpect: https://pexpect.readthedocs.io
73+
.. _paramiko: https://www.lag.net/paramiko/

0 commit comments

Comments
 (0)