summaryrefslogtreecommitdiff
path: root/doc/user/project/wiki
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-27 00:09:19 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-27 00:09:19 +0000
commit0a0e82d1440b06650e5fc524168b1f50a8feec68 (patch)
treec2202560fb250008cf4109e99537b10604faf01b /doc/user/project/wiki
parentf82d5dcab7c3d9a672abc827c92f86887b683a7d (diff)
downloadgitlab-ce-0a0e82d1440b06650e5fc524168b1f50a8feec68.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/wiki')
-rw-r--r--doc/user/project/wiki/index.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/project/wiki/index.md b/doc/user/project/wiki/index.md
index 42c622e4786..9dc39e328a6 100644
--- a/doc/user/project/wiki/index.md
+++ b/doc/user/project/wiki/index.md
@@ -38,7 +38,7 @@ automatically. For example, a title of `docs/my-page` will create a wiki
page with a path `/wikis/docs/my-page`.
Once you enter the page name, it's time to fill in its content. GitLab wikis
-support Markdown, RDoc, AsciiDoc and Org. For Markdown based pages, all the
+support Markdown, RDoc, AsciiDoc, and Org. For Markdown based pages, all the
[Markdown features](../../markdown.md) are supported and for links there is
some [wiki specific](../../markdown.md#wiki-specific-markdown) behavior.
@@ -121,7 +121,7 @@ The changes of a wiki page over time are recorded in the wiki's Git repository,
and you can view them by clicking the **Page history** button.
From the history page you can see the revision of the page (Git commit SHA), its
-author, the commit message, when it was last updated and the page markup format.
+author, the commit message, when it was last updated, and the page markup format.
To see how a previous version of the page looked like, click on a revision
number.