Interdiff:

diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
index b4a482e..859064a 100644
--- a/man/gnt-instance.rst
+++ b/man/gnt-instance.rst
@@ -1144,16 +1144,17 @@ The ``--disk add:size=*SIZE*,[options..]`` option
adds a disk to the
 instance, and ``--disk *N*:add:size=*SIZE*,[options..]`` will add a disk
 to the the instance at a specific index. The available options are the
 same as in the **add** command(``spindles``, ``mode``, ``name``, ``vg``,
-``metavg``). If you do not want gnt-instance to wait for the disk mirror
-to be synced, use the ``--no-wait-for-sync`` option. When adding an
-ExtStorage disk the ``provider=*PROVIDER*`` option is also mandatory and
-specifies the ExtStorage provider. Also, for ExtStorage disks arbitrary
-parameters can be passed as additional comma separated options, same as
-in the **add** command. The ``--disk remove`` option will remove the
-last disk of the instance. Use ``--disk `` *ID*``:remove`` to remove a
-disk by its identifier. *ID* can be the index of the disk, the disks's
-name or the disks's UUID. The ``--disk *ID*:modify[,options...]`` will
-change the options of the disk. Available options are:
+``metavg``). Per default, gnt-instance waits for the disk mirror to sync.
+If you do not want this behavior, use the ``--no-wait-for-sync`` option.
+When adding an ExtStorage disk, the ``provider=*PROVIDER*`` option is
+also mandatory and specifies the ExtStorage provider. Also, for
+ExtStorage disks arbitrary parameters can be passed as additional comma
+separated options, same as in the **add** command. The ``--disk remove``
+option will remove the last disk of the instance. Use
+``--disk `` *ID*``:remove`` to remove a disk by its identifier. *ID*
+can be the index of the disk, the disks's name or the disks's UUID. The
+``--disk *ID*:modify[,options...]`` will change the options of the disk.
+Available options are:

 mode
   The access mode. Either ``ro`` (read-only) or the default ``rw``
(read-write).


On Thu, Sep 26, 2013 at 11:48 AM, Jose A. Lopes <[email protected]>wrote:

> On Thu, Sep 26, 2013 at 07:47:35AM +0200, Thomas Thrainer wrote:
> > The already present option '--no-wait-for-sync' in
> > `gnt-instance modify` is now also mentioned in the part which describes
> > adding a disk.
> >
> > Signed-off-by: Thomas Thrainer <[email protected]>
> > ---
> >  man/gnt-instance.rst | 19 ++++++++++---------
> >  1 file changed, 10 insertions(+), 9 deletions(-)
> >
> > diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
> > index 1808c97..b4a482e 100644
> > --- a/man/gnt-instance.rst
> > +++ b/man/gnt-instance.rst
> > @@ -1144,15 +1144,16 @@ The ``--disk add:size=*SIZE*,[options..]``
> option adds a disk to the
> >  instance, and ``--disk *N*:add:size=*SIZE*,[options..]`` will add a disk
> >  to the the instance at a specific index. The available options are the
> >  same as in the **add** command(``spindles``, ``mode``, ``name``, ``vg``,
> > -``metavg``). When adding an ExtStorage disk the ``provider=*PROVIDER*``
> > -option is also mandatory and specifies the ExtStorage provider. Also,
> > -for ExtStorage disks arbitrary parameters can be passed as additional
> > -comma separated options, same as in the **add** command. -The ``--disk
> > -remove`` option will remove the last disk of the instance. Use ``--disk
> > -`` *ID*``:remove`` to remove a disk by its identifier. *ID* can be the
> > -index of the disk, the disks's name or the disks's UUID. The ``--disk
> > -*ID*:modify[,options...]`` will change the options of the disk.
> > -Available options are:
> > +``metavg``). If you do not want gnt-instance to wait for the disk mirror
>
> Perhaps say first that, when a disk is added, by default the disks are
> synced.  And then say "If you do not want gnt-instance to wait..."
>
> > +to be synced, use the ``--no-wait-for-sync`` option. When adding an
> > +ExtStorage disk the ``provider=*PROVIDER*`` option is also mandatory and
>
> s/disk/disk, /
>
> Thanks,
> Jose
>
> > +specifies the ExtStorage provider. Also, for ExtStorage disks arbitrary
> > +parameters can be passed as additional comma separated options, same as
> > +in the **add** command. The ``--disk remove`` option will remove the
> > +last disk of the instance. Use ``--disk `` *ID*``:remove`` to remove a
> > +disk by its identifier. *ID* can be the index of the disk, the disks's
> > +name or the disks's UUID. The ``--disk *ID*:modify[,options...]`` will
> > +change the options of the disk. Available options are:
> >
> >  mode
> >    The access mode. Either ``ro`` (read-only) or the default ``rw``
> (read-write).
> > --
> > 1.8.4
> >
>
> --
> Jose Antonio Lopes
> Ganeti Engineering
> Google Germany GmbH
> Dienerstr. 12, 80331, München
>
> Registergericht und -nummer: Hamburg, HRB 86891
> Sitz der Gesellschaft: Hamburg
> Geschäftsführer: Graham Law, Christine Elizabeth Flores
> Steuernummer: 48/725/00206
> Umsatzsteueridentifikationsnummer: DE813741370
>



-- 
Thomas Thrainer | Software Engineer | [email protected] |

Google Germany GmbH
Dienerstr. 12
80331 München

Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschäftsführer: Graham Law, Christine Elizabeth Flores

Reply via email to