Commit b8095dcd authored by Craig Norris's avatar Craig Norris

Merge branch 'sselhorn-master-patch-19761' into 'master'

Added legal disclaimer for future versions

See merge request gitlab-org/gitlab!71957
parents 9e07b0ed 7bf1fed9
...@@ -1375,6 +1375,7 @@ Alert boxes are generated when one of these words is followed by a line break: ...@@ -1375,6 +1375,7 @@ Alert boxes are generated when one of these words is followed by a line break:
- `NOTE:` - `NOTE:`
- `WARNING:` - `WARNING:`
- `INFO:` (Marketing only) - `INFO:` (Marketing only)
- `DISCLAIMER:`
For example: For example:
...@@ -1438,13 +1439,18 @@ to sales and marketing efforts. ...@@ -1438,13 +1439,18 @@ to sales and marketing efforts.
```markdown ```markdown
INFO: INFO:
This info is important. This information is important.
``` ```
It renders on the GitLab documentation site as: It renders on the GitLab documentation site as:
INFO: INFO:
This info is important. This information is important.
### Disclaimer
Use to describe future functionality only.
For more information, see [Legal disclaimer for future features](#legal-disclaimer-for-future-features).
## Blockquotes ## Blockquotes
...@@ -1639,6 +1645,24 @@ For example: ...@@ -1639,6 +1645,24 @@ For example:
You can say that we plan to remove a feature. You can say that we plan to remove a feature.
#### Legal disclaimer for future features
If you **must** write about features we have not yet delivered, put this exact disclaimer near the content it applies to.
```markdown
DISCLAIMER:
This page contains information related to upcoming products, features, and functionality.
It is important to note that the information presented is for informational purposes only.
Please do not rely on this information for purchasing or planning purposes.
As with all projects, the items mentioned on this page are subject to change or delay.
The development, release, and timing of any products, features, or functionality remain at the
sole discretion of GitLab Inc.
```
If all of the content on the page is not available, use the disclaimer once at the top of the page.
If the content in a topic is not ready, use the disclaimer in the topic.
### Removing versions after each major release ### Removing versions after each major release
Whenever a major GitLab release occurs, we remove all version references Whenever a major GitLab release occurs, we remove all version references
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment