From 4c6b8cc087ca774b2e76641af38a47a8c168b547 Mon Sep 17 00:00:00 2001
From: Steve Perry <steveperry-53@users.noreply.github.com>
Date: Thu, 16 Mar 2017 13:58:07 -0700
Subject: [PATCH] Move Garbage Collection topic. (#2874)

* Move Garbage Collection topic.

* Fix included file.
---
 _data/concepts.yml                              |  9 +--------
 .../controllers/garbage-collection.md           |  5 ++++-
 .../workloads/controllers/my-repset.yaml        | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)
 rename docs/concepts/{abstractions => workloads}/controllers/garbage-collection.md (94%)
 create mode 100644 docs/concepts/workloads/controllers/my-repset.yaml

diff --git a/_data/concepts.yml b/_data/concepts.yml
index c319e00317..a2443cd301 100644
--- a/_data/concepts.yml
+++ b/_data/concepts.yml
@@ -14,14 +14,6 @@ toc:
     - docs/concepts/overview/working-with-objects/annotations.md
   - docs/concepts/overview/kubernetes-api.md
 
-- title: Kubernetes Objects
-  section:
-  - title: Pods
-    section:
-  - title: Controllers
-    section:
-    - docs/concepts/abstractions/controllers/garbage-collection.md
-
 - title: Workloads
   section:
   - title: Pods
@@ -33,6 +25,7 @@ toc:
     section:
     - docs/concepts/workloads/controllers/statefulset.md
     - docs/concepts/workloads/controllers/petset.md
+    - docs/concepts/workloads/controllers/garbage-collection.md
   - title: Jobs
     section:
     - docs/concepts/jobs/run-to-completion-finite-workloads.md
diff --git a/docs/concepts/abstractions/controllers/garbage-collection.md b/docs/concepts/workloads/controllers/garbage-collection.md
similarity index 94%
rename from docs/concepts/abstractions/controllers/garbage-collection.md
rename to docs/concepts/workloads/controllers/garbage-collection.md
index 889049c1ba..f273599921 100644
--- a/docs/concepts/abstractions/controllers/garbage-collection.md
+++ b/docs/concepts/workloads/controllers/garbage-collection.md
@@ -1,5 +1,8 @@
 ---
 title: Garbage Collection
+redirect_from:
+- "/docs/concepts/abstractions/controllers/garbage-collection/"
+- "/docs/concepts/abstractions/controllers/garbage-collection.html"
 ---
 
 {% capture overview %}
@@ -30,7 +33,7 @@ relationships between owners and dependents by manually setting the
 
 Here's a configuration file for a ReplicaSet that has three Pods:
 
-{% include code.html language="yaml" file="my-repset.yaml" ghlink="/docs/concepts/abstractions/controllers/my-repset.yaml" %}
+{% include code.html language="yaml" file="my-repset.yaml" ghlink="/docs/concepts/workloads/controllers/my-repset.yaml" %}
 
 If you create the ReplicaSet and then view the Pod metadata, you can see
 OwnerReferences field:
diff --git a/docs/concepts/workloads/controllers/my-repset.yaml b/docs/concepts/workloads/controllers/my-repset.yaml
new file mode 100644
index 0000000000..54befd8f9d
--- /dev/null
+++ b/docs/concepts/workloads/controllers/my-repset.yaml
@@ -0,0 +1,17 @@
+apiVersion: extensions/v1beta1
+kind: ReplicaSet
+metadata:
+  name: my-repset
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      pod-is-for: garbage-collection-example
+  template:
+    metadata:
+      labels:
+        pod-is-for: garbage-collection-example
+    spec:
+      containers:
+      - name: nginx
+        image: nginx