From 2022754d933176877e9cff1159512e63e9fff2d8 Mon Sep 17 00:00:00 2001
From: Patricio Cano <patricio@gitlab.com>
Date: Thu, 30 Oct 2014 17:36:25 -0500
Subject: [PATCH] Modified according to suggestions by @sytse

---
 doc/raketasks/import.md | 35 +++++------------------------------
 1 file changed, 5 insertions(+), 30 deletions(-)

diff --git a/doc/raketasks/import.md b/doc/raketasks/import.md
index a873cd299e3..153a2e2575b 100644
--- a/doc/raketasks/import.md
+++ b/doc/raketasks/import.md
@@ -11,30 +11,11 @@
 
 ### Create a new folder inside the git repositories path. This will be the name of the new group.
 
-- For omnibus-gitlab, it is located at: `/var/opt/gitlab/git-data/repositories`
+- For omnibus-gitlab, it is located at: `/var/opt/gitlab/git-data/repositories` by default, unless you changed
+it in the `/etc/gitlab/gitlab.rb` file.
 - For manual installations, it is usually located at: `/home/git/repositories` or you can see where
-your repositories are located by looking at `config/gitlab.yml`:
-
-```yaml
-# 3. Advanced settings
-# ==========================
-
-# GitLab Satellites
-# satellites:
-# Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
-# path: /home/git/gitlab-satellites/
-# timeout: 30
-
-satellites:
-  path: /home/git/gitlab-satellites/
-gitlab_shell:
-  path: /home/git/gitlab-shell/
-  repos_path: /home/git/repositories/
-  hooks_path: /home/git/gitlab-shell/hooks/
-  upload_pack: true
-  receive_pack: true
+your repositories are located by looking at `config/gitlab.yml` under the `gitlab_shell => repos_path` entry.
 
-```
 
 ### Copy your bare repositories inside this newly created folder:
 
@@ -42,28 +23,22 @@ gitlab_shell:
 $ cp -r /old/git/foo.git/ /home/git/repositories/new_group/
 ```
 
-### Run the commands below depending on your type of installation:
+### Run the command below depending on your type of installation:
 
 #### Omnibus Installation
 
 ```
 $ sudo gitlab-rake gitlab:import:repos
 ```
-```
-$ sudo gitlab-rake gitlab:satellites:create
-```
 
 #### Manual Installation
 
-Before running these commands you need to change the directory to where your GitLab installation is located:
+Before running this command you need to change the directory to where your GitLab installation is located:
 
 ```
 $ cd /home/git/gitlab
 $ sudo -u git -H bundle exec rake gitlab:import:repos RAILS_ENV=production
 ```
-```
-$ sudo -u git -H bundle exec rake gitlab:satellites:create
-```
 
 #### Example output:
 
-- 
GitLab