Commit 123c6ca6 authored by Marco Mariani's avatar Marco Mariani

added link to cli commands in index page; trivial changes

parent 45ca8a58
...@@ -11,6 +11,7 @@ Contents: ...@@ -11,6 +11,7 @@ Contents:
.. toctree:: .. toctree::
:maxdepth: 2 :maxdepth: 2
slapos.usage.rst
rest.rst rest.rst
slap.rst slap.rst
tioformat.rst tioformat.rst
......
...@@ -3,8 +3,8 @@ SlapOS command line usage ...@@ -3,8 +3,8 @@ SlapOS command line usage
========================= =========================
Notes: Notes
------ -----
* Default SlapOS Master is https://slap.vifib.com. It can be changed by altering configuration files or with the ``--master-url`` * Default SlapOS Master is https://slap.vifib.com. It can be changed by altering configuration files or with the ``--master-url``
argument for commands that support it. argument for commands that support it.
...@@ -161,7 +161,7 @@ This group of commands is used to control the current SlapOS Node. They are only ...@@ -161,7 +161,7 @@ This group of commands is used to control the current SlapOS Node. They are only
node, node status node, node status
~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~
These are aliases for ``node supervisorctl status``. These are both aliases for ``node supervisorctl status``.
It displays the status of the node, also running the supervisor daemon if needed. It displays the status of the node, also running the supervisor daemon if needed.
.. program-output:: python slapos help node supervisorctl status .. program-output:: python slapos help node supervisorctl status
......
...@@ -8,7 +8,7 @@ from slapos.client import init, do_console, ClientConfig ...@@ -8,7 +8,7 @@ from slapos.client import init, do_console, ClientConfig
class ConsoleCommand(ClientConfigCommand): class ConsoleCommand(ClientConfigCommand):
""" """
python console with slap library imported open python console with slap library imported
You can play with the global "slap" object and You can play with the global "slap" object and
with the global "request" method. with the global "request" method.
......
...@@ -12,7 +12,7 @@ import supervisor.supervisorctl ...@@ -12,7 +12,7 @@ import supervisor.supervisorctl
class SupervisorctlCommand(ConfigCommand): class SupervisorctlCommand(ConfigCommand):
"""enter into supervisor console, for process management""" """open supervisor console, for process management"""
log = logging.getLogger('supervisorctl') log = logging.getLogger('supervisorctl')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment