summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorVinnie Okada <vokada@mrvinn.com>2015-03-22 21:50:28 -0600
committerVinnie Okada <vokada@mrvinn.com>2015-03-22 21:50:28 -0600
commit637ca0b388382112850fd3052a961bb07db34d14 (patch)
tree15f8abdad066ffcda26a49e645d8f8aee4571002 /doc
parenta7afc0634240f5cddb6c6e1bf1f9fcf4374b852e (diff)
parentbc4e25189805879490555ef2782193470f4fe295 (diff)
downloadgitlab-ce-637ca0b388382112850fd3052a961bb07db34d14.tar.gz
Merge branch 'master' into markdown-tags
Diffstat (limited to 'doc')
-rw-r--r--doc/update/patch_versions.md2
-rw-r--r--doc/update/upgrader.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md
index ad302492556..e29ee2a7b3d 100644
--- a/doc/update/patch_versions.md
+++ b/doc/update/patch_versions.md
@@ -1,5 +1,5 @@
# Universal update guide for patch versions
-*Make sure you view this [upgrade guide from the `master` branch](../../../master/doc/update/patch_versions.md) for the most up to date instructions.*
+*Make sure you view this [upgrade guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/update/patch_versions.md) from the `master` branch for the most up to date instructions.*
For example from 6.2.0 to 6.2.1, also see the [semantic versioning specification](http://semver.org/).
diff --git a/doc/update/upgrader.md b/doc/update/upgrader.md
index d8476fb3457..f62a53d3340 100644
--- a/doc/update/upgrader.md
+++ b/doc/update/upgrader.md
@@ -24,7 +24,7 @@ If you have local changes to your GitLab repository the script will stash them a
## 2. Run GitLab upgrade tool
-Note: GitLab 7.9 adds nodejs as a dependency. GitLab 7.6 adds `libkrb5-dev` as a dependency (installed by default on Ubuntu and OSX). GitLab 7.2 adds `pkg-config` and `cmake` as dependency. Please check the dependencies in the [installation guide.](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md#1-packages-dependencies)
+Note: GitLab 7.9 adds `nodejs` as a dependency. GitLab 7.6 adds `libkrb5-dev` as a dependency (installed by default on Ubuntu and OSX). GitLab 7.2 adds `pkg-config` and `cmake` as dependency. Please check the dependencies in the [installation guide.](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md#1-packages-dependencies)
# Starting with GitLab version 7.0 upgrader script has been moved to bin directory
cd /home/git/gitlab