Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
d0a60a75
Commit
d0a60a75
authored
Jul 22, 2019
by
Marcel Amirault
Committed by
Evan Read
Jul 22, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add info about mdl to documentation
parent
53547792
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
18 deletions
+41
-18
doc/development/documentation/index.md
doc/development/documentation/index.md
+25
-18
doc/development/documentation/styleguide.md
doc/development/documentation/styleguide.md
+16
-0
No files found.
doc/development/documentation/index.md
View file @
d0a60a75
...
@@ -488,15 +488,17 @@ Currently, the following tests are in place:
...
@@ -488,15 +488,17 @@ Currently, the following tests are in place:
that all cURL examples in API docs use the full switches. It's recommended
that all cURL examples in API docs use the full switches. It's recommended
to [check locally](#previewing-the-changes-live) before pushing to GitLab by executing the command
to [check locally](#previewing-the-changes-live) before pushing to GitLab by executing the command
`bundle exec nanoc check internal_links` on your local
`bundle exec nanoc check internal_links` on your local
[`gitlab-docs`](https://gitlab.com/gitlab-org/gitlab-docs) directory.
[`gitlab-docs`](https://gitlab.com/gitlab-org/gitlab-docs) directory. In addition,
`docs-lint` also runs [markdownlint](styleguide.md#markdown-rules) to ensure the
markdown is consistent across all documentation.
1. [`ee_compat_check`](../automatic_ce_ee_merge.md#avoiding-ce-ee-merge-conflicts-beforehand) (runs on CE only):
1. [`ee_compat_check`](../automatic_ce_ee_merge.md#avoiding-ce-ee-merge-conflicts-beforehand) (runs on CE only):
When you submit a merge request to GitLab Community Edition (CE),
When you submit a merge request to GitLab Community Edition (CE),
there is this additional job that runs against Enterprise Edition (EE)
there is this additional job that runs against Enterprise Edition (EE)
and checks if your changes can apply cleanly to the EE codebase.
and checks if your changes can apply cleanly to the EE codebase.
If that job fails, read the instructions in the job log for what to do next.
If that job fails, read the instructions in the job log for what to do next.
As CE is merged into EE once a day, it's important to avoid merge conflicts.
As CE is merged into EE once a day, it's important to avoid merge conflicts.
Submitting an EE-equivalent merge request cherry-picking all commits from CE to EE is
Submitting an EE-equivalent merge request cherry-picking all commits from CE to EE is
essential to avoid them.
essential to avoid them.
1. [`ee-files-location-check`/`ee-specific-lines-check`](#ee-specific-lines-check) (runs on EE only):
1. [`ee-files-location-check`/`ee-specific-lines-check`](#ee-specific-lines-check) (runs on EE only):
This test ensures that no new files/directories are created/changed in EE.
This test ensures that no new files/directories are created/changed in EE.
All docs should be submitted in CE instead, regardless the tier they are on.
All docs should be submitted in CE instead, regardless the tier they are on.
...
@@ -559,15 +561,16 @@ A file with `proselint` configuration must be placed in a
...
@@ -559,15 +561,16 @@ A file with `proselint` configuration must be placed in a
#### `markdownlint`
#### `markdownlint`
`markdownlint` checks that certain rules ([example](https://github.com/DavidAnson/markdownlint/blob/master/README.md#rules--aliases))
`markdownlint` checks that certain rules ([example](https://github.com/DavidAnson/markdownlint/blob/master/README.md#rules--aliases))
are followed for Markdown syntax.
are followed for Markdown syntax. Our [Documentation Style Guide](styleguide.md) and
Our [Documentation Style Guide](styleguide.md) and [Markdown Guide](https://about.gitlab.com/handbook/product/technical-writing/markdown-guide/)
[Markdown Guide](https://about.gitlab.com/handbook/product/technical-writing/markdown-guide/)
elaborate on which choices must be made when selecting Markdown syntax for
elaborate on which choices must be made when selecting Markdown syntax for GitLab
GitLab documentation. This tool helps catch deviations from those guidelines.
documentation. This tool helps catch deviations from those guidelines, and matches the
tests run on the documentation by [`docs-lint`](#testing).
`markdownlint` can be used [on the command line](https://github.com/igorshubovych/markdownlint-cli#markdownlint-cli--),
`markdownlint` can be used [on the command line](https://github.com/igorshubovych/markdownlint-cli#markdownlint-cli--),
either on a single Markdown file or on all Markdown files in a project. For example, to run
either on a single Markdown file or on all Markdown files in a project. For example, to run
`markdownlint` on all documentation in the [`gitlab-ce` project](https://gitlab.com/gitlab-org/gitlab-ce),
`markdownlint` on all documentation in the [`gitlab-ce` project](https://gitlab.com/gitlab-org/gitlab-ce),
run the following commands from within the `gitlab-ce` project:
run the following commands from within the `gitlab-ce` project:
```
sh
```
sh
cd doc
cd doc
...
@@ -597,7 +600,7 @@ The following sample `markdownlint` configuration modifies the available default
...
@@ -597,7 +600,7 @@ The following sample `markdownlint` configuration modifies the available default
"line-length": false,
"line-length": false,
"no-trailing-punctuation": false,
"no-trailing-punctuation": false,
"ol-prefix": { "style": "one" },
"ol-prefix": { "style": "one" },
"blanks-around-fences":
fals
e,
"blanks-around-fences":
tru
e,
"no-inline-html": {
"no-inline-html": {
"allowed_elements": [
"allowed_elements": [
"table",
"table",
...
@@ -612,11 +615,15 @@ The following sample `markdownlint` configuration modifies the available default
...
@@ -612,11 +615,15 @@ The following sample `markdownlint` configuration modifies the available default
"a",
"a",
"strong",
"strong",
"i",
"i",
"div"
"div",
"b"
]
]
},
},
"hr-style": { "style": "---" },
"hr-style": { "style": "---" },
"fenced-code-language": false
"code-block-style": { "style": "fenced" },
"fenced-code-language": false,
"no-duplicate-header": { "allow_different_nesting": true },
"commands-show-output": false
}
}
```
```
...
...
doc/development/documentation/styleguide.md
View file @
d0a60a75
...
@@ -107,6 +107,22 @@ Hard-coded HTML is valid, although it's discouraged to be used while we have `/h
...
@@ -107,6 +107,22 @@ Hard-coded HTML is valid, although it's discouraged to be used while we have `/h
-
Special styling is required.
-
Special styling is required.
-
Reviewed and approved by a technical writer.
-
Reviewed and approved by a technical writer.
### Markdown Rules
GitLab ensures that the Markdown used across all documentation is consistent, as
well as easy to review and maintain, by testing documentation changes with
[
Markdownlint (mdl)
](
https://github.com/markdownlint/markdownlint
)
. This lint test
checks many common problems with Markdown, and fails when any document has an issue
with Markdown formatting that may cause the page to render incorrectly within GitLab.
It will also fail when a document is using non-standard Markdown (which may render
correctly, but is not the current standard in GitLab documentation).
Each formatting issue that mdl checks has an associated
[
rule
](
https://github.com/markdownlint/markdownlint/blob/master/docs/RULES.md
)
,
and the rules that are currently enabled for GitLab documentation are listed in the
[
`.mdlrc.style`
](
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/.mdlrc.style
)
file.
Configuration options are set in the
[
`.mdlrc`
](
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/.mdlrc.style
)
file.
## Structure
## Structure
### Organize by topic, not by type
### Organize by topic, not by type
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment