From: songweibin <song.weibin@zte.com.cn>
Date: Wed, 31 Jan 2018 03:25:05 +0000 (+0800)
Subject: pybind/rbd: fix some typo
X-Git-Tag: v13.0.2~372^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e50c352b35f12cd2f94cc5e3d28a61a9bb1731f;p=ceph.git

pybind/rbd: fix some typo

Signed-off-by: songweibin <song.weibin@zte.com.cn>
---

diff --git a/doc/man/8/rbd.rst b/doc/man/8/rbd.rst
index 9cae3f5120d6..e0fd26263201 100644
--- a/doc/man/8/rbd.rst
+++ b/doc/man/8/rbd.rst
@@ -275,7 +275,7 @@ Commands
 :command:`group snap rm` *group-snap-spec*
   Remove a snapshot from a group.
 
-:command:`group snap rename` *group-snap-spec* *snap-spec*
+:command:`group snap rename` *group-snap-spec* *snap-name*
   Rename group's snapshot.
 
 :command:`image-meta get` *image-spec* *key*
diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx
index cb936c1c37ee..97f0ddf382a6 100644
--- a/src/pybind/rbd/rbd.pyx
+++ b/src/pybind/rbd/rbd.pyx
@@ -1579,7 +1579,7 @@ cdef class Group(object):
 
         :param image_ioctx: determines which RADOS pool the image belongs to.
         :type ioctx: :class:`rados.Ioctx`
-        :param name: the name of the image to remove
+        :param name: the name of the image to add
         :type name: str
 
         :raises: :class:`ObjectNotFound`
@@ -1598,7 +1598,7 @@ cdef class Group(object):
 
     def remove_image(self, image_ioctx, image_name):
         """
-        Remove an image to a group.
+        Remove an image from a group.
 
         :param image_ioctx: determines which RADOS pool the image belongs to.
         :type ioctx: :class:`rados.Ioctx`
@@ -1687,7 +1687,7 @@ cdef class Group(object):
             ret = rbd_group_snap_rename(self._ioctx, self._name, _old_snap_name,
                                         _new_snap_name)
         if ret != 0:
-            raise make_ex(ret, 'error removing group snapshot',
+            raise make_ex(ret, 'error renaming group snapshot',
                           group_errno_to_exception)
 
     def list_snaps(self):
@@ -3598,7 +3598,7 @@ cdef class GroupImageIterator(object):
 
     * ``name`` (str) - name of the image
 
-    * ``pool`` (int) - name of the pool this image belongs to
+    * ``pool`` (int) - id of the pool this image belongs to
 
     * ``state`` (int) - state of the image
     """
@@ -3614,7 +3614,7 @@ cdef class GroupImageIterator(object):
         while True:
             self.images = <rbd_group_image_info_t*>realloc_chk(self.images,
                                                                self.num_images *
-                                                                sizeof(rbd_group_image_info_t))
+                                                               sizeof(rbd_group_image_info_t))
             with nogil:
                 ret = rbd_group_image_list(group._ioctx, group._name,
                                            self.images,