Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-16 21:06:05 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-16 21:06:05 +0300
commit930ff68c1efc380cb7522aa9b3884842eecb2486 (patch)
tree208f21205f9c8ee90e9722c6f641169d9a1569bf /doc/user
parent84727c8209a4412e21111a07f99b0438b03232de (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/project/wiki/img/wiki_create_new_page_modal.pngbin5831 -> 0 bytes
-rw-r--r--doc/user/project/wiki/index.md10
2 files changed, 6 insertions, 4 deletions
diff --git a/doc/user/project/wiki/img/wiki_create_new_page_modal.png b/doc/user/project/wiki/img/wiki_create_new_page_modal.png
deleted file mode 100644
index b800508901b..00000000000
--- a/doc/user/project/wiki/img/wiki_create_new_page_modal.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/project/wiki/index.md b/doc/user/project/wiki/index.md
index d1bab47de25..c0159230fec 100644
--- a/doc/user/project/wiki/index.md
+++ b/doc/user/project/wiki/index.md
@@ -30,10 +30,12 @@ Requires Developer [permissions](../../permissions.md).
Create a new page by clicking the **New page** button that can be found
in all wiki pages.
-You will be asked to fill in a title for your new wiki page. Wiki titles
-also determine the path to the wiki page. You can specify a full path
-(using "`/`" for subdirectories) for the new title and any missing
-directories will be created automatically.
+You will be asked to fill in a title for your new wiki page.
+
+You can specify a full path for the wiki page by using '/' in the
+title to indicate subdirectories. Any missing directories will be created
+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 and AsciiDoc. For Markdown based pages, all the