summaryrefslogtreecommitdiff
path: root/doc/update/2.6-to-3.0.md
diff options
context:
space:
mode:
authorEwan Edwards <eedwards@perforce.com>2015-02-03 15:18:40 -0800
committerEwan Edwards <eedwards@perforce.com>2015-02-03 15:18:40 -0800
commitad6c372eeee5d112ad199dd4e487df584976445d (patch)
tree802124a688c9d90861c033a23342512008a56665 /doc/update/2.6-to-3.0.md
parente6e337088bbb4736983119928b6b6b451bd3ef20 (diff)
downloadgitlab-ce-ad6c372eeee5d112ad199dd4e487df584976445d.tar.gz
Fix a number of discovered typos, capitalization of developer and
product names, plus a couple of instances of bad Markdown markup.
Diffstat (limited to 'doc/update/2.6-to-3.0.md')
-rw-r--r--doc/update/2.6-to-3.0.md14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/update/2.6-to-3.0.md b/doc/update/2.6-to-3.0.md
index 6aabbe095dc..2044b659468 100644
--- a/doc/update/2.6-to-3.0.md
+++ b/doc/update/2.6-to-3.0.md
@@ -22,29 +22,29 @@ sudo -u gitlab bundle exec rake db:migrate RAILS_ENV=production
# !!! Config should be replaced with a new one. Check it after replace
cp config/gitlab.yml.example config/gitlab.yml
-# update gitolite hooks
+# update Gitolite hooks
-# GITOLITE v2:
+# Gitolite v2:
sudo cp ./lib/hooks/post-receive /home/git/share/gitolite/hooks/common/post-receive
sudo chown git:git /home/git/share/gitolite/hooks/common/post-receive
-# GITOLITE v3:
+# Gitolite v3:
sudo cp ./lib/hooks/post-receive /home/git/.gitolite/hooks/common/post-receive
sudo chown git:git /home/git/.gitolite/hooks/common/post-receive
# set valid path to hooks in gitlab.yml in git_host section
# like this
git_host:
- # gitolite 2
+ # Gitolite 2
hooks_path: /home/git/share/gitolite/hooks
- # gitolite 3
+ # Gitolite 3
hooks_path: /home/git/.gitolite/hooks/
-# Make some changes to gitolite config
+# Make some changes to Gitolite config
# For more information visit https://github.com/gitlabhq/gitlabhq/pull/1719
-# gitolite v2
+# Gitolite v2
sudo -u git -H sed -i 's/\(GL_GITCONFIG_KEYS\s*=>*\s*\).\{2\}/\\1"\.\*"/g' /home/git/.gitolite.rc
# gitlite v3