From 6dbe911800b9e8e5fdad88e6e47e718db29f180d Mon Sep 17 00:00:00 2001
From: sunyajing <yajing.sun@easystack.cn>
Date: Fri, 17 Jun 2016 17:03:31 +0800
Subject: [PATCH] Modify help msg and docs in identity
Migrate 'change', 'update' to 'modify',
migrate 'user to delete' to 'user(s) to delete',
migrate '(name or ID)' to '(type, name or ID)'.
Change-Id: Ie425e178bb5ddf773e6e793fcd91c78e9c4a5053
---
doc/source/command-objects/service.rst | 2 +-
doc/source/command-objects/user.rst | 2 +-
openstackclient/identity/v2_0/service.py | 2 +-
openstackclient/identity/v2_0/user.py | 2 +-
openstackclient/identity/v3/service.py | 2 +-
openstackclient/identity/v3/user.py | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/source/command-objects/service.rst b/doc/source/command-objects/service.rst
index 352f68a0d4..421a298b31 100644
--- a/doc/source/command-objects/service.rst
+++ b/doc/source/command-objects/service.rst
@@ -117,7 +117,7 @@ Set service properties
.. _service_set-service:
.. describe:: <service>
- Service to update (type, name or ID)
+ Service to modify (type, name or ID)
service show
------------
diff --git a/doc/source/command-objects/user.rst b/doc/source/command-objects/user.rst
index b3707a2a0c..a9fee72811 100644
--- a/doc/source/command-objects/user.rst
+++ b/doc/source/command-objects/user.rst
@@ -95,7 +95,7 @@ Delete user(s)
.. _user_delete-user:
.. describe:: <user>
- User to delete (name or ID)
+ User(s) to delete (name or ID)
user list
---------
diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py
index 947f361cf3..c67dede716 100644
--- a/openstackclient/identity/v2_0/service.py
+++ b/openstackclient/identity/v2_0/service.py
@@ -94,7 +94,7 @@ class DeleteService(command.Command):
parser.add_argument(
'service',
metavar='<service>',
- help=_('Service to delete (name or ID)'),
+ help=_('Service to delete (type, name or ID)'),
)
return parser
diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index 3ee2a65e55..b8bbdaf47a 100644
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -240,7 +240,7 @@ class SetUser(command.Command):
parser.add_argument(
'user',
metavar='<user>',
- help=_('User to change (name or ID)'),
+ help=_('User to modify (name or ID)'),
)
parser.add_argument(
'--name',
diff --git a/openstackclient/identity/v3/service.py b/openstackclient/identity/v3/service.py
index 7beadc9d18..195b2701fb 100644
--- a/openstackclient/identity/v3/service.py
+++ b/openstackclient/identity/v3/service.py
@@ -130,7 +130,7 @@ class SetService(command.Command):
parser.add_argument(
'service',
metavar='<service>',
- help=_('Service to update (type, name or ID)'),
+ help=_('Service to modify (type, name or ID)'),
)
parser.add_argument(
'--type',
diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py
index 39125e2cd2..f916c8fc62 100644
--- a/openstackclient/identity/v3/user.py
+++ b/openstackclient/identity/v3/user.py
@@ -273,7 +273,7 @@ class SetUser(command.Command):
parser.add_argument(
'user',
metavar='<user>',
- help=_('User to change (name or ID)'),
+ help=_('User to modify (name or ID)'),
)
parser.add_argument(
'--name',