more cleanup

DEVELOPERS.md

@@ -204,7 +204,7 @@ make publish
 
 ### WebSocket Test Reports
 
-[AutobahnTestsuite](http://autobahn.ws/testsuite/) provides a fully automated test suite to verify client and server implementations of the WebSocket Protocol for specification conformance and implementation robustness.
+[AutobahnTestsuite](http://crossbar.io/autobahn#testsuite) provides a fully automated test suite to verify client and server implementations of the WebSocket Protocol for specification conformance and implementation robustness.
 
 We use that to test AutobahnPython at the WebSocket level, both client and server mode.
 

README.rst

@@ -9,7 +9,7 @@ WebSocket & WAMP for Python on Twisted and asyncio.
 
 | **Quick Links**: `Source Code <https://github.com/crossbario/autobahn-python>`__ - `Documentation <https://autobahn-python.readthedocs.io/en/latest/>`__ - `WebSocket Examples <https://autobahn-python.readthedocs.io/en/latest/websocket/examples.html>`__ - `WAMP Examples <https://autobahn-python.readthedocs.io/en/latest/wamp/examples.html>`__
 | **Community**: `Mailing list <http://groups.google.com/group/autobahnws>`__ - `StackOverflow <http://stackoverflow.com/questions/tagged/autobahn>`__ - `Twitter <https://twitter.com/autobahnws>`__ - `IRC #autobahn/chat.freenode.net <https://webchat.freenode.net/>`__
-| **Companion Projects**: `Autobahn|JS <https://github.com/crossbario/autobahn-js/>`__ - `Autobahn|Cpp <https://github.com/crossbario/autobahn-cpp>`__ - `Autobahn|Testsuite <https://github.com/crossbario/autobahn-testsuite>`__ - `Crossbar.io <http://crossbar.io>`__ - `WAMP <http://wamp.ws>`__
+| **Companion Projects**: `Autobahn|JS <https://github.com/crossbario/autobahn-js/>`__ - `Autobahn|Cpp <https://github.com/crossbario/autobahn-cpp>`__ - `Autobahn|Testsuite <https://github.com/crossbario/autobahn-testsuite>`__ - `Crossbar.io <http://crossbar.io>`__ - `WAMP <http://wamp-proto.org>`__
 
 Introduction
 ------------
@@ -80,7 +80,7 @@ message received:
         def onClose(self, wasClean, code, reason):
             print("WebSocket connection closed: {}".format(reason))
 
-To actually run above server protocol, you need some lines of `boilerplate <http://autobahn.ws/python/websocket/programming.html#running-a-server>`__.
+To actually run above server protocol, you need some lines of `boilerplate <https://autobahn-python.readthedocs.io/en/latest/websocket/programming.html#running-a-server>`__.
 
 WAMP Application Component
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -123,7 +123,7 @@ actions that WAMP provides:
             print("Got result: {}".format(res))
 
 Above code will work on Twisted and asyncio by changing a single line
-(the base class of ``MyComponent``). To actually run above application component, you need some lines of `boilerplate <http://autobahn.ws/python/wamp/programming.html#running-components>`__ and a `WAMP Router <http://crossbar.io>`__.
+(the base class of ``MyComponent``). To actually run above application component, you need some lines of `boilerplate <https://autobahn-python.readthedocs.io/en/latest/wamp/programming.html#running-components>`__ and a `WAMP Router <https://autobahn-python.readthedocs.io/en/latest/wamp/programming.html#running-a-wamp-router>`__.
 
 .. |Version| image:: https://img.shields.io/pypi/v/autobahn.svg
    :target: https://pypi.python.org/pypi/autobahn

autobahn/websocket/protocol.py

@@ -2935,7 +2935,7 @@ class WebSocketServerProtocol(WebSocketProtocol):
       <p>
          For more information, please see:
          <ul>
-            <li><a href="http://autobahn.ws/python">AutobahnPython</a></li>
+            <li><a href="http://crossbar.io/autobahn">Autobahn</a></li>
          </ul>
       </p>
    </body>

docs/index.rst

@@ -9,8 +9,8 @@
 
 |AbL| is part of the `Autobahn`_ project and provides open-source implementations of
 
-* `The WebSocket Protocol <http://tools.ietf.org/html/rfc6455>`_
+* `The WebSocket Protocol <http://tools.ietf.org/html/rfc6455>`__
-* `The Web Application Messaging Protocol (WAMP) <http://wamp.ws/>`_
+* `The Web Application Messaging Protocol (WAMP) <http://wamp.ws/>`__
 
 in Python 2 and 3, running on `Twisted`_ **or** `asyncio`_.
 
@@ -37,7 +37,7 @@ See :ref:`site_contents` for a full site-map. Top-level pages available:
 Autobahn Features
 -----------------
 
-WebSocket allows `bidirectional real-time messaging <http://crossbario.com/blog/post/websocket-why-what-can-i-use-it/>`_ on the Web while `WAMP <http://wamp.ws/>`_ provides applications with `high-level communication abstractions <http://wamp.ws/why/>`_ (remote procedure calling and publish/subscribe) in an open standard WebSocket-based protocol.
+`WebSocket`_ allows `bidirectional real-time messaging <http://crossbario.com/blog/post/websocket-why-what-can-i-use-it/>`_ on the Web while `WAMP`_ provides applications with `high-level communication abstractions <http://wamp.ws/why/>`__ (remote procedure calling and publish/subscribe) in an open standard WebSocket-based protocol.
 
 |AbL| features:
 
@@ -46,10 +46,10 @@ WebSocket allows `bidirectional real-time messaging <http://crossbario.com/blog/
 * runs on `CPython`_, `PyPy`_ and `Jython`_
 * runs under `Twisted`_ and `asyncio`_
 * implements WebSocket `RFC6455`_ (and draft versions Hybi-10+)
-* implements `WebSocket compression <http://tools.ietf.org/html/draft-ietf-hybi-permessage-compression>`_
+* implements `WebSocket compression <http://tools.ietf.org/html/draft-ietf-hybi-permessage-compression>`__
 * implements `WAMP`_, the Web Application Messaging Protocol
 * supports TLS (secure WebSocket) and proxies
-* Open-source (`MIT license <https://github.com/crossbario/autobahn-python/blob/master/LICENSE>`_)
+* Open-source (`MIT license <https://github.com/crossbario/autobahn-python/blob/master/LICENSE>`__)
 
 ...and much more.
 

examples/asciinema-autobahn-demo.py

@@ -48,7 +48,7 @@ def do_commands(lines):
 commands = [
     "clear",
     colors.red('# Welcome! Here we set up and run one basic'),
-    colors.red('# http://autobahn.ws example'),
+    colors.red('# http://crossbar.io/autobahn example'),
     colors.red('# (Note there are many other examples to try)'),
     colors.red('#'),
     colors.red("# I presume you've got a clone of https://github.com/crossbario/autobahn-python"),
@@ -72,7 +72,7 @@ commands = [
     colors.red('# ...and a frontend that calls those methods'),
     "./venv-autobahn/bin/" + colors.bold("python examples/twisted/wamp/rpc/arguments/frontend.py"),
     colors.red('# Thanks for watching!'),
-    colors.red('# http://autobahn.ws/python/wamp/examples.html'),
+    colors.red('# https://autobahn-python.readthedocs.io/en/latest/wamp/examples.html'),
     "sleep 5",
 ]