summaryrefslogtreecommitdiff
path: root/doc/policy
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-26 00:09:41 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-26 00:09:41 +0000
commitd29c19034b0d4da076e67e38b4cbd92bde4e30a2 (patch)
tree77a4a3818a48443926511bc3777e571a50c6d084 /doc/policy
parent8b12578ec6fc51494fcd55995472c3208587cd3f (diff)
downloadgitlab-ce-d29c19034b0d4da076e67e38b4cbd92bde4e30a2.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/policy')
-rw-r--r--doc/policy/maintenance.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/policy/maintenance.md b/doc/policy/maintenance.md
index 95bc176e70a..217618c1771 100644
--- a/doc/policy/maintenance.md
+++ b/doc/policy/maintenance.md
@@ -103,12 +103,12 @@ have to adhere to various internal requirements (for example, org. compliance, v
1. Requirements consisting of extensive testing for not only stable GitLab release, but every patch version.
In cases where a strategic user has a requirement to test a feature before it is
-officially released, we can offer to create a Release Candidate (RC) version that will
-include the specific feature. This should be needed only in extreme cases and can be requested for
+officially released, we can offer to create a Release Candidate (RC) version that
+includes the specific feature. This should be needed only in extreme cases and can be requested for
consideration by raising an issue in the [release/tasks](https://gitlab.com/gitlab-org/release/tasks/-/issues/new?issuable_template=Backporting-request) issue tracker.
-It is important to note that the Release Candidate will also contain other features and changes as
+It is important to note that the Release Candidate contains other features and changes as
it is not possible to easily isolate a specific feature (similar reasons as noted above). The
-Release Candidate will be no different than any code that is deployed to GitLab.com or is publicly
+Release Candidate is no different than any code that is deployed to GitLab.com or is publicly
accessible.
### Backporting to older releases