Merge pull request openshift#313 from apinnick/recommit-procedure-hea…

…dings Recommit procedure headings
sbeskin-redhat · Jul 1, 2020 · 508f3b7 · 508f3b7
2 parents 028a1b0 + 944513b
commit 508f3b7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/docs/topics_5/create-first-xml-rule.adoc b/docs/topics_5/create-first-xml-rule.adoc
@@ -87,8 +87,13 @@ NOTE: {ProductShortName} identifies files with the `.windup.xml` or `.mta.xml` e
 
 . Add the unique identifier for the ruleset and rule:
 
+<<<<<<< HEAD
 * Replace the `<UNIQUE_RULESET_ID>` with an appropriate ruleset ID, for example, `JBoss5-web-class-loading`.
 * Replace the `<UNIQUE_RULE_ID>` with an appropriate rule ID, for example, `JBoss5-web-class-loading_001`.
+=======
+* Replace the `__UNIQUE_RULESET_ID__` with an appropriate ruleset ID, for example, `JBoss5-web-class-loading`.
+* Replace the `__UNIQUE_RULE_ID__` with an appropriate rule ID, for example, `JBoss5-web-class-loading_001`.
+>>>>>>> 61034b8... Fix procedure headings
 
 . Add the following ruleset add-on dependencies.
 +

diff --git a/docs/topics_5/web-openshift-deploy.adoc b/docs/topics_5/web-openshift-deploy.adoc
@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 // * docs/web-console-guide_5/master.adoc
-[[deploy_mta_app_openshift]]
-= Deploy the {ProductShortName} Application
+[id='deploy_mta_app_openshift_{context}']
+= Deploying the {ProductShortName} Application
 
 . Download the {WebName} from the link:https://developers.redhat.com/products/mta/download[{ProductShortName} Download page].
 . Extract the ZIP file to a directory of your choice.