summaryrefslogtreecommitdiff
path: root/doc/update
diff options
context:
space:
mode:
authorEwan Edwards <eedwards@perforce.com>2015-01-30 10:24:45 -0800
committerEwan Edwards <eedwards@perforce.com>2015-01-30 10:24:45 -0800
commite6e337088bbb4736983119928b6b6b451bd3ef20 (patch)
treeb4052034e51615b85f7f09ca71012a398638a3d9 /doc/update
parentc47328948b5fff218c68279260a57ab6b03e7423 (diff)
downloadgitlab-ce-e6e337088bbb4736983119928b6b6b451bd3ef20.tar.gz
Make all non-config/non-operational mentions of URL consistently
capitalized. Make the plural version consistently "URLs". Fix an instance where the article "the" before URL was missing.
Diffstat (limited to 'doc/update')
-rw-r--r--doc/update/4.2-to-5.0.md4
-rw-r--r--doc/update/5.4-to-6.0.md2
-rw-r--r--doc/update/7.6-to-7.7.md4
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/update/4.2-to-5.0.md b/doc/update/4.2-to-5.0.md
index cde679598f7..7974ae47ff4 100644
--- a/doc/update/4.2-to-5.0.md
+++ b/doc/update/4.2-to-5.0.md
@@ -41,8 +41,8 @@ git checkout v1.1.0
# copy config
cp config.yml.example config.yml
-# change url to GitLab instance
-# ! make sure url end with '/' like 'https://gitlab.example/'
+# change URL to GitLab instance
+# ! make sure the URL ends with '/' like 'https://gitlab.example/'
vim config.yml
# rewrite hooks
diff --git a/doc/update/5.4-to-6.0.md b/doc/update/5.4-to-6.0.md
index 7bf7bce6aa0..ba8f8e39584 100644
--- a/doc/update/5.4-to-6.0.md
+++ b/doc/update/5.4-to-6.0.md
@@ -10,7 +10,7 @@ GitLab 6.0 is affected by critical security vulnerabilities CVE-2013-4490 and CV
The root (global) namespace for projects is deprecated.
-So you need to move all your global projects under groups or users manually before update or they will be automatically moved to the project owner namespace during the update. When a project is moved all its members will receive an email with instructions how to update their git remote url. Please make sure you disable sending email when you do a test of the upgrade.
+So you need to move all your global projects under groups or users manually before update or they will be automatically moved to the project owner namespace during the update. When a project is moved all its members will receive an email with instructions how to update their git remote URL. Please make sure you disable sending email when you do a test of the upgrade.
### Teams
diff --git a/doc/update/7.6-to-7.7.md b/doc/update/7.6-to-7.7.md
index 51084576f33..8f4fd197b72 100644
--- a/doc/update/7.6-to-7.7.md
+++ b/doc/update/7.6-to-7.7.md
@@ -101,8 +101,8 @@ If all items are green, then congratulations upgrade is complete!
### 8. GitHub settings (if applicable)
-If you are using GitHub as an OAuth provider for authentication, you should change the callback url so that it
-only contains a root url (ex. `https://gitlab.example.com/`)
+If you are using GitHub as an OAuth provider for authentication, you should change the callback URL so that it
+only contains a root URL (ex. `https://gitlab.example.com/`)
## Things went south? Revert to previous version (7.6)