Merge branch 'docs-update-import-export-page' into 'master'

Updating import-export doc page with better screenshots and updated information

See merge request gitlab-org/gitlab-ce!27777

7 files changed, 11 insertions, 16 deletions

diff --git a/doc/user/project/settings/img/import_export_download_export.png b/doc/user/project/settings/img/import_export_download_export.png
index 668254073e8..ab81c87bf5f 100644
--- a/doc/user/project/settings/img/import_export_download_export.png
+++ b/doc/user/project/settings/img/import_export_download_export.png
diff --git a/doc/user/project/settings/img/import_export_export_button.png b/doc/user/project/settings/img/import_export_export_button.png
index 7f21bb2335b..9e368739695 100644
--- a/doc/user/project/settings/img/import_export_export_button.png
+++ b/doc/user/project/settings/img/import_export_export_button.png
diff --git a/doc/user/project/settings/img/import_export_mail_link.png b/doc/user/project/settings/img/import_export_mail_link.png
index 48ef42855bc..985c37650d3 100644
--- a/doc/user/project/settings/img/import_export_mail_link.png
+++ b/doc/user/project/settings/img/import_export_mail_link.png
diff --git a/doc/user/project/settings/img/import_export_new_project.png b/doc/user/project/settings/img/import_export_new_project.png
index b335700c5be..fc1f73c5d6e 100644
--- a/doc/user/project/settings/img/import_export_new_project.png
+++ b/doc/user/project/settings/img/import_export_new_project.png
diff --git a/doc/user/project/settings/img/import_export_select_file.png b/doc/user/project/settings/img/import_export_select_file.png
index e1e5e031d81..e3e1a5ef980 100644
--- a/doc/user/project/settings/img/import_export_select_file.png
+++ b/doc/user/project/settings/img/import_export_select_file.png
diff --git a/doc/user/project/settings/img/settings_edit_button.png b/doc/user/project/settings/img/settings_edit_button.png
deleted file mode 100644
index 32bcda03c7e..00000000000
--- a/doc/user/project/settings/img/settings_edit_button.png
+++ /dev/null
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index db4f8fbd8d3..819515d7a4c 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -2,10 +2,11 @@
 
 >**Notes:**
 >
->  - [Introduced][ce-3050] in GitLab 8.9.
+>  - [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/3050) in GitLab 8.9.
 >  - Importing will not be possible if the import instance version differs from
 >    that of the exporter.
->  - For GitLab admins, please read through [Project import/export administration](../../../administration/raketasks/project_import_export.md).
+>  - For GitLab admins, please read through 
+>    [Project import/export administration](../../../administration/raketasks/project_import_export.md).
 >  - For existing installations, the project import option has to be enabled in
 >    application settings (`/admin/application_settings`) under 'Import sources'.
 >    Ask your administrator if you don't see the **GitLab export** button when
@@ -14,10 +15,9 @@
 >    on the GitLab instance in application settings (`/admin/application_settings`)
 >    under 'Visibility and Access Controls'.
 >  - You can find some useful raketasks if you are an administrator in the
->    [import_export](../../../administration/raketasks/project_import_export.md)
->    raketask.
->  - The exports are stored in a temporary [shared directory][tmp] and are deleted
->    every 24 hours by a specific worker.
+>    [import_export](../../../administration/raketasks/project_import_export.md) raketask.
+>  - The exports are stored in a temporary [shared directory](../../../development/shared_files.md) 
+>    and are deleted every 24 hours by a specific worker.
 >  - Group members will get exported as project members, as long as the user has
 >    maintainer or admin access to the group where the exported project lives. An admin
 >    in the import side is required to map the users, based on email or username.
@@ -77,9 +77,9 @@ The following items will NOT be exported:
 
 ## Exporting a project and its data
 
-1. Go to the project settings page by clicking on **Edit Project**:
+1. Go to your project's homepage.
 
-    ![Project settings button](img/settings_edit_button.png)
+1. Click **Settings** in the sidebar.
 
 1. Scroll down to find the **Export project** button:
 
@@ -98,19 +98,14 @@ The following items will NOT be exported:
 
 ## Importing the project
 
-1. The new GitLab project import feature is at the far right of the import
-   options when creating a New Project. Make sure you are in the right namespace
-   and you have entered a project name. Click on **GitLab export**:
+1. The GitLab project import feature is the first import option when creating a 
+   new project. Click on **GitLab export**:
 
     ![New project](img/import_export_new_project.png)
 
-1. You can see where the project will be imported to. You can now select file
-   exported previously:
+1. Enter your project name and URL. Then select the file you exported previously:
 
     ![Select file](img/import_export_select_file.png)
 
 1. Click on **Import project** to begin importing. Your newly imported project
    page will appear soon.
-
-[ce-3050]: https://gitlab.com/gitlab-org/gitlab-ce/issues/3050
-[tmp]: ../../../development/shared_files.md