You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Inclusivity changes for CloudStack - rename some offensive words/terms as appropriate, that are meaningful and inclusive.
- Renamed default git branch name from 'master' to 'main'.
- Removed black/whitelist phrasing, replaced with allowlist/denylist.
- Replaced some offensive words/terms with appropriate word for inclusiveness.
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.
103
+
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.
104
104
105
105
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.
106
106
@@ -115,40 +115,40 @@ It is good practice to create a new branch each time you want to contribute to t
115
115
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`.
116
116
117
117
118
-
Merging `upstream/master` into your `dev` branch
118
+
Merging `upstream/main` into your `dev` branch
119
119
------------------------------------------------
120
120
121
-
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.
121
+
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.
122
122
123
123
This process will do the following:
124
124
125
-
#. Checkout your local `master` branch
125
+
#. Checkout your local `main` branch
126
126
127
-
#. Synchronize your local `master` branch with the `upstream/master` so you have all the latest changes from the official docs
127
+
#. Synchronize your local `main` branch with the `upstream/main` so you have all the latest changes from the official docs
128
128
129
129
#. Merge the latest changes from the official docs into your `dev` branch so it is up-to-date with the latest changes
130
130
131
131
.. code:: bash
132
132
133
-
$ git checkout master
133
+
$ git checkout main
134
134
$ git fetch upstream
135
-
$ git merge upstream/master
135
+
$ git merge upstream/main
136
136
$ git checkout dev
137
-
$ git pull .master
137
+
$ git pull .main
138
138
139
-
.. note:: Now your `dev` branch is up-to-date with all the recent changes in the `upstream/master`.
139
+
.. note:: Now your `dev` branch is up-to-date with all the recent changes in the `upstream/main`.
140
140
141
141
142
142
Making a pull request on GitHub to contribute your changes
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.
146
146
147
-
.. note:: Make sure you have merged `upstream/master` into your `dev` branch before you do this.
147
+
.. note:: Make sure you have merged `upstream/main` into your `dev` branch before you do this.
148
148
149
149
.. code:: bash
150
150
151
-
$ git push origin master
151
+
$ git push origin main
152
152
$ git push origin dev
153
153
154
154
Now that the `dev` branch has been pushed to your GitHub repository, you can initiate the pull request.
@@ -167,14 +167,14 @@ If you are requested to make modifications to your proposed changes, make the ch
167
167
Cleaning up after a successful pull request
168
168
-------------------------------------------
169
169
170
-
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.
170
+
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.
171
171
172
-
.. note:: Make sure that your changes are in `upstream/master` before you delete your `dev` and `origin/dev` branches!
172
+
.. note:: Make sure that your changes are in `upstream/main` before you delete your `dev` and `origin/dev` branches!
173
173
174
174
You can delete these deprecated branches with the following:
Copy file name to clipboardExpand all lines: source/adminguide/locale/pot/hosts.pot
+1-1Lines changed: 1 addition & 1 deletion
Original file line number
Diff line number
Diff line change
@@ -103,7 +103,7 @@ msgstr ""
103
103
104
104
#:../../hosts.rst:80
105
105
# 38555be75efd4fed91c3479a883493d1
106
-
msgid"For XenServer, you can take a server offline temporarily by using the Maintenance Mode feature in XenCenter. When you place a server into Maintenance Mode, all running VMs are automatically migrated from it to another host in the same pool. If the server is the pool master, a new master will also be selected for the pool. While a server is Maintenance Mode, you cannot create or start any VMs on it."
106
+
msgid"For XenServer, you can take a server offline temporarily by using the Maintenance Mode feature in XenCenter. When you place a server into Maintenance Mode, all running VMs are automatically migrated from it to another host in the same pool. If the server is the pool primary, a new primary will also be selected for the pool. While a server is Maintenance Mode, you cannot create or start any VMs on it."
Copy file name to clipboardExpand all lines: source/adminguide/locale/pot/networking.pot
+1-1Lines changed: 1 addition & 1 deletion
Original file line number
Diff line number
Diff line change
@@ -730,7 +730,7 @@ msgstr ""
730
730
731
731
#:../../networking.rst:369
732
732
# 6c9c68a68ab14d30a00460dd3b13f8a6
733
-
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."
733
+
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."
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."
1230
+
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."
Copy file name to clipboardExpand all lines: source/adminguide/locale/pot/networking2.pot
+2-2Lines changed: 2 additions & 2 deletions
Original file line number
Diff line number
Diff line change
@@ -5988,12 +5988,12 @@ msgstr ""
5988
5988
5989
5989
#:../../networking2.rst:5737
5990
5990
# 4bb61ba3dd1444269d2f517a3d774dac
5991
-
msgid"Blacklisting Routes"
5991
+
msgid"Denylisting Routes"
5992
5992
msgstr""
5993
5993
5994
5994
#:../../networking2.rst:5739
5995
5995
# bf15aaf7395c48438bdfb1c5a1b303cd
5996
-
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."
5996
+
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."
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."
5987
+
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."
Copy file name to clipboardExpand all lines: source/adminguide/locale/pot/reliability.pot
+10-10Lines changed: 10 additions & 10 deletions
Original file line number
Diff line number
Diff line change
@@ -283,22 +283,22 @@ msgstr ""
283
283
284
284
#:../../reliability.rst:207
285
285
# 147ac9efb2314312b6e97323a267fd7c
286
-
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."
286
+
msgid"``db.cloud.backup``: set to a comma-delimited set of backup hosts for the cloud database. This is the list of nodes set up with replication. The primary node is not in the list, since it is already mentioned elsewhere in the properties file."
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."
296
+
msgid"``db.usage.backup``: set to a comma-delimited set of backup hosts for the usage database. This is the list of nodes set up with replication. The primary node is not in the list, since it is already mentioned elsewhere in the properties file."
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."
316
+
msgid"``db.cloud.secondsBeforeRetryPrimary``: The number of seconds the MySQL connector should wait before trying again to connect to the primary after the primary went down. Default is 1 hour. The retry might happen sooner if db.cloud.queriesBeforeRetryPrimary is reached first."
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."
326
+
msgid"``db.cloud.queriesBeforeRetryPrimary``: The minimum number of queries to be sent to the database before trying again to connect to the primary after the primary went down. Default is 5000. The retry might happen sooner if db.cloud.secondsBeforeRetryPrimary is reached first."
0 commit comments