Renames variants of the OpenShift internal image registry to OpenShift image registry

Author: Steven Smith

modules/oc-by-example-content.adoc

@@ -1320,8 +1320,6 @@ Edit a resource on the server
 
 
 
-<<<<<<< HEAD
-=======
 == oc events
 List events
 
@@ -1346,7 +1344,6 @@ List events
 
 
 
->>>>>>> af9abc5c2d (Renames varients of the OpenShift internal image registry to OpenShift image registry)
 == oc exec
 Execute a command in a container
 
@@ -2878,12 +2875,18 @@ Tag existing images into image streams
   # Tag an external container image and request pullthrough for it
   oc tag --source=docker openshift/origin-control-plane:latest yourproject/ruby:tip --reference-policy=local
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
+=======
+>>>>>>> af9abc5c2d (Renames varients of the OpenShift internal image registry to OpenShift image registry)
 
   # Tag an external container image and include the full manifest list
   oc tag --source=docker openshift/origin-control-plane:latest yourproject/ruby:tip --import-mode=PreserveOriginal
 
+<<<<<<< HEAD
+>>>>>>> af9abc5c2d (Renames varients of the OpenShift internal image registry to OpenShift image registry)
+=======
 >>>>>>> af9abc5c2d (Renames varients of the OpenShift internal image registry to OpenShift image registry)
   # Remove the specified spec tag from an image stream
   oc tag openshift/origin-control-plane:latest -d

scalability_and_performance/ztp_far_edge/ztp-advanced-policy-config.adoc

@@ -45,7 +45,11 @@ include::modules/ztp-add-local-reg-for-sno-duprofile.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* For more information about container image registries, see xref:../../registry/index.adoc#registry-overview[{product-title} registry overview].
+* xref:../../networking/using-ptp.adoc#cnf-installing-amq-interconnect-messaging-bus_using-ptp[Installing the AMQ messaging bus]
+* For more information about container image registries, see xref:../../registry/index.adoc#registry-overview[{product-registry} overview].
+
+[id="ztp-advanced-policy-config-bare-metal_{context}"]
+== Configuring bare-metal events with PolicyGenTemplate CRs
 
 include::modules/ztp-configuring-disk-partitioning.adoc[leveloffset=+2]