Add latest changes from gitlab-org/gitlab@master

10 files changed, 16 insertions, 16 deletions

diff --git a/doc/university/README.md b/doc/university/README.md
index 2d2321ffc2d..e0bc54518db 100644
--- a/doc/university/README.md
+++ b/doc/university/README.md
@@ -52,7 +52,7 @@ The GitLab University curriculum is composed of GitLab videos, screencasts, pres
 
 ### 1.5. Migrating from other Source Control
 
-1. [Migrating from BitBucket/Stash](../user/project/import/bitbucket.md)
+1. [Migrating from Bitbucket/Stash](../user/project/import/bitbucket.md)
 1. [Migrating from GitHub](../user/project/import/github.md)
 1. [Migrating from SVN](../user/project/import/svn.md)
 1. [Migrating from Fogbugz](../user/project/import/fogbugz.md)
diff --git a/doc/university/glossary/README.md b/doc/university/glossary/README.md
index 21e2da3e47c..297b841b283 100644
--- a/doc/university/glossary/README.md
+++ b/doc/university/glossary/README.md
@@ -6,6 +6,6 @@ comments: false
 
 This page has been removed after an effort to ensure that all applicable GitLab-specific
 terms are available in context on the relevant [GitLab Documentation](https://docs.gitlab.com/)
-or [about.gitlab.com](https://about.gitlab.com/) pages.
+or <https://about.gitlab.com/> pages.
 
 If you are looking for a definition of a specific term, please search these sites.
diff --git a/doc/university/process/README.md b/doc/university/process/README.md
index c3e023da655..d640edae10f 100644
--- a/doc/university/process/README.md
+++ b/doc/university/process/README.md
@@ -19,7 +19,7 @@ please submit a merge request to add an upcoming class, assign to
 1. Don't make materials that are needlessly specific to one group of people, try
    to keep the wording broad and inclusive (don't make things for only GitLab Inc.
    people, only interns, only customers, etc.).
-1. To allow people to contribute all content should be in git.
+1. To allow people to contribute all content should be in Git.
 1. The content can go in a subdirectory under `/doc/university/`.
 1. To make, view or modify the slides of the classes use [Deckset](http://www.decksetapp.com/)
    or [RevealJS](http://lab.hakim.se/reveal-js/). Do not use Powerpoint or Google
diff --git a/doc/university/training/end-user/README.md b/doc/university/training/end-user/README.md
index 0ea51a95445..40ad71df0be 100644
--- a/doc/university/training/end-user/README.md
+++ b/doc/university/training/end-user/README.md
@@ -109,11 +109,11 @@ cd ~/workspace
 - GitLab is an application to code, test and deploy.
 - Provides repository management with access controls, code reviews,
   issue tracking, Merge Requests, and other features.
-- The hosted version of GitLab is gitlab.com
+- The hosted version of GitLab is <https://gitlab.com>
 
 ### New Project
 
-- Sign in into your gitlab.com account
+- Sign in into your <https://gitlab.com> account
 - Create a project
 - Choose to import from 'Any Repo by URL' and use <https://gitlab.com/gitlab-org/training-examples.git>
 - On your machine clone the `training-examples` project
@@ -126,7 +126,7 @@ cd ~/workspace
 1. Stage the file
 1. Commit
 1. Push the commit to the remote
-1. View the git log
+1. View the Git log
 
 ```shell
 # Edit `edit_this_file.rb`
@@ -271,7 +271,7 @@ This will unstage the file but maintain the modifications. To revert the file ba
 git checkout -- <file>
 ```
 
-To remove a file from disk and repo use 'git rm' and to rm a dir use the '-r' flag:
+To remove a file from disk and repo use `git rm` and to remove a directory use the `-r` flag:
 
 ```sh
 git rm '*.txt'
@@ -338,7 +338,7 @@ git pull origin master
 git push origin master
 ```
 
-### git revert vs git reset
+### `git revert` vs `git reset`
 
 Reset removes the commit while revert removes the changes but leaves the commit
 Revert is safer considering we can revert a revert
diff --git a/doc/university/training/topics/getting_started.md b/doc/university/training/topics/getting_started.md
index 3fadb58e804..bb197f3f1ed 100644
--- a/doc/university/training/topics/getting_started.md
+++ b/doc/university/training/topics/getting_started.md
@@ -65,7 +65,7 @@ Modified files that have been marked to go in the next commit.
 1. Stage the file
 1. Commit
 1. Push the commit to the remote
-1. View the git log
+1. View the Git log
 
 ```sh
 # Edit `edit_this_file.rb`
@@ -79,5 +79,5 @@ git log
 
 ## Note
 
-- git fetch vs pull
-- Pull is git fetch + git merge
+- `git fetch` vs `git pull`
+- Pull is `git fetch` + `git merge`
diff --git a/doc/university/training/topics/merge_conflicts.md b/doc/university/training/topics/merge_conflicts.md
index 97bb038f405..12798f7ff08 100644
--- a/doc/university/training/topics/merge_conflicts.md
+++ b/doc/university/training/topics/merge_conflicts.md
@@ -60,7 +60,7 @@ git push origin conflicts_branch -f
 
 ## Note
 
-- When to use 'git merge' and when to use 'git rebase'
+- When to use `git merge` and when to use `git rebase`
 - Rebase when updating your branch with master
 - Merge when bringing changes from feature to master
 - Reference: <https://www.atlassian.com/git/tutorials/merging-vs-rebasing/>
diff --git a/doc/university/training/topics/rollback_commits.md b/doc/university/training/topics/rollback_commits.md
index c17e8d59737..333b2f23a1b 100644
--- a/doc/university/training/topics/rollback_commits.md
+++ b/doc/university/training/topics/rollback_commits.md
@@ -62,7 +62,7 @@ git push origin master
 
 ## Note
 
-- git revert vs git reset
+- `git revert` vs `git reset`
 - Reset removes the commit while revert removes the changes but leaves the commit
 - Revert is safer considering we can revert a revert
 
diff --git a/doc/university/training/topics/stash.md b/doc/university/training/topics/stash.md
index d3e63db0c6a..c582240d0f7 100644
--- a/doc/university/training/topics/stash.md
+++ b/doc/university/training/topics/stash.md
@@ -4,7 +4,7 @@ comments: false
 
 # Git Stash
 
-We use git stash to store our changes when they are not ready to be committed
+We use `git stash` to store our changes when they are not ready to be committed
 and we need to change to a different branch.
 
 - Stash:
diff --git a/doc/university/training/topics/unstage.md b/doc/university/training/topics/unstage.md
index d7482bf2bd5..9a9d42221a4 100644
--- a/doc/university/training/topics/unstage.md
+++ b/doc/university/training/topics/unstage.md
@@ -16,7 +16,7 @@ comments: false
   git checkout -- <file>
   ```
 
-- To remove a file from disk and repo use 'git rm' and to rm a dir use the '-r' flag:
+- To remove a file from disk and repo use `git rm` and to remove a directory use the `-r` flag:
 
   ```sh
   git rm '*.txt'
diff --git a/doc/university/training/user_training.md b/doc/university/training/user_training.md
index 231039b0be8..262b153e3e2 100644
--- a/doc/university/training/user_training.md
+++ b/doc/university/training/user_training.md
@@ -140,7 +140,7 @@ Modified files that have been marked to go in the next commit.
 1. Stage the file.
 1. Commit.
 1. Push the commit to the remote.
-1. View the git log.
+1. View the Git log.
 
 ## Commands (committing)