summaryrefslogtreecommitdiffstats
path: root/docs/api/overview.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/api/overview.rst')
-rw-r--r--docs/api/overview.rst13
1 files changed, 6 insertions, 7 deletions
diff --git a/docs/api/overview.rst b/docs/api/overview.rst
index 605cf4c97..2aace93b5 100644
--- a/docs/api/overview.rst
+++ b/docs/api/overview.rst
@@ -13,9 +13,9 @@ From Wikipedia, the free encyclopedia [1]_:
.. rubric:: Motivation
The idea of the centralized pyLoad :class:`Api <module.Api.Api>` is to give uniform access to all integral parts
-and plugins in pyLoad to other clients written in arbitrary programming languages.
-Most of the :class:`Api <module.Api.Api>` functionality is exposed via RPC [2]_ and accessible via thrift [3]_ or
-simple JSON objects [4]_. In conclusion the :class:`Api <module.Api.Api>` is accessible via many programming language,
+and plugins in pyLoad as well as other clients written in arbitrary programming languages.
+Most of the :class:`Api <module.Api.Api>` functionality is exposed via HTTP or WebSocktes [2]_ as
+simple JSON objects [3]_. In conclusion the :class:`Api <module.Api.Api>` is accessible via many programming languages,
over network from remote machines and over browser with javascript.
@@ -23,14 +23,13 @@ over network from remote machines and over browser with javascript.
.. toctree::
- thrift_api.rst
json_api.rst
+ websocket_api.rst
datatypes.rst
.. rubric:: Footnotes
.. [1] http://en.wikipedia.org/wiki/Application_programming_interface
-.. [2] http://en.wikipedia.org/wiki/Remote_procedure_call
-.. [3] `<http://en.wikipedia.org/wiki/Thrift_(protocol)>`_
-.. [4] http://en.wikipedia.org/wiki/Json \ No newline at end of file
+.. [2] http://en.wikipedia.org/wiki/WebSocket
+.. [3] http://en.wikipedia.org/wiki/Json \ No newline at end of file