configure: allow detection of Sphinx 1.2+

[ganeti-local] / doc / admin.rst

diff --git a/doc/admin.rst b/doc/admin.rst
index 23a0ce7..dd45a04 100644 (file)
--- a/doc/admin.rst
+++ b/doc/admin.rst
@@ -802,13 +802,13 @@ nodes ``(C, D)`` in a single move, it is possible to do so in a few
 steps::
 
   # instance is located on A, B
-  $ gnt-instance replace -n %nodeC% %instance1%
+  $ gnt-instance replace-disks -n %nodeC% %instance1%
   # instance has moved from (A, B) to (A, C)
   # we now flip the primary/secondary nodes
   $ gnt-instance migrate %instance1%
   # instance lives on (C, A)
   # we can then change A to D via:
-  $ gnt-instance replace -n %nodeD% %instance1%
+  $ gnt-instance replace-disks -n %nodeD% %instance1%
 
 Which brings it into the final configuration of ``(C, D)``. Note that we
 needed to do two replace-disks operation (two copies of the instance
@@ -1791,7 +1791,11 @@ permissions to files and programs to be correct.
 The ``users-setup`` tool, when run, takes care of setting up the proper
 users and groups.
 
-The tool does not accept any parameter, and requires root permissions to run.
+When invoked without parameters, the tool runs in interactive mode, showing the
+list of actions it will perform and asking for confirmation before proceeding.
+
+Providing the ``--yes-do-it`` parameter to the tool prevents the confirmation
+from being asked, and the users and groups will be created immediately.
 
 .. TODO: document cluster-merge tool