RHIDP-3440-about-1 Resolve merge conflicts (#566)

Co-authored-by: Gerry-Forde <[email protected]>

Author: openshift-cherrypick-robot

titles/plugins-rhdh-about/master.adoc

@@ -1,12 +1,11 @@
 [id="title-plugins-rhdh-about"]
 include::artifacts/attributes.adoc[]
-= About {product} plugins 
 :context: title-plugins-rhdh-about
 :doctype: book
 :imagesdir: images
-
-:title: About {product} plugins
+:title: Introduction to plugins
 :subtitle: Introduction to {product-very-short} plugins
 :abstract: As a {product} user, you can learn about {product} plugins.
 
-include::assemblies/dynamic-plugins/assembly-about-rhdh-plugins.adoc[leveloffset=+1]
+= Introduction to plugins
+include::modules/dynamic-plugins/con-rhdh-plugins.adoc[leveloffset=+1]