summaryrefslogtreecommitdiff
path: root/doc/development/documentation
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 06:07:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 06:07:50 +0000
commit92077e0f8d70c70a908395808b16f98ecd3a5fcd (patch)
treeefb011b2b7e96c2a8a0e7877c0966ab70014ebee /doc/development/documentation
parent83a3209c3f8e5bc055acf80f3440335d2b97133b (diff)
downloadgitlab-ce-92077e0f8d70c70a908395808b16f98ecd3a5fcd.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/documentation')
-rw-r--r--doc/development/documentation/site_architecture/index.md2
-rw-r--r--doc/development/documentation/styleguide.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/documentation/site_architecture/index.md b/doc/development/documentation/site_architecture/index.md
index 3c7f0aa91d2..bd870399978 100644
--- a/doc/development/documentation/site_architecture/index.md
+++ b/doc/development/documentation/site_architecture/index.md
@@ -6,7 +6,7 @@ description: "Learn how GitLab's documentation website is architectured."
The [`gitlab-docs`](https://gitlab.com/gitlab-org/gitlab-docs) project hosts
the repository which is used to generate the GitLab documentation website and
-is deployed to <https://docs.gitlab.com>. It uses the [Nanoc](http://nanoc.ws)
+is deployed to <https://docs.gitlab.com>. It uses the [Nanoc](https://nanoc.ws/)
static site generator.
## Architecture
diff --git a/doc/development/documentation/styleguide.md b/doc/development/documentation/styleguide.md
index 41a87412ef9..4f1c266a9bf 100644
--- a/doc/development/documentation/styleguide.md
+++ b/doc/development/documentation/styleguide.md
@@ -424,7 +424,7 @@ This is a list of available features:
- Do not add commas (`,`) or semicolons (`;`) to the end of list items.
- Only add periods to the end of a list item if the item consists of a complete sentence.
- The [definition of full sentence](https://www2.le.ac.uk/offices/ld/resources/writing/grammar/grammar-guides/sentence)
+ The [definition of full sentence](https://www2.le.ac.uk/offices/ld/all-resources/writing/grammar/grammar-guides/sentence)
is: _"a complete sentence always contains a verb, expresses a complete idea, and makes sense standing alone"_.
- Be consistent throughout the list: if the majority of the items do not end in a period,
do not end any of the items in a period, even if they consist of a complete sentence.