summaryrefslogtreecommitdiffstats
path: root/docs/glances-doc.rst
diff options
context:
space:
mode:
authorNicolas Hennion <nicolas@nicolargo.com>2014-07-07 15:54:26 +0200
committerNicolas Hennion <nicolas@nicolargo.com>2014-07-07 15:54:26 +0200
commit09ec93a9d96ca3e7a471423b326c5dbfeccd5780 (patch)
tree28852a6c732fa9b3bb232cccb84da0a084d23982 /docs/glances-doc.rst
parent2749e967bbbf30f1326705335af9887bb947f72f (diff)
Add methods to the Restfull/API
Diffstat (limited to 'docs/glances-doc.rst')
-rw-r--r--docs/glances-doc.rst13
1 files changed, 8 insertions, 5 deletions
diff --git a/docs/glances-doc.rst b/docs/glances-doc.rst
index c41e49d0..f6dfa97b 100644
--- a/docs/glances-doc.rst
+++ b/docs/glances-doc.rst
@@ -592,13 +592,15 @@ CSV files have two lines per stats:
- Stats description
- Stats (comma separated)
-API Documentation
-=================
+APIs Documentations
+===================
+
+Glances includes a `XML-RPC server`_ and a `RESTFULL-JSON`_ API which and can be used by another client software.
-Glances uses a `XML-RPC server`_ and can be used by another client software.
+APIs documentations are available at:
-API documentation is available at
-https://github.com/nicolargo/glances/wiki/The-Glances-2.x-API-How-to.
+- XML-RPC: https://github.com/nicolargo/glances/wiki/The-Glances-2.x-API-How-to
+- RESTFULL-JSON: https://github.com/nicolargo/glances/wiki/The-Glances-RESTFULL-JSON-API
Support
=======
@@ -614,3 +616,4 @@ Feel free to contribute!
.. _psutil: https://code.google.com/p/psutil/
.. _XML-RPC server: http://docs.python.org/2/library/simplexmlrpcserver.html
+.. _RESTFULL-JSON: http://jsonapi.org/ \ No newline at end of file