summaryrefslogtreecommitdiff
path: root/api-guide/source/general_info.rst
diff options
context:
space:
mode:
authorKen'ichi Ohmichi <ken-oomichi@wx.jp.nec.com>2015-12-08 05:34:26 +0000
committerKen'ichi Ohmichi <ken-oomichi@wx.jp.nec.com>2015-12-08 05:36:11 +0000
commitda3001bc80fee95be1c254396f0edeaaf32e95d3 (patch)
tree89fadd00ce55273db076a14c328b614fe70e149e /api-guide/source/general_info.rst
parent3f8c69b2ef3eef886e36c0b7f397b83a36a7beb8 (diff)
downloadnova-da3001bc80fee95be1c254396f0edeaaf32e95d3.tar.gz
Make admin consistent
There are variety like "admin" or "administrator" on api-guide, so this patch makes these words consistent for the readability. Partially implements blueprint complete-todo-in-api-concept-doc Change-Id: Id0a9444e5d48f62d6d02114f8668761647c2dae0
Diffstat (limited to 'api-guide/source/general_info.rst')
-rw-r--r--api-guide/source/general_info.rst9
1 files changed, 5 insertions, 4 deletions
diff --git a/api-guide/source/general_info.rst b/api-guide/source/general_info.rst
index 9745c29304..6bc6544fdf 100644
--- a/api-guide/source/general_info.rst
+++ b/api-guide/source/general_info.rst
@@ -70,7 +70,7 @@ several key concepts:
Quotas can be used to limit the number of servers a tenant creates, or the
amount of disk space consumed, so that no one tenant can overwhelm the
system and prevent normal operation for others. Changing quotas is an
- admin-level action.
+ administrator-level action.
- **Rate Limiting**
@@ -83,8 +83,8 @@ several key concepts:
zone" is used in other clouds, such as Amazon Web Services, to denote a
physical separation of server locations that can be used to distribute cloud
resources for fault tolerance in case one zone is unavailable for any
- reason. Such a separation is possible in Nova if an admin carefully sets up
- availability zones for that, but it is not the default.
+ reason. Such a separation is possible in Nova if an administrator carefully
+ sets up availability zones for that, but it is not the default.
- **User data**
A user data file is a special key in the metadata service that holds a file
@@ -188,7 +188,8 @@ on compute hosts rather than servers.
- **enable, disable, disable-log-reason**
The service can be disabled to indicate the service didn't provided
- service anymore. This is used by admin to stop service for maintenance.
+ service anymore. This is used by administrator to stop service for
+ maintenance.
For example, when Administrator wants to maintain a specific compute node,
Administrator can disable nova-compute service on that compute node. Then
nova won't dispatch any new compute request to that compute node anymore.