Inclusivity changes for CloudStack in the documentation - Rename default git branch name from 'master' to 'main' and replace some offensive words/terms as appropriate (#155)
* Renamed default git branch name from 'master' to 'main', for inclusiveness.
* Updated master and slave(s) in the database context, with source and replica(s) respectively for inclusiveness.
* Updated the configurations 'user.vm.blacklisted.details' and 'blacklisted.routes', to 'user.vm.denied.details' and 'denied.routes' respectively and other related offending words for inclusiveness.
* Updated redundant state of router from 'master' to 'primary', to be more inclusive.
* Updated whitelist, blacklist, master, slave and some other offensive words/terms as appropriate for inclusiveness.
* Updated kubernetes service docs with inclusive words/terms.
* Update some doc with gender-inclusive words
* Reverted Sphinx conf changes
Co-authored-by: Suresh Kumar Anaparti <suresh.anaparti@shapeblue.com>
Co-authored-by: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com>
diff --git a/README.rst b/README.rst
index 2cd4ed7..686a01b 100644
--- a/README.rst
+++ b/README.rst
@@ -92,15 +92,15 @@
$ git clone https://github.com/YOUR_ACCOUNT/cloudstack-documentation.git
$ cd cloudstack-docs-install
$ git remote add upstream https://github.com/apache/cloudstack-documentation.git
- $ git checkout master
+ $ git checkout main
$ git fetch upstream
- $ git merge upstream/master
+ $ git merge upstream/main
Making changes
--------------
-It is important that you create a new branch to make changes on and that you do not change the `master` branch (other than to pull in changes from `upstream/master`). In this case I will assume you will be creating a branch called `dev` to make your changes in. This `dev` branch will be created on your local repository and will then be pushed to your forked repository on GitHub where you will create a Pull Request for the changes to be committed into the official documentation.
+It is important that you create a new branch to make changes on and that you do not change the `main` branch (other than to pull in changes from `upstream/main`). In this case I will assume you will be creating a branch called `dev` to make your changes in. This `dev` branch will be created on your local repository and will then be pushed to your forked repository on GitHub where you will create a Pull Request for the changes to be committed into the official documentation.
It is good practice to create a new branch each time you want to contribute to the documentation and only track the changes for that pull request in this branch.
@@ -115,28 +115,28 @@
The `-b` specifies that you want to create a new branch called `dev`. You only specify `-b` the first time because you are creating a new branch. Once the `dev` branch exists, you can later switch to it with only `git checkout dev`.
-Merging `upstream/master` into your `dev` branch
+Merging `upstream/main` into your `dev` branch
------------------------------------------------
-It is important that you maintain an up-to-date `master` branch in your local repository. This is done by merging in the `upstream/master` (the official documentation repository) into your local repository. You will want to do this before you start working on a feature as well as right before you submit your changes as a pull request. You can also do this process periodically while you work on your changes to make sure you are working off the most recent version of the documentation.
+It is important that you maintain an up-to-date `main` branch in your local repository. This is done by merging in the `upstream/main` (the official documentation repository) into your local repository. You will want to do this before you start working on a feature as well as right before you submit your changes as a pull request. You can also do this process periodically while you work on your changes to make sure you are working off the most recent version of the documentation.
This process will do the following:
-#. Checkout your local `master` branch
+#. Checkout your local `main` branch
-#. Synchronize your local `master` branch with the `upstream/master` so you have all the latest changes from the official docs
+#. Synchronize your local `main` branch with the `upstream/main` so you have all the latest changes from the official docs
#. Merge the latest changes from the official docs into your `dev` branch so it is up-to-date with the latest changes
.. code:: bash
- $ git checkout master
+ $ git checkout main
$ git fetch upstream
- $ git merge upstream/master
+ $ git merge upstream/main
$ git checkout dev
- $ git pull . master
+ $ git pull . main
-.. note:: Now your `dev` branch is up-to-date with all the recent changes in the `upstream/master`.
+.. note:: Now your `dev` branch is up-to-date with all the recent changes in the `upstream/main`.
Making a pull request on GitHub to contribute your changes
@@ -144,11 +144,11 @@
When you are happy with your changes and you want to contribute them, you will be creating a Pull Request on GitHub to do so. This is done by pushing your changes to your forked repository (usually called 'origin') and then initiating a pull request.
-.. note:: Make sure you have merged `upstream/master` into your `dev` branch before you do this.
+.. note:: Make sure you have merged `upstream/main` into your `dev` branch before you do this.
.. code:: bash
- $ git push origin master
+ $ git push origin main
$ git push origin dev
Now that the `dev` branch has been pushed to your GitHub repository, you can initiate the pull request.
@@ -167,14 +167,14 @@
Cleaning up after a successful pull request
-------------------------------------------
-Once the `dev` branch has been committed into the `upstream/master` branch, your local `dev` branch and the `origin/dev` branch are not needed anymore. If you want to make additional documentation changes, restart the process with a new branch.
+Once the `dev` branch has been committed into the `upstream/main` branch, your local `dev` branch and the `origin/dev` branch are not needed anymore. If you want to make additional documentation changes, restart the process with a new branch.
-.. note:: Make sure that your changes are in `upstream/master` before you delete your `dev` and `origin/dev` branches!
+.. note:: Make sure that your changes are in `upstream/main` before you delete your `dev` and `origin/dev` branches!
You can delete these deprecated branches with the following:
.. code:: bash
- $ git checkout master
+ $ git checkout main
$ git branch -D dev
$ git push origin :dev
diff --git a/source/adminguide/autoscale_without_netscaler.rst b/source/adminguide/autoscale_without_netscaler.rst
index 055d44f..8420fd3 100644
--- a/source/adminguide/autoscale_without_netscaler.rst
+++ b/source/adminguide/autoscale_without_netscaler.rst
@@ -17,8 +17,8 @@
Configuring AutoScale without using NetScaler
=============================================
-.. warning::
- This feature is currently only available on the master branch and will be
+.. warning::
+ This feature is currently only available on the main branch and will be
released in the 4.4 release.
.. note::
diff --git a/source/adminguide/index.rst b/source/adminguide/index.rst
index b4865bb..d91d69f 100644
--- a/source/adminguide/index.rst
+++ b/source/adminguide/index.rst
@@ -13,7 +13,7 @@
specific language governing permissions and limitations
under the License.
-.. CloudStack Administration Documentation master file, created by
+.. CloudStack Administration Documentation main file, created by
sphinx-quickstart on Sat Jan 25 15:55:12 2014.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
diff --git a/source/adminguide/locale/pot/networking.pot b/source/adminguide/locale/pot/networking.pot
index 0c5c206..afce4e8 100644
--- a/source/adminguide/locale/pot/networking.pot
+++ b/source/adminguide/locale/pot/networking.pot
@@ -730,7 +730,7 @@
#: ../../networking.rst:369
# 6c9c68a68ab14d30a00460dd3b13f8a6
-msgid "**Redundant router capability**: Available only when Virtual Router is selected as the Source NAT provider. Select this option if you want to use two virtual routers in the network for uninterrupted connection: one operating as the master virtual router and the other as the backup. The master virtual router receives requests from and sends responses to the user’s VM. The backup virtual router is activated only when the master is down. After the failover, the backup becomes the master virtual router. CloudStack deploys the routers on different hosts to ensure reliability if one host is down."
+msgid "**Redundant router capability**: Available only when Virtual Router is selected as the Source NAT provider. Select this option if you want to use two virtual routers in the network for uninterrupted connection: one operating as the primary virtual router and the other as the backup. The primary virtual router receives requests from and sends responses to the user’s VM. The backup virtual router is activated only when the primary is down. After the failover, the backup becomes the primary virtual router. CloudStack deploys the routers on different hosts to ensure reliability if one host is down."
msgstr ""
#: ../../networking.rst:380
diff --git a/source/adminguide/locale/pot/networking/virtual_private_cloud_config.pot b/source/adminguide/locale/pot/networking/virtual_private_cloud_config.pot
index e589c54..ece514d 100644
--- a/source/adminguide/locale/pot/networking/virtual_private_cloud_config.pot
+++ b/source/adminguide/locale/pot/networking/virtual_private_cloud_config.pot
@@ -1222,12 +1222,12 @@
#: ../../networking/virtual_private_cloud_config.rst:648
# f66d2b908d63453ba9331658c3105974
-msgid "Blacklisting Routes"
+msgid "Denylisting Routes"
msgstr ""
#: ../../networking/virtual_private_cloud_config.rst:650
# 5e262d8f57f94df080de1ebfd57089c5
-msgid "CloudStack enables you to block a list of routes so that they are not assigned to any of the VPC private gateways. Specify the list of routes that you want to blacklist in the ``blacklisted.routes`` global parameter. Note that the parameter update affects only new static route creations. If you block an existing static route, it remains intact and continue functioning. You cannot add a static route if the route is blacklisted for the zone."
+msgid "CloudStack enables you to block a list of routes so that they are not assigned to any of the VPC private gateways. Specify the list of routes that you want to denylist in the ``denied.routes`` global parameter. Note that the parameter update affects only new static route creations. If you block an existing static route, it remains intact and continue functioning. You cannot add a static route if the route is denied for the zone."
msgstr ""
#: ../../networking/virtual_private_cloud_config.rst:660
diff --git a/source/adminguide/locale/pot/networking2.pot b/source/adminguide/locale/pot/networking2.pot
index a2f6fbd..85f97b4 100644
--- a/source/adminguide/locale/pot/networking2.pot
+++ b/source/adminguide/locale/pot/networking2.pot
@@ -5988,12 +5988,12 @@
#: ../../networking2.rst:5737
# 4bb61ba3dd1444269d2f517a3d774dac
-msgid "Blacklisting Routes"
+msgid "Denylisting Routes"
msgstr ""
#: ../../networking2.rst:5739
# bf15aaf7395c48438bdfb1c5a1b303cd
-msgid "CloudStack enables you to block a list of routes so that they are not assigned to any of the VPC private gateways. Specify the list of routes that you want to blacklist in the ``blacklisted.routes`` global parameter. Note that the parameter update affects only new static route creations. If you block an existing static route, it remains intact and continue functioning. You cannot add a static route if the route is blacklisted for the zone."
+msgid "CloudStack enables you to block a list of routes so that they are not assigned to any of the VPC private gateways. Specify the list of routes that you want to denylist in the ``denied.routes`` global parameter. Note that the parameter update affects only new static route creations. If you block an existing static route, it remains intact and continue functioning. You cannot add a static route if the route is denied for the zone."
msgstr ""
#: ../../networking2.rst:5748
diff --git a/source/adminguide/locale/pot/networking_and_traffic.pot b/source/adminguide/locale/pot/networking_and_traffic.pot
index 303e0c6..a70d327 100644
--- a/source/adminguide/locale/pot/networking_and_traffic.pot
+++ b/source/adminguide/locale/pot/networking_and_traffic.pot
@@ -5979,12 +5979,12 @@
#: ../../networking/virtual_private_cloud_config.rst:648
# f5f80f387b5246caa603111d30dcfab7
-msgid "Blacklisting Routes"
+msgid "Denylisting Routes"
msgstr ""
#: ../../networking/virtual_private_cloud_config.rst:650
# 8515025cd30a4b30b46f527ea9be5b2b
-msgid "CloudStack enables you to block a list of routes so that they are not assigned to any of the VPC private gateways. Specify the list of routes that you want to blacklist in the ``blacklisted.routes`` global parameter. Note that the parameter update affects only new static route creations. If you block an existing static route, it remains intact and continue functioning. You cannot add a static route if the route is blacklisted for the zone."
+msgid "CloudStack enables you to block a list of routes so that they are not assigned to any of the VPC private gateways. Specify the list of routes that you want to denylist in the ``denied.routes`` global parameter. Note that the parameter update affects only new static route creations. If you block an existing static route, it remains intact and continue functioning. You cannot add a static route if the route is denied for the zone."
msgstr ""
#: ../../networking/virtual_private_cloud_config.rst:660
diff --git a/source/adminguide/locale/pot/reliability.pot b/source/adminguide/locale/pot/reliability.pot
index 74a2341..114c7a3 100644
--- a/source/adminguide/locale/pot/reliability.pot
+++ b/source/adminguide/locale/pot/reliability.pot
@@ -283,22 +283,22 @@
#: ../../reliability.rst:207
# 147ac9efb2314312b6e97323a267fd7c
-msgid "``db.cloud.slaves``: set to a comma-delimited set of slave hosts for the cloud database. This is the list of nodes set up with replication. The master node is not in the list, since it is already mentioned elsewhere in the properties file."
+msgid "``db.cloud.replicas``: set to a comma-delimited set of replica hosts for the cloud database. This is the list of nodes set up with replication. The source node is not in the list, since it is already mentioned elsewhere in the properties file."
msgstr ""
#: ../../reliability.rst:212
# aa38f185ca8b4c1b86e19da970eb3901
-msgid "Example: ``db.cloud.slaves=node2,node3,node4``"
+msgid "Example: ``db.cloud.replicas=node2,node3,node4``"
msgstr ""
#: ../../reliability.rst:214
# 1783ef0808884e28ab22f6b3172dba41
-msgid "``db.usage.slaves``: set to a comma-delimited set of slave hosts for the usage database. This is the list of nodes set up with replication. The master node is not in the list, since it is already mentioned elsewhere in the properties file."
+msgid "``db.usage.replicas``: set to a comma-delimited set of replica hosts for the usage database. This is the list of nodes set up with replication. The source node is not in the list, since it is already mentioned elsewhere in the properties file."
msgstr ""
#: ../../reliability.rst:219
# 573fb04445dd4b0ba4f5b9a5f8517c75
-msgid "Example: ``db.usage.slaves=node2,node3,node4``"
+msgid "Example: ``db.usage.replicas=node2,node3,node4``"
msgstr ""
#: ../../reliability.rst:221
@@ -313,27 +313,27 @@
#: ../../reliability.rst:227
# bcfa8dcb331c4185bab0cbdfbb3624ca
-msgid "``db.cloud.secondsBeforeRetryMaster``: The number of seconds the MySQL connector should wait before trying again to connect to the master after the master went down. Default is 1 hour. The retry might happen sooner if db.cloud.queriesBeforeRetryMaster is reached first."
+msgid "``db.cloud.secondsBeforeRetrySource``: The number of seconds the MySQL connector should wait before trying again to connect to the source after the source went down. Default is 1 hour. The retry might happen sooner if db.cloud.queriesBeforeRetrySource is reached first."
msgstr ""
#: ../../reliability.rst:232
# 55d7217f8ea6408e8389bd39dbbfc3fc
-msgid "Example: ``db.cloud.secondsBeforeRetryMaster=3600``"
+msgid "Example: ``db.cloud.secondsBeforeRetrySource=3600``"
msgstr ""
#: ../../reliability.rst:234
# d8cfb3b10706434d8ad7c63b231e7ee9
-msgid "``db.cloud.queriesBeforeRetryMaster``: The minimum number of queries to be sent to the database before trying again to connect to the master after the master went down. Default is 5000. The retry might happen sooner if db.cloud.secondsBeforeRetryMaster is reached first."
+msgid "``db.cloud.queriesBeforeRetrySource``: The minimum number of queries to be sent to the database before trying again to connect to the source after the source went down. Default is 5000. The retry might happen sooner if db.cloud.secondsBeforeRetrySource is reached first."
msgstr ""
#: ../../reliability.rst:239
# f7b672a867c64854accef70177a0dd73
-msgid "Example: ``db.cloud.queriesBeforeRetryMaster=5000``"
+msgid "Example: ``db.cloud.queriesBeforeRetrySource=5000``"
msgstr ""
#: ../../reliability.rst:241
# 2283aca3081443c585804a3c9d63a45d
-msgid "``db.cloud.initialTimeout``: Initial time the MySQL connector should wait before trying again to connect to the master. Default is 3600."
+msgid "``db.cloud.initialTimeout``: Initial time the MySQL connector should wait before trying again to connect to the source. Default is 3600."
msgstr ""
#: ../../reliability.rst:244
@@ -353,7 +353,7 @@
#: ../../reliability.rst:253
# 7c4a38ab45c943a489f2e7ae8f3ab0e2
-msgid "Slave hosts can not be monitored through CloudStack. You will need to have a separate means of monitoring."
+msgid "Replica hosts can not be monitored through CloudStack. You will need to have a separate means of monitoring."
msgstr ""
#: ../../reliability.rst:256
diff --git a/source/adminguide/locale/pot/templates.pot b/source/adminguide/locale/pot/templates.pot
index 5491370..be9832f 100644
--- a/source/adminguide/locale/pot/templates.pot
+++ b/source/adminguide/locale/pot/templates.pot
@@ -341,7 +341,7 @@
#: ../../templates.rst:288
# 942a09f060a248499ad52006fb12910b
-msgid "Linux templates should be prepared using this documentation in order to prepare your linux VMs for template deployment. For ease of documentation, the VM which you are configuring the template on will be referred to as \"Template Master\". This guide currently covers legacy setups which do not take advantage of UserData and cloud-init and assumes openssh-server is installed during installation."
+msgid "Linux templates should be prepared using this documentation in order to prepare your linux VMs for template deployment. For ease of documentation, the VM which you are configuring the template on will be referred to as \"Template Primary\". This guide currently covers legacy setups which do not take advantage of UserData and cloud-init and assumes openssh-server is installed during installation."
msgstr ""
#: ../../templates.rst:295
@@ -417,7 +417,7 @@
#: ../../templates.rst:341
# f68b6e4efb764f92a1e56ad9ea54f90c
-msgid "The next steps updates the packages on the Template Master."
+msgid "The next steps updates the packages on the Template Primary."
msgstr ""
#: ../../templates.rst:343
@@ -473,7 +473,7 @@
#: ../../templates.rst:434
# 1f68693847f1433bb6541b70f1abedd5
-msgid "The following steps should be run when you are ready to template your Template Master. If the Template Master is rebooted during these steps you will have to run all the steps again. At the end of this process the Template Master should be shutdown and the template created in order to create and deploy the final template."
+msgid "The following steps should be run when you are ready to template your Template Primary. If the Template Primary is rebooted during these steps you will have to run all the steps again. At the end of this process the Template Primary should be shutdown and the template created in order to create and deploy the final template."
msgstr ""
#: ../../templates.rst:440
@@ -483,7 +483,7 @@
#: ../../templates.rst:442
# 7a1b5554792c4cb1aa676f8e73a843b8
-msgid "This step removes information unique to your Template Master such as network MAC addresses, lease files and CD block devices, the files are automatically generated on next boot."
+msgid "This step removes information unique to your Template Primary such as network MAC addresses, lease files and CD block devices, the files are automatically generated on next boot."
msgstr ""
#: ../../templates.rst:460
@@ -503,7 +503,7 @@
#: ../../templates.rst:472
# af913fb8f91b484bb83ac0737e1b1d10
-msgid "It is good practice to remove old logs from the Template Master."
+msgid "It is good practice to remove old logs from the Template Primary."
msgstr ""
#: ../../templates.rst:481
@@ -513,7 +513,7 @@
#: ../../templates.rst:483
# 5a2162138fca40088196712b5650f551
-msgid "In order for the Ubuntu DHCP script to function and the CentOS dhclient to set the VM hostname they both require the Template Master's hostname to be \"localhost\", run the following commands to change the hostname."
+msgid "In order for the Ubuntu DHCP script to function and the CentOS dhclient to set the VM hostname they both require the Template Primary's hostname to be \"localhost\", run the following commands to change the hostname."
msgstr ""
#: ../../templates.rst:493
@@ -543,7 +543,7 @@
#: ../../templates.rst:513
# f92b1a930b3e4d859616309b9db518e1
-msgid "Your now ready to shutdown your Template Master and create a template!"
+msgid "Your now ready to shutdown your Template Primary and create a template!"
msgstr ""
#: ../../templates.rst:520
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking.po
index 0d95a6e..196046a 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking.po
@@ -844,10 +844,10 @@
"**Redundant router capability**: Available only when Virtual Router is "
"selected as the Source NAT provider. Select this option if you want to use "
"two virtual routers in the network for uninterrupted connection: one "
-"operating as the master virtual router and the other as the backup. The "
-"master virtual router receives requests from and sends responses to the "
-"user’s VM. The backup virtual router is activated only when the master is "
-"down. After the failover, the backup becomes the master virtual router. "
+"operating as the primary virtual router and the other as the backup. The "
+"primary virtual router receives requests from and sends responses to the "
+"user’s VM. The backup virtual router is activated only when the primary is "
+"down. After the failover, the backup becomes the primary virtual router. "
"CloudStack deploys the routers on different hosts to ensure reliability if "
"one host is down."
msgstr "**冗余路由性能**:这个选项只有在虚拟路由作为Source NAT提供者时才是可选的。如果你希望提供不间断的网络连接，选中这个选项，则系统会提供两个虚拟路由：一个主的，一个辅的。主虚拟路由负载收发用户虚拟机器的相关请深圳市。如主的路由DOWN掉时，由辅助路由升级为主路由接替工作。CloudStack 会将两个邪气路由分别部署在不同的主机上，以保证可用性。"
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/virtual_private_cloud_config.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/virtual_private_cloud_config.po
index 163e960..4149510 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/virtual_private_cloud_config.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/virtual_private_cloud_config.po
@@ -1430,7 +1430,7 @@
# f66d2b908d63453ba9331658c3105974
#: ../../networking/virtual_private_cloud_config.rst:648
-msgid "Blacklisting Routes"
+msgid "Denylisting Routes"
msgstr "路由黑名单"
# 5e262d8f57f94df080de1ebfd57089c5
@@ -1438,11 +1438,11 @@
msgid ""
"CloudStack enables you to block a list of routes so that they are not "
"assigned to any of the VPC private gateways. Specify the list of routes that"
-" you want to blacklist in the ``blacklisted.routes`` global parameter. Note "
+" you want to denylist in the ``denied.routes`` global parameter. Note "
"that the parameter update affects only new static route creations. If you "
"block an existing static route, it remains intact and continue functioning. "
-"You cannot add a static route if the route is blacklisted for the zone."
-msgstr "CloudStack允许你定义一个路由黑名单，这样它们就不能关联到任何VPC私有网关。你需要在全局参数blacklisted.routes里定义。要注意，此参数只在新路由创建时才会生效。如果你在黑名单里加入了已存在的静态路由，则此静态路由还是会继续起作用。你不能把在路由黑名单里的路由加入到静态路由当中去。"
+"You cannot add a static route if the route is denied for the zone."
+msgstr "CloudStack允许你定义一个路由黑名单，这样它们就不能关联到任何VPC私有网关。你需要在全局参数denied.routes里定义。要注意，此参数只在新路由创建时才会生效。如果你在黑名单里加入了已存在的静态路由，则此静态路由还是会继续起作用。你不能把在路由黑名单里的路由加入到静态路由当中去。"
# c95c27354e2b4308b6fe6cd594b07c4b
#: ../../networking/virtual_private_cloud_config.rst:660
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking2.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking2.po
index f2a12a8..916e377 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking2.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking2.po
@@ -7451,7 +7451,7 @@
# 4bb61ba3dd1444269d2f517a3d774dac
#: ../../networking2.rst:5737
-msgid "Blacklisting Routes"
+msgid "Denylisting Routes"
msgstr "路由黑名单"
# bf15aaf7395c48438bdfb1c5a1b303cd
@@ -7459,11 +7459,11 @@
msgid ""
"CloudStack enables you to block a list of routes so that they are not "
"assigned to any of the VPC private gateways. Specify the list of routes that"
-" you want to blacklist in the ``blacklisted.routes`` global parameter. Note "
+" you want to denylist in the ``denied.routes`` global parameter. Note "
"that the parameter update affects only new static route creations. If you "
"block an existing static route, it remains intact and continue functioning. "
-"You cannot add a static route if the route is blacklisted for the zone."
-msgstr "CloudStack允许你定义一个路由黑名单，这样它们就不能关联到任何VPC私有网关。你需要在全局参数blacklisted.routes里定义。要注意，此参数只在新路由创建时才会生效。如果你在黑名单里加入了已存在的静态路由，则此静态路由还是会继续起作用。你不能把在路由黑名单里的路由加入到静态路由当中去。"
+"You cannot add a static route if the route is denied for the zone."
+msgstr "CloudStack允许你定义一个路由黑名单，这样它们就不能关联到任何VPC私有网关。你需要在全局参数denied.routes里定义。要注意，此参数只在新路由创建时才会生效。如果你在黑名单里加入了已存在的静态路由，则此静态路由还是会继续起作用。你不能把在路由黑名单里的路由加入到静态路由当中去。"
# 0331141edca34d0d88619127d2766371
#: ../../networking2.rst:5748
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking_and_traffic.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking_and_traffic.po
index 7093a23..bdf2913 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking_and_traffic.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking_and_traffic.po
@@ -7669,7 +7669,7 @@
# f5f80f387b5246caa603111d30dcfab7
#: ../../networking/virtual_private_cloud_config.rst:648
-msgid "Blacklisting Routes"
+msgid "Denylisting Routes"
msgstr "路由黑名单"
# 8515025cd30a4b30b46f527ea9be5b2b
@@ -7677,11 +7677,11 @@
msgid ""
"CloudStack enables you to block a list of routes so that they are not "
"assigned to any of the VPC private gateways. Specify the list of routes that"
-" you want to blacklist in the ``blacklisted.routes`` global parameter. Note "
+" you want to denylist in the ``denied.routes`` global parameter. Note "
"that the parameter update affects only new static route creations. If you "
"block an existing static route, it remains intact and continue functioning. "
-"You cannot add a static route if the route is blacklisted for the zone."
-msgstr "CloudStack允许你定义一个路由黑名单，这样它们就不能关联到任何VPC私有网关。你需要在全局参数blacklisted.routes里定义。要注意，此参数只在新路由创建时才会生效。如果你在黑名单里加入了已存在的静态路由，则此静态路由还是会继续起作用。你不能把在路由黑名单里的路由加入到静态路由当中去。"
+"You cannot add a static route if the route is denied for the zone."
+msgstr "CloudStack允许你定义一个路由黑名单，这样它们就不能关联到任何VPC私有网关。你需要在全局参数denied.routes里定义。要注意，此参数只在新路由创建时才会生效。如果你在黑名单里加入了已存在的静态路由，则此静态路由还是会继续起作用。你不能把在路由黑名单里的路由加入到静态路由当中去。"
# 0a8f5a5461c9432188d46d5dc80a91a0
#: ../../networking/virtual_private_cloud_config.rst:660
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/reliability.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/reliability.po
index 141543d..3fee99b 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/reliability.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/reliability.po
@@ -372,30 +372,30 @@
# 147ac9efb2314312b6e97323a267fd7c
#: ../../reliability.rst:207
msgid ""
-"``db.cloud.slaves``: set to a comma-delimited set of slave hosts for the "
+"``db.cloud.replicas``: set to a comma-delimited set of replica hosts for the "
"cloud database. This is the list of nodes set up with replication. The "
-"master node is not in the list, since it is already mentioned elsewhere in "
+"source node is not in the list, since it is already mentioned elsewhere in "
"the properties file."
-msgstr "``db.cloud.slaves``：为云数据库设置多台slave主机，用逗号隔开。这是用于复制的节点清单。主节点不在列表中，因为在属性文件中的别处已经使用了它。"
+msgstr "``db.cloud.replicas``：为云数据库设置多台replica主机，用逗号隔开。这是用于复制的节点清单。主节点不在列表中，因为在属性文件中的别处已经使用了它。"
# aa38f185ca8b4c1b86e19da970eb3901
#: ../../reliability.rst:212
-msgid "Example: ``db.cloud.slaves=node2,node3,node4``"
-msgstr "例如：``db.cloud.slaves=node2,node3,node4``"
+msgid "Example: ``db.cloud.replicas=node2,node3,node4``"
+msgstr "例如：``db.cloud.replicas=node2,node3,node4``"
# 1783ef0808884e28ab22f6b3172dba41
#: ../../reliability.rst:214
msgid ""
-"``db.usage.slaves``: set to a comma-delimited set of slave hosts for the "
+"``db.usage.replicas``: set to a comma-delimited set of replica hosts for the "
"usage database. This is the list of nodes set up with replication. The "
-"master node is not in the list, since it is already mentioned elsewhere in "
+"source node is not in the list, since it is already mentioned elsewhere in "
"the properties file."
-msgstr "``db.usage.slaves``：为用量数据库设置多台slave主机，用逗号隔开。这是用于复制的节点清单。主节点不在列表中，因为在属性文件中的别处已经使用了它。"
+msgstr "``db.usage.replicas``：为用量数据库设置多台replica主机，用逗号隔开。这是用于复制的节点清单。主节点不在列表中，因为在属性文件中的别处已经使用了它。"
# 573fb04445dd4b0ba4f5b9a5f8517c75
#: ../../reliability.rst:219
-msgid "Example: ``db.usage.slaves=node2,node3,node4``"
-msgstr "例如：``db.usage.slaves=node2,node3,node4``"
+msgid "Example: ``db.usage.replicas=node2,node3,node4``"
+msgstr "例如：``db.usage.replicas=node2,node3,node4``"
# 739f9df2617d4e24aaa9adb209c65969
#: ../../reliability.rst:221
@@ -413,37 +413,37 @@
# bcfa8dcb331c4185bab0cbdfbb3624ca
#: ../../reliability.rst:227
msgid ""
-"``db.cloud.secondsBeforeRetryMaster``: The number of seconds the MySQL "
-"connector should wait before trying again to connect to the master after the"
-" master went down. Default is 1 hour. The retry might happen sooner if "
-"db.cloud.queriesBeforeRetryMaster is reached first."
-msgstr "``db.cloud.secondsBeforeRetryMaster``：在master宕机之后，MySQL连接器重试连接到master之前所等待的秒数。默认是1小时。如果首先达到了db.cloud.queriesBeforeRetryMaster 的限制，重试可能更早发生。"
+"``db.cloud.secondsBeforeRetrySource``: The number of seconds the MySQL "
+"connector should wait before trying again to connect to the source after the"
+" source went down. Default is 1 hour. The retry might happen sooner if "
+"db.cloud.queriesBeforeRetrySource is reached first."
+msgstr "``db.cloud.secondsBeforeRetrySource``：在source宕机之后，MySQL连接器重试连接到source之前所等待的秒数。默认是1小时。如果首先达到了db.cloud.queriesBeforeRetrySource 的限制，重试可能更早发生。"
# 55d7217f8ea6408e8389bd39dbbfc3fc
#: ../../reliability.rst:232
-msgid "Example: ``db.cloud.secondsBeforeRetryMaster=3600``"
-msgstr "例如：``db.cloud.secondsBeforeRetryMaster=3600``"
+msgid "Example: ``db.cloud.secondsBeforeRetrySource=3600``"
+msgstr "例如：``db.cloud.secondsBeforeRetrySource=3600``"
# d8cfb3b10706434d8ad7c63b231e7ee9
#: ../../reliability.rst:234
msgid ""
-"``db.cloud.queriesBeforeRetryMaster``: The minimum number of queries to be "
-"sent to the database before trying again to connect to the master after the "
-"master went down. Default is 5000. The retry might happen sooner if "
-"db.cloud.secondsBeforeRetryMaster is reached first."
-msgstr "``db.cloud.queriesBeforeRetryMaster``：在master宕机之后，重新尝试连接到master之前向数据库查询的最小次数。默认值是5000。如果首先达到了db.cloud.secondsBeforeRetryMaster的限制，重试可能更早发生。"
+"``db.cloud.queriesBeforeRetrySource``: The minimum number of queries to be "
+"sent to the database before trying again to connect to the source after the "
+"source went down. Default is 5000. The retry might happen sooner if "
+"db.cloud.secondsBeforeRetrySource is reached first."
+msgstr "``db.cloud.queriesBeforeRetrySource``：在source宕机之后，重新尝试连接到source之前向数据库查询的最小次数。默认值是5000。如果首先达到了db.cloud.secondsBeforeRetrySource的限制，重试可能更早发生。"
# f7b672a867c64854accef70177a0dd73
#: ../../reliability.rst:239
-msgid "Example: ``db.cloud.queriesBeforeRetryMaster=5000``"
-msgstr "例如：``db.cloud.queriesBeforeRetryMaster=5000``"
+msgid "Example: ``db.cloud.queriesBeforeRetrySource=5000``"
+msgstr "例如：``db.cloud.queriesBeforeRetrySource=5000``"
# 2283aca3081443c585804a3c9d63a45d
#: ../../reliability.rst:241
msgid ""
"``db.cloud.initialTimeout``: Initial time the MySQL connector should wait "
-"before trying again to connect to the master. Default is 3600."
-msgstr "``db.cloud.initialTimeout``：在重新尝试连接至master之前，MySQL连接器等待的初始时间。默认是3600。"
+"before trying again to connect to the source. Default is 3600."
+msgstr "``db.cloud.initialTimeout``：在重新尝试连接至source之前，MySQL连接器等待的初始时间。默认是3600。"
# bae95908743e448b967b6992b4e88816
#: ../../reliability.rst:244
@@ -465,9 +465,9 @@
# 7c4a38ab45c943a489f2e7ae8f3ab0e2
#: ../../reliability.rst:253
msgid ""
-"Slave hosts can not be monitored through CloudStack. You will need to have a"
+"Replica hosts can not be monitored through CloudStack. You will need to have a"
" separate means of monitoring."
-msgstr "Slave主机不能被CloudStack监控。你必须有单独的监控手段。"
+msgstr "Replica主机不能被CloudStack监控。你必须有单独的监控手段。"
# 5270e63b8008415bbe847a54002660bc
#: ../../reliability.rst:256
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/templates.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/templates.po
index 5c7077f..75af44d 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/templates.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/templates.po
@@ -450,7 +450,7 @@
"Linux templates should be prepared using this documentation in order to "
"prepare your linux VMs for template deployment. For ease of documentation, "
"the VM which you are configuring the template on will be referred to as "
-"\"Template Master\". This guide currently covers legacy setups which do not "
+"\"Template Primary\". This guide currently covers legacy setups which do not "
"take advantage of UserData and cloud-init and assumes openssh-server is "
"installed during installation."
msgstr "为了准备使用模板部署你的Linux VMs，可以使用此文档来准备Linux模板。对于文档中的情况，你要通过配置模板，这会涉及\"主模板\"。这个指导目前覆盖了传统的安装，但不会涉及用户数据和cloud-init还有假设在装过程中安装了openshh服务。"
@@ -538,7 +538,7 @@
# f68b6e4efb764f92a1e56ad9ea54f90c
#: ../../templates.rst:341
-msgid "The next steps updates the packages on the Template Master."
+msgid "The next steps updates the packages on the Template Primary."
msgstr "下一步更新主模板中的包。"
# 143c241d86a44e32b496b66a9934ec6a
@@ -614,9 +614,9 @@
#: ../../templates.rst:434
msgid ""
"The following steps should be run when you are ready to template your "
-"Template Master. If the Template Master is rebooted during these steps you "
+"Template Primary. If the Template Primary is rebooted during these steps you "
"will have to run all the steps again. At the end of this process the "
-"Template Master should be shutdown and the template created in order to "
+"Template Primary should be shutdown and the template created in order to "
"create and deploy the final template."
msgstr "当你准备好做你的主模板的时候请运行下列步骤。如果主模板在这些步骤期间重启了，那么你要重新运行所有的步骤。在这个过程的最后，主模板应该关机并且将其创建为模板，然后再部署。"
@@ -628,7 +628,7 @@
# 7a1b5554792c4cb1aa676f8e73a843b8
#: ../../templates.rst:442
msgid ""
-"This step removes information unique to your Template Master such as network"
+"This step removes information unique to your Template Primary such as network"
" MAC addresses, lease files and CD block devices, the files are "
"automatically generated on next boot."
msgstr "这一步会移除你的主模板的特殊信息，如网络MAC地址，租约信息和CD块设备，这个文件会在下次启动时自动生成。"
@@ -652,7 +652,7 @@
# af913fb8f91b484bb83ac0737e1b1d10
#: ../../templates.rst:472
-msgid "It is good practice to remove old logs from the Template Master."
+msgid "It is good practice to remove old logs from the Template Primary."
msgstr "从主模板移除旧的日志文件是一个好习惯。"
# db125d8aa6cc45c8bdf9340dde1d3d45
@@ -664,7 +664,7 @@
#: ../../templates.rst:483
msgid ""
"In order for the Ubuntu DHCP script to function and the CentOS dhclient to "
-"set the VM hostname they both require the Template Master's hostname to be "
+"set the VM hostname they both require the Template Primary's hostname to be "
"\"localhost\", run the following commands to change the hostname."
msgstr "为了Ubuntu DHCP的脚本功能和CentOS dhclient能设置VM主机名，他们都去要设置主模板的主机名设置为“localhost”，运行下面的命令来更改主机名。"
@@ -697,7 +697,7 @@
# f92b1a930b3e4d859616309b9db518e1
#: ../../templates.rst:513
-msgid "Your now ready to shutdown your Template Master and create a template!"
+msgid "Your now ready to shutdown your Template Primary and create a template!"
msgstr "现在你可以关闭你的主模板并且创建模板了！"
# 43e271d15b2742238d231b3f7fe85ed1
diff --git a/source/adminguide/networking.rst b/source/adminguide/networking.rst
index 6b97075..959300f 100644
--- a/source/adminguide/networking.rst
+++ b/source/adminguide/networking.rst
@@ -392,11 +392,11 @@
- **Redundant router capability**: Available only when Virtual
Router is selected as the Source NAT provider. Select this option
if you want to use two virtual routers in the network for
- uninterrupted connection: one operating as the master virtual
- router and the other as the backup. The master virtual router
+ uninterrupted connection: one operating as the primary virtual
+ router and the other as the backup. The primary virtual router
receives requests from and sends responses to the user’s VM. The
- backup virtual router is activated only when the master is down.
- After the failover, the backup becomes the master virtual router.
+ backup virtual router is activated only when the primary is down.
+ After the failover, the backup becomes the primary virtual router.
CloudStack deploys the routers on different hosts to ensure
reliability if one host is down.
diff --git a/source/adminguide/networking/virtual_private_cloud_config.rst b/source/adminguide/networking/virtual_private_cloud_config.rst
index d802d40..475dc99 100644
--- a/source/adminguide/networking/virtual_private_cloud_config.rst
+++ b/source/adminguide/networking/virtual_private_cloud_config.rst
@@ -651,16 +651,16 @@
Wait for few seconds until the new route is created.
-Blacklisting Routes
+Denylisting Routes
^^^^^^^^^^^^^^^^^^^
CloudStack enables you to block a list of routes so that they are not
assigned to any of the VPC private gateways. Specify the list of routes
-that you want to blacklist in the ``blacklisted.routes`` global
+that you want to denylist in the ``denied.routes`` global
parameter. Note that the parameter update affects only new static route
creations. If you block an existing static route, it remains intact and
continue functioning. You cannot add a static route if the route is
-blacklisted for the zone.
+denied for the zone.
Deploying VMs to the Tier
diff --git a/source/adminguide/reliability.rst b/source/adminguide/reliability.rst
index 44647cb..e886097 100644
--- a/source/adminguide/reliability.rst
+++ b/source/adminguide/reliability.rst
@@ -204,19 +204,19 @@
Example: ``db.ha.enabled=true``
-- ``db.cloud.slaves``: set to a comma-delimited set of slave hosts for the
+- ``db.cloud.replicas``: set to a comma-delimited set of replica hosts for the
cloud database. This is the list of nodes set up with replication.
- The master node is not in the list, since it is already mentioned
+ The source node is not in the list, since it is already mentioned
elsewhere in the properties file.
- Example: ``db.cloud.slaves=node2,node3,node4``
+ Example: ``db.cloud.replicas=node2,node3,node4``
-- ``db.usage.slaves``: set to a comma-delimited set of slave hosts for the
+- ``db.usage.replicas``: set to a comma-delimited set of replica hosts for the
usage database. This is the list of nodes set up with replication.
- The master node is not in the list, since it is already mentioned
+ The source node is not in the list, since it is already mentioned
elsewhere in the properties file.
- Example: ``db.usage.slaves=node2,node3,node4``
+ Example: ``db.usage.replicas=node2,node3,node4``
**Optional Settings**
@@ -224,22 +224,22 @@
required to change the default values unless you wish to do so for
tuning purposes:
-- ``db.cloud.secondsBeforeRetryMaster``: The number of seconds the MySQL
- connector should wait before trying again to connect to the master
- after the master went down. Default is 1 hour. The retry might happen
- sooner if db.cloud.queriesBeforeRetryMaster is reached first.
+- ``db.cloud.secondsBeforeRetrySource``: The number of seconds the MySQL
+ connector should wait before trying again to connect to the source
+ after the source went down. Default is 1 hour. The retry might happen
+ sooner if db.cloud.queriesBeforeRetrySource is reached first.
- Example: ``db.cloud.secondsBeforeRetryMaster=3600``
+ Example: ``db.cloud.secondsBeforeRetrySource=3600``
-- ``db.cloud.queriesBeforeRetryMaster``: The minimum number of queries to
- be sent to the database before trying again to connect to the master
- after the master went down. Default is 5000. The retry might happen
- sooner if db.cloud.secondsBeforeRetryMaster is reached first.
+- ``db.cloud.queriesBeforeRetrySource``: The minimum number of queries to
+ be sent to the database before trying again to connect to the source
+ after the source went down. Default is 5000. The retry might happen
+ sooner if db.cloud.secondsBeforeRetrySource is reached first.
- Example: ``db.cloud.queriesBeforeRetryMaster=5000``
+ Example: ``db.cloud.queriesBeforeRetrySource=5000``
- ``db.cloud.initialTimeout``: Initial time the MySQL connector should wait
- before trying again to connect to the master. Default is 3600.
+ before trying again to connect to the source. Default is 3600.
Example: ``db.cloud.initialTimeout=3600``
@@ -250,7 +250,7 @@
The following limitations exist in the current implementation of this
feature.
-- Slave hosts can not be monitored through CloudStack. You will need to
+- Replica hosts can not be monitored through CloudStack. You will need to
have a separate means of monitoring.
- Events from the database side are not integrated with the CloudStack
diff --git a/source/adminguide/templates.rst b/source/adminguide/templates.rst
index 3f3b35a..e15272a 100644
--- a/source/adminguide/templates.rst
+++ b/source/adminguide/templates.rst
@@ -323,17 +323,17 @@
Sharing templates and ISOs with other accounts/projects
----------------------------------------------
-When adding a template/ISO, the owner can choose to make template/ISO public or to keep it private. Once the template/ISO is created, the owner can choose to share this template/ISO so that other accounts/projects can also use the template/ISO.
+When adding a template/ISO, the owner can choose to make template/ISO public or to keep it private. Once the template/ISO is created, the owner can choose to share this template/ISO so that other accounts/projects can also use the template/ISO.
-Currently, the owner can share his template/ISO with:
- - other accounts inside his own domain (i.e. can't share the template/ISO with other accounts in the subdomain of his domain or any other domains)
- - projects where he belongs to (i.e. projects where he is the owner/creator or other projects where he has been joined)
+Currently, the owners can share their template/ISO with:
+ - other accounts inside their own domain (i.e. can't share the template/ISO with other accounts in the subdomain of their domain or any other domains)
+ - projects where they belongs to (i.e. projects where they are the owners/creators or other projects where they have been joined)
Template/ISO permissions can be changed via updateTemplatePermissions/updateIsoPermissions API call or via GUI. It is supported to add, remove or reset (remove all) template/ISO permissions.
When adding or removing permissions to/from a template/ISO, it is required to specify account/project name which is being added/removed from the template/ISO permissions.
-Global setting "allow.user.view.all.domain.accounts" has a default value of "false". This makes sure that when a regular user (of a "User" role) wants to share a template/ISO via GUI, he will not be shown the list of all accounts in his domain and he will need to know the name of the destination account with which he is sharing the template/ISO. This makes sense in public clouds where each account of a single domain is a different tenant/customer and privacy is imperative. In this case, the user will be presented with an input field to enter the account name, as on the images below:
+Global setting "allow.user.view.all.domain.accounts" has a default value of "false". This makes sure that when the regular users (of a "User" role) wants to share a template/ISO via GUI, they will not be shown the list of all accounts in their domain and they will need to know the name of the destination account with which they are sharing the template/ISO. This makes sense in public clouds where each account of a single domain is a different tenant/customer and privacy is imperative. In this case, the user will be presented with an input field to enter the account name, as on the images below:
.. warning::
The images displayed below refer to template permissions, but the same applies for ISO permissions.
@@ -346,7 +346,7 @@
Revoking permissions from account "user2"
-But in environments where privacy within a domain is not an issue, setting "allow.user.view.all.domain.accounts" setting to "true" will make sure that the user, who is sharing the template, will be presented a more user-friendly multi-select list, listing all the accounts in his domain. This is shown in the images below;
+But in environments where privacy within a domain is not an issue, setting "allow.user.view.all.domain.accounts" setting to "true" will make sure that the user, who is sharing the template, will be presented a more user-friendly multi-select list, listing all the accounts in their domain. This is shown in the images below;
|template-permissions-update-1.png|
diff --git a/source/adminguide/templates/_create_linux.rst b/source/adminguide/templates/_create_linux.rst
index 24a9061..217556f 100644
--- a/source/adminguide/templates/_create_linux.rst
+++ b/source/adminguide/templates/_create_linux.rst
@@ -20,7 +20,7 @@
Linux templates should be prepared using this documentation in order to
prepare your linux VMs for template deployment. For ease of
documentation, the VM which you are configuring the template on will be
-referred to as "Template Master". This guide currently covers legacy
+referred to as "Template Primary". This guide currently covers legacy
setups which do not take advantage of UserData and cloud-init and
assumes openssh-server is installed during installation.
@@ -70,7 +70,7 @@
BOOTPROTO=dhcp
ONBOOT=yes
- The next steps updates the packages on the Template Master.
+ The next steps updates the packages on the Template Primary.
- Ubuntu
@@ -165,14 +165,14 @@
.. warning::
The following steps should be run when you are ready to template
- your Template Master. If the Template Master is rebooted during
+ your Template Primary. If the Template Primary is rebooted during
these steps you will have to run all the steps again. At the end
- of this process the Template Master should be shutdown and the
+ of this process the Template Primary should be shutdown and the
template created in order to create and deploy the final template.
#. **Remove the udev persistent device rules**
- This step removes information unique to your Template Master such as
+ This step removes information unique to your Template Primary such as
network MAC addresses, lease files and CD block devices, the files
are automatically generated on next boot.
@@ -202,7 +202,7 @@
#. **Cleaning log files**
- It is good practice to remove old logs from the Template Master.
+ It is good practice to remove old logs from the Template Primary.
.. code:: bash
@@ -215,7 +215,7 @@
In order for the Ubuntu DHCP script to function and the CentOS
dhclient to set the VM hostname they both require the Template
- Master's hostname to be "localhost", run the following commands to
+ Primary's hostname to be "localhost", run the following commands to
change the hostname.
.. code:: bash
@@ -243,7 +243,7 @@
#. **Shutdown the VM**
- Your now ready to shutdown your Template Master and create a
+ Your now ready to shutdown your Template Primary and create a
template!
.. code:: bash
diff --git a/source/adminguide/templates/_password.rst b/source/adminguide/templates/_password.rst
index a09c127..1b39ae9 100644
--- a/source/adminguide/templates/_password.rst
+++ b/source/adminguide/templates/_password.rst
@@ -48,8 +48,8 @@
#. Download the latest version of the cloud-set-guest-password script from the repository:
- - `https://github.com/apache/cloudstack/blob/master/setup/bindir/cloud-set-guest-password.in
- <https://github.com/apache/cloudstack/blob/master/setup/bindir/cloud-set-guest-password.in>`_
+ - `https://github.com/apache/cloudstack/blob/main/setup/bindir/cloud-set-guest-password.in
+ <https://github.com/apache/cloudstack/blob/main/setup/bindir/cloud-set-guest-password.in>`_
#. Rename the file:
diff --git a/source/adminguide/virtual_machines.rst b/source/adminguide/virtual_machines.rst
index dadb011..2fa1a37 100644
--- a/source/adminguide/virtual_machines.rst
+++ b/source/adminguide/virtual_machines.rst
@@ -741,7 +741,7 @@
Each user VM has a set of "details" associated with it (as visible via listVirtualMachine API call) - those "details" are shown on the "Settings" tab of the VM in the GUI (words "setting(s)" and "detail(s)" are here used interchangeably).
The Settings tab is always present/visible, but settings can be changed only when the VM is in a Stopped state.
-Some VM details/settings can be hidden for users via "user.vm.blacklisted.details" global setting. VM details/settings can also be made read-only for users using "user.vm.readonly.details" global setting. List of default hidden and read-only details/settings is given below.
+Some VM details/settings can be hidden for users via "user.vm.denied.details" global setting. VM details/settings can also be made read-only for users using "user.vm.readonly.details" global setting. List of default hidden and read-only details/settings is given below.
.. note::
Since version 4.15, VMware VM settings for the ROOT disk controller, NIC adapter type and data disk controller are populated automatically with the values inherited from the template.
diff --git a/source/conceptsandterminology/index.rst b/source/conceptsandterminology/index.rst
index 9e57598..8272338 100644
--- a/source/conceptsandterminology/index.rst
+++ b/source/conceptsandterminology/index.rst
@@ -13,7 +13,7 @@
specific language governing permissions and limitations
under the License.
-.. CloudStack Installation Documentation master file, created by
+.. CloudStack Installation Documentation main file, created by
sphinx-quickstart on Sat Jan 25 15:15:31 2014.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
diff --git a/source/conceptsandterminology/locale/pot/ansible.pot b/source/conceptsandterminology/locale/pot/ansible.pot
index 0ea3a7e..53201ae 100644
--- a/source/conceptsandterminology/locale/pot/ansible.pot
+++ b/source/conceptsandterminology/locale/pot/ansible.pot
@@ -363,7 +363,7 @@
#: ../../ansible.rst:395
# 55f1b360102642c992d5a63319701117
-msgid "In a production deployment, the Ansible playbooks would configure multiple management servers connected to master/slave replicating MySQL databases along with any other infrastructure components required and deploy and configure the hypervisor hosts. We would also have a dedicated file describing the hosts in the environment and a dedicated file containing variables which describe the environment."
+msgid "In a production deployment, the Ansible playbooks would configure multiple management servers connected to the source/replica replicating MySQL databases along with any other infrastructure components required and deploy and configure the hypervisor hosts. We would also have a dedicated file describing the hosts in the environment and a dedicated file containing variables which describe the environment."
msgstr ""
#: ../../ansible.rst:402
diff --git a/source/conceptsandterminology/locale/pot/networking.pot b/source/conceptsandterminology/locale/pot/networking.pot
index c27f11e..7d46221 100644
--- a/source/conceptsandterminology/locale/pot/networking.pot
+++ b/source/conceptsandterminology/locale/pot/networking.pot
@@ -23,7 +23,7 @@
#: ../../networking/autoscale_without_netscaler.rst:4
# c9d0712245864f35982f232729bae189
-msgid "This feature is currently only available on the master branch and will be released in the 4.4 release."
+msgid "This feature is currently only available on the main branch and will be released in the 4.4 release."
msgstr ""
#: ../../networking/autoscale_without_netscaler.rst:7
@@ -1514,7 +1514,7 @@
#: ../../networking/ovs-plugin.rst:58
# aec6d4e64ef34c9785419abc0d40a4ff
-msgid "To make sure that the native bridge module will not interfere with openvSwitch the bridge module should be added to the blacklist. See the modprobe documentation for your distribution on where to find the blacklist. Make sure the module is not loaded either by rebooting or executing rmmod bridge before executing next steps."
+msgid "To make sure that the native bridge module will not interfere with openvSwitch the bridge module should be added to the denylist. See the modprobe documentation for your distribution on where to find the denylist. Make sure the module is not loaded either by rebooting or executing rmmod bridge before executing next steps."
msgstr ""
#: ../../networking/ovs-plugin.rst:64
diff --git a/source/developersguide/ansible.rst b/source/developersguide/ansible.rst
index c0627db..21eb38b 100644
--- a/source/developersguide/ansible.rst
+++ b/source/developersguide/ansible.rst
@@ -422,7 +422,7 @@
-----------------------------------------------------------
In a production deployment, the Ansible playbooks would configure
-multiple management servers connected to master/slave replicating MySQL
+multiple management servers connected to the source/replica replicating MySQL
databases along with any other infrastructure components required and
deploy and configure the hypervisor hosts. We would also have a
dedicated file describing the hosts in the environment and a dedicated
diff --git a/source/developersguide/index.rst b/source/developersguide/index.rst
index 343dd44..85ac882 100644
--- a/source/developersguide/index.rst
+++ b/source/developersguide/index.rst
@@ -13,7 +13,7 @@
specific language governing permissions and limitations
under the License.
-.. CloudStack Installation Documentation master file, created by
+.. CloudStack Installation Documentation main file, created by
sphinx-quickstart on Sat Jan 25 15:15:31 2014.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
diff --git a/source/index.rst b/source/index.rst
index ba69e42..fc0fb47 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -13,7 +13,7 @@
specific language governing permissions and limitations
under the License.
-.. Apache CloudStack documentation master file, created by
+.. Apache CloudStack documentation main file, created by
sphinx-quickstart on Fri Jul 20 17:32:34 2018.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
diff --git a/source/installguide/configuration.rst b/source/installguide/configuration.rst
index fe73f23..402e70a 100644
--- a/source/installguide/configuration.rst
+++ b/source/installguide/configuration.rst
@@ -1641,8 +1641,8 @@
zone router.template.vmware Name of the default router template on VMware.
zone enable.dynamic.scale.vm Enable or diable dynamically scaling of a VM.
zone use.external.dns Bypass internal DNS, and use the external DNS1 and DNS2
-zone blacklisted.routes Routes that are blacklisted cannot be used for creating static routes for a VPC Private Gateway.
-======== ========================================================= ======================================================================================================================================
+zone denied.routes Routes that are denied cannot be used for creating static routes for a VPC Private Gateway.
+======== ========================================================= ======================================================================================================================================
.. |provisioning-overview.png: Conceptual overview of a basic deployment| image:: /_static/images/provisioning-overview.png
diff --git a/source/installguide/hypervisor/kvm.rst b/source/installguide/hypervisor/kvm.rst
index 4b3ccc2..5f94750 100644
--- a/source/installguide/hypervisor/kvm.rst
+++ b/source/installguide/hypervisor/kvm.rst
@@ -849,10 +849,10 @@
^^^^^^^^^
To make sure that the native bridge module will not interfere with
-openvswitch the bridge module should be added to the blacklist. See the
-modprobe documentation for your distribution on where to find the
-blacklist. Make sure the module is not loaded either by rebooting or
-executing rmmod bridge before executing next steps.
+openvswitch the bridge module should be added to the denylist (likely named
+'denylist') see the modprobe documentation for your distribution on
+where to find the denylist. Make sure the module is not loaded either
+by rebooting or executing rmmod bridge before executing next steps.
The network configurations below depend on the ifup-ovs and ifdown-ovs
scripts which are part of the openvswitch installation. They should be
diff --git a/source/installguide/index.rst b/source/installguide/index.rst
index 01d9012..4a4f111 100644
--- a/source/installguide/index.rst
+++ b/source/installguide/index.rst
@@ -13,7 +13,7 @@
specific language governing permissions and limitations
under the License.
-.. CloudStack Installation Documentation master file, created by
+.. CloudStack Installation Documentation main file, created by
sphinx-quickstart on Sat Jan 25 15:15:31 2014.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
diff --git a/source/installguide/locale/pot/configuration.pot b/source/installguide/locale/pot/configuration.pot
index 710eb60..9c4db09 100644
--- a/source/installguide/locale/pot/configuration.pot
+++ b/source/installguide/locale/pot/configuration.pot
@@ -2540,11 +2540,11 @@
#: ../../configuration.rst:1621
# c8177a7ac4ea4c07bf0c16f2833e48bf
-msgid "blacklisted.routes"
+msgid "denied.routes"
msgstr ""
#: ../../configuration.rst:1621
# d9441a44a1824e80804bbbe62fd7f531
-msgid "Routes that are blacklisted cannot be used for creating static routes for a VPC Private Gateway."
+msgid "Routes that are denied cannot be used for creating static routes for a VPC Private Gateway."
msgstr ""
diff --git a/source/installguide/locale/pot/hypervisor/kvm.pot b/source/installguide/locale/pot/hypervisor/kvm.pot
index c40ddd8..7b75d4c 100644
--- a/source/installguide/locale/pot/hypervisor/kvm.pot
+++ b/source/installguide/locale/pot/hypervisor/kvm.pot
@@ -630,7 +630,7 @@
#: ../../hypervisor/kvm.rst:631
# 1cd9101e47b3400c8e51f0979708da0d
-msgid "To make sure that the native bridge module will not interfere with openvswitch the bridge module should be added to the blacklist. See the modprobe documentation for your distribution on where to find the blacklist. Make sure the module is not loaded either by rebooting or executing rmmod bridge before executing next steps."
+msgid "To make sure that the native bridge module will not interfere with openvswitch the bridge module should be added to the denylist. See the modprobe documentation for your distribution on where to find the denylist. Make sure the module is not loaded either by rebooting or executing rmmod bridge before executing next steps."
msgstr ""
#: ../../hypervisor/kvm.rst:637
diff --git a/source/installguide/locale/pot/hypervisor_installation.pot b/source/installguide/locale/pot/hypervisor_installation.pot
index 180fcff..b0cb272 100644
--- a/source/installguide/locale/pot/hypervisor_installation.pot
+++ b/source/installguide/locale/pot/hypervisor_installation.pot
@@ -839,7 +839,7 @@
#: ../../hypervisor_installation.rst:694
# eca14b3123854338ba1f14a14829b739
-msgid "To make sure that the native bridge module will not interfere with openvswitch the bridge module should be added to the blacklist. See the modprobe documentation for your distribution on where to find the blacklist. Make sure the module is not loaded either by rebooting or executing rmmod bridge before executing next steps."
+msgid "To make sure that the native bridge module will not interfere with openvswitch the bridge module should be added to the denylist. See the modprobe documentation for your distribution on where to find the denylist. Make sure the module is not loaded either by rebooting or executing rmmod bridge before executing next steps."
msgstr ""
#: ../../hypervisor_installation.rst:700
diff --git a/source/installguide/locale/pot/installation.pot b/source/installguide/locale/pot/installation.pot
index 11b4ccf..e30f644 100644
--- a/source/installguide/locale/pot/installation.pot
+++ b/source/installguide/locale/pot/installation.pot
@@ -480,7 +480,7 @@
#: ../../installation.rst:350
# aef5f1918b994df1a0da2b55407ba85f
-msgid "This bug has been fixed in master and upcoming 4.4 release and will also be fixed in bug fix releases 4.3.x"
+msgid "This bug has been fixed in main and upcoming 4.4 release and will also be fixed in bug fix releases 4.3.x"
msgstr ""
#: ../../installation.rst:353
diff --git a/source/installguide/locale/pot/managing_networks.pot b/source/installguide/locale/pot/managing_networks.pot
index d8ac813..cb2c581 100644
--- a/source/installguide/locale/pot/managing_networks.pot
+++ b/source/installguide/locale/pot/managing_networks.pot
@@ -5961,12 +5961,12 @@
#: ../../managing_networks.rst:5628
# 7a2e407277964cd18757e610c1197596
-msgid "Blacklisting Routes"
+msgid "Denylisting Routes"
msgstr ""
#: ../../managing_networks.rst:5630
# a154d3d5488f418e95dbd3c0ae59a55f
-msgid "CloudStack enables you to block a list of routes so that they are not assigned to any of the VPC private gateways. Specify the list of routes that you want to blacklist in the ``blacklisted.routes`` global parameter. Note that the parameter update affects only new static route creations. If you block an existing static route, it remains intact and continue functioning. You cannot add a static route if the route is blacklisted for the zone."
+msgid "CloudStack enables you to block a list of routes so that they are not assigned to any of the VPC private gateways. Specify the list of routes that you want to denylist in the ``denied.routes`` global parameter. Note that the parameter update affects only new static route creations. If you block an existing static route, it remains intact and continue functioning. You cannot add a static route if the route is denied for the zone."
msgstr ""
#: ../../managing_networks.rst:5639
diff --git a/source/installguide/locale/pot/optional_installation.pot b/source/installguide/locale/pot/optional_installation.pot
index 80ec79b..25e6664 100644
--- a/source/installguide/locale/pot/optional_installation.pot
+++ b/source/installguide/locale/pot/optional_installation.pot
@@ -108,7 +108,7 @@
#: ../../optional_installation.rst:92
# 7862ab06634f4e73aea90b6a69fba6d8
-msgid "CloudStack supports database replication from one MySQL node to another. This is achieved using standard MySQL replication. You may want to do this as insurance against MySQL server or storage loss. MySQL replication is implemented using a master/slave model. The master is the node that the Management Servers are configured to use. The slave is a standby node that receives all write operations from the master and applies them to a local, redundant copy of the database. The following steps are a guide to implementing MySQL replication."
+msgid "CloudStack supports database replication from one MySQL node to another. This is achieved using standard MySQL replication. You may want to do this as insurance against MySQL server or storage loss. MySQL replication enables data from one MySQL database server (the source) to be copied to one or more MySQL database servers (the replicas). The source is the node that the Management Servers are configured to use. The replica is a standby node that receives all write operations from the source and applies them to a local, redundant copy of the database. The following steps are a guide to implementing MySQL replication."
msgstr ""
#: ../../optional_installation.rst:102
@@ -118,17 +118,17 @@
#: ../../optional_installation.rst:105
# 8f01c4d5d9e849f7aa21e1fafec88427
-msgid "Ensure that this is a fresh install with no data in the master."
+msgid "Ensure that this is a fresh install with no data in the source server."
msgstr ""
#: ../../optional_installation.rst:107
# 3207c0439bb34ea28e96d4ee62ad1c2e
-msgid "Edit my.cnf on the master and add the following in the [mysqld] section below datadir."
+msgid "Edit my.cnf on the source server and add the following in the [mysqld] section below datadir."
msgstr ""
#: ../../optional_installation.rst:115
# 5d1dfef940ab48418d921ea6ab2104d5
-msgid "The server\\_id must be unique with respect to other servers. The recommended way to achieve this is to give the master an ID of 1 and each slave a sequential number greater than 1, so that the servers are numbered 1, 2, 3, etc."
+msgid "The server\\_id must be unique with respect to other servers. The recommended way to achieve this is to give the source server an ID of 1 and each replica a sequential number greater than 1, so that the servers are numbered 1, 2, 3, etc."
msgstr ""
#: ../../optional_installation.rst:120
@@ -143,7 +143,7 @@
#: ../../optional_installation.rst:132
# 37951ede2d454f428070c346ebef21fd
-msgid "Create a replication account on the master and give it privileges. We will use the \"cloud-repl\" user with the password \"password\". This assumes that master and slave run on the 172.16.1.0/24 network."
+msgid "Create a replication account on the source server and give it privileges. We will use the \"cloud-repl\" user with the password \"password\". This assumes that source and replica run on the 172.16.1.0/24 network."
msgstr ""
#: ../../optional_installation.rst:144
@@ -173,12 +173,12 @@
#: ../../optional_installation.rst:164
# 3448c24480a343129c3e323c59e1d52f
-msgid "Complete the master setup. Returning to your first session on the master, release the locks and exit MySQL."
+msgid "Complete the source server setup. Returning to your first session on the source server, release the locks and exit MySQL."
msgstr ""
#: ../../optional_installation.rst:171
# b756f3987b8345d78bb98a1da0cdf5f0
-msgid "Install and configure the slave. On the slave server, run the following commands."
+msgid "Install and configure the replica. On the replica server, run the following commands."
msgstr ""
#: ../../optional_installation.rst:179
@@ -198,17 +198,17 @@
#: ../../optional_installation.rst:200
# cc3fe860c3244bfaabe3d4c4317c7ac8
-msgid "Instruct the slave to connect to and replicate from the master. Replace the IP address, password, log file, and position with the values you have used in the previous steps."
+msgid "Instruct the replica to connect to and replicate from the source. Replace the IP address, password, log file, and position with the values you have used in the previous steps."
msgstr ""
#: ../../optional_installation.rst:213
# 9a9640cbcab74267a00aefe5b61ca112
-msgid "Then start replication on the slave."
+msgid "Then start replication on the replica."
msgstr ""
#: ../../optional_installation.rst:219
# a561331155b44e14a5a9540ccfaded76
-msgid "Optionally, open port 3306 on the slave as was done on the master earlier."
+msgid "Optionally, open port 3306 on the replica as was done on the source earlier."
msgstr ""
#: ../../optional_installation.rst:222
@@ -233,7 +233,7 @@
#: ../../optional_installation.rst:237
# df74922f2b5a44b0820337aecbb8703f
-msgid "Change the replica's configuration to be a master and restart it."
+msgid "Change the replica's configuration to be a source and restart it."
msgstr ""
#: ../../optional_installation.rst:239
diff --git a/source/installguide/locale/zh_CN/LC_MESSAGES/configuration.po b/source/installguide/locale/zh_CN/LC_MESSAGES/configuration.po
index cfa5faf..eeba00e 100644
--- a/source/installguide/locale/zh_CN/LC_MESSAGES/configuration.po
+++ b/source/installguide/locale/zh_CN/LC_MESSAGES/configuration.po
@@ -3238,12 +3238,12 @@
# c8177a7ac4ea4c07bf0c16f2833e48bf
#: ../../configuration.rst:1621
-msgid "blacklisted.routes"
-msgstr "blacklisted.routes"
+msgid "denied..routes"
+msgstr "denied..routes"
# d9441a44a1824e80804bbbe62fd7f531
#: ../../configuration.rst:1621
msgid ""
-"Routes that are blacklisted cannot be used for creating static routes for a "
+"Routes that are denied cannot be used for creating static routes for a "
"VPC Private Gateway."
msgstr "黑名单中的路由不能用于虚拟机的私有网关来创建静态路由"
diff --git a/source/installguide/locale/zh_CN/LC_MESSAGES/hypervisor/kvm.po b/source/installguide/locale/zh_CN/LC_MESSAGES/hypervisor/kvm.po
index def7817..e9cf577 100644
--- a/source/installguide/locale/zh_CN/LC_MESSAGES/hypervisor/kvm.po
+++ b/source/installguide/locale/zh_CN/LC_MESSAGES/hypervisor/kvm.po
@@ -730,8 +730,8 @@
#: ../../hypervisor/kvm.rst:631
msgid ""
"To make sure that the native bridge module will not interfere with "
-"openvswitch the bridge module should be added to the blacklist. See the "
-"modprobe documentation for your distribution on where to find the blacklist."
+"openvswitch the bridge module should be added to the denylist. See the "
+"modprobe documentation for your distribution on where to find the denylist."
" Make sure the module is not loaded either by rebooting or executing rmmod "
"bridge before executing next steps."
msgstr "将系统自带的网络桥接模块加入黑名单，确保该模块不会与openvswitch模块冲突。请参阅你所使用发行版的modprobe文档并找到黑名单。确保该模块不会在重启时自动加载或在下一操作步骤之前卸载该桥接模块。"
diff --git a/source/installguide/locale/zh_CN/LC_MESSAGES/hypervisor_installation.po b/source/installguide/locale/zh_CN/LC_MESSAGES/hypervisor_installation.po
index dcbb0b5..c31f471 100644
--- a/source/installguide/locale/zh_CN/LC_MESSAGES/hypervisor_installation.po
+++ b/source/installguide/locale/zh_CN/LC_MESSAGES/hypervisor_installation.po
@@ -926,8 +926,8 @@
#: ../../hypervisor_installation.rst:694
msgid ""
"To make sure that the native bridge module will not interfere with "
-"openvswitch the bridge module should be added to the blacklist. See the "
-"modprobe documentation for your distribution on where to find the blacklist."
+"openvswitch the bridge module should be added to the denylist. See the "
+"modprobe documentation for your distribution on where to find the denylist."
" Make sure the module is not loaded either by rebooting or executing rmmod "
"bridge before executing next steps."
msgstr "将系统自带的网络桥接模块加入黑名单，确保该模块不会与openvswitch模块冲突。请参阅你所使用发行版的modprobe文档并找到黑名单。确保该模块不会在重启时自动加载或在下一操作步骤之前卸载该桥接模块。"
diff --git a/source/installguide/locale/zh_CN/LC_MESSAGES/installation.po b/source/installguide/locale/zh_CN/LC_MESSAGES/installation.po
index 7ea4ad0..69875ad 100644
--- a/source/installguide/locale/zh_CN/LC_MESSAGES/installation.po
+++ b/source/installguide/locale/zh_CN/LC_MESSAGES/installation.po
@@ -571,7 +571,7 @@
# aef5f1918b994df1a0da2b55407ba85f
#: ../../installation.rst:350
msgid ""
-"This bug has been fixed in master and upcoming 4.4 release and will also be "
+"This bug has been fixed in main and upcoming 4.4 release and will also be "
"fixed in bug fix releases 4.3.x"
msgstr ""
diff --git a/source/installguide/locale/zh_CN/LC_MESSAGES/managing_networks.po b/source/installguide/locale/zh_CN/LC_MESSAGES/managing_networks.po
index b453da8..b46ad22 100644
--- a/source/installguide/locale/zh_CN/LC_MESSAGES/managing_networks.po
+++ b/source/installguide/locale/zh_CN/LC_MESSAGES/managing_networks.po
@@ -7466,7 +7466,7 @@
# 7a2e407277964cd18757e610c1197596
#: ../../managing_networks.rst:5628
-msgid "Blacklisting Routes"
+msgid "Denylisting Routes"
msgstr "路由黑名单"
# a154d3d5488f418e95dbd3c0ae59a55f
@@ -7474,11 +7474,11 @@
msgid ""
"CloudStack enables you to block a list of routes so that they are not "
"assigned to any of the VPC private gateways. Specify the list of routes that"
-" you want to blacklist in the ``blacklisted.routes`` global parameter. Note "
+" you want to denylist in the ``denied.routes`` global parameter. Note "
"that the parameter update affects only new static route creations. If you "
"block an existing static route, it remains intact and continue functioning. "
-"You cannot add a static route if the route is blacklisted for the zone."
-msgstr "CloudStack允许你定义一个路由黑名单，这样它们就不能关联到任何VPC私有网关。你需要在全局参数blacklisted.routes里定义。要注意，此参数只在新路由创建时才会生效。如果你在黑名单里加入了已存在的静态路由，则此静态路由还是会继续起作用。你不能把在路由黑名单里的路由加入到静态路由当中去。"
+"You cannot add a static route if the route is denied for the zone."
+msgstr "CloudStack允许你定义一个路由黑名单，这样它们就不能关联到任何VPC私有网关。你需要在全局参数denied.routes里定义。要注意，此参数只在新路由创建时才会生效。如果你在黑名单里加入了已存在的静态路由，则此静态路由还是会继续起作用。你不能把在路由黑名单里的路由加入到静态路由当中去。"
# 7f1bbdc7458942d88e89b8e0af49db0c
#: ../../managing_networks.rst:5639
diff --git a/source/installguide/locale/zh_CN/LC_MESSAGES/optional_installation.po b/source/installguide/locale/zh_CN/LC_MESSAGES/optional_installation.po
index 9fbad9c..063c639 100644
--- a/source/installguide/locale/zh_CN/LC_MESSAGES/optional_installation.po
+++ b/source/installguide/locale/zh_CN/LC_MESSAGES/optional_installation.po
@@ -137,12 +137,13 @@
"CloudStack supports database replication from one MySQL node to another. "
"This is achieved using standard MySQL replication. You may want to do this "
"as insurance against MySQL server or storage loss. MySQL replication is "
-"implemented using a master/slave model. The master is the node that the "
-"Management Servers are configured to use. The slave is a standby node that "
-"receives all write operations from the master and applies them to a local, "
+"enables data from one MySQL database server (the source) to be copied to "
+"one or more MySQL database servers (the replicas). The source is the node that the "
+"Management Servers are configured to use. The replica is a standby node that "
+"receives all write operations from the source and applies them to a local, "
"redundant copy of the database. The following steps are a guide to "
"implementing MySQL replication."
-msgstr "CloudStack支持MySQL节点间的数据库复制。这个通过标准的MySQL复制功能来实现。你这样做可能希望防止MySQL服务器或者存储损坏。MySQL复制使用master/slave的模型。master节点是直接为管理服务器所使用。slave节点为备用，接收来自master节点的所有写操作，并将它应用于本地冗余数据库。以下是实施数据库复制的步骤。"
+msgstr "CloudStack支持MySQL节点间的数据库复制。这个通过标准的MySQL复制功能来实现。你这样做可能希望防止MySQL服务器或者存储损坏。MySQL复制使用source/replica的模型。source节点是直接为管理服务器所使用。replica节点为备用，接收来自source节点的所有写操作，并将它应用于本地冗余数据库。以下是实施数据库复制的步骤。"
# b03832e56503442494767e262e0d5266
#: ../../optional_installation.rst:102
@@ -153,24 +154,24 @@
# 8f01c4d5d9e849f7aa21e1fafec88427
#: ../../optional_installation.rst:105
-msgid "Ensure that this is a fresh install with no data in the master."
-msgstr "确保这是一个全新安装且没有数据的master数据库节点。"
+msgid "Ensure that this is a fresh install with no data in the source server."
+msgstr "确保这是一个全新安装且没有数据的source server数据库节点。"
# 3207c0439bb34ea28e96d4ee62ad1c2e
#: ../../optional_installation.rst:107
msgid ""
-"Edit my.cnf on the master and add the following in the [mysqld] section "
+"Edit my.cnf on the source server and add the following in the [mysqld] section "
"below datadir."
-msgstr "编辑master数据库的my.cnf，在[mysqld]的datadir下增加如下部分。"
+msgstr "编辑source server数据库的my.cnf，在[mysqld]的datadir下增加如下部分。"
# 5d1dfef940ab48418d921ea6ab2104d5
#: ../../optional_installation.rst:115
msgid ""
"The server\\_id must be unique with respect to other servers. The "
-"recommended way to achieve this is to give the master an ID of 1 and each "
-"slave a sequential number greater than 1, so that the servers are numbered "
+"recommended way to achieve this is to give the source server an ID of 1 and each "
+"replica a sequential number greater than 1, so that the servers are numbered "
"1, 2, 3, etc."
-msgstr "考虑到其他的服务器，服务器id必须是唯一的。推荐的方式是将master的ID设置为1，后续的每个slave节点序号大于1，使得所有服务器编号如：1，2，3等。"
+msgstr "考虑到其他的服务器，服务器id必须是唯一的。推荐的方式是将source server的ID设置为1，后续的每个replica节点序号大于1，使得所有服务器编号如：1，2，3等。"
# 3b36dc410ff54ea89e014b950f48408a
#: ../../optional_installation.rst:120
@@ -185,10 +186,10 @@
# 37951ede2d454f428070c346ebef21fd
#: ../../optional_installation.rst:132
msgid ""
-"Create a replication account on the master and give it privileges. We will "
+"Create a replication account on the source server and give it privileges. We will "
"use the \"cloud-repl\" user with the password \"password\". This assumes "
-"that master and slave run on the 172.16.1.0/24 network."
-msgstr "在master上创建一个用于复制的账户，并赋予权限。我们创建用户\"cloud-repl\"，密码为\"password\"。假设master和slave都运行在172.16.1.0/24网段。"
+"that source and replica run on the 172.16.1.0/24 network."
+msgstr "在source server上创建一个用于复制的账户，并赋予权限。我们创建用户\"cloud-repl\"，密码为\"password\"。假设source和replica都运行在172.16.1.0/24网段。"
# f487c49c63214050912b21eef50fb648
#: ../../optional_installation.rst:144
@@ -218,16 +219,16 @@
# 3448c24480a343129c3e323c59e1d52f
#: ../../optional_installation.rst:164
msgid ""
-"Complete the master setup. Returning to your first session on the master, "
+"Complete the source server setup. Returning to your first session on the source server, "
"release the locks and exit MySQL."
-msgstr "完成master安装。返回到master的第一个会话，取消锁定并退出MySQL。"
+msgstr "完成source server安装。返回到source server的第一个会话，取消锁定并退出MySQL。"
# b756f3987b8345d78bb98a1da0cdf5f0
#: ../../optional_installation.rst:171
msgid ""
-"Install and configure the slave. On the slave server, run the following "
+"Install and configure the replica. On the replica server, run the following "
"commands."
-msgstr "安装并配置slave节点。在slave服务器上，运行如下命令。"
+msgstr "安装并配置replica节点。在replica服务器上，运行如下命令。"
# ce5052106169447d867315b4ab5acf5c
#: ../../optional_installation.rst:179
@@ -249,21 +250,21 @@
# cc3fe860c3244bfaabe3d4c4317c7ac8
#: ../../optional_installation.rst:200
msgid ""
-"Instruct the slave to connect to and replicate from the master. Replace the "
+"Instruct the replica to connect to and replicate from the source. Replace the "
"IP address, password, log file, and position with the values you have used "
"in the previous steps."
-msgstr "引导slave连接master并进行复制。使用上面步骤中得到数据来替换IP地址，密码，日志文件，以及位置点。"
+msgstr "引导replica连接source并进行复制。使用上面步骤中得到数据来替换IP地址，密码，日志文件，以及位置点。"
# 9a9640cbcab74267a00aefe5b61ca112
#: ../../optional_installation.rst:213
-msgid "Then start replication on the slave."
-msgstr "在slave上启动复制功能。"
+msgid "Then start replication on the replica."
+msgstr "在replica上启动复制功能。"
# a561331155b44e14a5a9540ccfaded76
#: ../../optional_installation.rst:219
msgid ""
-"Optionally, open port 3306 on the slave as was done on the master earlier."
-msgstr "在slave上可能需要开启3306端口，就像之前在master上所做的一样。"
+"Optionally, open port 3306 on the replica as was done on the source earlier."
+msgstr "在replica上可能需要开启3306端口，就像之前在source上所做的一样。"
# efdf8223dd9a43a8827dd97444acf8e3
#: ../../optional_installation.rst:222
@@ -293,8 +294,8 @@
# df74922f2b5a44b0820337aecbb8703f
#: ../../optional_installation.rst:237
-msgid "Change the replica's configuration to be a master and restart it."
-msgstr "将数据库的复本服务器修改为master并重启"
+msgid "Change the replica's configuration to be a source and restart it."
+msgstr "将数据库的复本服务器修改为source并重启"
# 2bc5d7c5cd654d7abc5305542ac56d8d
#: ../../optional_installation.rst:239
diff --git a/source/installguide/management-server/_database.rst b/source/installguide/management-server/_database.rst
index 3fb2903..bad57c7 100644
--- a/source/installguide/management-server/_database.rst
+++ b/source/installguide/management-server/_database.rst
@@ -68,7 +68,7 @@
.. parsed-literal::
- server-id=master-01
+ server-id=source-01
innodb_rollback_on_timeout=1
innodb_lock_wait_timeout=600
max_connections=350
diff --git a/source/installguide/optional_installation.rst b/source/installguide/optional_installation.rst
index 8e1617f..54cd52d 100644
--- a/source/installguide/optional_installation.rst
+++ b/source/installguide/optional_installation.rst
@@ -120,9 +120,10 @@
CloudStack supports database replication from one MySQL node to another.
This is achieved using standard MySQL replication. You may want to do
this as insurance against MySQL server or storage loss. MySQL
-replication is implemented using a master/slave model. The master is the
-node that the Management Servers are configured to use. The slave is a
-standby node that receives all write operations from the master and
+replication enables data from one MySQL database server (the source) to be
+copied to one or more MySQL database servers (the replicas). The source is the
+node that the Management Servers are configured to use. The replica is a
+standby node that receives all write operations from the source and
applies them to a local, redundant copy of the database. The following
steps are a guide to implementing MySQL replication.
@@ -130,9 +131,9 @@
Creating a replica is not a backup solution. You should develop a backup
procedure for the MySQL data that is distinct from replication.
-#. Ensure that this is a fresh install with no data in the master.
+#. Ensure that this is a fresh install with no data in the source server.
-#. Edit my.cnf on the master and add the following in the [mysqld]
+#. Edit my.cnf on the source server and add the following in the [mysqld]
section below datadir.
.. parsed-literal::
@@ -141,8 +142,8 @@
server_id=1
The server\_id must be unique with respect to other servers. The
- recommended way to achieve this is to give the master an ID of 1 and
- each slave a sequential number greater than 1, so that the servers
+ recommended way to achieve this is to give the source server an ID of 1 and
+ each replica a sequential number greater than 1, so that the servers
are numbered 1, 2, 3, etc.
#. Restart the MySQL service. On RHEL/CentOS systems, use:
@@ -157,15 +158,15 @@
# service mysql restart
-#. Create a replication account on the master and give it privileges. We
+#. Create a replication account on the source server and give it privileges. We
will use the "cloud-repl" user with the password "password". This
- assumes that master and slave run on the 172.16.1.0/24 network.
+ assumes that source and replica run on the 172.16.1.0/24 network.
.. sourcecode: bash
.. parsed-literal::
# mysql -u root
mysql> create user 'cloud-repl'@'172.16.1.%' identified by 'password';
- mysql> grant replication slave on *.* TO 'cloud-repl'@'172.16.1.%';
+ mysql> grant replication replica on *.* TO 'cloud-repl'@'172.16.1.%';
mysql> flush privileges;
mysql> flush tables with read lock;
@@ -178,7 +179,7 @@
.. parsed-literal::
# mysql -u root
- mysql> show master status;
+ mysql> show source status;
+------------------+----------+--------------+------------------+
| File | Position | Binlog_Do_DB | Binlog_Ignore_DB |
+------------------+----------+--------------+------------------+
@@ -189,14 +190,14 @@
#. Exit from this session.
-#. Complete the master setup. Returning to your first session on the
- master, release the locks and exit MySQL.
+#. Complete the source server setup. Returning to your first session on the
+ source server, release the locks and exit MySQL.
.. parsed-literal::
mysql> unlock tables;
-#. Install and configure the slave. On the slave server, run the
+#. Install and configure the replica. On the replica server, run the
following commands.
.. parsed-literal::
@@ -225,26 +226,26 @@
# service mysql restart
-#. Instruct the slave to connect to and replicate from the master.
+#. Instruct the replica to connect to and replicate from the source.
Replace the IP address, password, log file, and position with the
values you have used in the previous steps.
.. parsed-literal::
- mysql> change master to
- -> master_host='172.16.1.217',
- -> master_user='cloud-repl',
- -> master_password='password',
- -> master_log_file='mysql-bin.000001',
- -> master_log_pos=412;
+ mysql> change source to
+ -> source_host='172.16.1.217',
+ -> source_user='cloud-repl',
+ -> source_password='password',
+ -> source_log_file='mysql-bin.000001',
+ -> source_log_pos=412;
-#. Then start replication on the slave.
+#. Then start replication on the replica.
.. parsed-literal::
- mysql> start slave;
+ mysql> start replica;
-#. Optionally, open port 3306 on the slave as was done on the master
+#. Optionally, open port 3306 on the replica as was done on the source
earlier.
This is not required for replication to work. But if you choose not
@@ -262,7 +263,7 @@
#. Stop the Management Servers (via service cloudstack-management stop).
-#. Change the replica's configuration to be a master and restart it.
+#. Change the replica's configuration to be a source and restart it.
#. Ensure that the replica's port 3306 is open to the Management
Servers.
diff --git a/source/plugins/cloudstack-kubernetes-service.rst b/source/plugins/cloudstack-kubernetes-service.rst
index 4290b6c..ac26bd8 100644
--- a/source/plugins/cloudstack-kubernetes-service.rst
+++ b/source/plugins/cloudstack-kubernetes-service.rst
@@ -17,7 +17,7 @@
Kubernetes Service plugin uses a CoreOS based template for node VMs for the Kubernetes cluster. CoreOS has been used as it provides docker installation and networking rules needed for Kubernetes by default. In future, different guest OSes might be used. For installation of Kubernetes binaries on cluster nodes, a binaries ISO is used for each Kubernetes version to be made available via CloudStack. This allows faster, offline installation of Kubernetes binaries and docker images along with support for adding multiple versions of Kubernetes for upgrades and running different clusters.
-For deployment and setup of Kubernetes on cluster nodes, the plugin uses the Kubernetes tool, 'kubeadm'. kubeadm is the command-line tool for easily provisioning a secure Kubernetes cluster on top of physical or cloud servers or virtual machines. Under the hood, master node(s) of the cluster starts a Kubernetes cluster using kubeadm init command with a custom token, and worker nodes join this Kubernetes cluster using kubeadm join command with the same token. More about kubeadm here: https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm/. Weave Net CNI provider plugin is used for cluster networking. More about Weave Net provide plugin here: https://www.weave.works/docs/net/latest/kubernetes/kube-addon/.
+For deployment and setup of Kubernetes on cluster nodes, the plugin uses the Kubernetes tool, 'kubeadm'. kubeadm is the command-line tool for easily provisioning a secure Kubernetes cluster on top of physical or cloud servers or virtual machines. Under the hood, control node(s) of the cluster starts a Kubernetes cluster using kubeadm init command with a custom token, and worker nodes join this Kubernetes cluster using kubeadm join command with the same token. More about kubeadm here: https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm/. Weave Net CNI provider plugin is used for cluster networking. More about Weave Net provide plugin here: https://www.weave.works/docs/net/latest/kubernetes/kube-addon/.
To access the Kubernetes dashboard securely, the plugin provides access to kubeconfig file data which uses the Kubernetes tool kubectl to run a local proxy and thereby access the dashboard. More about kubectl here: https://kubernetes.io/docs/reference/kubectl/overview/
@@ -161,8 +161,8 @@
A new network offering named DefaultNetworkOfferingforKubernetesService has been added since 4.14.0
.. note::
- - Multi-master, HA cluster can be created for Kubernetes version 1.16 and above only.
- - While creating multi-master, HA cluster over a shared network, an external load-balancer must be manually setup. This load-balancer should have port-forwarding rules for SSH, Kubernetes API server access. Service assumes SSH access to cluster nodes is available from port 2222 to (2222 + cluster node count -1). Similarly, for API access 6443 must be forwarded to master nodes. Over the CloudStack isolated network these rules are automatically provisioned.
+ - Multi-control nodes, HA cluster can be created for Kubernetes version 1.16 and above only.
+ - While creating multi-control nodes, HA cluster over a shared network, an external load-balancer must be manually setup. This load-balancer should have port-forwarding rules for SSH, Kubernetes API server access. Service assumes SSH access to cluster nodes is available from port 2222 to (2222 + cluster node count -1). Similarly, for API access 6443 must be forwarded to control nodes. Over the CloudStack isolated network these rules are automatically provisioned.
Managing Kubernetes clusters
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -188,7 +188,7 @@
- **projectid** (Deploy cluster for the project)
- **networkid** (Network in which Kubernetes cluster is to be launched)
- **keypair** (name of the ssh key pair used to login to the virtual machines)
-- **masternodes** (number of Kubernetes cluster master nodes, default is 1) externalloadbalanceripaddress (external load balancer IP address while using shared network with Kubernetes HA cluster)
+- **controlnodes** (number of Kubernetes cluster control nodes, default is 1) externalloadbalanceripaddress (external load balancer IP address while using shared network with Kubernetes HA cluster)
- **size** (number of Kubernetes cluster worker nodes; Required)
- **noderootdisksize** (root disk size of root disk for each node)
- **dockerregistryusername** (username for the docker image private registry; Experimental)
@@ -209,7 +209,7 @@
"id": "74e3cc02-bbf7-438f-bfb0-9c193e90c1fb",
"kubernetesversionid": "6668e999-fe6c-4a91-88d8-d10bcf280d02",
"kubernetesversionname": "v1.13.2",
- "masternodes": 1,
+ "controlnodes": 1,
"memory": "4096",
"name": "Test",
"networkid": "148af2cb-4b94-42a2-b701-3b6aa884cbb0",
diff --git a/source/plugins/index.rst b/source/plugins/index.rst
index 783e4f4..6c8ac83 100644
--- a/source/plugins/index.rst
+++ b/source/plugins/index.rst
@@ -13,7 +13,7 @@
specific language governing permissions and limitations
under the License.
-.. CloudStack Installation Documentation master file, created by
+.. CloudStack Installation Documentation main file, created by
sphinx-quickstart on Sat Jan 25 15:15:31 2014.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
diff --git a/source/plugins/ovs-plugin.rst b/source/plugins/ovs-plugin.rst
index 5c6799e..56608fc 100644
--- a/source/plugins/ovs-plugin.rst
+++ b/source/plugins/ovs-plugin.rst
@@ -89,8 +89,9 @@
- CentOS 6.4 is recommended.
- To make sure that the native bridge module will not interfere with
- openvSwitch the bridge module should be added to the blacklist. See the
- modprobe documentation for your distribution on where to find the blacklist.
+ openvSwitch the bridge module should be added to the denylist. See the
+ modprobe documentation for your distribution on where to find the denylist
+ (likely named 'denylist').
Make sure the module is not loaded either by rebooting or executing rmmod
bridge before executing next steps.
diff --git a/source/plugins/quota.rst b/source/plugins/quota.rst
index 2c6bd5e..bf86944 100644
--- a/source/plugins/quota.rst
+++ b/source/plugins/quota.rst
@@ -21,9 +21,9 @@
provide a measurement for the resources used by the accounts and domains using a
common unit referred to as cloud currency in this document. It can be configured
to ensure that your usage won’t exceed the budget allocated to accounts/domain
-in cloud currency. It will let user know how much of the cloud resources he is
+in cloud currency. It will let users know how much of the cloud resources they are
using. It will help the cloud admins, if they want, to ensure that a user does
-not go beyond his allocated quota. Per usage cycle if an account is found to be
+not go beyond their allocated quota. Per usage cycle if an account is found to be
exceeding its quota then it is locked. Locking an account means that it will not
be able to initiate a new resource allocation request, whether it is more
storage or an additional ip. To unlock an account you need to add more credit to it.
diff --git a/source/quickinstallationguide/qig.rst b/source/quickinstallationguide/qig.rst
index d1dd629..37b96d6 100644
--- a/source/quickinstallationguide/qig.rst
+++ b/source/quickinstallationguide/qig.rst
@@ -405,7 +405,7 @@
.. parsed-literal::
- server-id=master-01
+ server-id=source-01
innodb_rollback_on_timeout=1
innodb_lock_wait_timeout=600
max_connections=350
diff --git a/source/releasenotes/index.rst b/source/releasenotes/index.rst
index 40a7000..d73d02f 100644
--- a/source/releasenotes/index.rst
+++ b/source/releasenotes/index.rst
@@ -13,7 +13,7 @@
specific language governing permissions and limitations
under the License.
-.. CloudStack Release Notes documentation master file, created by
+.. CloudStack Release Notes documentation main file, created by
sphinx-quickstart on Fri Feb 7 16:00:59 2014.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
diff --git a/source/releasenotes/locale/ja/LC_MESSAGES/about.po b/source/releasenotes/locale/ja/LC_MESSAGES/about.po
index c9c8b14..cadf46a 100644
--- a/source/releasenotes/locale/ja/LC_MESSAGES/about.po
+++ b/source/releasenotes/locale/ja/LC_MESSAGES/about.po
@@ -2622,7 +2622,7 @@
# 15c21a5396e7428b928fd0ad2dec879a
#: ../../source/about.rst:711
msgid ""
-"HA - When the master host is disconnected , the host status contines to "
+"HA - When the primary host is disconnected , the host status contines to "
"remain i..."
msgstr ""
@@ -4807,7 +4807,7 @@
# 676f457929c74bcc83ebb6f37c4a72c9
#: ../../source/about.rst:903
msgid ""
-"Contrail: Slave compute host restarts when the master compute host is "
+"Contrail: Secondary compute host restarts when the primary compute host is "
"changed to..."
msgstr ""
diff --git a/source/releasenotes/locale/ja/LC_MESSAGES/rnotes.po b/source/releasenotes/locale/ja/LC_MESSAGES/rnotes.po
index e53f851..7834db0 100644
--- a/source/releasenotes/locale/ja/LC_MESSAGES/rnotes.po
+++ b/source/releasenotes/locale/ja/LC_MESSAGES/rnotes.po
@@ -1512,7 +1512,7 @@
# 9c4f5494faa54226bfeea797c0d3bcdf
#: ../../source/rnotes.rst:1826 ../../source/rnotes.rst:2656
msgid ""
-"On the MySQL master, take a backup of the MySQL databases. We recommend "
+"On the MySQL source server, take a backup of the MySQL databases. We recommend "
"performing this step even in test upgrades. If there is an issue, this will "
"assist with debugging."
msgstr ""
diff --git a/source/releasenotes/locale/pot/about.pot b/source/releasenotes/locale/pot/about.pot
index 37253ca..4d98216 100644
--- a/source/releasenotes/locale/pot/about.pot
+++ b/source/releasenotes/locale/pot/about.pot
@@ -2194,7 +2194,7 @@
#: ../../about.rst:716
# c06bebf8a33649ed8131f4b65a442741
-msgid "HA - When the master host is disconnected , the host status contines to remain i..."
+msgid "HA - When the primary host is disconnected , the host status contines to remain i..."
msgstr ""
#: ../../about.rst:717
@@ -3974,7 +3974,7 @@
#: ../../about.rst:908
# e13098ccaa854d3390abfce0d6b31ab9
-msgid "Contrail: Slave compute host restarts when the master compute host is changed to..."
+msgid "Contrail: Secondary compute host restarts when the primary compute host is changed to..."
msgstr ""
#: ../../about.rst:909
diff --git a/source/releasenotes/locale/pot/rnotes.pot b/source/releasenotes/locale/pot/rnotes.pot
index e1f188b..50a5d25 100644
--- a/source/releasenotes/locale/pot/rnotes.pot
+++ b/source/releasenotes/locale/pot/rnotes.pot
@@ -1475,7 +1475,7 @@
#: ../../rnotes.rst:2656
# bda05cf21e784a1cbc68f3bbef5bcf32
# d35c3cd591f547888c10e4a335ab6d70
-msgid "On the MySQL master, take a backup of the MySQL databases. We recommend performing this step even in test upgrades. If there is an issue, this will assist with debugging."
+msgid "On the MySQL source server, take a backup of the MySQL databases. We recommend performing this step even in test upgrades. If there is an issue, this will assist with debugging."
msgstr ""
#: ../../rnotes.rst:1830
diff --git a/source/upgrading/index.rst b/source/upgrading/index.rst
index 5186e1c..2b851a4 100644
--- a/source/upgrading/index.rst
+++ b/source/upgrading/index.rst
@@ -13,7 +13,7 @@
specific language governing permissions and limitations
under the License.
-.. CloudStack Release Notes documentation master file, created by
+.. CloudStack Release Notes documentation main file, created by
sphinx-quickstart on Fri Feb 7 16:00:59 2014.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
diff --git a/source/upgrading/locale/ja/LC_MESSAGES/about.po b/source/upgrading/locale/ja/LC_MESSAGES/about.po
index c9c8b14..cadf46a 100644
--- a/source/upgrading/locale/ja/LC_MESSAGES/about.po
+++ b/source/upgrading/locale/ja/LC_MESSAGES/about.po
@@ -2622,7 +2622,7 @@
# 15c21a5396e7428b928fd0ad2dec879a
#: ../../source/about.rst:711
msgid ""
-"HA - When the master host is disconnected , the host status contines to "
+"HA - When the primary host is disconnected , the host status contines to "
"remain i..."
msgstr ""
@@ -4807,7 +4807,7 @@
# 676f457929c74bcc83ebb6f37c4a72c9
#: ../../source/about.rst:903
msgid ""
-"Contrail: Slave compute host restarts when the master compute host is "
+"Contrail: Secondary compute host restarts when the primary compute host is "
"changed to..."
msgstr ""
diff --git a/source/upgrading/locale/ja/LC_MESSAGES/rnotes.po b/source/upgrading/locale/ja/LC_MESSAGES/rnotes.po
index e53f851..7834db0 100644
--- a/source/upgrading/locale/ja/LC_MESSAGES/rnotes.po
+++ b/source/upgrading/locale/ja/LC_MESSAGES/rnotes.po
@@ -1512,7 +1512,7 @@
# 9c4f5494faa54226bfeea797c0d3bcdf
#: ../../source/rnotes.rst:1826 ../../source/rnotes.rst:2656
msgid ""
-"On the MySQL master, take a backup of the MySQL databases. We recommend "
+"On the MySQL source server, take a backup of the MySQL databases. We recommend "
"performing this step even in test upgrades. If there is an issue, this will "
"assist with debugging."
msgstr ""
diff --git a/source/upgrading/locale/pot/about.pot b/source/upgrading/locale/pot/about.pot
index 37253ca..4d98216 100644
--- a/source/upgrading/locale/pot/about.pot
+++ b/source/upgrading/locale/pot/about.pot
@@ -2194,7 +2194,7 @@
#: ../../about.rst:716
# c06bebf8a33649ed8131f4b65a442741
-msgid "HA - When the master host is disconnected , the host status contines to remain i..."
+msgid "HA - When the primary host is disconnected , the host status contines to remain i..."
msgstr ""
#: ../../about.rst:717
@@ -3974,7 +3974,7 @@
#: ../../about.rst:908
# e13098ccaa854d3390abfce0d6b31ab9
-msgid "Contrail: Slave compute host restarts when the master compute host is changed to..."
+msgid "Contrail: Secondary compute host restarts when the primary compute host is changed to..."
msgstr ""
#: ../../about.rst:909
diff --git a/source/upgrading/locale/pot/rnotes.pot b/source/upgrading/locale/pot/rnotes.pot
index e1f188b..50a5d25 100644
--- a/source/upgrading/locale/pot/rnotes.pot
+++ b/source/upgrading/locale/pot/rnotes.pot
@@ -1475,7 +1475,7 @@
#: ../../rnotes.rst:2656
# bda05cf21e784a1cbc68f3bbef5bcf32
# d35c3cd591f547888c10e4a335ab6d70
-msgid "On the MySQL master, take a backup of the MySQL databases. We recommend performing this step even in test upgrades. If there is an issue, this will assist with debugging."
+msgid "On the MySQL source server, take a backup of the MySQL databases. We recommend performing this step even in test upgrades. If there is an issue, this will assist with debugging."
msgstr ""
#: ../../rnotes.rst:1830
