From 753066eeee3e583a2b9a39a1a10167bf1024b375 Mon Sep 17 00:00:00 2001
From: Kendall Nelson <kennelson11@gmail.com>
Date: Wed, 14 Jun 2017 23:06:26 -0500
Subject: [PATCH] [upstream] Move Branching Model to Archive

It was intended that this be moved to the archive since we
haven't used it in the latest training. We cover some discussion
of stable branches elsewhere so it's not necessary to have a whole
slide deck in the agenda that we don't cover anyway.

Change-Id: I38d70709e8cd36688bc2a55741263d093f4b3e47
---
 .../slides/{branching-model.rst => archive-branching-model.rst} | 0
 doc/upstream-training/source/slides/slide-index.rst             | 2 +-
 doc/upstream-training/source/website/index.rst                  | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename doc/upstream-training/source/slides/{branching-model.rst => archive-branching-model.rst} (100%)

diff --git a/doc/upstream-training/source/slides/branching-model.rst b/doc/upstream-training/source/slides/archive-branching-model.rst
similarity index 100%
rename from doc/upstream-training/source/slides/branching-model.rst
rename to doc/upstream-training/source/slides/archive-branching-model.rst
diff --git a/doc/upstream-training/source/slides/slide-index.rst b/doc/upstream-training/source/slides/slide-index.rst
index d50ef88f..36b7c8ae 100644
--- a/doc/upstream-training/source/slides/slide-index.rst
+++ b/doc/upstream-training/source/slides/slide-index.rst
@@ -61,7 +61,6 @@ Code Deep Dive
 
    code-devstack.rst
    code-exercises.rst
-   branching-model.rst
 
 Documentation Deep Dive
 =======================
@@ -80,3 +79,4 @@ Archive
 
    archive-training-agile-for-contributors.rst
    archive-closing-exercise.rst
+   archive-branching-model.rst
diff --git a/doc/upstream-training/source/website/index.rst b/doc/upstream-training/source/website/index.rst
index f10f3f99..990deb62 100644
--- a/doc/upstream-training/source/website/index.rst
+++ b/doc/upstream-training/source/website/index.rst
@@ -163,7 +163,6 @@ Code Deep Dive
 
 * `Demo environment <code-devstack.html>`_
 * `Code exercises <code-exercises.html>`_
-* `Branching model <branching-model.html>`_
 
 Other
 -----------------------
@@ -178,5 +177,6 @@ Archive of additional training activities
 * `Lego applied to Free Software contributions
   <archive-training-agile-for-contributors.html>`_
 * `Closing Exercise  <archive-closing-exercise.html>`_
+* `Branching model <archive-branching-model.html>`_
 
 `Complete index in slide format only <slide-index.html>`_