From a5627b0cc70b6da8cc79eb8d324bea56f9612f3c Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Sat, 20 Jul 2013 21:14:59 -0500 Subject: [PATCH] Tweak description of "id" minion config param --- doc/ref/configuration/minion.rst | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst index 06c26a5f7b..13a214dfde 100644 --- a/doc/ref/configuration/minion.rst +++ b/doc/ref/configuration/minion.rst @@ -104,13 +104,12 @@ The directory used to store the minion's public and private keys. ``id`` ------ -Default: hostname (as returned by the Python call: ``socket.getfqdn()``) +Default: the system's hostname (as returned by the Python function +``socket.getfqdn()``) -Explicitly declare the id for this minion to use, if left commented the id -will be the hostname as returned by the Python call: ``socket.getfqdn()`` -Since Salt uses detached ids it is possible to run multiple minions on the -same machine but with different ids, this can be useful for Salt compute -clusters. +Explicitly declare the id for this minion to use. Since Salt uses detached ids +it is possible to run multiple minions on the same machine but with different +ids. This can be useful for Salt compute clusters. .. code-block:: yaml