Commit b3b7fbdd authored by Susan Tacker's avatar Susan Tacker

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

Updated INFO alert again, bc it renders so differently from other alerts

See merge request gitlab-org/gitlab!72029
parents c6061725 80c5d410
...@@ -1437,17 +1437,7 @@ This is something to be warned about. ...@@ -1437,17 +1437,7 @@ This is something to be warned about.
The Marketing team uses the `INFO` alert to add information relating The Marketing team uses the `INFO` alert to add information relating
to sales and marketing efforts. to sales and marketing efforts.
```markdown The text in an `INFO:` alert always renders in a floating text box to the right of the text around it.
INFO:
This information is important.
```
It renders on the GitLab documentation site as:
INFO:
This information is important.
The text always renders in a floating text box to the right of the text around it.
To view the rendered GitLab docs site, check the review app in the MR. You might need to move the text up or down To view the rendered GitLab docs site, check the review app in the MR. You might need to move the text up or down
in the surrounding text, depending on where you'd like to floating box to appear. in the surrounding text, depending on where you'd like to floating box to appear.
...@@ -1462,6 +1452,10 @@ INFO: ...@@ -1462,6 +1452,10 @@ INFO:
Here is some information. This information is an important addition to how you Here is some information. This information is an important addition to how you
work with GitLab and you might want to consider it. work with GitLab and you might want to consider it.
And here is another paragraph. GitLab uses the SSH protocol to securely communicate with Git.
When you use SSH keys to authenticate to the GitLab remote server,
you don't need to supply your username and password each time.
And here is another paragraph. GitLab uses the SSH protocol to securely communicate with Git. And here is another paragraph. GitLab uses the SSH protocol to securely communicate with Git.
When you use SSH keys to authenticate to the GitLab remote server, When you use SSH keys to authenticate to the GitLab remote server,
you don't need to supply your username and password each time. you don't need to supply your username and password each time.
...@@ -1481,6 +1475,10 @@ And here is another paragraph. GitLab uses the SSH protocol to securely communic ...@@ -1481,6 +1475,10 @@ And here is another paragraph. GitLab uses the SSH protocol to securely communic
When you use SSH keys to authenticate to the GitLab remote server, When you use SSH keys to authenticate to the GitLab remote server,
you don't need to supply your username and password each time. you don't need to supply your username and password each time.
And here is another paragraph. GitLab uses the SSH protocol to securely communicate with Git.
When you use SSH keys to authenticate to the GitLab remote server,
you don't need to supply your username and password each time.
### Disclaimer ### Disclaimer
Use to describe future functionality only. Use to describe future functionality only.
......
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