From c16e7aaea920b1ed9cad70e8cbdc657d3854cb85 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Sun, 1 May 2016 18:11:06 +0200 Subject: [PATCH] more cleanup --- DEVELOPERS.md | 2 +- README.rst | 6 +++--- autobahn/websocket/protocol.py | 2 +- docs/index.rst | 10 +++++----- examples/asciinema-autobahn-demo.py | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/DEVELOPERS.md b/DEVELOPERS.md index 63f87295..6e240760 100644 --- a/DEVELOPERS.md +++ b/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. diff --git a/README.rst b/README.rst index e53bb095..b9b34296 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ WebSocket & WAMP for Python on Twisted and asyncio. | **Quick Links**: `Source Code `__ - `Documentation `__ - `WebSocket Examples `__ - `WAMP Examples `__ | **Community**: `Mailing list `__ - `StackOverflow `__ - `Twitter `__ - `IRC #autobahn/chat.freenode.net `__ -| **Companion Projects**: `Autobahn|JS `__ - `Autobahn|Cpp `__ - `Autobahn|Testsuite `__ - `Crossbar.io `__ - `WAMP `__ +| **Companion Projects**: `Autobahn|JS `__ - `Autobahn|Cpp `__ - `Autobahn|Testsuite `__ - `Crossbar.io `__ - `WAMP `__ 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 `__. +To actually run above server protocol, you need some lines of `boilerplate `__. 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 `__ and a `WAMP Router `__. +(the base class of ``MyComponent``). To actually run above application component, you need some lines of `boilerplate `__ and a `WAMP Router `__. .. |Version| image:: https://img.shields.io/pypi/v/autobahn.svg :target: https://pypi.python.org/pypi/autobahn diff --git a/autobahn/websocket/protocol.py b/autobahn/websocket/protocol.py index 0d41d5a9..f87cba66 100755 --- a/autobahn/websocket/protocol.py +++ b/autobahn/websocket/protocol.py @@ -2935,7 +2935,7 @@ class WebSocketServerProtocol(WebSocketProtocol):

For more information, please see:

diff --git a/docs/index.rst b/docs/index.rst index bfa7919d..7baf150a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -9,8 +9,8 @@ |AbL| is part of the `Autobahn`_ project and provides open-source implementations of -* `The WebSocket Protocol `_ -* `The Web Application Messaging Protocol (WAMP) `_ +* `The WebSocket Protocol `__ +* `The Web Application Messaging Protocol (WAMP) `__ 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 `_ on the Web while `WAMP `_ provides applications with `high-level communication abstractions `_ (remote procedure calling and publish/subscribe) in an open standard WebSocket-based protocol. +`WebSocket`_ allows `bidirectional real-time messaging `_ on the Web while `WAMP`_ provides applications with `high-level communication abstractions `__ (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 `_ +* implements `WebSocket compression `__ * implements `WAMP`_, the Web Application Messaging Protocol * supports TLS (secure WebSocket) and proxies -* Open-source (`MIT license `_) +* Open-source (`MIT license `__) ...and much more. diff --git a/examples/asciinema-autobahn-demo.py b/examples/asciinema-autobahn-demo.py index bb8f634d..a286b17b 100755 --- a/examples/asciinema-autobahn-demo.py +++ b/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", ]