Commit 58b2316b authored by Marcel Amirault's avatar Marcel Amirault Committed by Evan Read

Tweak rendering of codeblocks

Make codeblocks render more normally, and update
test text. Also makes a few links inline
parent 9d960418
# Checks for the presence of reference-style links that must be inline.
#
# For a list of all options, see https://errata-ai.github.io/vale/styles/
extends: existence
message: 'Link "%s" must be inline.'
link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#basic-link-criteria
level: error
scope: raw
raw:
- '\n\[.*\]: .*'
...@@ -29,14 +29,10 @@ them. It can be done by GitLab administrators with access to GitLab Rails ...@@ -29,14 +29,10 @@ them. It can be done by GitLab administrators with access to GitLab Rails
console. console.
If you used a certain feature and identified a bug, a misbehavior, or an If you used a certain feature and identified a bug, a misbehavior, or an
error, it's very important that you **[provide feedback]** to GitLab as soon error, it's very important that you [**provide feedback**](https://gitlab.com/gitlab-org/gitlab/issues/new?issue[title]=Docs%20-%20feature%20flag%20feedback%3A%20Feature%20Name&issue[description]=Describe%20the%20problem%20you%27ve%20encountered.%0A%0A%3C!--%20Don%27t%20edit%20below%20this%20line%20--%3E%0A%0A%2Flabel%20~%22docs%5C-comments%22%20) to GitLab as soon
as possible so we can improve or fix it while behind a flag. When you upgrade as possible so we can improve or fix it while behind a flag. When you upgrade
GitLab to an earlier version, the feature flag status may change. GitLab to an earlier version, the feature flag status may change.
[provide feedback]: https://gitlab.com/gitlab-org/gitlab/issues/new?issue[title]=Docs%20-%20feature%20flag%20feedback%3A%20Feature%20Name&issue[description]=Describe%20the%20problem%20you%27ve%20encountered.%0A%0A%3C!--%20Don%27t%20edit%20below%20this%20line%20--%3E%0A%0A%2Flabel%20~%22docs%5C-comments%22%20
<!-- Note: the link identifier above was used to facilitate review and update. -->
NOTE: **Note:** NOTE: **Note:**
Mind that features deployed behind feature flags may not be ready for Mind that features deployed behind feature flags may not be ready for
production use. However, disabling features behind flags that were deployed production use. However, disabling features behind flags that were deployed
......
This diff is collapsed.
...@@ -828,23 +828,31 @@ Reference tags can use letters and other characters. Avoid using lowercase `w` o ...@@ -828,23 +828,31 @@ Reference tags can use letters and other characters. Avoid using lowercase `w` o
(`_`) in footnote tag names until [this bug](https://gitlab.com/gitlab-org/gitlab/issues/24423) is (`_`) in footnote tag names until [this bug](https://gitlab.com/gitlab-org/gitlab/issues/24423) is
resolved. resolved.
```markdown <!--
A footnote reference tag looks like this: [^1] Do not edit the following codeblock. It uses HTML to skip the Vale ReferenceLinks test.
-->
<pre class="highlight"><code>A footnote reference tag looks like this: [^1]
This reference tag is a mix of letters and numbers. [^footnote-42] This reference tag is a mix of letters and numbers. [^footnote-42]
[^1]: This is the text inside a footnote. &#91;^1]: This is the text inside a footnote.
[^footnote-42]: This is another footnote. &#91;^footnote-42]: This is another footnote.
``` </code></pre>
A footnote reference tag looks like this:[^1] A footnote reference tag looks like this:[^1]
This reference tag is a mix of letters and numbers.[^footnote-42] This reference tag is a mix of letters and numbers.[^footnote-42]
[^1]: This is the text inside a footnote. <!--
Do not delete the single space before the [^1] and [^footnotes] references below.
These are used to force the Vale ReferenceLinks check to skip these examples.
-->
[^1]: This is the text inside a footnote.
[^footnote-42]: This is another footnote. [^footnote-42]: This is another footnote.
### Headers ### Headers
...@@ -928,8 +936,11 @@ ___ ...@@ -928,8 +936,11 @@ ___
Examples: Examples:
```markdown <!--
Inline-style (hover to see title text): Do not edit the following codeblock. It uses HTML to skip the Vale ReferenceLinks test.
-->
<pre class="highlight"><code>Inline-style (hover to see title text):
![alt text](img/markdown_logo.png "Title Text") ![alt text](img/markdown_logo.png "Title Text")
...@@ -937,12 +948,12 @@ Reference-style (hover to see title text): ...@@ -937,12 +948,12 @@ Reference-style (hover to see title text):
![alt text1][logo] ![alt text1][logo]
[logo]: img/markdown_logo.png "Title Text" &#91;logo]: img/markdown_logo.png "Title Text"
``` </code></pre>
<!-- <!--
DO NOT change the name of markdown_logo.png. This is used for a test DO NOT change the name of markdown_logo.png. This is used for a test in
in spec/controllers/help_controller_spec.rb. spec/controllers/help_controller_spec.rb.
--> -->
Inline-style (hover to see title text): Inline-style (hover to see title text):
...@@ -951,9 +962,12 @@ Inline-style (hover to see title text): ...@@ -951,9 +962,12 @@ Inline-style (hover to see title text):
Reference-style (hover to see title text): Reference-style (hover to see title text):
![alt text][logo] <!--
The example below uses an in-line link to pass the Vale ReferenceLinks test.
Do not change to a reference style link.
-->
[logo]: img/markdown_logo.png "Title Text" ![alt text](img/markdown_logo.png "Title Text")
#### Videos #### Videos
...@@ -1036,7 +1050,10 @@ are separated into their own lines: ...@@ -1036,7 +1050,10 @@ are separated into their own lines:
</dl> </dl>
``` ```
<!-- Note: The example below uses HTML to force correct rendering on docs.gitlab.com, Markdown will be fine in GitLab --> <!--
Note: The example below uses HTML to force correct rendering on docs.gitlab.com,
Markdown will be fine in GitLab.
-->
<dl> <dl>
<dt>Markdown in HTML</dt> <dt>Markdown in HTML</dt>
...@@ -1102,7 +1119,10 @@ PASTE LOGS HERE ...@@ -1102,7 +1119,10 @@ PASTE LOGS HERE
</details> </details>
```` ````
<!-- Note: The example below uses HTML to force correct rendering on docs.gitlab.com, Markdown will be fine in GitLab --> <!--
The example below uses HTML to force correct rendering on docs.gitlab.com, Markdown
will work correctly in GitLab.
-->
<details> <details>
<summary>Click this to collapse/fold.</summary> <summary>Click this to collapse/fold.</summary>
...@@ -1167,8 +1187,11 @@ A new line due to the previous backslash. ...@@ -1167,8 +1187,11 @@ A new line due to the previous backslash.
There are two ways to create links, inline-style and reference-style: There are two ways to create links, inline-style and reference-style:
```markdown <!--
- This is an [inline-style link](https://www.google.com) Do not edit the following codeblock. It uses HTML to skip the Vale ReferenceLinks test.
-->
<pre class="highlight"><code>- This is an [inline-style link](https://www.google.com)
- This is a [link to a repository file in the same directory](index.md) - This is a [link to a repository file in the same directory](index.md)
- This is a [relative link to a readme one directory higher](../README.md) - This is a [relative link to a readme one directory higher](../README.md)
- This is a [link that also has title text](https://www.google.com "This link takes you to Google!") - This is a [link that also has title text](https://www.google.com "This link takes you to Google!")
...@@ -1186,10 +1209,10 @@ Using references: ...@@ -1186,10 +1209,10 @@ Using references:
Some text to show that the reference links can follow later. Some text to show that the reference links can follow later.
[arbitrary case-insensitive reference text]: https://www.mozilla.org/en-US/ &#91;arbitrary case-insensitive reference text]: https://www.mozilla.org/en-US/
[1]: https://slashdot.org &#91;1]: https://slashdot.org
[link text itself]: https://www.reddit.com &#91;link text itself]: https://www.reddit.com
``` </code></pre>
- This is an [inline-style link](https://www.google.com) - This is an [inline-style link](https://www.google.com)
- This is a [link to a repository file in the same directory](index.md) - This is a [link to a repository file in the same directory](index.md)
...@@ -1203,15 +1226,16 @@ Using header ID anchors: ...@@ -1203,15 +1226,16 @@ Using header ID anchors:
Using references: Using references:
- This is a [reference-style link, see below][Arbitrary case-insensitive reference text] <!--
- You can [use numbers for reference-style link definitions, see below][1] The example below uses in-line links to pass the Vale ReferenceLinks test.
- Or leave it empty and use the [link text itself][], see below. Do not change to reference style links.
-->
Some text to show that the reference links can follow later. - This is a [reference-style link, see below](https://www.mozilla.org/en-US/)
- You can [use numbers for reference-style link definitions, see below](https://slashdot.org)
- Or leave it empty and use the [link text itself](https://www.reddit.com), see below.
[arbitrary case-insensitive reference text]: https://www.mozilla.org/en-US/ Some text to show that the reference links can follow later.
[1]: https://slashdot.org
[link text itself]: https://www.reddit.com
NOTE: **Note:** Relative links do not allow the referencing of project files in a wiki NOTE: **Note:** Relative links do not allow the referencing of project files in a wiki
page, or a wiki page in a project file. The reason for this is that a wiki is always page, or a wiki page in a project file. The reason for this is that a wiki is always
...@@ -1261,8 +1285,11 @@ Examples: ...@@ -1261,8 +1285,11 @@ Examples:
4. And another item. 4. And another item.
``` ```
<!-- The "2." and "4." in the example above are changed to "1." below, to match the style standards on docs.gitlab.com --> <!--
<!-- See https://docs.gitlab.com/ee/development/documentation/styleguide.html#lists --> The "2." and "4." in the example above are changed to "1." below, to match the style
standards on docs.gitlab.com.
See https://docs.gitlab.com/ee/development/documentation/styleguide.html#lists
-->
1. First ordered list item 1. First ordered list item
1. Another item 1. Another item
...@@ -1292,8 +1319,11 @@ They can even: ...@@ -1292,8 +1319,11 @@ They can even:
+ pluses + pluses
``` ```
<!-- The "*" and "+" in the example above are changed to "-" below, to match the style standards on docs.gitlab.com --> <!--
<!-- See https://docs.gitlab.com/ee/development/documentation/styleguide.html#lists --> The "*" and "+" in the example above are changed to "-" below, to match the style
standards on docs.gitlab.com.
See https://docs.gitlab.com/ee/development/documentation/styleguide.html#lists
-->
Unordered lists can: Unordered lists can:
......
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