Make main match 4.16

Author: Michael Burke

_topic_maps/_topic_map.yml

@@ -2238,6 +2238,8 @@ Topics:
   File: machine-configs-custom
 - Name: Updated boot images
   File: mco-update-boot-images
+- Name: Managing unused rendered machine configs
+  File: machine-configs-garbage-collection
 - Name: Red Hat Enterprise Linux (RHEL) CoreOS image layering
   File: mco-coreos-layering
   Distros: openshift-enterprise

hardware_enablement/kmm-kernel-module-management.adoc

@@ -133,7 +133,7 @@ include::modules/kmm-customizing-upgrades-for-kernel-modules.adoc[leveloffset=+1
 include::modules/kmm-day1-kernel-module-loading.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
-* link:https://docs.openshift.com/container-platform/4.13/post_installation_configuration/machine-configuration-tasks.html#machine-config-operator_post-install-machine-configuration-tasks[Machine Config Operator]
+* xref:../machine_configuration/index.adoc#machine-config-index[Machine Config Operator]
 
 include::modules/kmm-day1-supported-use-cases.adoc[leveloffset=+2]
 include::modules/kmm-day1-oot-kernel-module-loading-flow.adoc[leveloffset=+2]

modules/machineconfig-garbage-collect.adoc renamed to machine_configuration/machine-configs-garbage-collection.adoc

@@ -1,10 +1,11 @@
-// Module included in the following assemblies:
-//
-// * post_installation_configuration/machine-configuration-tasks.adoc
-
-:_mod-docs-content-type: CONCEPT
-[id="machineconfig-garbage-collect_{context}"]
+:_mod-docs-content-type: ASSEMBLY
+include::_attributes/common-attributes.adoc[]
+[id="machine-configs-garbage-collection"]
 = Managing unused rendered machine configs
+:context: machine-configs-garbage-collection
+
+toc::[]
+
 
 The Machine Config Operator (MCO) does not perform any garbage collection activities. This means that all rendered machine configs remain in the cluster. Each time a user or controller applies a new machine config, the MCO creates new rendered configs for each affected machine config pool. Over time, this can lead to a large number of rendered machine configs, which can make working with machine configs confusing. Having too many rendered machine configs can also contribute to disk space issues and performance issues with etcd. 
 
@@ -18,3 +19,6 @@ Use the `list` subcommand to display all the rendered machine configs in the clu
 ====
 The `oc adm prune renderedmachineconfigs` command deletes only rendered machine configs that are not in use. If a rendered machine configs are in use by a machine config pool, the rendered machine config is not deleted. In this case, the command output specifies the reason that the rendered machine config was not deleted.
 ====
+
+include::modules/machineconfig-garbage-collect-viewing.adoc[leveloffset=+1]
+include::modules/machineconfig-garbage-collect-removing.adoc[leveloffset=+1]