Resolved the conflict

Author: mpershina

docs/cli-guide/master.adoc

@@ -1,6 +1,6 @@
 :mta:
 include::topics/templates/document-attributes.adoc[]
-:_content-type: ASSEMBLY
+:_mod-docs-content-type: ASSEMBLY
 [id="cli-guide"]
 = CLI Guide
 
@@ -37,8 +37,24 @@ include::topics/installing-cli-tool.adoc[leveloffset=+2]
 // CLI known issues
 include::topics/cli-tool-known-issues.adoc[leveloffset=+3]
 
+[id="running-cli"]
+=== Running the CLI
+
+You can run the {ProductFullName} {CLINameTitle} against one or more applications.
+
+Before {ProductShortName} 7.1.0, if you wanted to run the {CLINameTitle} against multiple applications, you ran a series of `--analyze` commands, each against an application, and each generating a separate report. This option, which is still fully supported, is described in xref:mta-cli-run-single-app_cli-guide[Running the {ProductShortName} {CLINameTitle} against an application].
+
+In {ProductShortName} 7.1.0 and later, you can run the {CLINameTitle} against multiple applications by using the `--bulk` option, to generate a single report. This option, which is presented as a Developer Preview, is described in xref:mta-cli-run-multiple-apps_cli-guide[Running the {ProductShortName} {CLINameTitle} against multiple applications and generating a single report (Developer Preview)].
+
+[IMPORTANT]
+====
+include::snippets/developer-preview.adoc[]
+====
+
 // Run the CLI
-include::topics/mta-cli-run.adoc[leveloffset=+2]
+include::topics/mta-cli-run-single-app.adoc[leveloffset=+3]
+
+include::topics/mta-cli-run-multiple-apps.adoc[leveloffset=+3]
 
 // Analyze application source code
 include::topics/mta-cli-analyze.adoc[leveloffset=+3]

docs/cli-guide/snippets

@@ -0,0 +1 @@
+../../snippets

docs/eclipse-code-ready-studio-guide/snippets

@@ -0,0 +1 @@
+../../snippets

docs/getting-started-guide/snippets

@@ -0,0 +1 @@
+../../snippets

docs/intellij-idea-plugin-guide/snippets

@@ -0,0 +1 @@
+../../snippets

docs/maven-guide/snippets

@@ -0,0 +1 @@
+../../snippets

docs/release-notes/snippets

@@ -0,0 +1 @@
+../../snippets

docs/rules-development-guide/snippets

@@ -0,0 +1 @@
+../../snippets

docs/topics/create-first-yaml-rule.adoc

@@ -2,7 +2,7 @@
 //
 // * docs/rules-development-guide/master.adoc
 
-:_content-type: PROCEDURE
+:_mod-docs-content-type: PROCEDURE
 [id="create-first-yaml-rule_{context}"]
 = Creating your first YAML rule
 
@@ -13,7 +13,7 @@ In this example, you will create a rule to discover instances where an applicati
 [id="creating-yaml-file-for-the-rule_{context}"]
 == Creating a YAML file for the rule
 
-Create a YAML file for your first rule.
+* Create a YAML file for your first rule.
 
 [options="nowrap",subs="attributes+"]
 ----
@@ -82,7 +82,7 @@ when(condition)
 
 .Procedure
 
-. In the `rule.yaml` file you created, paste the following contents:
+* In the `rule.yaml` file you created, paste the following contents:
 +
 [options="nowrap",subs="attributes+"]
 ----
@@ -97,10 +97,10 @@ when(condition)
   - <LINKS> <7>
 ----
 +
-<1> Unique ID for your rule, for instance, `jboss5-web-class-loading`.
+<1> Unique ID for your rule. For example, `jboss5-web-class-loading`.
 <2> Text description of the rule.
 <3> Complete the `when` block specifying one or more conditions:
-.. Use the `builtin` provider’s XML capability because this rule checks for a match in an XML file.
+.. Use the `builtin` provider's XML capability because this rule checks for a match in an XML file.
 .. To match on the `class-loading` element that is a child of `jboss-web`, use the XPath expression `jboss-web/web-loading` as an XML query. In this case, you need just one condition:
 +
 [options="nowrap",subs="attributes+"]
@@ -146,7 +146,7 @@ The rule is now complete and looks similar to the following:
 == Installing the rule
 
 .Procedure
-. Point the CLI  to the rule file you created :
+* Point the CLI to the rule file you created :
 +
 [options="nowrap",subs="attributes+"]
 ----

docs/topics/create-yaml-rule.adoc

@@ -2,7 +2,7 @@
 //
 // * docs/rules-development-guide/master.adoc
 
-:_content-type: PROCEDURE
+:_mod-docs-content-type: PROCEDURE
 [id="create-yaml-rule_{context}"]
 = Creating a YAML rule
 
@@ -125,7 +125,7 @@ The table below lists all available providers, their capabilities, and their fie
 |Yes
 |Finds files with names matching this pattern
 |`hasTags`
-3+>|This is an inline list of string tags. See _Tag Action_ for details on tag format.
+3+^| This is an inline list of string tags. See *Tag Actions* in xref:yaml-rule-actions_{context}[Rule Actions] for details on tag format.
 
 .5+.^|`go`
 |`referenced`