summaryrefslogtreecommitdiff
path: root/doc/README.md
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-06-23 10:47:09 +0200
committerJames Lopez <james@jameslopez.es>2016-06-23 10:47:09 +0200
commit8c253997499e285c745da8a5800c38533d7959f7 (patch)
tree2cdb59c328fb03425da385c62b984a25e5951ab2 /doc/README.md
parent16ed545e7cb0177612d327df4007433083763cce (diff)
parent3f41eecff298d4dbdbc6bead4e9ac0b74e4a0b52 (diff)
downloadgitlab-ce-8c253997499e285c745da8a5800c38533d7959f7.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-export-gitlab-errors
Diffstat (limited to 'doc/README.md')
-rw-r--r--doc/README.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/README.md b/doc/README.md
index 3e7165d5ae4..f1283cea0ad 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -7,7 +7,8 @@
- [GitLab as OAuth2 authentication service provider](integration/oauth_provider.md). It allows you to login to other applications from GitLab.
- [Container Registry](container_registry/README.md) Learn how to use GitLab Container Registry.
- [GitLab Basics](gitlab-basics/README.md) Find step by step how to start working on your commandline and on GitLab.
-- [Importing to GitLab](workflow/importing/README.md)
+- [Importing to GitLab](workflow/importing/README.md).
+- [Importing and exporting projects between instances](user/project/settings/import_export.md).
- [Markdown](markdown/markdown.md) GitLab's advanced formatting system.
- [Migrating from SVN](workflow/importing/migrating_from_svn.md) Convert a SVN repository to Git and GitLab.
- [Permissions](permissions/permissions.md) Learn what each role in a project (external/guest/reporter/developer/master/owner) can do.