Commit 5c5bddbd authored by Amy Qualls's avatar Amy Qualls Committed by Marcel Amirault

Clean up style violations in the style guide

Fix some easier-to-fix issues in the style guide to get closer to
Vale compliance.
parent d41c3555
...@@ -41,6 +41,7 @@ exceptions: ...@@ -41,6 +41,7 @@ exceptions:
- GCP - GCP
- GDK - GDK
- GET - GET
- GIF
- GKE - GKE
- GNU - GNU
- GPG - GPG
...@@ -56,6 +57,8 @@ exceptions: ...@@ -56,6 +57,8 @@ exceptions:
- IMAP - IMAP
- IRC - IRC
- ISO - ISO
- JPEG
- JPG
- JSON - JSON
- LAN - LAN
- LDAP - LDAP
...@@ -76,6 +79,7 @@ exceptions: ...@@ -76,6 +79,7 @@ exceptions:
- PDF - PDF
- PGP - PGP
- PHP - PHP
- PNG
- POST - POST
- PUT - PUT
- RAM - RAM
...@@ -92,6 +96,7 @@ exceptions: ...@@ -92,6 +96,7 @@ exceptions:
- SCP - SCP
- SCSS - SCSS
- SDK - SDK
- SEO
- SHA - SHA
- SLA - SLA
- SMTP - SMTP
......
...@@ -120,6 +120,7 @@ dequarantining ...@@ -120,6 +120,7 @@ dequarantining
DevOps DevOps
discoverability discoverability
Disqus Disqus
Divio
Dockerfile Dockerfile
Dockerfiles Dockerfiles
dogfood dogfood
...@@ -344,6 +345,7 @@ prepend ...@@ -344,6 +345,7 @@ prepend
prepended prepended
prepending prepending
prepends prepends
Prettifier
Pritaly Pritaly
profiler profiler
Prometheus Prometheus
......
...@@ -129,7 +129,7 @@ of GitLab more efficient. ...@@ -129,7 +129,7 @@ of GitLab more efficient.
New information that would be useful toward the future usage or troubleshooting New information that would be useful toward the future usage or troubleshooting
of GitLab should not be written directly in a forum or other messaging system, of GitLab should not be written directly in a forum or other messaging system,
but added to a documentation MR and then referenced, as described above. Note but added to a documentation merge request and then referenced, as described above. Note
that among any other documentation changes, you can either: that among any other documentation changes, you can either:
- Add a [Troubleshooting section](#troubleshooting) to a doc if none exists. - Add a [Troubleshooting section](#troubleshooting) to a doc if none exists.
...@@ -141,7 +141,7 @@ the documentation helps others efficiently accomplish ...@@ -141,7 +141,7 @@ the documentation helps others efficiently accomplish
tasks and solve problems. tasks and solve problems.
If you have questions when considering, authoring, or editing documentation, ask If you have questions when considering, authoring, or editing documentation, ask
the Technical Writing team on Slack in `#docs` or in GitLab by mentioning the the Technical Writing team. They're available on Slack in `#docs` or in GitLab by mentioning the
writer for the applicable [DevOps stage](https://about.gitlab.com/handbook/product/product-categories/#devops-stages). writer for the applicable [DevOps stage](https://about.gitlab.com/handbook/product/product-categories/#devops-stages).
Otherwise, forge ahead with your best effort. It does not need to be perfect; Otherwise, forge ahead with your best effort. It does not need to be perfect;
the team is happy to review and improve upon your content. Review the the team is happy to review and improve upon your content. Review the
...@@ -160,7 +160,7 @@ Markdown rendering engine. For a complete Kramdown reference, see the ...@@ -160,7 +160,7 @@ Markdown rendering engine. For a complete Kramdown reference, see the
[GitLab Markdown Kramdown Guide](https://about.gitlab.com/handbook/markdown-guide/). [GitLab Markdown Kramdown Guide](https://about.gitlab.com/handbook/markdown-guide/).
The [`gitlab-kramdown`](https://gitlab.com/gitlab-org/gitlab_kramdown) Ruby gem The [`gitlab-kramdown`](https://gitlab.com/gitlab-org/gitlab_kramdown) Ruby gem
will support all [GitLab Flavored Markdown](../../../user/markdown.md) in the future, which is plans to support all [GitLab Flavored Markdown](../../../user/markdown.md) in the future, which is
all Markdown supported for display in the GitLab application itself. For now, use all Markdown supported for display in the GitLab application itself. For now, use
regular Markdown, following the rules in the linked style guide. regular Markdown, following the rules in the linked style guide.
...@@ -256,7 +256,7 @@ Put files for a specific product area into the related folder: ...@@ -256,7 +256,7 @@ Put files for a specific product area into the related folder:
Refer to the following items when working with directories and files: Refer to the following items when working with directories and files:
1. When you create a new directory, always start with an `index.md` file. 1. When you create a new directory, always start with an `index.md` file.
Don't use another file name and _do not_ create `README.md` files. Don't use another filename and _do not_ create `README.md` files.
1. _Do not_ use special characters and spaces, or capital letters in file 1. _Do not_ use special characters and spaces, or capital letters in file
names, directory names, branch names, and anything that generates a path. names, directory names, branch names, and anything that generates a path.
1. When creating or renaming a file or directory and it has more than one word 1. When creating or renaming a file or directory and it has more than one word
...@@ -304,9 +304,9 @@ Do not include the same information in multiple places. ...@@ -304,9 +304,9 @@ Do not include the same information in multiple places.
### References across documents ### References across documents
- Give each folder an `index.md` page that introduces the topic, introduces the - Give each folder an `index.md` page that introduces the topic, and both introduces
pages within, and links to the pages within (including to the index pages of and links to the child pages, including to the index pages of
any next-level subpaths). any next-level sub-paths.
- To ensure discoverability, ensure each new or renamed doc is linked from its - To ensure discoverability, ensure each new or renamed doc is linked from its
higher-level index page and other related pages. higher-level index page and other related pages.
- When making reference to other GitLab products and features, link to their - When making reference to other GitLab products and features, link to their
...@@ -540,8 +540,8 @@ tenses, words, and phrases: ...@@ -540,8 +540,8 @@ tenses, words, and phrases:
- Don't overuse "that". In many cases, you can remove "that" from a sentence - Don't overuse "that". In many cases, you can remove "that" from a sentence
and improve readability. and improve readability.
- Avoid use of the future tense: - Avoid use of the future tense:
- Instead of "after you execute this command, GitLab will display the - Instead of `after you execute this command, GitLab will display the result`, use
result", use "after you execute this command, GitLab displays the result". `after you execute this command, GitLab displays the result`.
- Only use the future tense to convey when the action or result actually - Only use the future tense to convey when the action or result actually
occurs at a future time. occurs at a future time.
- Don't use slashes to clump different words together or as a replacement for - Don't use slashes to clump different words together or as a replacement for
...@@ -565,7 +565,7 @@ tenses, words, and phrases: ...@@ -565,7 +565,7 @@ tenses, words, and phrases:
<!-- vale gitlab.LatinTerms = YES --> <!-- vale gitlab.LatinTerms = YES -->
- Avoid using the word *currently* when talking about the product or its - Avoid using the word *currently* when talking about the product or its
features. The documentation describes the product as it is, and not as it features. The documentation describes the product as it is, and not as it
will be at some indeterminate point in the future. is planned to be in some indeterminate point in the future.
- Avoid using the word *scalability* when talking about increasing GitLab - Avoid using the word *scalability* when talking about increasing GitLab
performance for additional users. The words scale or scaling are sometimes performance for additional users. The words scale or scaling are sometimes
acceptable, but references to increasing GitLab performance for additional acceptable, but references to increasing GitLab performance for additional
...@@ -690,12 +690,12 @@ cp <your_source_directory> <your_destination_directory> ...@@ -690,12 +690,12 @@ cp <your_source_directory> <your_destination_directory>
Use the HTML `<kbd>` tag when referring to keystroke presses. For example: Use the HTML `<kbd>` tag when referring to keystroke presses. For example:
```plaintext ```plaintext
To stop the command, press <kbd>Ctrl</kbd>+<kbd>C</kbd>. To stop the command, press <kbd>Control</kbd>+<kbd>C</kbd>.
``` ```
When the docs are generated, the output is: When the docs are generated, the output is:
To stop the command, press <kbd>Ctrl</kbd>+<kbd>C</kbd>. To stop the command, press <kbd>Control</kbd>+<kbd>C</kbd>.
## Lists ## Lists
...@@ -732,7 +732,7 @@ This is a list of available features: ...@@ -732,7 +732,7 @@ This is a list of available features:
- Use dashes (`-`) for unordered lists instead of asterisks (`*`). - Use dashes (`-`) for unordered lists instead of asterisks (`*`).
- Prefix `1.` to every item in an ordered list. When rendered, the list items - Prefix `1.` to every item in an ordered list. When rendered, the list items
will appear with sequential numbering. display with sequential numbering.
### Punctuation ### Punctuation
...@@ -805,7 +805,7 @@ indentation: ...@@ -805,7 +805,7 @@ indentation:
- Unordered list item 3 - Unordered list item 3
```plaintext ```plaintext
a codeblock that will next inside list item 3 a code block that nests inside list item 3
``` ```
- Unordered list item 4 - Unordered list item 4
...@@ -828,7 +828,7 @@ For ordered lists, use three spaces for each level of indentation: ...@@ -828,7 +828,7 @@ For ordered lists, use three spaces for each level of indentation:
1. Ordered list item 3 1. Ordered list item 3
```plaintext ```plaintext
a codeblock that will next inside list item 3 a code block that nests inside list item 3
``` ```
1. Ordered list item 4 1. Ordered list item 4
...@@ -863,7 +863,7 @@ that's best described by a matrix, tables are the best choice. ...@@ -863,7 +863,7 @@ that's best described by a matrix, tables are the best choice.
### Creation guidelines ### Creation guidelines
Due to accessibility and scannability requirements, tables should not have any To keep tables accessible and scannable, tables should not have any
empty cells. If there is no otherwise meaningful value for a cell, consider entering empty cells. If there is no otherwise meaningful value for a cell, consider entering
*N/A* (for 'not applicable') or *none*. *N/A* (for 'not applicable') or *none*.
...@@ -909,7 +909,7 @@ For other punctuation rules, refer to the ...@@ -909,7 +909,7 @@ For other punctuation rules, refer to the
## Headings ## Headings
- Add _only one H1_ in each document, by adding `#` at the beginning of - Add _only one H1_ in each document, by adding `#` at the beginning of
it (when using Markdown). The `h1` will be the document `<title>`. it (when using Markdown). The `h1` becomes the document `<title>`.
- Start with an `h2` (`##`), and respect the order `h2` > `h3` > `h4` > `h5` > `h6`. - Start with an `h2` (`##`), and respect the order `h2` > `h3` > `h4` > `h5` > `h6`.
Never skip the hierarchy level, such as `h2` > `h4` Never skip the hierarchy level, such as `h2` > `h4`
- Avoid putting numbers in headings. Numbers shift, hence documentation anchor - Avoid putting numbers in headings. Numbers shift, hence documentation anchor
...@@ -974,7 +974,7 @@ sure to replace it with the new one. ...@@ -974,7 +974,7 @@ sure to replace it with the new one.
Important: Important:
- Avoid crosslinking documentation to headings unless you need to link to a - Avoid crosslinking documentation to headings unless you need to link to a
specific section of the document. This will avoid breaking anchors in the specific section of the document. This avoids breaking anchors in the
future in case the heading is changed. future in case the heading is changed.
- If possible, avoid changing headings since they're not only linked internally. - If possible, avoid changing headings since they're not only linked internally.
There are various links to GitLab documentation on the internet, such as There are various links to GitLab documentation on the internet, such as
...@@ -1023,7 +1023,7 @@ documentation in separate projects (for example, linking to Omnibus documentatio ...@@ -1023,7 +1023,7 @@ documentation in separate projects (for example, linking to Omnibus documentatio
from GitLab documentation), you must use absolute URLs. from GitLab documentation), you must use absolute URLs.
Do not use absolute URLs like `https://docs.gitlab.com/ee/index.html` to Do not use absolute URLs like `https://docs.gitlab.com/ee/index.html` to
crosslink to other documentation within the same project. Use relative links to cross-link to other documentation within the same project. Use relative links to
the file, like `../index.md`. (These are converted to HTML when the site is the file, like `../index.md`. (These are converted to HTML when the site is
rendered.) rendered.)
...@@ -1052,7 +1052,7 @@ To link to internal documentation: ...@@ -1052,7 +1052,7 @@ To link to internal documentation:
Do: `../../geo/replication/troubleshooting.md` Do: `../../geo/replication/troubleshooting.md`
- Always add the file name `file.md` at the end of the link with the `.md` - Always add the filename `file.md` at the end of the link with the `.md`
extension, not `.html`. extension, not `.html`.
Don't: Don't:
...@@ -1121,7 +1121,7 @@ Don't link directly to: ...@@ -1121,7 +1121,7 @@ Don't link directly to:
- Project features that require [special permissions](../../../user/permissions.md) - Project features that require [special permissions](../../../user/permissions.md)
to view. to view.
These will fail for: These fail for:
- Those without sufficient permissions. - Those without sufficient permissions.
- Automated link checkers. - Automated link checkers.
...@@ -1205,9 +1205,9 @@ When you take screenshots: ...@@ -1205,9 +1205,9 @@ When you take screenshots:
### Save the image ### Save the image
- Save the image with a lowercase file name that's descriptive of the feature - Save the image with a lowercase filename that's descriptive of the feature
or concept in the image. If the image is of the GitLab interface, append the or concept in the image. If the image is of the GitLab interface, append the
GitLab version to the file name, based on the following format: GitLab version to the filename, based on the following format:
`image_name_vX_Y.png`. For example, for a screenshot taken from the pipelines `image_name_vX_Y.png`. For example, for a screenshot taken from the pipelines
page of GitLab 11.1, a valid name is `pipelines_v11_1.png`. If you're adding an page of GitLab 11.1, a valid name is `pipelines_v11_1.png`. If you're adding an
illustration that doesn't include parts of the user interface, add the release illustration that doesn't include parts of the user interface, add the release
...@@ -1217,10 +1217,10 @@ When you take screenshots: ...@@ -1217,10 +1217,10 @@ When you take screenshots:
the `.md` document that you're working on is located. the `.md` document that you're working on is located.
- Consider using PNG images instead of JPEG. - Consider using PNG images instead of JPEG.
- [Compress all PNG images](#compress-images). - [Compress all PNG images](#compress-images).
- Compress gifs with <https://ezgif.com/optimize> or similar tool. - Compress GIFs with <https://ezgif.com/optimize> or similar tool.
- Images should be used (only when necessary) to _illustrate_ the description - Images should be used (only when necessary) to _illustrate_ the description
of a process, not to _replace_ it. of a process, not to _replace_ it.
- Max image size: 100KB (gifs included). - Max image size: 100KB (GIFs included).
- See also how to link and embed [videos](#videos) to illustrate the - See also how to link and embed [videos](#videos) to illustrate the
documentation. documentation.
...@@ -1360,7 +1360,7 @@ hidden on the documentation site, but is displayed by `/help`. ...@@ -1360,7 +1360,7 @@ hidden on the documentation site, but is displayed by `/help`.
and leave a blank line between the command and the output. and leave a blank line between the command and the output.
- When providing a command without output, don't prefix the shell command with `$`. - When providing a command without output, don't prefix the shell command with `$`.
- If you need to include triple backticks inside a code block, use four backticks - If you need to include triple backticks inside a code block, use four backticks
for the codeblock fences instead of three. for the code block fences instead of three.
- For regular fenced code blocks, always use a highlighting class corresponding to - For regular fenced code blocks, always use a highlighting class corresponding to
the language for better readability. Examples: the language for better readability. Examples:
...@@ -1397,7 +1397,7 @@ of available language classes: ...@@ -1397,7 +1397,7 @@ of available language classes:
| `graphql` | | | `graphql` | |
| `haml` | | | `haml` | |
| `html` | | | `html` | |
| `ini` | For some simple config files that are not in TOML format. | | `ini` | For some simple configuration files that are not in TOML format. |
| `javascript` | Alias `js`. | | `javascript` | Alias `js`. |
| `json` | | | `json` | |
| `markdown` | Alias: `md`. | | `markdown` | Alias: `md`. |
...@@ -1405,7 +1405,7 @@ of available language classes: ...@@ -1405,7 +1405,7 @@ of available language classes:
| `nginx` | | | `nginx` | |
| `perl` | | | `perl` | |
| `php` | | | `php` | |
| `plaintext` | Examples with no defined language, such as output from shell commands or API calls. If a codeblock has no language, it defaults to `plaintext`. Alias: `text`. | | `plaintext` | Examples with no defined language, such as output from shell commands or API calls. If a code block has no language, it defaults to `plaintext`. Alias: `text`.|
| `prometheus` | Prometheus configuration examples. | | `prometheus` | Prometheus configuration examples. |
| `python` | | | `python` | |
| `ruby` | Alias: `rb`. | | `ruby` | Alias: `rb`. |
...@@ -1435,7 +1435,7 @@ Usage examples: ...@@ -1435,7 +1435,7 @@ Usage examples:
Example: `**{tanuki}**` renders as: **{tanuki}**. Example: `**{tanuki}**` renders as: **{tanuki}**.
- Icon with custom size: `**{icon-name, size}**` - Icon with custom size: `**{icon-name, size}**`
Available sizes (in px): 8, 10, 12, 14, 16, 18, 24, 32, 48, and 72 Available sizes (in pixels): 8, 10, 12, 14, 16, 18, 24, 32, 48, and 72
Example: `**{tanuki, 24}**` renders as: **{tanuki, 24}**. Example: `**{tanuki, 24}**` renders as: **{tanuki, 24}**.
- Icon with custom size and class: `**{icon-name, size, class-name}**`. - Icon with custom size and class: `**{icon-name, size, class-name}**`.
...@@ -1488,7 +1488,7 @@ When you need to call special attention to particular sentences, use the ...@@ -1488,7 +1488,7 @@ When you need to call special attention to particular sentences, use the
following markup to create highlighted alert boxes. following markup to create highlighted alert boxes.
Alert boxes work for one paragraph only. Multiple paragraphs, lists, and headers Alert boxes work for one paragraph only. Multiple paragraphs, lists, and headers
won't render correctly. For multiple lines, use [blockquotes](#blockquotes) don't render correctly. For multiple lines, use [blockquotes](#blockquotes)
instead. instead.
Alert boxes render only on the GitLab documentation site (<https://docs.gitlab.com>). Alert boxes render only on the GitLab documentation site (<https://docs.gitlab.com>).
...@@ -1609,7 +1609,7 @@ documentation authors on agreed styles and usage of terms. ...@@ -1609,7 +1609,7 @@ documentation authors on agreed styles and usage of terms.
### Merge requests (MRs) ### Merge requests (MRs)
Merge requests allow you to exchange changes you made to source code and Merge requests allow you to exchange changes you made to source code and
collaborate with other people on the same project. You'll see this term used in collaborate with other people on the same project. This term is used in
the following ways: the following ways:
- Use lowercase _merge requests_ regardless of whether referring to the feature - Use lowercase _merge requests_ regardless of whether referring to the feature
...@@ -1782,7 +1782,7 @@ For example: ...@@ -1782,7 +1782,7 @@ For example:
### Removing versions after each major release ### Removing versions after each major release
Whenever a major GitLab release occurs, we will remove all version references Whenever a major GitLab release occurs, we remove all version references
to now-unsupported versions of GitLab. Note that this includes the removal of to now-unsupported versions of GitLab. Note that this includes the removal of
specific instructions for users of non-supported GitLab versions. For example, specific instructions for users of non-supported GitLab versions. For example,
if we're currently supporting GitLab versions 11.x through 13.x, special if we're currently supporting GitLab versions 11.x through 13.x, special
...@@ -1854,12 +1854,12 @@ self-managed instances. If so, include the relevant "`TIER` ONLY" ...@@ -1854,12 +1854,12 @@ self-managed instances. If so, include the relevant "`TIER` ONLY"
#### Product badge display behavior #### Product badge display behavior
When using the tier markup with headers, the documentation page will display the When using the tier markup with headers, the documentation page displays the
full tier badge with the header line. full tier badge with the header line.
You can also use the tier markup with paragraphs, list items, and table cells. You can also use the tier markup with paragraphs, list items, and table cells.
For these cases, the tier mention will be represented by an orange info icon For these cases, the tier mention is represented by an information icon
**{information}** that will display the tiers when visitors point to the icon. that displays the tiers when visitors point to the icon.
For example: For example:
- `**(STARTER)**` displays as **(STARTER)** - `**(STARTER)**` displays as **(STARTER)**
...@@ -1869,9 +1869,9 @@ For example: ...@@ -1869,9 +1869,9 @@ For example:
#### How it works #### How it works
Introduced by [!244](https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/244), Introduced by [!244](https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/244),
the special markup `**(STARTER)**` will generate a `span` element to trigger the the special markup `**(STARTER)**` generates a `span` element to trigger the
badges and tooltips (`<span class="badge-trigger starter">`). When the keyword badges and tooltips (`<span class="badge-trigger starter">`). When the keyword
_only_ is added, the corresponding GitLab.com badge will not be displayed. _only_ is added, the corresponding GitLab.com badge isn't displayed.
## Specific sections ## Specific sections
...@@ -1883,7 +1883,7 @@ sections are outlined in this section. ...@@ -1883,7 +1883,7 @@ sections are outlined in this section.
There are many cases that a restart/reconfigure of GitLab is required. To avoid There are many cases that a restart/reconfigure of GitLab is required. To avoid
duplication, link to the special document that can be found in duplication, link to the special document that can be found in
[`doc/administration/restart_gitlab.md`](../../../administration/restart_gitlab.md). [`doc/administration/restart_gitlab.md`](../../../administration/restart_gitlab.md).
Usually the text will read like: Usually the text reads like:
```markdown ```markdown
Save the file and [reconfigure GitLab](../../../administration/restart_gitlab.md) Save the file and [reconfigure GitLab](../../../administration/restart_gitlab.md)
...@@ -1899,8 +1899,8 @@ If the document you are editing resides in a place other than the GitLab CE/EE ...@@ -1899,8 +1899,8 @@ If the document you are editing resides in a place other than the GitLab CE/EE
**Ruby:** **Ruby:**
In [step 2 of the installation guide](../../../install/installation.md#2-ruby), In [step 2 of the installation guide](../../../install/installation.md#2-ruby),
we install Ruby from source. Whenever there is a new version that needs to we install Ruby from source. When a version update is needed,
be updated, remember to change it throughout the codeblock and also replace remember to change it throughout the code block and also replace
the sha256sum (it can be found in the [downloads page](https://www.ruby-lang.org/en/downloads/) the sha256sum (it can be found in the [downloads page](https://www.ruby-lang.org/en/downloads/)
of the Ruby website). of the Ruby website).
...@@ -1954,7 +1954,7 @@ In this case: ...@@ -1954,7 +1954,7 @@ In this case:
methods. methods.
- The code blocks are indented one or more spaces under the list item to render - The code blocks are indented one or more spaces under the list item to render
correctly. correctly.
- Different highlighting languages are used for each config in the code block. - Different highlighting languages are used for each configuration in the code block.
- The [GitLab Restart](#gitlab-restart) section is used to explain a required - The [GitLab Restart](#gitlab-restart) section is used to explain a required
restart or reconfigure of GitLab. restart or reconfigure of GitLab.
......
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