Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 4 insertions, 42 deletions

diff --git a/doc/university/training/index.md b/doc/university/training/index.md
index f69bd51b341..02709314708 100644
--- a/doc/university/training/index.md
+++ b/doc/university/training/index.md
@@ -1,46 +1,8 @@
 ---
-stage: none
-group: unassigned
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
-comments: false
-type: index
+redirect_to: '../../topics/index.md'
 ---
 
-# GitLab Training Material
+This document was moved to [another location](../../topics/index.md).
 
-<!-- vale gitlab.Spelling = NO -->
-All GitLab training material is stored in Markdown format. Slides are
-generated using [Deckset](https://www.deckset.com/).
-<!-- vale gitlab.Spelling = YES -->
-
-All training material is open to public contribution.
-
-This section contains the following topics:
-
-- [Agile and Git](topics/agile_git.md).
-- [Bisect](topics/bisect.md).
-- [Cherry pick](topics/cherry_picking.md).
-- [Code review and collaboration with Merge Requests](topics/merge_requests.md).
-- [Configure your environment](topics/env_setup.md).
-- [Explore GitLab](../../gitlab-basics/index.md).
-- [Feature branching](topics/feature_branching.md).
-- [Getting started](topics/getting_started.md).
-- [GitLab flow](gitlab_flow.md).
-- [GitLab Git workshop](user_training.md).
-- [Git add](topics/git_add.md).
-- [Git introduction](topics/git_intro.md).
-- [Git log](topics/git_log.md).
-- [Git stash](topics/stash.md).
-- [Merge conflicts](topics/merge_conflicts.md).
-- [Rollback commits](topics/rollback_commits.md).
-- [Subtree](topics/subtree.md).
-- [Unstage](topics/unstage.md).
-
-## Additional Resources
-
-1. [GitLab Documentation](https://docs.gitlab.com)
-1. [GUI Clients](https://git-scm.com/downloads/guis)
-1. [Pro Git book](https://git-scm.com/book/en/v2)
-1. <!-- vale gitlab.Spelling = NO --> [Platzi Course](https://courses.platzi.com/courses/git-gitlab/) <!-- vale gitlab.Spelling = NO -->
-1. [Code School tutorial](http://try.github.io/)
-1. Contact us at `subscribers@gitlab.com`
+<!-- This redirect file can be deleted after <2021-08-13>. -->
+<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->