diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2019-06-05 12:14:25 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-06-05 12:14:25 +0000 |
commit | 0552e248c1984ba7c5b3a8b7314e26863d2dfb9f (patch) | |
tree | fa7dc5b1360c329258c6e2390cd683f8466d96bf | |
parent | d994406192ecb00e6c3b470e9ce99a2ba537cea0 (diff) | |
parent | 4027acf504bff58f3d26a9b8182208c8a4820007 (diff) | |
download | gitlab-ce-0552e248c1984ba7c5b3a8b7314e26863d2dfb9f.tar.gz |
Merge branch 'clarify-ce-first-docs' into 'master'
Clarify the process for CE-first documentation
See merge request gitlab-org/gitlab-ce!29197
-rw-r--r-- | doc/development/documentation/index.md | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/development/documentation/index.md b/doc/development/documentation/index.md index 6dfd3b2a690..c7fa40af930 100644 --- a/doc/development/documentation/index.md +++ b/doc/development/documentation/index.md @@ -74,9 +74,14 @@ Here are some links to get you up to speed with the current effort: After a given documentation path is aligned across CE and EE, all merge requests affecting that path must be submitted to CE, regardless of the content it has. -This means that for EE-only features which are being added only to the EE codebase, -you have to submit a separate merge request in CE that contains the docs. -This might seem like a duplicate effort, but it's for the short term. +This means that: + +* For **EE-only docs changes**, you only have to submit a CE MR. +* For **EE-only features** that touch both the code and the docs, you have to submit +an EE MR containing all changes, and a CE MR containing only the docs changes +and without a changelog entry. + +This might seem like a duplicate effort, but it's only for the short term. A list of the already aligned docs can be found in [the epic description](https://gitlab.com/groups/gitlab-org/-/epics/199#ee-specific-lines-check). |