diff options
author | Mike Lewis <mlewis@gitlab.com> | 2019-02-18 21:38:24 +0000 |
---|---|---|
committer | Mike Lewis <mlewis@gitlab.com> | 2019-02-18 21:38:24 +0000 |
commit | 07c32a0df5306082fe800de1ae6e2c51325f46ef (patch) | |
tree | 2d810bcd76a993ac71224de5b5f0b6a7707127df /doc/development/documentation | |
parent | f1645c744fcf8677ae14714914c4c4ffb9d5b17e (diff) | |
parent | fe10964a6884162b9272ec3a32a5736c2a997ab2 (diff) | |
download | gitlab-ce-07c32a0df5306082fe800de1ae6e2c51325f46ef.tar.gz |
Merge branch 'master' into 'template-improvements-for-documentation'
# Conflicts:
# .gitlab/merge_request_templates/Documentation.md
Diffstat (limited to 'doc/development/documentation')
-rw-r--r-- | doc/development/documentation/site_architecture/global_nav.md | 3 | ||||
-rw-r--r-- | doc/development/documentation/styleguide.md | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/development/documentation/site_architecture/global_nav.md b/doc/development/documentation/site_architecture/global_nav.md index 62ca7d6c805..0aa3c41a225 100644 --- a/doc/development/documentation/site_architecture/global_nav.md +++ b/doc/development/documentation/site_architecture/global_nav.md @@ -234,7 +234,7 @@ Examples: ```yaml - category_title: Issues category_url: 'user/project/issues/' - # note that the above URL does not start with a slash and + # note that the above URL does not start with a slash and # does not include index.html at the end docs: @@ -295,7 +295,6 @@ On the other hand, if the user is looking at `/ce/` docs, all the links in the CE nav should link internally to `/ce/` files, except for [`ee-only` docs](#ee-only-docs). - ```html <% if dir != 'ce' %> <a href="/ee/<%= sec[:section_url] %>">...</a> diff --git a/doc/development/documentation/styleguide.md b/doc/development/documentation/styleguide.md index cda66447c2c..7a3a8f25c2d 100644 --- a/doc/development/documentation/styleguide.md +++ b/doc/development/documentation/styleguide.md @@ -112,7 +112,7 @@ table_display_block: true ## Emphasis - Use double asterisks (`**`) to mark a word or text in bold (`**bold**`). -- Use undescore (`_`) for text in italics (`_italic_`). +- Use underscore (`_`) for text in italics (`_italic_`). - Use greater than (`>`) for blockquotes. ## Punctuation |