summaryrefslogtreecommitdiff
path: root/doc/university/training
diff options
context:
space:
mode:
authorPascal Borreli <pascal@borreli.com>2018-04-27 08:50:05 +0000
committerRémy Coutable <remy@rymai.me>2018-04-27 08:50:05 +0000
commit12e3eff462077008143146181c81f77204d1a8a9 (patch)
tree3a7c1cf7ae9004a27df9d1c3d942a138185a3ee2 /doc/university/training
parent740f0bb126a4e7da94d9d0181d2023b14113c93e (diff)
downloadgitlab-ce-12e3eff462077008143146181c81f77204d1a8a9.tar.gz
Fixed typos
Diffstat (limited to 'doc/university/training')
-rw-r--r--doc/university/training/end-user/README.md2
-rw-r--r--doc/university/training/topics/tags.md2
-rw-r--r--doc/university/training/user_training.md2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/university/training/end-user/README.md b/doc/university/training/end-user/README.md
index a882bf0eb48..9b8a8db58e2 100644
--- a/doc/university/training/end-user/README.md
+++ b/doc/university/training/end-user/README.md
@@ -27,7 +27,7 @@ project.
### Short Story of Git
-- 1991-2002: The Linux kernel was being maintaned by sharing archived files
+- 1991-2002: The Linux kernel was being maintained by sharing archived files
and patches.
- 2002: The Linux kernel project began using a DVCS called BitKeeper
- 2005: BitKeeper revoked the free-of-charge status and Git was created
diff --git a/doc/university/training/topics/tags.md b/doc/university/training/topics/tags.md
index ab48d52d3c3..6333ceedbd7 100644
--- a/doc/university/training/topics/tags.md
+++ b/doc/university/training/topics/tags.md
@@ -9,7 +9,7 @@ comments: false
- Useful for marking deployments and releases
- Annotated tags are an unchangeable part of Git history
- Soft/lightweight tags can be set and removed at will
-- Many projects combine an anotated release tag with a stable branch
+- Many projects combine an annotated release tag with a stable branch
- Consider setting deployment/release tags automatically
----------
diff --git a/doc/university/training/user_training.md b/doc/university/training/user_training.md
index 90e1d2ba5e8..dccb6cbf071 100644
--- a/doc/university/training/user_training.md
+++ b/doc/university/training/user_training.md
@@ -279,7 +279,7 @@ See GitLab merge requests for examples:
- Useful for marking deployments and releases
- Annotated tags are an unchangeable part of Git history
- Soft/lightweight tags can be set and removed at will
-- Many projects combine an anotated release tag with a stable branch
+- Many projects combine an annotated release tag with a stable branch
- Consider setting deployment/release tags automatically
---