From d0646babdbb54c652ce19e6329b904193be8522c Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 25 Feb 2013 21:45:33 +0200
Subject: [PATCH] Remove gitolite mention from docs

---
 doc/raketasks/backup_restore.md |  2 --
 doc/raketasks/cleanup.md        |  8 +-------
 doc/raketasks/features.md       |  6 +++---
 doc/raketasks/maintenance.md    | 34 +++++----------------------------
 4 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 9b42afa7ca0..d2da64f3d3c 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -31,7 +31,6 @@ Dumping database tables:
 - Dumping table wikis... [DONE]
 Dumping repositories:
 - Dumping repository abcd... [DONE]
-- Dumping repository gitolite-admin.git... [DONE]
 Creating backup archive: $TIMESTAMP_gitlab_backup.tar [DONE]
 Deleting tmp directories...[DONE]
 Deleting old backups... [SKIPPING]
@@ -77,6 +76,5 @@ Restoring database tables:
 - Loading fixture wikis...[SKIPPING]
 Restoring repositories:
 - Restoring repository abcd... [DONE]
-- Restoring repository gitolite-admin.git... [DONE]
 Deleting tmp directories...[DONE]
 ```
diff --git a/doc/raketasks/cleanup.md b/doc/raketasks/cleanup.md
index ad9e5a613b0..30a5d362caa 100644
--- a/doc/raketasks/cleanup.md
+++ b/doc/raketasks/cleanup.md
@@ -1,10 +1,4 @@
-### Remove grabage from gitolite config and filesystem. Important! Data loss!
-
-Remove projects from gitolite config if they dont exist in GitLab database
-
-```
-bundle exec rake gitlab:cleanup:config RAILS_ENV=production
-```
+### Remove grabage from filesystem. Important! Data loss!
 
 Remove namespaces(dirs) from /home/git/repositories if they dont exist in GitLab database
 
diff --git a/doc/raketasks/features.md b/doc/raketasks/features.md
index 7f7daaf046c..018817d219b 100644
--- a/doc/raketasks/features.md
+++ b/doc/raketasks/features.md
@@ -17,12 +17,12 @@ bundle exec rake gitlab:enable_namespaces RAILS_ENV=production
 ```
 
 
-### Enable auto merge
+### Rebuild project satellites
 
-This command will enable the auto merge feature. After this you will be able to **merge a merge request** via GitLab and use the **online editor**.
+This command will build missing satellites for projects. After this you will be able to **merge a merge request** via GitLab and use the **online editor**.
 
 ```
-bundle exec rake gitlab:enable_automerge RAILS_ENV=production
+bundle exec rake gitlab:satellites:create RAILS_ENV=production
 ```
 
 Example output:
diff --git a/doc/raketasks/maintenance.md b/doc/raketasks/maintenance.md
index 110dbd161f7..726cc083f10 100644
--- a/doc/raketasks/maintenance.md
+++ b/doc/raketasks/maintenance.md
@@ -31,12 +31,10 @@ SSH Clone URL:  git@localhost:some-project.git
 Using LDAP:     no
 Using Omniauth: no
 
-Gitolite information
-Version:        v3.04-4-g4524f01
-Admin URI:      git@localhost:gitolite-admin
-Admin Key:      gitlab
+GitLab Shell
+Version:        1.0.4
 Repositories:   /home/git/repositories/
-Hooks:          /home/git/.gitolite/hooks/
+Hooks:          /home/git/gitlab-shell/hooks/
 Git:            /usr/bin/git
 ```
 
@@ -46,8 +44,8 @@ Git:            /usr/bin/git
 Runs the following rake tasks:
 
 * gitlab:env:check
-* gitlab:gitolite:check
-* gitlab:resque:check
+* gitlab:gitlab_shell:check
+* gitlab:sidekiq:check
 * gitlab:app:check
 
 It will check that each component was setup according to the installation guide and suggest fixes for issues found.
@@ -74,16 +72,12 @@ Checking Environment ... Finished
 Checking Gitolite ...
 
 Using recommended version ... yes
-Repo umask is 0007 in .gitolite.rc? ... yes
-Allow all Git config keys in .gitolite.rc ... yes
 Config directory exists? ... yes
 Config directory owned by git:git? ... yes
 Config directory access is drwxr-x---? ... yes
 Repo base directory exists? ... yes
 Repo base owned by git:git? ... yes
 Repo base access is drwxrws---? ... yes
-Can clone gitolite-admin? ... yes
-Can commit to gitolite-admin? ... yes
 post-receive hook exists? ... yes
 post-receive hook up-to-date? ... yes
 post-receive hooks in repos are links: ...
@@ -135,24 +129,6 @@ If necessary, remove the `tmp/repo_satellites` directory and rerun the command b
 bundle exec rake gitlab:satellites:create RAILS_ENV=production
 ```
 
-
-### Rebuild each key at gitolite config
-
-This will send all users ssh public keys to gitolite and grant them access (based on their permission) to their projects.
-
-```
-bundle exec rake gitlab:gitolite:update_keys RAILS_ENV=production
-```
-
-
-### Rebuild each project at gitolite config
-
-This makes sure that all projects are present in gitolite and can be accessed.
-
-```
-bundle exec rake gitlab:gitolite:update_repos RAILS_ENV=production
-```
-
 ### Import bare repositories into GitLab project instance
 
 Notes: