diff --git a/docs/Core-Development-Guide.asciidoc b/docs/Core-Development-Guide.asciidoc
index ee21eceb81..66f327741e 100644
--- a/docs/Core-Development-Guide.asciidoc
+++ b/docs/Core-Development-Guide.asciidoc
@@ -11,7 +11,7 @@ or core rule add-ons to the Windup 2.0 project.
 * link:Get-Involved[Get Involved] - We need your feedback!
 * link:Dev-Windup-Project-Information[Windup Project Information] - Github
 repository, IRC, Mailing lists, ...
-* link:Report-Issues-with-Windup[Report Issues with Windup
+* link:Report-Issues-with-Windup[Report Issues with Windup]
 * link:About-the-WINDUP_HOME-Variable[About the WINDUP_HOME Variable]
 
 ==== Get Started
@@ -24,7 +24,7 @@ repository, IRC, Mailing lists, ...
 
 ==== Developer Contributing Information
 
-* link:Dev-Development-Guidelines[Developer Guidelines]
+* link:Dev-Development-Guidelines-and-Conventions[Developer Guidelines and Conventions]
 * link:Dev-Submit-Code-Updates-to-the-Windup-Project[Submit Code Updates to the Windup Project]
 
 ==== Understand the Windup Architecture and Structure
diff --git a/docs/Dev-Build-Windup-from-Source.adoc b/docs/Dev-Build-Windup-from-Source.adoc
index 7b00ab291a..8c21b0db0f 100644
--- a/docs/Dev-Build-Windup-from-Source.adoc
+++ b/docs/Dev-Build-Windup-from-Source.adoc
@@ -106,7 +106,7 @@ project directory, then click `OK`.
 or dependency errors and click `Finish`. If you get a dialog titled
 _Incomplete Maven Goal Execution_, ignore it and click `OK` to continue.
 . In the Project Explorer tab, find the `windup_parent` project in the
-list, right-mouse, and choose `Run As` --> `Maven install`.
+list, right-click, and choose `Run As` --> `Maven install`.
 
 ==== Extract the Windup Distribution Source File
 
diff --git a/docs/Dev-Classloading-Notes.adoc b/docs/Dev-Classloading-Notes.adoc
index 520c8da20b..5d331c3aa1 100644
--- a/docs/Dev-Classloading-Notes.adoc
+++ b/docs/Dev-Classloading-Notes.adoc
@@ -12,6 +12,9 @@ This covers the specific situations when the Windup core developer needs to look
 [source,java]
 --------
 AddonRegistry.getServices(MyServiceInterface.class)
+
+// To get the AddonRegistry, use Windup's FurnaceHolder:
+FurnaceHolder.getFurnace().getAddonRegistry().getServices(MyServiceInterface.class);
 --------
 or
 [source,java]
@@ -27,6 +30,19 @@ If you want something from the current addon, you need to @Inject its ServiceReg
 Depends, if you are in a Furnace Service, then yes, it will use the
 current code's addon's classloader.
 
+==== Reading annotations from classes
+
+Since classes can be proxied by Forge/Furnace, it's safer to read annotations using `Annotations API`:
+
+    Rules annotation = Annotations.getAnnotation(this.getClass(), Rules.class);
+
+Supposedly, Furnace proxies should also be able to handle such call:
+
+    Rules annotation1 = ((FurnaceProxy) proxy).getOriginalClass().getAnnotation(Rules.class);
+
+TODO: Find out how exactly this is done.
+
+
 ==== How do I know if I am in a Furnace service?
 
 Every furnace service is wrapped in a proxy. If it came from another
diff --git a/docs/Dev-Development-Guidelines-and-Conventions.adoc b/docs/Dev-Development-Guidelines-and-Conventions.adoc
new file mode 100644
index 0000000000..fb87c5d228
--- /dev/null
+++ b/docs/Dev-Development-Guidelines-and-Conventions.adoc
@@ -0,0 +1,57 @@
+[[Dev-Development-Guidelines-and-Conventions]]
+=== Development Guidelines and Conventions
+
+* xref:project-source-code-formatting[Project Source Code Formatting]
+* xref:source-code-naming-conventions[Source Code Naming Conventions]
+* xref:maven-project-naming-conventions[Maven Project Naming Conventions]
+
+[[project-source-code-formatting]]
+==== Project Source Code Formatting
+
+All project source code contributed to Windup should be formatted using the settings defined in the `Eclipse_Code_Format_Profile.xml` file located in the root directory of the Windup project.
+
+===== Eclipse IDE
+
+. In Eclipse, choose Windows -> Preferences.
+. Expand Java -> Code Style -> Formatter
+. Click Import
+. Browse to the `Eclipse_Code_Format_Profile.xml` located in the root of the Windup project directory, then click 'OK'.
+
+===== Netbeans IDE
+
+Use this file to format Windup source code: 
+
+http://plugins.netbeans.org/plugin/50877/eclipse-code-formatter-for-java[http://plugins.netbeans.org/plugin/50877/eclipse-code-formatter-for-java] 
+
+===== IntelliJ IDEA
+
+Use this file to format Windup source code: 
+
+http://plugins.jetbrains.com/plugin/?id=6546[http://plugins.jetbrains.com/plugin/?id=6546]
+
+[[source-code-naming-conventions]]
+==== Source Code Naming Conventions
+
+===== Class Interface and Implementation Names
+
+* Do not name interfaces using the prefix 'I' for interface names. Instead, use a descriptive term for the interface, like `Module.java`.
+* The implementation class name should begin with a descriptive name, followed by the interface name, for example, for example `JavaHandlerModule.java`
+
+===== Standard Prefixes and Suffixes
+
+* Append all RuleProvider class names with `RuleProvider`.
+* Append all XML rule file names with `.windup.xml`
+* Append all Model class names with `Model`.
+* All test names should be prefixed with 'Test'.
+* Property constants: TBD 
+
+[[maven-project-naming-conventions]]
+==== Maven Project Naming Conventions
+
+===== Maven Module Names
+
+The following are not really accurate at this time. This is still TBD! 
+
+* Lowercase with dashes. Start with `windup-`.
+* Ruleset addons start with `windup-rules-`.
+
diff --git a/docs/Dev-Troubleshoot-Windup-Issues.adoc b/docs/Dev-Troubleshoot-Windup-Issues.adoc
index b6adc9d375..9b59b6ba9b 100644
--- a/docs/Dev-Troubleshoot-Windup-Issues.adoc
+++ b/docs/Dev-Troubleshoot-Windup-Issues.adoc
@@ -19,3 +19,11 @@ See xref:Known-Issues[Known Issues] and https://issues.jboss.org/browse/WINDUP-1
 
 Configuring dependencies in a Forge-based project can be a little tricky.
 See xref:Dev-Dependencies[Dependencies] for some hints.
+
+
+-----
+Caused by: java.lang.IllegalArgumentException: Type value for model 'org.jboss.windup.rules.files.model.FileReferenceModel' is already registered with model org.jboss.windup.rules.files.model.FileReferenceModel
+-----
+
+This means that the model class is loaded twice. I.e. the module containing it is loaded twice. Or, in tests, you may be (accidentally) adding the class to the deployment.
+This may especially happen after Maven coordinates of some module are changed.
\ No newline at end of file
diff --git a/docs/Dev-Windup-Documentation-Process.adoc b/docs/Dev-Windup-Documentation-Process.adoc
index 3c5f3951f7..2a5e9989d8 100644
--- a/docs/Dev-Windup-Documentation-Process.adoc
+++ b/docs/Dev-Windup-Documentation-Process.adoc
@@ -12,9 +12,70 @@ Windup product documentation is stored here: https://github.com/windup/windup-do
 
 See the https://github.com/windup/windup-documentation/blob/master/CONTRIBUTING.adoc[CONTRIBUTING guide] for AsciiDoc syntax rules regarding headers and links to make this process easier.
 
-The https://github.com/windup/windup-documentation/tree/master/scripts/windupDocUpdate.sh script copies the pages from the Windup wiki to the windup-documentation repository, makes minor modifications, and generates each guide in a single HTML page book format. The resulting guides are created in the `html/` directory.
+==== Update the Windup Documentation with the Latest Wiki Changes
 
-==== Publish the HTML docs to online docs (at GitHub IO)
+===== Summary
+
+The Windup guides are located in the windup-documentation/docs directory. They are named the same as the guides in the Wiki but have a 'Windup-' prefix. The windup-documentation/docs guides should kept synchronized with the versions in the windup.wiki.
+
+[cols="2*", options="header"] 
+|===
+|Wiki Guide
+|Windup Docs Guide
+
+|User-Guide.asciidoc
+|Windup-User-Guide.adoc
+
+|Rules-Development-Guide.asciidoc
+|Windup-Rules-Development-Guide.adoc
+
+|Core-Development-Guide.asciidoc
+|Windup-Core-Development-Guide.adoc
+
+|Migration-Planning-Guide
+|Windup-Migration-Planning-Guide.adoc
+|===
+
+====== Documentation Update Scripts
+
+The https://github.com/windup/windup-documentation/tree/master/scripts/windupDocUpdate.sh script copies the pages from the Windup wiki to the windup-documentation repository, makes minor modifications, and generates each guide in a single HTML page book format. The resulting guides are created in the `WINDUP_DOCUMENTATION_HOME/html/` directory.
+
+The script performs the following steps.
+
+. Copies the Windup wiki pages to the `WINDUP_DOCUMENTATION_HOME/docs/` directory, renaming them with the `.adoc` extension.
+
+. Makes sure each guide includes all pages that are referenced by pages within it. Scripts are provided to search for links within each individual guide. They navigate to the `WINDUP_DOCUMENTATION_HOME/docs/` directory and search using the following command:
+
+    grep 'xref:[A-Z]' `find . -name '*.adoc'`.
+
+. Replaces each `xref:` to external pages with an `xref:` using the following command.
+
+    find . -name '*.adoc' -print | xargs sed -i 's/xref:/xref:/g'
+
+. Navigates to the `WINDUP_DOCUMENTATION_HOME/` directory and builds the books. The single page HTML files are created in the `WINDUP_DOCUMENTATION_HOME/html/` directory.
+
++
+[cols="2*", options="header"] 
+|===
+|Windup Guide
+|Command
+
+|Windup User Guide
+|asciidoctor -t -dbook -a toc -o html/WindupUserGuide.html docs/Windup-User-Guide.adoc
+
+|Windup Rules Development Guide
+|asciidoctor -t -dbook -a toc -o html/WindupRulesDevelopmentGuide.html docs/Windup-Rules-Development-Guide.adoc
+
+|Windup Core Development Guide
+|asciidoctor -t -dbook -a toc -o html/WindupCoreDevelopmentGuide.html docs/Windup-Core-Development-Guide.adoc
+|===
+
+
+==== Publish the HTML Docs for Access at GitHub IO
+
+The https://github.com/windup/windup-documentation/tree/master/scripts/windupPublish.sh script copies the pages from the Windup wiki to the windup-documentation repository, makes minor modifications, and generates each guide in a single HTML page book format. The resulting guides are created in the `WINDUP_DOCUMENTATION_HOME/html/` directory.
+
+The script performs the following steps.
 
 * The first time, you must fork and clone the windup GitHub repository. After that, just fetch the latest upstream.
 +
@@ -23,35 +84,32 @@ git clone https://github.com/windup/windup.git
 git fetch upstream
 ----
     
-* The first time, you must fork and clone the windup-documentation GitHub repository. After that, just fetch the latest upstream.
-+
-----
-git clone https://github.com/windup/windup-documentation.git
-git fetch upstream
-----
-    
-* Navigate to the local windup directory.
+* Navigate to the local `WINDUP_HOME/` directory.
 +
 ----
 cd windup
 ----
     
-* Checkout the gh-pages from the windup repository
+* Checkout the `gh-pages` from the `WINDUP_HOME` repository
 +
 ----
-git checkout -b gh-pages windup
+git checkout -b gh-pages windup/gh-pages
 ----
 
-* If the directory does not yet exist, create a docs/WINDUP-RELEASE-html/ directory.
+* If the `WINDUP_HOME/docs/WINDUP_RELEASE/` directory does not yet exist, create a `docs/WINDUP_RELEASE/html/images/` 
 +
 ----
-mkdir -p docs/2.0.0.VERSION/html (if it doesn't exist!)
+mkdir -p docs/WINDUP_RELEASE/html/images (if it doesn't exist!)
 ----
     
-* Copy any new images, stylesheets, and html files from windup-documentation:
+* Copy any the images, stylesheets, and html files from windup-documentation:
 +
 ----
-cp ../windup-documentation/html/*.html ../windup-documentation/*.css ../windup-documentation/images/* docs/2.0.0.VERSION/html
+
+cp WINDUP_DOCUMENTATION_HOME/html/*.html WINDUP_HOME/docs/WINDUP_RELEASE/html/
+cp WINDUP_DOCUMENTATION_HOME/*.css WINDUP_HOME/docs/WINDUP_RELEASE/html/
+cp WINDUP_DOCUMENTATION_HOME/images/* WINDUP_HOME/docs/WINDUP_RELEASE/html/images/
+
 ----
  
 * Add the updated files to GitHub.
@@ -72,4 +130,35 @@ git commit -m "Update message..."
 git push upstream gh-pages
 ----
 
-* View the documentation at http://windup.github.io/windup/docs/2.0.0.VERSION/html/WindupUserGuide.html
+* View the documentation at http://windup.github.io/windup/docs/WINDUP_RELEASE/html/WindupUserGuide.html
+
+* Update the symlink for `latest` to point to the new version.
+
+** Navigate to the `WINDUP_HOME/docs` directory.
+
+** Remove the existing symlink for "latest".
+
+        unlink latest
+
+** Create a symlink to the new documentation.
+
+        Syntax: ln -s WINDUP_RELEASE latest
+        Example: ln -s 2.0.0.Final latest
+
+** Add the modified "latest" directory to Git.
+
+        git add latest
+
+** Commit the change.
+
+        git commit -m 'Replace symlink for latest to point to 2.0.0.Final'
+
+** Push the changes to your own git repository, verify and issue a pull.
+
+        git push origin HEAD
+
+** Push the changes upstream
+
+        git push upstream gh-pages
+
+** View the documentation at http://windup.github.io/windup/docs/latest/html/WindupUserGuide.html
diff --git a/docs/Execute-Windup.adoc b/docs/Execute-Windup.adoc
index 886d481ccb..03244c5ada 100644
--- a/docs/Execute-Windup.adoc
+++ b/docs/Execute-Windup.adoc
@@ -75,7 +75,7 @@ Where:
 +
 *OUTPUT_REPORT_DIRECTORY* is the fully qualified path to the folder that will contain the the report information produced by Windup.
 +
-NOTE: If the *OUTPUT_REPORT_DIRECTORY* directory exists, your are prompted to overwrite the contents. If you respond "y", it is deleted and recreated by Windup, so be careful not to specify an output directory that contains important information!
+NOTE: If the *OUTPUT_REPORT_DIRECTORY* directory exists, you are prompted to overwrite the contents. If you respond "y", it is deleted and recreated by Windup, so be careful not to specify an output directory that contains important information!
 
 +
 *PACKAGE_1*, *PACKAGE_2*, *PACKAGE_N* are the packages to be evaluated by Windup.
diff --git a/docs/Get-Involved.adoc b/docs/Get-Involved.adoc
index e6bb1eb3ee..224e32ba6b 100644
--- a/docs/Get-Involved.adoc
+++ b/docs/Get-Involved.adoc
@@ -31,6 +31,7 @@ Any level of involvement is greatly appreciated!
 ** http://windup.github.io/windup/docs/latest/html/WindupRulesDevelopmentGuide.html
 ** http://windup.github.io/windup/docs/latest/html/WindupCoreDevelopmentGuide.html
 * Windup Forums: https://community.jboss.org/en/windup
+* Windup Forums: https://developer.jboss.org/en/windup (inherited from Windup 0.x)
 * Windup Issue Tracker: https://issues.jboss.org/browse/WINDUP
 * Windup Users Mailing List: windup-users@lists.jboss.org
 * Windup Developers Mailing List: windup-dev@lists.jboss.org
diff --git a/docs/Install-and-Configure-Maven.adoc b/docs/Install-and-Configure-Maven.adoc
index 28fb980c8d..7aba5b01d6 100644
--- a/docs/Install-and-Configure-Maven.adoc
+++ b/docs/Install-and-Configure-Maven.adoc
@@ -1,11 +1,13 @@
 [[Install-and-Configure-Maven]]
 === Install and Configure Maven
 
+If you plan to contribute to the core code base or create Java-based rule addons, you must first install and configure Maven to build Windup from source.
+
 ==== Download and Install Maven
 
 If you plan to use Eclipse Luna (4.4) to build Windup, you can skip this
-step. This version of Eclipse embeds Maven 3.2.1 so you do not need to
-install it separately. Skip to the section entitled xref:configure-maven-to-build-windup[Configure Maven to Build Windup].
+step and go directly to the section entitled xref:configure-maven-to-build-windup[Configure Maven to Build Windup]. This version of Eclipse embeds Maven 3.2.1 so you do not need to
+install it separately.
 
 If you plan to run Maven using the command line or plan to use Red Hat
 JBoss Developer Studio 7.1.1 or an older version of Eclipse, you must
@@ -80,5 +82,8 @@ ending `</profiles>` element.
 element to make the profile active.
 +
 ----------------------------------------------------------
-    <activeProfile>jboss-nexus-repository</activeProfile> 
-----------------------------------------------------------
\ No newline at end of file
+<activeProfile>jboss-nexus-repository</activeProfile> 
+----------------------------------------------------------
+
+You are now configured to build Windup.
+ 
\ No newline at end of file
diff --git a/docs/Rule-Metadata.adoc b/docs/Rule-Metadata.adoc
new file mode 100644
index 0000000000..5ddfe77646
--- /dev/null
+++ b/docs/Rule-Metadata.adoc
@@ -0,0 +1,101 @@
+=== Rules Metadata
+
+.Draft
+
+==== Overview
+Rules metadata are used for ordering, filtering, debugging and performance reasons.
+
+==== Metadata used by Windup
+
+NOTE: The ruleset metadata will be set using annotations in the future.
+[source,java]
+---------------
+@Rules(id="", after=[...], ...)
+---------------
+
+
+To control *ordering*, override `getExecuteAfter()` and `getExecuteBefore()`.
+
+[source,java]
+--------
+public class MyRules extends WindupRuleProvider
+{
+    public List<Class<? extends WindupRuleProvider>> getExecuteAfter() {
+        return asClassList(UpdateVictimsDbRules.class, ComputeArchivesSHA512.class);
+    }
+--------
+
+NOTE: The order is set for whole `RuleProvider`. There's no way to set it for individual rules.
+
+
+To specify the *rule ID*, use `.withId("...")`.
+
+[source,java]
+--------
+            .addRule()
+            .perform(...)
+            .withId("CheckArchivesWithVictims")
+--------
+
+
+For *other metadata*, either use `.withMetadata()` or override `enhanceMetadata()`.
+To provide categorization for filtering, use `CATEGORY`.
+
+For its metadata, Windup uses the keys defined in `RuleMetadata`:
+
+* http://windup.github.io/windup/docs/javadoc/latest/org/jboss/windup/config/metadata/RuleMetadata.html#CATEGORY[CATEGORY] (String): Define which category the rule belongs to, which can be then used to filter the rules to execute (plus all those they depend on). Not implemented yet.
+
+* http://windup.github.io/windup/docs/javadoc/latest/org/jboss/windup/config/metadata/RuleMetadata.html#ORIGIN[ORIGIN] (String): The rule origin. Typically a class name.
+
+* http://windup.github.io/windup/docs/javadoc/latest/org/jboss/windup/config/metadata/RuleMetadata.html#[AUTO_COMMIT] (boolean): Whether to call database `commit()` after the rule executes.
+
+* http://windup.github.io/windup/docs/javadoc/latest/org/jboss/windup/config/metadata/RuleMetadata.html#TREAT_EXCEPTIONS_AS_FATAL[TREAT_EXCEPTIONS_AS_FATAL] (boolean): Whether all Exceptions from this Rule are to be treated as fatal. The default is non-fatal.
+
+* http://windup.github.io/windup/docs/javadoc/latest/org/jboss/windup/config/metadata/RuleMetadata.html#RULE_PROVIDER[RULE_PROVIDER]: The `WindupRuleProvider` that originated the rule. This is used internally, not to be specified by rule author.
+
+You can find out more information about rule metadata here: http://windup.github.io/windup/docs/javadoc/latest/org/jboss/windup/config/metadata/RuleMetadata.html[RuleMetadata] Javadoc. 
+
+
+==== How to define rule metadata
+
+The `RuleMetadata` is defined using the `.withMetadata(Object key, Object value)`.
+
+[source,java]
+--------
+            .addRule()
+            .when(...)
+            .perform(...)
+            .withId("CheckArchivesWithVictims")
+            .withMetadata(RuleMetadata.CATEGORY, ...)
+--------
+
+In case you want to apply the same metadata to all rules in some `RuleProvider`, override it's `enhanceMetadata()` method. The default implementations sets `CATEGORY` to "Uncategorized", `ORIGIN` to it's class'es name, and `RULE_PROVIDER` to the `RuleProvider` object:
+
+[source,java]
+--------
+public class MyRules extends WindupRuleProvider
+{
+    public void enhanceMetadata(Context context) {
+        if( ! context.containsKey(RuleMetadata.CATEGORY) )
+            context.put(RuleMetadata.CATEGORY, "Uncategorized");
+        if( ! context.containsKey(RuleMetadata.ORIGIN) )
+            context.put(RuleMetadata.ORIGIN, this.getClass().getName());
+        if( ! context.containsKey(RuleMetadata.RULE_PROVIDER) )
+            context.put(RuleMetadata.RULE_PROVIDER, this);
+    }
+--------
+
+===== Why a Map?
+
+For the rules definition, Windup uses the OCPsoft Rewrite library. Whenever there is something Windup specific which can't be pulled to the upstream implementation, Windup resorts to putting data into a metadata map.
+
+This map is typically not used by rule authors, unless they use a custom Windup extension (don't confuse that with custom Ruleset).
+
+
+==== Ruleset metadata
+
+Ruleset metadata cover the whole Ruleset, not individual rules.
+For ruleset metadata, unlike rules, Windup uses a type-safe interface `WindupRulesetMetadata`
+(see http://windup.github.io/windup/docs/javadoc/latest/org/jboss/windup/config/WindupRulesetMetadata.html[javadoc]).
+
+Currently, it only defines Ruleset ID.
diff --git a/docs/Rules-Create-a-Basic-Java-based-Rule-Add-on.adoc b/docs/Rules-Create-a-Basic-Java-based-Rule-Add-on.adoc
index 3c1200c538..250886f936 100644
--- a/docs/Rules-Create-a-Basic-Java-based-Rule-Add-on.adoc
+++ b/docs/Rules-Create-a-Basic-Java-based-Rule-Add-on.adoc
@@ -132,7 +132,6 @@ The following are examples of some dependencies you may need for your rule add-o
     <classifier>forge-addon</classifier>
     <scope>test</scope>
 </dependency>
-
 ----
 
 4. Add the `<plugins>` section to make it a Forge add-on.
@@ -172,7 +171,9 @@ The following are examples of some dependencies you may need for your rule add-o
 
 ===== Create the Java RuleProvider
 
-1. Within your Maven project, create a Java class that extends the `WindupRuleProvider` class. It is suggested that you end the name of the class with `RuleProvider`. For example:
+. Add `beans.xml` file to `META-INF/` dir in resources - typically, `$project-dir/src/main/resources/META-INF/beans.xml`. This file can be empty. It tells CDI to scan your addon for CDI beans.
+
+. Within your Maven project, create a Java class that extends the `WindupRuleProvider` class. It is suggested that you end the name of the class with `RuleProvider`. For example:
 +
 [source,xml]
 ----
@@ -181,7 +182,7 @@ public class MyCustomRuleProvider extends WindupRuleProvider
 }
 ----
 
-2. If the rule provider must run in a phase other than the default `MIGRATION_RULES` phase, override the phase using the `getPhase()` method. For example, you may want the rule provider to perform a task during the initial *DISCOVERY* phase, for example, to ignore files with a specific name or extension.
+. If the rule provider must run in a phase other than the default `MIGRATION_RULES` phase, override the phase using the `getPhase()` method. For example, you may want the rule provider to perform a task during the initial *DISCOVERY* phase, for example, to ignore files with a specific name or extension.
 +
 [source,java]
 ----
@@ -192,7 +193,7 @@ public class MyCustomRuleProvider extends WindupRuleProvider
 ----
 For more information about rule phases, see xref:Rules-Rule-Execution-Lifecycle[Rules Execution Lifecycles].
 
-3. To control the order in which the rule is executed, implement the `getExecuteBefore()` or `getExecuteAfter()` method.
+. To control the order in which the rule is executed, implement the `getExecuteBefore()` or `getExecuteAfter()` method.
 +
 [source,java]
 ----
@@ -216,7 +217,7 @@ public List<Class<? extends WindupRuleProvider>> getExecuteAfter()
 }
 ----
 
-4. Finally, add the rule or rules to the rule provider. 
+. Finally, add the rule or rules to the rule provider. 
 
 * High-level Conditions and Operations
 +
diff --git a/docs/Rules-Create-a-Basic-XML-Rule.adoc b/docs/Rules-Create-a-Basic-XML-Rule.adoc
index f0aaf0c13a..6b56f2456b 100644
--- a/docs/Rules-Create-a-Basic-XML-Rule.adoc
+++ b/docs/Rules-Create-a-Basic-XML-Rule.adoc
@@ -1,4 +1,4 @@
-[[Rules-Create-a-Basic-XML-Rule]]
+[[Rules-Create-am-Basic-XML-Rule]]
 === Create a Basic XML Rule
 
 You can create a rule addon using Java or a rule using XML or Groovy. This topic describes how to create a rule using XML.
@@ -9,111 +9,49 @@ You can create a rule addon using Java or a rule using XML or Groovy. This topic
 * Before you begin, you may also want to be familiar with the following documentation:
 ** Windup rules are based on the ocpsoft *rewrite* project. You can find more information about ocpsoft *rewrite* here: http://ocpsoft.org/rewrite/
 ** The JavaDoc for the Windup API is located here: http://windup.github.io/windup/docs/javadoc/latest/
+** The XML rule schema is located here: https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd.
 
-NOTE:  Working examples of XML-based rules can be found in the Windup quickstarts GitHub repository located here: https://github.com/windup/windup-quickstarts
+==== File Naming Convention for XML Rules
 
-==== Create a Rule
+You must name the file containing an XML rule with the `.windup.xml` extension. Windup identifies files with this extension as XML-base rules, so be sure to use this naming convention, otherwise the rule will not be evaluated!
 
-The following is an example of an XML rule.
+==== Basic XML Rule Template
 
-        <?xml version="1.0"?>
-        <ruleset xmlns="http://windup.jboss.org/v1/xml"
-          id="customruleprovider">
-          <!-- This defaults to MIGRATION_RULES -->
-          <phase>
-            DISCOVERY
-          </phase>
-          <rules>
-            <rule>
-              <when>
-                <javaclass references="javax.servlet.http.HttpServletRequest">
-                  <location>METHOD_PARAMETER</location>
-                </javaclass>
-              </when>
-              <perform>
-                <hint>
-        	  <message>Message from XML Rule</message>
-                  <link href="http://example.com" description="Description from XML Hint Link" />
-                </hint>
-                <log message="test log message"/>
-              </perform>
-              <otherwise>
-                <!--  -->
-              </otherwise>
-            </rule>
-            <rule>
-              <when>
-                <xmlfile xpath="/w:web-app/w:resource-ref/w:res-auth[text() = 'Container']">
-                  <namespace prefix="w" uri="http://java.sun.com/xml/ns/javaee"/>
-                </xmlfile>
-              </when>
-              <perform>
-                <hint>
-        	  <message>Container Auth</message>
-                </hint>
-                <xslt description="Example XSLT Conversion" extension="-converted-example.xml" 
-                         xsltFile="/exampleconversion.xsl"/>
-                <log message="test log message"/>
-              </perform>
-              <otherwise>
-                <!--  -->
-              </otherwise>
-            </rule>
-          </rules>
-        </ruleset>
-
-===== Create the XML Rule
-
-**Note:** Windup only analyzes XML files with names ending in `.windup.xml`. Be sure to name XML-based rules using this naming convention!
-
-The XML rule consists of the following level elements:
+XML rules consist of _conditions_ and _actions_ and follow the familiar "if/then/else" construct:
 
-* **<ruleset>**: This element defines this as a Windup rule.
-* **<phase>**: This element specifies when the ruleset should execute. See xref:Rules-Rule-Execution-Lifecycle[Rule Execution Lifecyle] for more information about rule phases.
-* **<rules>**: element contains the individual rules.
-** **<rule>**: This element is a child of the **rules** element. One or more rules can be defined for a ruleset. Each `rule` contains the following elements.
-*** **<when>**: This element defines the condition to match on.
-**** **<javaclass references="CLASS_NAME">**
-***** **<location>**: The location where the reference was found in a Java source file. See the http://windup.github.io/windup/docs/javadoc/latest/org/jboss/windup/rules/apps/java/scan/ast/TypeReferenceLocation.html[Enum TypeReferenceLocation] Javadoc for valid values.
-*** **<perform>**: This element is invoked when the condition is met.
-**** **<hint>**: This child element of **perform** is used to create a `hint`
-***** **<message>**: 
-***** **<link>**:
-**** **<xslt>**: This specifies how to transform the the specified XML file
-**** **<log>**: This child element of **perform** is used to log a message. It takes the attribute **message** to define the text message.
-*** The **<otherwise>** element is invoked when the condition is not met.
+    when(condition)
+        perform(action)
+    otherwise
+        perform(action)
 
-==== Add the Rule to Windup
+The following is the basic syntax for XML rules.
 
-A Windup rule is installed simply by copying the rule to the appropriate Windup folder. Windup scans for rules in the following locations:
-
-
-WINDUP_HOME/rules/:: This is the Windup folder where you run the Windup executable. See xref:About-the-WINDUP_HOME-Variable[About the WINDUP_HOME Variable] for details.
-
-${user.home}/.windup/rules/:: This folder is created by Windup the first time you execute Windup.
-+
---------
-For Linux or Mac:   ~/.windup/rules/
-For Windows: "\Documents and Settings\USER_NAME\.windup\rules\"  -or-  "\Users\USER_NAME\.windup\rules\"
---------
-
-==== Test the XML Rule
-
-NOTE: If you have not started Windup, follow the instructions to xref:Execute-Windup[Execute Windup].
+    <?xml version="1.0"?>
+    <ruleset xmlns="http://windup.jboss.org/v1/xml" id="XmlFileMappings">
+        <phase>
+            <!-- The phase in which to run the rules -->
+        </phase>
+        <rules>
+            <rule>
+                <when>
+                    <!-- Test a condition... -->
+                </when>
+                <perform>
+                    <!-- Perform this action when condition is satisfied -->
+                </perform>
+                <otherwise>
+                    <!-- Perform this action when condition is not satisfied -->
+                </otherwise>
+            </rule>
+          <rules>
+        </ruleset>
 
-Test the XML rule against your application file by running the `windup-migrate-app` command in the Windup console prompt. 
+==== Create the Rule When Condition
 
-The command uses this syntax:
+The syntax is dependent on whether you are creating a rule to evaluate Java class, an XML file, a project, or file content and is described in more detail here: xref:Rules-XML-Rule-When-Condition-Syntax[XML Rule - When Condition Syntax]
 
---------
-windup-migrate-app [--sourceMode true] --input INPUT_ARCHIVE_OR_FOLDER --output OUTPUT_REPORT_DIRECTORY --packages PACKAGE_1 PACKAGE_2 PACKAGE_N
---------
+==== Create the Rule Perform Action
 
-You should see the following result:
+Operations allowed in the `perform` section of the rule include the classification of application resources, in-line hints for migration steps, links to migration information, and project lineitem reporting. The syntax is described in detail here: xref:Rules-XML-Rule-Perform-Action-Syntax[XML Rule - Perform Action Syntax].
 
---------
-***SUCCESS*** Windup report created: QUICKSTART_HOME/windup-reports-java/index.html
---------
-For more information and examples of how to run Windup, see: xref:Execute-Windup[Execute Windup] 
 
- 
diff --git a/docs/Rules-Development-Guide.asciidoc b/docs/Rules-Development-Guide.asciidoc
index 3d782ca8b1..eeb126f121 100644
--- a/docs/Rules-Development-Guide.asciidoc
+++ b/docs/Rules-Development-Guide.asciidoc
@@ -4,7 +4,7 @@
 This guide is for engineers, consultants, or others who plan to create
 rules for Windup 2.0.
 
-==== Overview
+==== General Windup Information
 
 * link:What-is-Windup[What is Windup?]
 * link:Features-of-Windup-2.0[Features of Windup 2.0]
@@ -12,7 +12,7 @@ rules for Windup 2.0.
 * link:Report-Issues-with-Windup[Report Issues with Windup]
 * link:About-the-WINDUP_HOME-Variable[About the WINDUP_HOME Variable]
 
-==== Get Started
+==== Get Started with Windup
 
 * link:Install-Windup[Install Windup]
 * link:Execute-Windup[Execute Windup]
@@ -30,6 +30,8 @@ If you plan to create Java-based rule addons, you must also do the following.
 * link:Windup-Processing-Overview[Windup Processing Overview]
 * link:Rules-Rule-Execution-Lifecycle[Rule Execution Lifecycle]
 * link:Rules-Rule-Story-Points[Rule Story Points]
+* link:Rules-Difference-Between-XML-based-and-Java-based-Rules[
+Difference Between XML-based and Java-based Rules]
 
 ==== Create and Test Java Rule Addons
 
@@ -41,6 +43,7 @@ If you plan to create Java-based rule addons, you must also do the following.
 ==== Create and Test XML Rules
 
 * link:Rules-Create-a-Basic-XML-Rule[Create a Basic XML Rule]
+* link:Rules-Test-a-Basic-XML-Rule-in-Windup[Test an XML Rule in Windup]
 
 ==== Review the Report
 
diff --git a/docs/Rules-Rule-Execution-Lifecycle.adoc b/docs/Rules-Rule-Execution-Lifecycle.adoc
index 935f47ae3c..f2dec2e004 100644
--- a/docs/Rules-Rule-Execution-Lifecycle.adoc
+++ b/docs/Rules-Rule-Execution-Lifecycle.adoc
@@ -3,7 +3,7 @@
 
 ==== Rule Lifecycle
 
-Windup executes each rule in sequential order. The following
+Windup executes each rule in a sequential order. The following
 sections describe the phases of rule execution and how rules may specify
 that one or more other rules must be executed before or after they are
 run.
diff --git a/docs/Rules-Test-a-Basic-XML-Rule-in-Windup.adoc b/docs/Rules-Test-a-Basic-XML-Rule-in-Windup.adoc
new file mode 100644
index 0000000000..01b54e7dfe
--- /dev/null
+++ b/docs/Rules-Test-a-Basic-XML-Rule-in-Windup.adoc
@@ -0,0 +1,43 @@
+[[Rules-Test-an-XML-Rule-In-Windup]]
+=== Test an XML Rule in Windup
+
+==== Add the Rule to Windup
+
+A Windup rule is installed simply by copying the rule to the appropriate Windup folder. Windup scans for rules in the following locations:
+
+* The `WINDUP_HOME/rules/` folder. 
++
+This is the folder where you run the Windup executable. See xref:About-the-WINDUP_HOME-Variable[About the WINDUP_HOME Variable] for details.
+
+* The `${user.home}/.windup/rules/` folder. 
++
+This folder is created by Windup the first time you execute Windup. It used to track rules and addons and to contains the Windup log.
++
+--------
+For Linux or Mac:   ~/.windup/rules/
+For Windows: "\Documents and Settings\USER_NAME\.windup\rules\"  -or-  "\Users\USER_NAME\.windup\rules\"
+--------
+
+==== Test the XML Rule
+
+. If you have not started Windup, follow the instructions to xref:Execute-Windup[Execute Windup].
+
+. Test the XML rule against your application file by running the `windup-migrate-app` command in the Windup console prompt. 
++
+The command uses this syntax:
++
+--------
+windup-migrate-app [--sourceMode true] --input INPUT_ARCHIVE_OR_FOLDER --output OUTPUT_REPORT_DIRECTORY --packages PACKAGE_1 PACKAGE_2 PACKAGE_N
+--------
++
+You should see the following result:
++
+--------
+***SUCCESS*** Windup report created: OUTPUT_REPORT_DIRECTORY/index.html
+--------
+
+==== Additional Resources
+
+* For more information and examples of how to run Windup, see: xref:Execute-Windup[Execute Windup] 
+* Working examples of XML-based rules can be found on GitHub in the https://github.com/windup/windup/[Windup source code] GitHub repository and the Windup quickstarts https://github.com/windup/windup-quickstarts/[GitHub repository] or https://github.com/windup/windup-quickstarts/releases[latest release ZIP download].
+ 
diff --git a/docs/Rules-XML-Rule-Action-Classification-Syntax.adoc b/docs/Rules-XML-Rule-Action-Classification-Syntax.adoc
new file mode 100644
index 0000000000..0e5bc05096
--- /dev/null
+++ b/docs/Rules-XML-Rule-Action-Classification-Syntax.adoc
@@ -0,0 +1,53 @@
+[[Rules-XML-Rule-Action-Classification]]
+=== XML Rule Action - Classification Syntax
+
+==== Summary 
+
+The `classification` element is used to identify or classify application resources. It provides a level of effort and can also provide links to additional information about how to migrate this resource classification.
+
+The following is an example of a rule that classifies a resource as a WebLogic EAR application deployment descriptor file.
+
+_Example:_
+
+    <rule id="XmlWebLogicRules_10vvyf">
+        <when>
+            <xmlfile as="default" matches="/*[local-name()='weblogic-application']">
+            </xmlfile>
+        </when>
+        <perform>
+            <iteration>
+                <classification classification="Weblogic EAR Application Descriptor" effort="3"/>
+            </iteration>
+        </perform>
+    </rule>
+
+
+==== Construct a Classification Element
+
+The XML rule schema is located here: https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd.
+
+===== Classification Element Attributes
+
+classification="STRING":: Classify the resource as the specified string.
++
+_Example:_
+
+    classification="JBoss Seam Components"
+    
+effort="NUMBER":: The level of effort assigned to this resource. 
++
+_Example:_
+
+    effort="2"
+
+===== Classification Element Child Elements
+
+xref:: Provides a link URI and text description for additional information.
++
+_Example:_
+
+   <classification classification="Websphere Startup Service" effort="4">
+       <link href="http://docs.oracle.com/javaee/6/api/javax/ejb/Singleton.html" description="EJB3.1 Singleton Bean"/>
+       <link href="http://docs.oracle.com/javaee/6/api/javax/ejb/Startup.html" description="EJB3.1 Startup Bean"/>
+    </classification>
+
diff --git a/docs/Rules-XML-Rule-Action-Hint-Syntax.adoc b/docs/Rules-XML-Rule-Action-Hint-Syntax.adoc
new file mode 100644
index 0000000000..78824ecc45
--- /dev/null
+++ b/docs/Rules-XML-Rule-Action-Hint-Syntax.adoc
@@ -0,0 +1,52 @@
+[[Rules-XML-Rule-Action-Hint-Syntax]]
+=== XML Rule Action - Hint Syntax
+
+==== Summary 
+
+The `hint` element is used to provide a hint or inline information about how to migrate a section of code.
+
+The following is an example of a rule that creates a hint.
+
+_Example:_
+
+    <rule id="WebLogicWebServiceRules_8jyqn">
+        <when>
+            <javaclass references="weblogic.wsee.connection.transport.http.HttpTransportInfo.setUsername({*})" as="default">
+                <location>METHOD</location>
+            </javaclass>
+        </when>
+        <perform>
+            <iteration>
+                <hint message="Replace proprietary web-service authentication with JAX-WS standards." effort="0">
+                    <link href="http://java-x.blogspot.com/2009/03/invoking-web-services-through-proxy.html" description="JAX-WS Proxy Password Example"/>
+                </hint>
+            </iteration>
+        </perform>
+    </rule>
+
+NOTE: The XML rule schema is located here: https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd.
+
+==== Construct a Hint Element
+
+===== Hint Element:  Attributes
+
+message="MESSAGE":: A message describing the migration hint
++
+_Example:_
+
+    message=""
+    
+effort="NUMBER":: The level of effort assigned to this resource. 
++
+_Example:_
+
+    effort="2"
+
+===== Hint Element: Child Elements
+
+xref:: Identify or classify links to informational content. See See xref:Rules-XML-Rule-Action-Link-Syntax
+[XML Rule Action - Link Syntax]
++
+_Example:_
+
+    link href="http://java-x.blogspot.com/2009/03/invoking-web-services-through-proxy.html" description="JAX-WS Proxy Password Example"/>
diff --git a/docs/Rules-XML-Rule-Action-Iteration-Syntax.adoc b/docs/Rules-XML-Rule-Action-Iteration-Syntax.adoc
new file mode 100644
index 0000000000..c12ad9af2f
--- /dev/null
+++ b/docs/Rules-XML-Rule-Action-Iteration-Syntax.adoc
@@ -0,0 +1,48 @@
+[[Rules-XML-Rule-Action-Iteration-Syntax]]
+=== XML Rule Action - Iteration Syntax
+
+==== Summary 
+
+The `iteration` element specifies to iterate over all options.
+
+The following is an example of a rule that preforms an iteration.
+
+_Example:_
+
+   <rule id="XmlWebLogicRules_14wscy">
+        <when>
+            <xmlfile as="1" matches="/wl:weblogic-webservices | /wl9:weblogic-webservices">
+                <namespace prefix="wl9" uri="http://www.bea.com/ns/weblogic/90"/>
+                <namespace prefix="wl" uri="http://www.bea.com/ns/weblogic/weblogic-webservices"/>
+            </xmlfile>
+            <xmlfile as="2" matches="//wl:webservice-type | //wl9:webservice-type" from="1">
+                <namespace prefix="wl9" uri="http://www.bea.com/ns/weblogic/90"/>
+                <namespace prefix="wl" uri="http://www.bea.com/ns/weblogic/weblogic-webservices"/>
+            </xmlfile>
+        </when>
+        <perform>
+            <iteration over="1">
+                <classification classification="Weblogic Webservice Descriptor" effort="0"/>
+            </iteration>
+            <iteration over="2">
+                <hint message="Webservice Type" effort="0"/>
+            </iteration>
+        </perform>
+    </rule>
+
+NOTE: The XML rule schema is located here: https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd.
+
+==== Construct an Iteration Element
+
+===== Hint Element:  Attributes
+
+over="NUMBER":: A message describing the migration hint
++
+_Example:_
+
+    over="2"
+    
+
+===== Iteration Element: Child Elements
+
+Iteration child elements include `iteration`, `when`, `classification`, `hint`, `xslt`, `lineitem`, and `otherwise`.
\ No newline at end of file
diff --git a/docs/Rules-XML-Rule-Action-Lineitem-Syntax.adoc b/docs/Rules-XML-Rule-Action-Lineitem-Syntax.adoc
new file mode 100644
index 0000000000..440258201b
--- /dev/null
+++ b/docs/Rules-XML-Rule-Action-Lineitem-Syntax.adoc
@@ -0,0 +1,37 @@
+[[Rules-XML-Rule-Action-Lineitem-Syntax]]
+=== XML Rule Action - Lineitem Syntax
+
+==== Summary 
+
+The `lineitem` element is used to provide line item information about a hint on the project or application overview page. 
+
+The following is an example of a rule that creates a lineitem message.
+
+_Example:_
+
+    <rule>
+        <when>
+            <javaclass references="weblogic.servlet.annotation.WLServlet" as="default">
+                <location>ANNOTATION</location>
+            </javaclass>
+        </when>
+        <perform>
+            <hint message="Replace the proprietary WebLogic @WLServlet annotation with the Java EE 6 standard @WebServlet annotation." effort="1">
+                <link href="https://access.redhat.com/articles/1249423" description="Migrate WebLogic Proprietary Servlet Annotations" />
+                <lineitem message="Proprietary WebLogic @WLServlet annotation found in file."/>
+            </hint>
+        </perform>
+    </rule>
+
+NOTE: The XML rule schema is located here: https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd.
+
+==== Construct a Lineitem Element
+
+===== Hint Element:  Attributes
+
+message="MESSAGE":: A lineitem message
++
+_Example:_
+
+    message="Proprietary code found."
+    
diff --git a/docs/Rules-XML-Rule-Action-Link-Syntax.adoc b/docs/Rules-XML-Rule-Action-Link-Syntax.adoc
new file mode 100644
index 0000000000..76a5015d49
--- /dev/null
+++ b/docs/Rules-XML-Rule-Action-Link-Syntax.adoc
@@ -0,0 +1,47 @@
+[[Rules-XML-Rule-Action-Link-Syntax]]
+=== XML Rule Action - Link Syntax
+
+==== Summary 
+
+The `link` element is used in classifications or hints to identify or classify links to informational content. 
+
+The following is an example of a rule that creates links to additional information.
+
+_Example:_
+
+    <rule id="SeamToCDIRules_2fmb">
+        <when>
+            <javaclass references="org.jboss.seam.{*}" as="default"/>
+        </when>
+        <perform>
+            <iteration>
+                <classification classification="SEAM Component" effort="1">
+                    <link href="http://www.seamframework.org/Seam3/Seam2ToSeam3MigrationNotes" description="Seam 2 to Seam 3 Migration Notes"/>
+                    <link href="http://docs.jboss.org/weld/reference/latest/en-US/html/example.html" description="JSF Web Application Example"/>
+                    <link href="http://docs.jboss.org/weld/reference/latest/en-US/html/contexts.html" description="JBoss Context Documentation"/>
+                    <link href="http://www.andygibson.net/blog/tutorial/cdi-conversations-part-2/" description="CDI Conversations Blog Post"/>
+                </classification>
+            </iteration>
+        </perform>
+    </rule>
+
+NOTE: The XML rule schema is located here: https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd.
+
+==== Construct a Link Element
+
+===== Link Element: Attributes
+
+href="URI":: The URI for the referenced link/.
++
+_Example:_
+
+    href="https://access.redhat.com/articles/1249423"
+    
+description="URI_DESCRIPTION":: A description for the link. 
++
+_Example:_
+
+    description="Migrate WebLogic Proprietary Servlet Annotations"
+
+
+
diff --git a/docs/Rules-XML-Rule-Action-XSLT-Syntax.adoc b/docs/Rules-XML-Rule-Action-XSLT-Syntax.adoc
new file mode 100644
index 0000000000..54244ed813
--- /dev/null
+++ b/docs/Rules-XML-Rule-Action-XSLT-Syntax.adoc
@@ -0,0 +1,61 @@
+[[Rules-XML-Rule-Action-XSLT-Syntax]]
+=== XML Rule Action - XSLT Syntax
+
+==== Summary 
+
+The `xslt` element specifies how to transform an XML file.
+
+The following is an example of rule that defines an XSLT action.
+
+_Example:_
+
+    <rule id="XmlWebLogicRules_6bcvk">
+        <when>
+            <xmlfile as="default" matches="/weblogic-ejb-jar"/>
+        </when>
+        <perform>
+            <iteration>
+                <classification classification="Weblogic EJB XML" effort="3"/>
+                <xslt description="JBoss EJB Descriptor (Windup-Generated)" template="transformations/xslt/weblogic-ejb-to-jboss.xsl" extension="-jboss.xml"/>
+            </iteration>
+        </perform>
+    </rule>
+
+NOTE: The XML rule schema is located here: https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd.
+
+==== Construct an XSLT Element
+
+===== XSLT Element:  Attributes
+
+of="STRING":: Create a new transformation for the given reference.
++
+_Example:_
+
+    of="testVariable_instance"
+    
+description="String":: Sets the description of this XSLTTransformation.
++
+_Example:_
+
+    description="XSLT Transformed Output"
+
+extension="String":: Sets the extension for this XSLTTransformation.
++
+_Example:_
+
+    extension="-result.html"
+
+
+template=String:: Sets the XSL template.
++
+_Example:_
+
+    template="simpleXSLT.xsl"
+
+===== XSLT Element: Child Elements
+
+xslt-parameter=Map<String,String> :: Specify XSLTTransformation parameters as property value pairs 
++
+_Example:_
+
+    <xslt-parameter property="title" value="EJB Transformation"/>
diff --git a/docs/Rules-XML-Rule-Condition-FileContent-Syntax.adoc b/docs/Rules-XML-Rule-Condition-FileContent-Syntax.adoc
new file mode 100644
index 0000000000..dc33fb13b2
--- /dev/null
+++ b/docs/Rules-XML-Rule-Condition-FileContent-Syntax.adoc
@@ -0,0 +1,6 @@
+[[Rules-XML-Rule-Condition-FileContent-Syntax]]
+=== XML Rule Condition - FileContent Syntax
+
+TBD : .Draft
+
+Use the `filecontent` element to test for content within files. The following is an example of a rule that tests for `filecontent`.
diff --git a/docs/Rules-XML-Rule-Condition-Java-Class-Syntax.adoc b/docs/Rules-XML-Rule-Condition-Java-Class-Syntax.adoc
new file mode 100644
index 0000000000..1b1964e17e
--- /dev/null
+++ b/docs/Rules-XML-Rule-Condition-Java-Class-Syntax.adoc
@@ -0,0 +1,46 @@
+[[Rules-XML-Rule-Condition-Java-Class-Syntax]]
+=== XML Rule Condition - Java Class Syntax
+
+==== Summary 
+
+Use the `javaclass` element to find imports, methods, variable declarations, annotations, class implementations, and other items related to Java classes. The following is an example of a rule that tests for a `javaclass`.
+
+    <rule>
+        <when>
+            <javaclass references="org.jboss.ws.api.annotation.WebContext" in="org/jboss/{*}" as="webcontextclasses">
+                <location>IMPORT</location>
+                <location>TYPE</location>
+            </javaclass>
+        </when>
+        <perform>
+            <hint message="WebContext is deprecated." effort="0"/>
+        </perform>
+    </rule>
+
+==== Construct a JavaClass Element
+
+The XML rule schema is located here: https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd.
+
+===== JavaClass Element Attributes
+
+references="CLASS_NAME":: The package or class name to match on. Wildcard characters can be used.
+
+    Example: references="org.apache.commons.{*}"
+    
+as="VARIABLE_NAME":: A variable name assigned to the rule so that it can be used as a reference in later processing. See the `from` attribute below.
+
+    Example: as="MyEjbRule"
+
+in="PATH_FILTER":: Used to filter input files matching this regex (regular expression) naming pattern. Wildcard characters can be used.
+
+    Example: in="{*}File1"
+
+from="VARIABLE_NAME":: Begin the search query with the filtered result from a previous search identified by its `as` VARIABLE_NAME. 
+
+    Example: from="MyEjbRule"
+
+===== JavaClass Element Child Elements
+
+location:: The location where the reference was found in a Java class. Location can refer to annotations, field and variable declarations, imports, and methods. For the complete list of valid values, see the JavaDoc for http://windup.github.io/windup/docs/javadoc/latest/org/jboss/windup/rules/apps/java/scan/ast/TypeReferenceLocation.html[TypeReferenceLocation].
+
+    Example: <location>IMPORT</location>
diff --git a/docs/Rules-XML-Rule-Condition-Project-Syntax.adoc b/docs/Rules-XML-Rule-Condition-Project-Syntax.adoc
new file mode 100644
index 0000000000..42e2119072
--- /dev/null
+++ b/docs/Rules-XML-Rule-Condition-Project-Syntax.adoc
@@ -0,0 +1,47 @@
+[[Rules-XML-Rule-Condition-Project-Syntax]]
+=== XML Rule Condition - Project Syntax
+
+==== Summary 
+
+Use the `project` element to find information in project files. The following is an example of a rule that tests for an `xmlfile`.
+
+    <rule>
+        <when>
+            <project>
+                <artifact groupId="junit" artifactId="junit" from="MyEjbRule" to="???"/>
+            </project>
+        </when>
+        <perform>
+            <hint title="Title for Hint for Project">
+                <message>Descriptive message</message>
+            </hint>
+        </perform>
+    </rule>
+
+==== Construct a Project Element
+
+The XML rule schema is located here: https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd.
+
+===== Project Element Attributes
+
+The `project` element does not have any attributes.
+
+===== Project Element Child Elements
+
+artifact:: The namespace to referenced in XML files. This element contains the following attributes: 
+
+* groupId="PROJECT_GROUP_ID"
++
+Match on the project `<groupId>`
+
+* artifactId="PROJECT_ARTIFACT_ID"
+Match on the project `<artifactId>`
+
+* from="VARIABLE_NAME"
++
+Begin the search query with the filtered result from a previous search identified by its `as` VARIABLE_NAME. ???
+
+* to = "???"
+
+
+
diff --git a/docs/Rules-XML-Rule-Condition-XML-File-Syntax.adoc b/docs/Rules-XML-Rule-Condition-XML-File-Syntax.adoc
new file mode 100644
index 0000000000..1244611ef0
--- /dev/null
+++ b/docs/Rules-XML-Rule-Condition-XML-File-Syntax.adoc
@@ -0,0 +1,58 @@
+[[Rules-XML-Rule-Condition-XML-File-Syntax]]
+=== XML Rule Condition - XML File Syntax
+
+==== Summary 
+
+Use the `xmlfile` element to find information in XML files. The following is an example of a rule that tests for an `xmlfile`.
+
+    <rule>
+        <when>
+            <xmlfile matches="/w:web-app/w:resource-ref/w:res-auth[text() = 'Container']">
+                <namespace prefix="w" uri="http://java.sun.com/xml/ns/javaee"/>
+            </xmlfile>
+        </when>
+        <perform>
+            <hint title="Title for Hint from XML">
+                <message>Container Auth</message>
+            </hint>
+            <xslt description="Example XSLT Conversion" extension="-converted-example.xml" 
+                  template="/exampleconversion.xsl"/>
+        </perform>
+    </rule>
+
+==== Construct an XmlFile Element
+
+The XML rule schema is located here: https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd.
+
+===== XmlFile Element: Attributes
+
+matches="XPATH":: Match on an XML file condition.
+
+    Example: matches="/w:web-app/w:resource-ref/w:res-auth[text() = 'Container']"
+    
+xpathResultMatch="XPATH_RESULT_STRING":: Return results that match the given regex. 
+
+    Example: xpathResultMatch=""
+
+as="VARIABLE_NAME":: A variable name assigned to the rule so that it can be used as a reference in later processing. See the `from` attribute below.
+
+    Example: as="MyEjbRule"
+
+in="PATH_FILTER":: Used to filter input files matching this regex (regular expression) naming pattern. Wildcard characters can be used.
+
+    Example: in="{*}File1"
+
+from="VARIABLE_NAME":: Begin the search query with the filtered result from a previous search identified by its `as` VARIABLE_NAME. 
+
+    Example: from="MyEjbRule"
+
+public-id="PUBLIC_ID":: The DTD public-id regex.
+
+    Example: public-id="public"
+
+
+===== XmlFile Element: Child Elements
+
+namespace:: The namespace to referenced in XML files. This element contains 2 attributes: The `prefix` and the `uri`.
+
+    Example: <namespace prefix="abc" uri="http://maven.apache.org/POM/4.0.0"/>
diff --git a/docs/Rules-XML-Rule-Perform-Action-Syntax.adoc b/docs/Rules-XML-Rule-Perform-Action-Syntax.adoc
new file mode 100644
index 0000000000..371c91d9f2
--- /dev/null
+++ b/docs/Rules-XML-Rule-Perform-Action-Syntax.adoc
@@ -0,0 +1,301 @@
+[[Rules-XML-Rule-Perform-Action-Syntax]]
+=== XML Rule - Perform Action Syntax
+
+Operations allowed in the `perform` section of the rule include the classification of application resources, in-line hints for migration steps, links to migration information, and project lineitem reporting. Because XML rules are modeled after the Java-based rule addons, links to JavaDocs for the related Java classes are provided for a better understanding of how they behave. 
+
+The complete XML rule schema is located here: https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd.
+
+The following sections describe the more common XML rule perform actions. 
+
+* xref:classification-syntax[classification Syntax]
+* xref:link-syntax[link Syntax]
+* xref:hint-syntax[hint Syntax]
+* xref:xslt-syntax[xslt Syntax]
+* xref:lineitem-syntax[lineitem Syntax]
+* xref:iteration-syntax[iteration Syntax]
+
+[[classification-syntax]]
+==== classification Syntax
+
+===== Summary 
+
+The `classification` element is used to identify or classify application resources. It provides a level of effort and can also provide links to additional information about how to migrate this resource classification. For a better understanding of the `classification` action, see the JavaDoc for the http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/reporting/config/classification/Classification.html[Classification] class.
+
+The following is an example of a rule that classifies a resource as a WebLogic EAR application deployment descriptor file.
+
+_Example:_
+
+    <rule id="XmlWebLogicRules_10vvyf">
+        <when>
+            <xmlfile as="default" matches="/*[local-name()='weblogic-application']">
+            </xmlfile>
+        </when>
+        <perform>
+            <iteration>
+                <classification classification="Weblogic EAR Application Descriptor" effort="3"/>
+            </iteration>
+        </perform>
+    </rule>
+
+
+===== Construct a classification Element
+
+====== classification Element Attributes
+
+classification="STRING":: Classify the resource as the specified string.
++
+_Example:_
+
+    classification="JBoss Seam Components"
+    
+effort="NUMBER":: The level of effort assigned to this resource. 
++
+_Example:_
+
+    effort="2"
+
+====== classification Element Child Elements
+
+xref:: Provides a link URI and text description for additional information.
++
+_Example:_
+
+   <classification classification="Websphere Startup Service" effort="4">
+       <link href="http://docs.oracle.com/javaee/6/api/javax/ejb/Singleton.html" description="EJB3.1 Singleton Bean"/>
+       <link href="http://docs.oracle.com/javaee/6/api/javax/ejb/Startup.html" description="EJB3.1 Startup Bean"/>
+    </classification>
+
+[[link-syntax]]
+==== link Syntax
+
+===== Summary 
+
+The `link` element is used in classifications or hints to identify or classify links to informational content. For a better understanding of the `link` action, see the JavaDoc for the http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/reporting/config/Link.html[Link] class.
+
+The following is an example of a rule that creates links to additional information.
+
+_Example:_
+
+    <rule id="SeamToCDIRules_2fmb">
+        <when>
+            <javaclass references="org.jboss.seam.{*}" as="default"/>
+        </when>
+        <perform>
+            <iteration>
+                <classification classification="SEAM Component" effort="1">
+                    <link href="http://www.seamframework.org/Seam3/Seam2ToSeam3MigrationNotes" description="Seam 2 to Seam 3 Migration Notes"/>
+                    <link href="http://docs.jboss.org/weld/reference/latest/en-US/html/example.html" description="JSF Web Application Example"/>
+                    <link href="http://docs.jboss.org/weld/reference/latest/en-US/html/contexts.html" description="JBoss Context Documentation"/>
+                    <link href="http://www.andygibson.net/blog/tutorial/cdi-conversations-part-2/" description="CDI Conversations Blog Post"/>
+                </classification>
+            </iteration>
+        </perform>
+    </rule>
+
+===== Construct a link Element
+
+====== link Element: Attributes
+
+href="URI":: The URI for the referenced link/.
++
+_Example:_
+
+    href="https://access.redhat.com/articles/1249423"
+    
+description="URI_DESCRIPTION":: A description for the link. 
++
+_Example:_
+
+    description="Migrate WebLogic Proprietary Servlet Annotations"
+
+[[hint-syntax]]
+==== hint Syntax
+
+===== Summary 
+
+The `hint` element is used to provide a hint or inline information about how to migrate a section of code. For a better understanding of the `hint` action, see the JavaDoc for the http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/reporting/config/Hint.html[Hint] class.
+
+The following is an example of a rule that creates a hint.
+
+_Example:_
+
+    <rule id="WebLogicWebServiceRules_8jyqn">
+        <when>
+            <javaclass references="weblogic.wsee.connection.transport.http.HttpTransportInfo.setUsername({*})" as="default">
+                <location>METHOD</location>
+            </javaclass>
+        </when>
+        <perform>
+            <iteration>
+                <hint message="Replace proprietary web-service authentication with JAX-WS standards." effort="0">
+                    <link href="http://java-x.blogspot.com/2009/03/invoking-web-services-through-proxy.html" description="JAX-WS Proxy Password Example"/>
+                </hint>
+            </iteration>
+        </perform>
+    </rule>
+
+===== Construct a hint Element
+
+====== hint Element:  Attributes
+
+message="MESSAGE":: A message describing the migration hint
++
+_Example:_
+
+    message=""
+    
+effort="NUMBER":: The level of effort assigned to this resource. 
++
+_Example:_
+
+    effort="2"
+
+====== hint Element: Child Elements
+
+xref:: Identify or classify links to informational content. See the section on xref:link-syntax[link Syntax] for details.
+
++
+_Example:_
+
+    link href="http://java-x.blogspot.com/2009/03/invoking-web-services-through-proxy.html" description="JAX-WS Proxy Password Example"/>
+
+[[xslt-syntax]]
+==== xslt Syntax
+
+===== Summary 
+
+The `xslt` element specifies how to transform an XML file. For a better understanding of the `xslt` action, see the JavaDoc for the http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/rules/apps/xml/operation/xslt/XSLTTransformation.html[XSLTTransformation]  class.
+
+The following is an example of rule that defines an XSLT action.
+
+_Example:_
+
+    <rule id="XmlWebLogicRules_6bcvk">
+        <when>
+            <xmlfile as="default" matches="/weblogic-ejb-jar"/>
+        </when>
+        <perform>
+            <iteration>
+                <classification classification="Weblogic EJB XML" effort="3"/>
+                <xslt description="JBoss EJB Descriptor (Windup-Generated)" template="transformations/xslt/weblogic-ejb-to-jboss.xsl" extension="-jboss.xml"/>
+            </iteration>
+        </perform>
+    </rule>
+
+===== Construct an xslt Element
+
+====== xslt Element:  Attributes
+
+of="STRING":: Create a new transformation for the given reference.
++
+_Example:_
+
+    of="testVariable_instance"
+    
+description="String":: Sets the description of this XSLTTransformation.
++
+_Example:_
+
+    description="XSLT Transformed Output"
+
+extension="String":: Sets the extension for this XSLTTransformation.
++
+_Example:_
+
+    extension="-result.html"
+
+
+template=String:: Sets the XSL template.
++
+_Example:_
+
+    template="simpleXSLT.xsl"
+
+====== xslt Element: Child Elements
+
+xslt-parameter=Map<String,String> :: Specify XSLTTransformation parameters as property value pairs 
++
+_Example:_
+
+    <xslt-parameter property="title" value="EJB Transformation"/>
+
+[[lineitem-syntax]]
+==== lineitem Syntax
+
+===== Summary 
+
+The `lineitem` element is used to provide line item information about a hint on the project or application overview page. For a better understanding of the `lineitem` action, see the JavaDoc for the http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/project/operation/LineItem.html[Lineitem] class.
+
+The following is an example of a rule that creates a lineitem message.
+
+_Example:_
+
+    <rule>
+        <when>
+            <javaclass references="weblogic.servlet.annotation.WLServlet" as="default">
+                <location>ANNOTATION</location>
+            </javaclass>
+        </when>
+        <perform>
+            <hint message="Replace the proprietary WebLogic @WLServlet annotation with the Java EE 6 standard @WebServlet annotation." effort="1">
+                <link href="https://access.redhat.com/articles/1249423" description="Migrate WebLogic Proprietary Servlet Annotations" />
+                <lineitem message="Proprietary WebLogic @WLServlet annotation found in file."/>
+            </hint>
+        </perform>
+    </rule>
+
+===== Construct a lineitem Element
+
+====== lineitem Element:  Attributes
+
+message="MESSAGE":: A lineitem message
++
+_Example:_
+
+    message="Proprietary code found."
+    
+[[iteration-syntax]]
+==== iteration Syntax
+
+===== Summary 
+
+The `iteration` element specifies to iterate over an implicit or explicit variable defined within the rule. For a better understanding of the `iteration` action, see the JavaDoc for the http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/config/operation/Iteration.html[Iteration] class.
+
+The following is an example of a rule that preforms an iteration.
+
+_Example:_
+
+   <rule id="XmlWebLogicRules_14wscy">
+        <when>
+            <xmlfile as="1" matches="/wl:weblogic-webservices | /wl9:weblogic-webservices">
+                <namespace prefix="wl9" uri="http://www.bea.com/ns/weblogic/90"/>
+                <namespace prefix="wl" uri="http://www.bea.com/ns/weblogic/weblogic-webservices"/>
+            </xmlfile>
+            <xmlfile as="2" matches="//wl:webservice-type | //wl9:webservice-type" from="1">
+                <namespace prefix="wl9" uri="http://www.bea.com/ns/weblogic/90"/>
+                <namespace prefix="wl" uri="http://www.bea.com/ns/weblogic/weblogic-webservices"/>
+            </xmlfile>
+        </when>
+        <perform>
+            <iteration over="1">
+                <classification classification="Weblogic Webservice Descriptor" effort="0"/>
+            </iteration>
+            <iteration over="2">
+                <hint message="Webservice Type" effort="0"/>
+            </iteration>
+        </perform>
+    </rule>
+
+===== Construct an iteration Element
+
+====== iteration Element:  Attributes
+
+over="NUMBER":: ??
++
+_Example:_
+
+    over="2"
+    
+====== iteration Element: Child Elements
+
+iteration child elements include a `when` condition, along with the actions `iteration`, `classification`, `hint`, `xslt`, `lineitem`, and `otherwise`.
diff --git a/docs/Rules-XML-Rule-When-Condition-Syntax.adoc b/docs/Rules-XML-Rule-When-Condition-Syntax.adoc
new file mode 100644
index 0000000000..7861e6ac32
--- /dev/null
+++ b/docs/Rules-XML-Rule-When-Condition-Syntax.adoc
@@ -0,0 +1,176 @@
+[[Rules-XML-Rule-When-Condition-Syntax]]
+=== XML Rule - When Condition Syntax
+
+Conditions allowed in the `when` portion of a rule must extend http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/config/operation/GraphOperation.html[GraphOperaton] and currently include evaluation of Java classes, XML files, projects, and file content. Because XML rules are modeled after the Java-based rule addons, links to JavaDocs for the related Java classes are provided for a better understanding of how they behave. 
+
+The complete XML rule schema is located here: https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd.
+
+The following sections describe the more common XML `when` rule conditions. 
+
+* xref:javaclass-syntax[javaclass Syntax]
+* xref:xmlfile-syntax[xmlfile Syntax]
+* xref:project-syntax[project Syntax]
+* xref:filecontent-syntax[filecontent Syntax]
+
+[[javaclass-syntax]]
+==== javaclass Syntax
+
+===== Summary 
+
+Use the `javaclass` element to find imports, methods, variable declarations, annotations, class implementations, and other items related to Java classes. For a better understanding of the `javaclass` condition, see the JavaDoc for the http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/rules/apps/java/condition/JavaClass.html[JavaClass] class.
+
+The following is an example of a rule that tests for a `javaclass`.
+
+    <rule>
+        <when>
+            <javaclass references="org.jboss.ws.api.annotation.WebContext" in="org/jboss/{*}" as="webcontextclasses">
+                <location>IMPORT</location>
+                <location>TYPE</location>
+            </javaclass>
+        </when>
+        <perform>
+            <hint message="WebContext is deprecated." effort="0"/>
+        </perform>
+    </rule>
+
+===== Construct a javaclass Element
+
+====== javaclass Element Attributes
+
+references="CLASS_NAME":: The package or class name to match on. Wildcard characters can be used.
+
+    Example: references="org.apache.commons.{*}"
+    
+as="VARIABLE_NAME":: A variable name assigned to the rule so that it can be used as a reference in later processing. See the `from` attribute below.
+
+    Example: as="MyEjbRule"
+
+in="PATH_FILTER":: Used to filter input files matching this regex (regular expression) naming pattern. Wildcard characters can be used.
+
+    Example: in="{*}File1"
+
+from="VARIABLE_NAME":: Begin the search query with the filtered result from a previous search identified by its `as` VARIABLE_NAME. 
+
+    Example: from="MyEjbRule"
+
+====== JavaClass Element Child Elements
+
+location:: The location where the reference was found in a Java class. Location can refer to annotations, field and variable declarations, imports, and methods. For the complete list of valid values, see the JavaDoc for http://windup.github.io/windup/docs/javadoc/latest/org/jboss/windup/rules/apps/java/scan/ast/TypeReferenceLocation.html[TypeReferenceLocation].
+
+    Example: <location>IMPORT</location>
+
+
+[[xmlfile-syntax]]
+==== xmlfile Syntax
+
+===== Summary 
+
+Use the `xmlfile` element to find information in XML files. For a better understanding of the `xmlfile` condition, see the http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/rules/apps/xml/condition/XmlFile.html[XmlFile] JavaDoc.
+
+The following is an example of a rule that tests for an `xmlfile`.
+
+    <rule>
+        <when>
+            <xmlfile matches="/w:web-app/w:resource-ref/w:res-auth[text() = 'Container']">
+                <namespace prefix="w" uri="http://java.sun.com/xml/ns/javaee"/>
+            </xmlfile>
+        </when>
+        <perform>
+            <hint title="Title for Hint from XML">
+                <message>Container Auth</message>
+            </hint>
+            <xslt description="Example XSLT Conversion" extension="-converted-example.xml" 
+                  template="/exampleconversion.xsl"/>
+        </perform>
+    </rule>
+
+===== Construct an xmlfile Element
+
+
+====== xmlfile Element: Attributes
+
+matches="XPATH":: Match on an XML file condition.
+
+    Example: matches="/w:web-app/w:resource-ref/w:res-auth[text() = 'Container']"
+    
+xpathResultMatch="XPATH_RESULT_STRING":: Return results that match the given regex. 
+
+    Example: xpathResultMatch=""
+
+as="VARIABLE_NAME":: A variable name assigned to the rule so that it can be used as a reference in later processing. See the `from` attribute below.
+
+    Example: as="MyEjbRule"
+
+in="PATH_FILTER":: Used to filter input files matching this regex (regular expression) naming pattern. Wildcard characters can be used.
+
+    Example: in="{*}File1"
+
+from="VARIABLE_NAME":: Begin the search query with the filtered result from a previous search identified by its `as` VARIABLE_NAME. 
+
+    Example: from="MyEjbRule"
+
+public-id="PUBLIC_ID":: The DTD public-id regex.
+
+    Example: public-id="public"
+
+
+====== xmlfile Element: Child Elements
+
+namespace:: The namespace to referenced in XML files. This element contains 2 attributes: The `prefix` and the `uri`.
+
+    Example: <namespace prefix="abc" uri="http://maven.apache.org/POM/4.0.0"/>
+
+[[project-syntax]]
+==== project Syntax
+
+===== Summary 
+
+Use the `project` element to find information in project files. For a better understanding of the `project` condition, see the JavaDoc for the http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/project/condition/Project.html[Project] class.
+
+The following is an example of a rule that tests for an `xmlfile`.
+
+    <rule>
+        <when>
+            <project>
+                <artifact groupId="junit" artifactId="junit" from="MyEjbRule" to="???"/>
+            </project>
+        </when>
+        <perform>
+            <hint title="Title for Hint for Project">
+                <message>Descriptive message</message>
+            </hint>
+        </perform>
+    </rule>
+
+===== Construct a project Element
+
+====== project Element Attributes
+
+The `project` element does not have any attributes.
+
+====== project Element Child Elements
+
+artifact:: The namespace to referenced in XML files. This element contains the following attributes: 
+
+* groupId="PROJECT_GROUP_ID"
++
+Match on the project `<groupId>`
+
+* artifactId="PROJECT_ARTIFACT_ID"
+Match on the project `<artifactId>`
+
+* from="VARIABLE_NAME"
++
+Begin the search query with the filtered result from a previous search identified by its `as` VARIABLE_NAME. ???
+
+* to = "???"
+
+
+[[filecontent-syntax]]
+==== filecontent Syntax
+
+Use the `filecontent` element to find information in file content.For a better understanding of the `filecontent` condition, see the JavaDoc for the http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/rules/files/condition/FileContent.html[FileContent] class.
+TBD : .Draft
+
+Use the `filecontent` element to test for content within files. The following is an example of a rule that tests for `filecontent`.
+
diff --git a/docs/What-is-Windup.adoc b/docs/What-is-Windup.adoc
index ecb2dfc52a..2f2818a688 100644
--- a/docs/What-is-Windup.adoc
+++ b/docs/What-is-Windup.adoc
@@ -1,10 +1,9 @@
-[[What-is-Windup]]
-=== What is Windup?
-
 image:images/windup-logo-wiki-header.jpg[Windup Logo] 
 
 ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
 
+=== What is Windup?
+
 JBoss Windup is a rule-based tool to simplify application migrations.
 
 Running from a http://forge.jboss.org[Forge] environment, the tool examines EAR, WAR, and
diff --git a/docs/Windup-Core-Development-Guide.adoc b/docs/Windup-Core-Development-Guide.adoc
index 7ea4c9abfa..41de633f31 100644
--- a/docs/Windup-Core-Development-Guide.adoc
+++ b/docs/Windup-Core-Development-Guide.adoc
@@ -17,7 +17,7 @@ include::About-the-WINDUP_HOME-Variable.adoc[tabsize=4]
 
 == Developer Contributing Information
 
-include::Dev-Development-Guidelines.adoc[tabsize=4]
+include::Dev-Development-Guidelines-and-Conventions.adoc[tabsize=4]
 include::Dev-Submit-Code-Updates-to-the-Windup-Project.adoc[tabsize=4]
 
 == Understand the Windup Architecture and Structure
diff --git a/docs/Windup-Processing-Overview.adoc b/docs/Windup-Processing-Overview.adoc
index 66672e3655..43bf48b1ca 100644
--- a/docs/Windup-Processing-Overview.adoc
+++ b/docs/Windup-Processing-Overview.adoc
@@ -7,7 +7,9 @@ The following is a high level conceptual overview of what happens within Windup
 
 ==== Discovery Phase
 
-Wnen you run the `windup-migrate-app` command, Windup executes its own core rules to extract files from archives, decompile classes, and analyze the application. In this phase, Windup builds a datamodel, storing component data and relationships in a graph database, which can then be queried and updated as needed by the migration rules and for reporting purposes.
+Wnen you run the `windup-migrate-app` command, Windup executes its own core rules to extract files from archives, decompile classes, and analyze the application. In this phase Windup builds a data model and stores component data and relationships in a graph database, which can then be queried and updated as needed by the migration rules and for reporting purposes.
+
+For more information about the phases of rule execution and how to control rule dependencies, see xref:Rules-Rule-Execution-Lifecycle[Rule Execution Lifecycle].
 
 For more information about the graph database components, see xref:Windup-Architectural-Components[Windup Architectural Components].
 
diff --git a/docs/Windup-Rules-Development-Guide.adoc b/docs/Windup-Rules-Development-Guide.adoc
index ada2632d95..7d7da4e6cf 100644
--- a/docs/Windup-Rules-Development-Guide.adoc
+++ b/docs/Windup-Rules-Development-Guide.adoc
@@ -1,14 +1,18 @@
 = Windup Rules Development Guide
 
+:imagesdir: images
+:includedir: .
+
 :toc:
 :toclevels: 4
-
+:numbered:
 
 == Overview
 
 This guide is for engineers, consultants, and others who plan to create 
 custom rules for Windup 2.0.
 
+// include::{includedir}/What-is-Windup.adoc[tabsize=4]
 include::What-is-Windup.adoc[tabsize=4]
 
 include::Features-of-Windup-2.0.adoc[tabsize=4]
@@ -30,13 +34,6 @@ include::Execute-Windup.adoc[tabsize=4]
 
 include::Review-the-Report.adoc[tabsize=4]
 
-
-== Configure Your System for Java-based Rules 
-
-If you plan to create Java-based rule addons, you must also do the following.
-
-include::Install-and-Configure-Maven.adoc[tabsize=4]
-
 include::http://windup.github.io/windup/docs/javadoc/latest/[Windup API JavaDoc reference]: The JavaDoc can serve as a reference for creating Java-based rule addons.
 
 == Understand the Rule Processing
@@ -47,6 +44,7 @@ include::Rules-Rule-Story-Points.adoc[tabsize=4]
 
 == Create and Test Java Rule Addons
 
+include::Install-and-Configure-Maven.adoc[tabsize=4]
 include::Rules-Java-based-Rule-Structure.adoc[tabsize=4]
 include::Rules-Basic-Rule-Execution-Flow-Patterns.adoc[tabsize=4]
 include::Rules-Create-a-Basic-Java-based-Rule-Add-on.adoc[tabsize=4]
@@ -55,6 +53,9 @@ include::Rules-Create-an-Advanced-Ruleset.adoc[tabsize=4]
 == Create and Test XML Rules
 
 include::Rules-Create-a-Basic-XML-Rule.adoc[tabsize=4]
+include::Rules-XML-Rule-When-Condition-Syntax.adoc[tabsize=4]
+include::Rules-XML-Rule-Perform-Action-Syntax.adoc[tabsize=4]
+include::Rules-Test-a-Basic-XML-Rule-in-Windup.adoc[tabsize=4]
 
 == Review the Report
 
diff --git a/html/WindupCoreDevelopmentGuide.html b/html/WindupCoreDevelopmentGuide.html
index 421aeeb44b..f01b51c018 100644
--- a/html/WindupCoreDevelopmentGuide.html
+++ b/html/WindupCoreDevelopmentGuide.html
@@ -417,7 +417,7 @@ <h1>Windup Core Development Guide</h1>
 <ul class="sectlevel1">
 <li><a href="#_overview">Overview</a>
 <ul class="sectlevel2">
-<li><a href="#What-is-Windup">What is Windup?</a></li>
+<li><a href="#_what_is_windup">What is Windup?</a></li>
 <li><a href="#Features-of-Windup-2.0">Features of Windup 2.0</a></li>
 <li><a href="#Get-Involved">Get Involved</a></li>
 <li><a href="#Report-Issues-with-Windup">Report Issues with Windup</a></li>
@@ -425,7 +425,7 @@ <h1>Windup Core Development Guide</h1>
 </li>
 <li><a href="#_developer_contributing_information">Developer Contributing Information</a>
 <ul class="sectlevel2">
-<li><a href="#Dev-Development-Guidelines">Development Guidelines</a></li>
+<li><a href="#Dev-Development-Guidelines-and-Conventions">Development Guidelines and Conventions</a></li>
 <li><a href="#Dev-Submit-Code-Updates-to-the-Windup-Project">Submit Code Updates to the Windup Project</a></li>
 </ul>
 </li>
@@ -438,6 +438,7 @@ <h1>Windup Core Development Guide</h1>
 <li><a href="#_get_started">Get Started</a>
 <ul class="sectlevel2">
 <li><a href="#Install-and-Configure-Maven">Install and Configure Maven</a></li>
+<li><a href="#Dev-Get-the-Windup-Source-Code">Get the Windup Source Code</a></li>
 <li><a href="#Dev-Build-Windup-from-Source">Build Windup from Source</a></li>
 <li><a href="#Dev-Execute-Windup-Built-from-Source">Execute Windup (Built from Windup Source)</a></li>
 <li><a href="#Execute-Windup">Execute Windup</a></li>
@@ -460,7 +461,7 @@ <h1>Windup Core Development Guide</h1>
 </li>
 <li><a href="#_create_and_test_xml_rules">Create and Test XML Rules</a>
 <ul class="sectlevel2">
-<li><a href="#Rules-Create-a-Basic-XML-Rule">Create a Basic XML Rule</a></li>
+<li><a href="#Rules-Create-am-Basic-XML-Rule">Create a Basic XML Rule</a></li>
 </ul>
 </li>
 <li><a href="#_core_developer_topics">Core Developer topics</a>
@@ -521,12 +522,12 @@ <h2 id="_overview">Overview</h2>
 <p>This guide is for developers who plan to contribute source code updates
 or core rule add-ons to the Windup 2.0 project.</p>
 </div>
-<div class="sect2">
-<h3 id="What-is-Windup">What is Windup?</h3>
 <div class="paragraph">
 <p><span class="image"><img src="images/windup-logo-wiki-header.jpg" alt="Windup Logo"></span></p>
 </div>
 <hr>
+<div class="sect2">
+<h3 id="_what_is_windup">What is Windup?</h3>
 <div class="paragraph">
 <p>JBoss Windup is a rule-based tool to simplify application migrations.</p>
 </div>
@@ -819,6 +820,9 @@ <h4 id="_helpful_links">Helpful links</h4>
 <p>Windup Forums: <a href="https://community.jboss.org/en/windup" class="bare">https://community.jboss.org/en/windup</a></p>
 </li>
 <li>
+<p>Windup Forums: <a href="https://developer.jboss.org/en/windup" class="bare">https://developer.jboss.org/en/windup</a> (inherited from Windup 0.x)</p>
+</li>
+<li>
 <p>Windup Issue Tracker: <a href="https://issues.jboss.org/browse/WINDUP" class="bare">https://issues.jboss.org/browse/WINDUP</a></p>
 </li>
 <li>
@@ -1019,9 +1023,22 @@ <h4 id="_create_a_jira_issue">Create a JIRA Issue</h4>
 <h2 id="_developer_contributing_information">Developer Contributing Information</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="Dev-Development-Guidelines">Development Guidelines</h3>
+<h3 id="Dev-Development-Guidelines-and-Conventions">Development Guidelines and Conventions</h3>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="#project-source-code-formatting">Project Source Code Formatting</a></p>
+</li>
+<li>
+<p><a href="#source-code-naming-conventions">Source Code Naming Conventions</a></p>
+</li>
+<li>
+<p><a href="#maven-project-naming-conventions">Maven Project Naming Conventions</a></p>
+</li>
+</ul>
+</div>
 <div class="sect3">
-<h4 id="_project_source_code_format">Project Source Code Format</h4>
+<h4 id="project-source-code-formatting">Project Source Code Formatting</h4>
 <div class="paragraph">
 <p>All project source code contributed to Windup should be formatted using the settings defined in the <code>Eclipse_Code_Format_Profile.xml</code> file located in the root directory of the Windup project.</p>
 </div>
@@ -1033,7 +1050,7 @@ <h5 id="_eclipse_ide">Eclipse IDE</h5>
 <p>In Eclipse, choose Windows &#8594; Preferences.</p>
 </li>
 <li>
-<p>Expand Java &#8594; Code Style &#8594; Formatter (Ctrl+Shift+F by default)</p>
+<p>Expand Java &#8594; Code Style &#8594; Formatter</p>
 </li>
 <li>
 <p>Click Import</p>
@@ -1047,37 +1064,76 @@ <h5 id="_eclipse_ide">Eclipse IDE</h5>
 <div class="sect4">
 <h5 id="_netbeans_ide">Netbeans IDE</h5>
 <div class="paragraph">
-<p>Use this file to format Windup source code: <a href="http://plugins.netbeans.org/plugin/50877/eclipse-code-formatter-for-java" class="bare">http://plugins.netbeans.org/plugin/50877/eclipse-code-formatter-for-java</a></p>
+<p>Use this file to format Windup source code:</p>
+</div>
+<div class="paragraph">
+<p><a href="http://plugins.netbeans.org/plugin/50877/eclipse-code-formatter-for-java">http://plugins.netbeans.org/plugin/50877/eclipse-code-formatter-for-java</a></p>
 </div>
 </div>
 <div class="sect4">
 <h5 id="_intellij_idea">IntelliJ IDEA</h5>
 <div class="paragraph">
-<p>Use this file to format Windup source code: <a href="http://plugins.jetbrains.com/plugin/?id=6546" class="bare">http://plugins.jetbrains.com/plugin/?id=6546</a></p>
+<p>Use this file to format Windup source code:</p>
+</div>
+<div class="paragraph">
+<p><a href="http://plugins.jetbrains.com/plugin/?id=6546">http://plugins.jetbrains.com/plugin/?id=6546</a></p>
 </div>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_naming_conventions">Naming conventions</h4>
+<h4 id="source-code-naming-conventions">Source Code Naming Conventions</h4>
 <div class="sect4">
-<h5 id="_suffixes_and_prefixes">Suffixes and prefixes</h5>
-<div class="paragraph">
-<p><code>*RuleProvider</code></p>
+<h5 id="_class_interface_and_implementation_names">Class Interface and Implementation Names</h5>
+<div class="ulist">
+<ul>
+<li>
+<p>Do not name interfaces using the prefix 'I' for interface names. Instead, use a descriptive term for the interface, like <code>Module.java</code>.</p>
+</li>
+<li>
+<p>The implementation class name should begin with a descriptive name, followed by the interface name, for example, for example <code>JavaHandlerModule.java</code></p>
+</li>
+</ul>
 </div>
-<div class="sect5">
-<h6 id="_models">Models</h6>
-<div class="paragraph">
-<p><code>*Model</code></p>
 </div>
-<div class="paragraph">
-<p>Property constants</p>
+<div class="sect4">
+<h5 id="_standard_prefixes_and_suffixes">Standard Prefixes and Suffixes</h5>
+<div class="ulist">
+<ul>
+<li>
+<p>Append all RuleProvider class names with <code>RuleProvider</code>.</p>
+</li>
+<li>
+<p>Append all XML rule file names with <code>.windup.xml</code></p>
+</li>
+<li>
+<p>Append all Model class names with <code>Model</code>.</p>
+</li>
+<li>
+<p>All test names should be prefixed with 'Test'.</p>
+</li>
+<li>
+<p>Property constants: TBD</p>
+</li>
+</ul>
 </div>
 </div>
-<div class="sect5">
-<h6 id="_tests">Tests</h6>
+</div>
+<div class="sect3">
+<h4 id="maven-project-naming-conventions">Maven Project Naming Conventions</h4>
+<div class="sect4">
+<h5 id="_maven_module_names">Maven Module Names</h5>
 <div class="paragraph">
-<p>All test names should be prefixed with 'Test'.</p>
+<p>The following are not really accurate at this time. This is still TBD!</p>
 </div>
+<div class="ulist">
+<ul>
+<li>
+<p>Lowercase with dashes. Start with <code>windup-</code>.</p>
+</li>
+<li>
+<p>Ruleset addons start with <code>windup-rules-</code>.</p>
+</li>
+</ul>
 </div>
 </div>
 </div>
@@ -1354,12 +1410,15 @@ <h2 id="_get_started">Get Started</h2>
 <div class="sectionbody">
 <div class="sect2">
 <h3 id="Install-and-Configure-Maven">Install and Configure Maven</h3>
+<div class="paragraph">
+<p>If you plan to contribute to the core code base or create Java-based rule addons, you must first install and configure Maven to build Windup from source.</p>
+</div>
 <div class="sect3">
 <h4 id="_download_and_install_maven">Download and Install Maven</h4>
 <div class="paragraph">
 <p>If you plan to use Eclipse Luna (4.4) to build Windup, you can skip this
-step. This version of Eclipse embeds Maven 3.2.1 so you do not need to
-install it separately. Skip to the section entitled <a href="#configure-maven-to-build-windup">Configure Maven to Build Windup</a>.</p>
+step and go directly to the section entitled <a href="#configure-maven-to-build-windup">Configure Maven to Build Windup</a>. This version of Eclipse embeds Maven 3.2.1 so you do not need to
+install it separately.</p>
 </div>
 <div class="paragraph">
 <p>If you plan to run Maven using the command line or plan to use Red Hat
@@ -1467,18 +1526,21 @@ <h4 id="configure-maven-to-build-windup">Configure Maven to Build Windup</h4>
 element to make the profile active.</p>
 <div class="listingblock">
 <div class="content">
-<pre>    &lt;activeProfile&gt;jboss-nexus-repository&lt;/activeProfile&gt;</pre>
-</div>
+<pre>&lt;activeProfile&gt;jboss-nexus-repository&lt;/activeProfile&gt;</pre>
 </div>
-<div id="Dev-Get-the-Windup-Source-Code" class="paragraph">
-<p>=== Get the Windup Source Code</p>
 </div>
 </li>
 </ol>
 </div>
 <div class="paragraph">
-<p>To contribute to the Windup 2.0 project source code, you must fork the Windup repository to your own Git, clone your fork, commit your work on topic branches, and make pull requests back to the Windup repository.</p>
+<p>You are now configured to build Windup.</p>
+</div>
+</div>
 </div>
+<div class="sect2">
+<h3 id="Dev-Get-the-Windup-Source-Code">Get the Windup Source Code</h3>
+<div class="paragraph">
+<p>To contribute to the Windup 2.0 project source code, you must fork the Windup repository to your own Git, clone your fork, commit your work on topic branches, and make pull requests back to the Windup repository.</p>
 </div>
 <div class="sect3">
 <h4 id="_install_the_git_client">Install the Git Client</h4>
@@ -1726,7 +1788,7 @@ <h4 id="_build_windup_using_red_hat_jboss_developer_studio_or_eclipse">Build Win
 </li>
 <li>
 <p>In the Project Explorer tab, find the <code>windup_parent</code> project in the
-list, right-mouse, and choose <code>Run As</code> -&#8594; <code>Maven install</code>.</p>
+list, right-click, and choose <code>Run As</code> -&#8594; <code>Maven install</code>.</p>
 </li>
 </ol>
 </div>
@@ -1932,7 +1994,7 @@ <h4 id="_run_the_code_windup_migrate_app_code_command">Run the <code>windup-migr
 <div class="title">Note</div>
 </td>
 <td class="content">
-If the <strong>OUTPUT_REPORT_DIRECTORY</strong> directory exists, your are prompted to overwrite the contents. If you respond "y", it is deleted and recreated by Windup, so be careful not to specify an output directory that contains important information!
+If the <strong>OUTPUT_REPORT_DIRECTORY</strong> directory exists, you are prompted to overwrite the contents. If you respond "y", it is deleted and recreated by Windup, so be careful not to specify an output directory that contains important information!
 </td>
 </tr>
 </table>
@@ -2273,7 +2335,10 @@ <h3 id="Windup-Processing-Overview">Windup Processing Overview</h3>
 <div class="sect3">
 <h4 id="_discovery_phase">Discovery Phase</h4>
 <div class="paragraph">
-<p>Wnen you run the <code>windup-migrate-app</code> command, Windup executes its own core rules to extract files from archives, decompile classes, and analyze the application. In this phase, Windup builds a datamodel, storing component data and relationships in a graph database, which can then be queried and updated as needed by the migration rules and for reporting purposes.</p>
+<p>Wnen you run the <code>windup-migrate-app</code> command, Windup executes its own core rules to extract files from archives, decompile classes, and analyze the application. In this phase Windup builds a data model and stores component data and relationships in a graph database, which can then be queried and updated as needed by the migration rules and for reporting purposes.</p>
+</div>
+<div class="paragraph">
+<p>For more information about the phases of rule execution and how to control rule dependencies, see <a href="#Rules-Rule-Execution-Lifecycle">Rule Execution Lifecycle</a>.</p>
 </div>
 <div class="paragraph">
 <p>For more information about the graph database components, see <a href="#Windup-Architectural-Components">Windup Architectural Components</a>.</p>
@@ -2319,7 +2384,7 @@ <h3 id="Rules-Rule-Execution-Lifecycle">Rule Execution Lifecycle</h3>
 <div class="sect3">
 <h4 id="_rule_lifecycle">Rule Lifecycle</h4>
 <div class="paragraph">
-<p>Windup executes each rule in sequential order. The following
+<p>Windup executes each rule in a sequential order. The following
 sections describe the phases of rule execution and how rules may specify
 that one or more other rules must be executed before or after they are
 run.</p>
@@ -3074,6 +3139,9 @@ <h5 id="_create_the_java_ruleprovider">Create the Java RuleProvider</h5>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
+<p>Add <code>beans.xml</code> file to <code>META-INF/</code> dir in resources - typically, <code>$project-dir/src/main/resources/META-INF/beans.xml</code>. This file can be empty. It tells CDI to scan your addon for CDI beans.</p>
+</li>
+<li>
 <p>Within your Maven project, create a Java class that extends the <code>WindupRuleProvider</code> class. It is suggested that you end the name of the class with <code>RuleProvider</code>. For example:</p>
 <div class="listingblock">
 <div class="content">
@@ -3341,7 +3409,7 @@ <h4 id="_review_the_output_report">Review the Output Report</h4>
 <h2 id="_create_and_test_xml_rules">Create and Test XML Rules</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="Rules-Create-a-Basic-XML-Rule">Create a Basic XML Rule</h3>
+<h3 id="Rules-Create-am-Basic-XML-Rule">Create a Basic XML Rule</h3>
 <div class="paragraph">
 <p>You can create a rule addon using Java or a rule using XML or Groovy. This topic describes how to create a rule using XML.</p>
 </div>
@@ -3362,217 +3430,71 @@ <h4 id="_prerequisites_3">Prerequisites</h4>
 <li>
 <p>The JavaDoc for the Windup API is located here: <a href="http://windup.github.io/windup/docs/javadoc/latest/" class="bare">http://windup.github.io/windup/docs/javadoc/latest/</a></p>
 </li>
-</ul>
-</div>
-</li>
-</ul>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">
-Working examples of XML-based rules can be found in the Windup quickstarts GitHub repository located here: <a href="https://github.com/windup/windup-quickstarts" class="bare">https://github.com/windup/windup-quickstarts</a>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_create_a_rule">Create a Rule</h4>
-<div class="paragraph">
-<p>The following is an example of an XML rule.</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>&lt;?xml version="1.0"?&gt;
-&lt;ruleset xmlns="http://windup.jboss.org/v1/xml"
-  id="customruleprovider"&gt;
-  &lt;!-- This defaults to MIGRATION_RULES --&gt;
-  &lt;phase&gt;
-    DISCOVERY
-  &lt;/phase&gt;
-  &lt;rules&gt;
-    &lt;rule&gt;
-      &lt;when&gt;
-        &lt;javaclass references="javax.servlet.http.HttpServletRequest"&gt;
-          &lt;location&gt;METHOD_PARAMETER&lt;/location&gt;
-        &lt;/javaclass&gt;
-      &lt;/when&gt;
-      &lt;perform&gt;
-        &lt;hint&gt;
-      &lt;message&gt;Message from XML Rule&lt;/message&gt;
-          &lt;link href="http://example.com" description="Description from XML Hint Link" /&gt;
-        &lt;/hint&gt;
-        &lt;log message="test log message"/&gt;
-      &lt;/perform&gt;
-      &lt;otherwise&gt;
-        &lt;!--  --&gt;
-      &lt;/otherwise&gt;
-    &lt;/rule&gt;
-    &lt;rule&gt;
-      &lt;when&gt;
-        &lt;xmlfile xpath="/w:web-app/w:resource-ref/w:res-auth[text() = 'Container']"&gt;
-          &lt;namespace prefix="w" uri="http://java.sun.com/xml/ns/javaee"/&gt;
-        &lt;/xmlfile&gt;
-      &lt;/when&gt;
-      &lt;perform&gt;
-        &lt;hint&gt;
-      &lt;message&gt;Container Auth&lt;/message&gt;
-        &lt;/hint&gt;
-        &lt;xslt description="Example XSLT Conversion" extension="-converted-example.xml"
-                 xsltFile="/exampleconversion.xsl"/&gt;
-        &lt;log message="test log message"/&gt;
-      &lt;/perform&gt;
-      &lt;otherwise&gt;
-        &lt;!--  --&gt;
-      &lt;/otherwise&gt;
-    &lt;/rule&gt;
-  &lt;/rules&gt;
-&lt;/ruleset&gt;</pre>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_create_the_xml_rule">Create the XML Rule</h5>
-<div class="paragraph">
-<p><strong>Note:</strong> Windup only analyzes XML files with names ending in <code>.windup.xml</code>. Be sure to name XML-based rules using this naming convention!</p>
-</div>
-<div class="paragraph">
-<p>The XML rule consists of the following level elements:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>&lt;ruleset&gt;</strong>: This element defines this as a Windup rule.</p>
-</li>
 <li>
-<p><strong>&lt;phase&gt;</strong>: This element specifies when the ruleset should execute. See <a href="#Rules-Rule-Execution-Lifecycle">Rule Execution Lifecyle</a> for more information about rule phases.</p>
-</li>
-<li>
-<p><strong>&lt;rules&gt;</strong>: element contains the individual rules.</p>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>&lt;rule&gt;</strong>: This element is a child of the <strong>rules</strong> element. One or more rules can be defined for a ruleset. Each <code>rule</code> contains the following elements.</p>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>&lt;when&gt;</strong>: This element defines the condition to match on.</p>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>&lt;javaclass references="CLASS_NAME"&gt;</strong></p>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>&lt;location&gt;</strong>: The location where the reference was found in a Java source file. See the <a href="http://windup.github.io/windup/docs/javadoc/latest/org/jboss/windup/rules/apps/java/scan/ast/TypeReferenceLocation.html">Enum TypeReferenceLocation</a> Javadoc for valid values.</p>
+<p>The XML rule schema is located here: <a href="https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd" class="bare">https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd</a>.</p>
 </li>
 </ul>
 </div>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p><strong>&lt;perform&gt;</strong>: This element is invoked when the condition is met.</p>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>&lt;hint&gt;</strong>: This child element of <strong>perform</strong> is used to create a <code>hint</code></p>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>&lt;message&gt;</strong>:</p>
-</li>
-<li>
-<p><strong>&lt;link&gt;</strong>:</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p><strong>&lt;xslt&gt;</strong>: This specifies how to transform the the specified XML file</p>
-</li>
-<li>
-<p><strong>&lt;log&gt;</strong>: This child element of <strong>perform</strong> is used to log a message. It takes the attribute <strong>message</strong> to define the text message.</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>The <strong>&lt;otherwise&gt;</strong> element is invoked when the condition is not met.</p>
-</li>
-</ul>
-</div>
-</li>
-</ul>
-</div>
-</li>
-</ul>
 </div>
+<div class="sect3">
+<h4 id="_file_naming_convention_for_xml_rules">File Naming Convention for XML Rules</h4>
+<div class="paragraph">
+<p>You must name the file containing an XML rule with the <code>.windup.xml</code> extension. Windup identifies files with this extension as XML-base rules, so be sure to use this naming convention, otherwise the rule will not be evaluated!</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_add_the_rule_to_windup">Add the Rule to Windup</h4>
+<h4 id="_basic_xml_rule_template">Basic XML Rule Template</h4>
 <div class="paragraph">
-<p>A Windup rule is installed simply by copying the rule to the appropriate Windup folder. Windup scans for rules in the following locations:</p>
+<p>XML rules consist of <em>conditions</em> and <em>actions</em> and follow the familiar "if/then/else" construct:</p>
 </div>
-<div class="dlist">
-<dl>
-<dt class="hdlist1">WINDUP_HOME/rules/</dt>
-<dd>
-<p>This is the Windup folder where you run the Windup executable. See <a href="#About-the-WINDUP_HOME-Variable">About the WINDUP_HOME Variable</a> for details.</p>
-</dd>
-<dt class="hdlist1">${user.home}/.windup/rules/</dt>
-<dd>
-<p>This folder is created by Windup the first time you execute Windup.</p>
-<div class="listingblock">
+<div class="literalblock">
 <div class="content">
-<pre>For Linux or Mac:   ~/.windup/rules/
-For Windows: "\Documents and Settings\USER_NAME\.windup\rules\"  -or-  "\Users\USER_NAME\.windup\rules\"</pre>
-</div>
-</div>
-</dd>
-</dl>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_test_the_xml_rule">Test the XML Rule</h4>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">
-If you have not started Windup, follow the instructions to <a href="#Execute-Windup">Execute Windup</a>.
-</td>
-</tr>
-</table>
+<pre>when(condition)
+    perform(action)
+otherwise
+    perform(action)</pre>
 </div>
-<div class="paragraph">
-<p>Test the XML rule against your application file by running the <code>windup-migrate-app</code> command in the Windup console prompt.</p>
 </div>
 <div class="paragraph">
-<p>The command uses this syntax:</p>
+<p>The following is the basic syntax for XML rules.</p>
 </div>
-<div class="listingblock">
+<div class="literalblock">
 <div class="content">
-<pre>windup-migrate-app [--sourceMode true] --input INPUT_ARCHIVE_OR_FOLDER --output OUTPUT_REPORT_DIRECTORY --packages PACKAGE_1 PACKAGE_2 PACKAGE_N</pre>
+<pre>&lt;?xml version="1.0"?&gt;
+&lt;ruleset xmlns="http://windup.jboss.org/v1/xml" id="XmlFileMappings"&gt;
+    &lt;phase&gt;
+        &lt;!-- The phase in which to run the rules --&gt;
+    &lt;/phase&gt;
+    &lt;rules&gt;
+        &lt;rule&gt;
+            &lt;when&gt;
+                &lt;!-- Test a condition... --&gt;
+            &lt;/when&gt;
+            &lt;perform&gt;
+                &lt;!-- Perform this action when condition is satisfied --&gt;
+            &lt;/perform&gt;
+            &lt;otherwise&gt;
+                &lt;!-- Perform this action when condition is not satisfied --&gt;
+            &lt;/otherwise&gt;
+        &lt;/rule&gt;
+      &lt;rules&gt;
+    &lt;/ruleset&gt;</pre>
 </div>
 </div>
-<div class="paragraph">
-<p>You should see the following result:</p>
 </div>
-<div class="listingblock">
-<div class="content">
-<pre>***SUCCESS*** Windup report created: QUICKSTART_HOME/windup-reports-java/index.html</pre>
+<div class="sect3">
+<h4 id="_create_the_rule_when_condition">Create the Rule When Condition</h4>
+<div class="paragraph">
+<p>The syntax is dependent on whether you are creating a rule to evaluate Java class, an XML file, a project, or file content and is described in more detail here: <a href="#Rules-XML-Rule-When-Condition-Syntax">XML Rule - When Condition Syntax</a></p>
 </div>
 </div>
+<div class="sect3">
+<h4 id="_create_the_rule_perform_action">Create the Rule Perform Action</h4>
 <div class="paragraph">
-<p>For more information and examples of how to run Windup, see: <a href="#Execute-Windup">Execute Windup</a></p>
+<p>Operations allowed in the <code>perform</code> section of the rule include the classification of application resources, in-line hints for migration steps, links to migration information, and project lineitem reporting. The syntax is described in detail here: <a href="#Rules-XML-Rule-Perform-Action-Syntax">XML Rule - Perform Action Syntax</a>.</p>
 </div>
 </div>
 </div>
@@ -3669,7 +3591,10 @@ <h3 id="Dev-Classloading-Notes">Classloading Notes</h3>
 <h4 id="_finding_classes">Finding classes</h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-java" data-lang="java">AddonRegistry.getServices(MyServiceInterface.class)</code></pre>
+<pre class="highlight"><code class="language-java" data-lang="java">AddonRegistry.getServices(MyServiceInterface.class)
+
+// To get the AddonRegistry, use Windup's FurnaceHolder:
+FurnaceHolder.getFurnace().getAddonRegistry().getServices(MyServiceInterface.class);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3695,6 +3620,28 @@ <h4 id="_which_classloader_is_used_always_the_one_of_the_current_code">Which cla
 </div>
 </div>
 <div class="sect3">
+<h4 id="_reading_annotations_from_classes">Reading annotations from classes</h4>
+<div class="paragraph">
+<p>Since classes can be proxied by Forge/Furnace, it&#8217;s safer to read annotations using <code>Annotations API</code>:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>Rules annotation = Annotations.getAnnotation(this.getClass(), Rules.class);</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Supposedly, Furnace proxies should also be able to handle such call:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>Rules annotation1 = ((FurnaceProxy) proxy).getOriginalClass().getAnnotation(Rules.class);</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>TODO: Find out how exactly this is done.</p>
+</div>
+</div>
+<div class="sect3">
 <h4 id="_how_do_i_know_if_i_am_in_a_furnace_service">How do I know if I am in a Furnace service?</h4>
 <div class="paragraph">
 <p>Every furnace service is wrapped in a proxy. If it came from another
@@ -4709,7 +4656,7 @@ <h4 id="_rule_providers">Rule providers</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_models_2">Models</h4>
+<h4 id="_models">Models</h4>
 <div class="ulist">
 <ul>
 <li>
@@ -4979,7 +4926,7 @@ <h4 id="_rule_providers_2">Rule providers</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_models_3">Models</h4>
+<h4 id="_models_2">Models</h4>
 <div class="paragraph">
 <p>_Subclasses of <code>WindupVertexFrame</code>.</p>
 </div>
@@ -5418,6 +5365,15 @@ <h4 id="_classloading_problems">Classloading Problems</h4>
 <p>Configuring dependencies in a Forge-based project can be a little tricky.
 See <a href="#Dev-Dependencies">Dependencies</a> for some hints.</p>
 </div>
+<div class="listingblock">
+<div class="content">
+<pre>Caused by: java.lang.IllegalArgumentException: Type value for model 'org.jboss.windup.rules.files.model.FileReferenceModel' is already registered with model org.jboss.windup.rules.files.model.FileReferenceModel</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>This means that the model class is loaded twice. I.e. the module containing it is loaded twice. Or, in tests, you may be (accidentally) adding the class to the deployment.
+This may especially happen after Maven coordinates of some module are changed.</p>
+</div>
 </div>
 <div class="sect3">
 <h4 id="_wiki_and_product_documentation">Wiki and Product Documentation</h4>
@@ -5668,34 +5624,128 @@ <h4 id="_product_documentation">Product Documentation</h4>
 <div class="paragraph">
 <p>See the <a href="https://github.com/windup/windup-documentation/blob/master/CONTRIBUTING.adoc">CONTRIBUTING guide</a> for AsciiDoc syntax rules regarding headers and links to make this process easier.</p>
 </div>
+</div>
+<div class="sect3">
+<h4 id="_update_the_windup_documentation_with_the_latest_wiki_changes">Update the Windup Documentation with the Latest Wiki Changes</h4>
+<div class="sect4">
+<h5 id="_summary">Summary</h5>
+<div class="paragraph">
+<p>The Windup guides are located in the windup-documentation/docs directory. They are named the same as the guides in the Wiki but have a 'Windup-' prefix. The windup-documentation/docs guides should kept synchronized with the versions in the windup.wiki.</p>
+</div>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Wiki Guide</th>
+<th class="tableblock halign-left valign-top">Windup Docs Guide</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">User-Guide.asciidoc</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Windup-User-Guide.adoc</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Rules-Development-Guide.asciidoc</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Windup-Rules-Development-Guide.adoc</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Core-Development-Guide.asciidoc</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Windup-Core-Development-Guide.adoc</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Migration-Planning-Guide</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Windup-Migration-Planning-Guide.adoc</p></td>
+</tr>
+</tbody>
+</table>
+<div class="sect5">
+<h6 id="_documentation_update_scripts">Documentation Update Scripts</h6>
 <div class="paragraph">
-<p>The <a href="https://github.com/windup/windup-documentation/tree/master/scripts/windupDocUpdate.sh" class="bare">https://github.com/windup/windup-documentation/tree/master/scripts/windupDocUpdate.sh</a> script copies the pages from the Windup wiki to the windup-documentation repository, makes minor modifications, and generates each guide in a single HTML page book format. The resulting guides are created in the <code>html/</code> directory.</p>
+<p>The <a href="https://github.com/windup/windup-documentation/tree/master/scripts/windupDocUpdate.sh" class="bare">https://github.com/windup/windup-documentation/tree/master/scripts/windupDocUpdate.sh</a> script copies the pages from the Windup wiki to the windup-documentation repository, makes minor modifications, and generates each guide in a single HTML page book format. The resulting guides are created in the <code>WINDUP_DOCUMENTATION_HOME/html/</code> directory.</p>
 </div>
+<div class="paragraph">
+<p>The script performs the following steps.</p>
 </div>
-<div class="sect3">
-<h4 id="_publish_the_html_docs_to_online_docs_at_github_io">Publish the HTML docs to online docs (at GitHub IO)</h4>
-<div class="ulist">
-<ul>
+<div class="olist arabic">
+<ol class="arabic">
 <li>
-<p>The first time, you must fork and clone the windup GitHub repository. After that, just fetch the latest upstream.</p>
-<div class="listingblock">
+<p>Copies the Windup wiki pages to the <code>WINDUP_DOCUMENTATION_HOME/docs/</code> directory, renaming them with the <code>.adoc</code> extension.</p>
+</li>
+<li>
+<p>Makes sure each guide includes all pages that are referenced by pages within it. Scripts are provided to search for links within each individual guide. They navigate to the <code>WINDUP_DOCUMENTATION_HOME/docs/</code> directory and search using the following command:</p>
+<div class="literalblock">
 <div class="content">
-<pre>git clone https://github.com/windup/windup.git
-git fetch upstream</pre>
+<pre>grep 'xref:[A-Z]' `find . -name '*.adoc'`.</pre>
+</div>
+</div>
+</li>
+<li>
+<p>Replaces each <code>xref:</code> to external pages with an <code>xref:</code> using the following command.</p>
+<div class="literalblock">
+<div class="content">
+<pre>find . -name '*.adoc' -print | xargs sed -i 's/xref:/xref:/g'</pre>
 </div>
 </div>
 </li>
 <li>
-<p>The first time, you must fork and clone the windup-documentation GitHub repository. After that, just fetch the latest upstream.</p>
+<p>Navigates to the <code>WINDUP_DOCUMENTATION_HOME/</code> directory and builds the books. The single page HTML files are created in the <code>WINDUP_DOCUMENTATION_HOME/html/</code> directory.</p>
+<table class="tableblock frame-all grid-all spread">
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Windup Guide</th>
+<th class="tableblock halign-left valign-top">Command</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Windup User Guide</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">asciidoctor -t -dbook -a toc -o html/WindupUserGuide.html docs/Windup-User-Guide.adoc</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Windup Rules Development Guide</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">asciidoctor -t -dbook -a toc -o html/WindupRulesDevelopmentGuide.html docs/Windup-Rules-Development-Guide.adoc</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Windup Core Development Guide</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">asciidoctor -t -dbook -a toc -o html/WindupCoreDevelopmentGuide.html docs/Windup-Core-Development-Guide.adoc</p></td>
+</tr>
+</tbody>
+</table>
+</li>
+</ol>
+</div>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_publish_the_html_docs_for_access_at_github_io">Publish the HTML Docs for Access at GitHub IO</h4>
+<div class="paragraph">
+<p>The <a href="https://github.com/windup/windup-documentation/tree/master/scripts/windupPublish.sh" class="bare">https://github.com/windup/windup-documentation/tree/master/scripts/windupPublish.sh</a> script copies the pages from the Windup wiki to the windup-documentation repository, makes minor modifications, and generates each guide in a single HTML page book format. The resulting guides are created in the <code>WINDUP_DOCUMENTATION_HOME/html/</code> directory.</p>
+</div>
+<div class="paragraph">
+<p>The script performs the following steps.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>The first time, you must fork and clone the windup GitHub repository. After that, just fetch the latest upstream.</p>
 <div class="listingblock">
 <div class="content">
-<pre>git clone https://github.com/windup/windup-documentation.git
+<pre>git clone https://github.com/windup/windup.git
 git fetch upstream</pre>
 </div>
 </div>
 </li>
 <li>
-<p>Navigate to the local windup directory.</p>
+<p>Navigate to the local <code>WINDUP_HOME/</code> directory.</p>
 <div class="listingblock">
 <div class="content">
 <pre>cd windup</pre>
@@ -5703,26 +5753,28 @@ <h4 id="_publish_the_html_docs_to_online_docs_at_github_io">Publish the HTML doc
 </div>
 </li>
 <li>
-<p>Checkout the gh-pages from the windup repository</p>
+<p>Checkout the <code>gh-pages</code> from the <code>WINDUP_HOME</code> repository</p>
 <div class="listingblock">
 <div class="content">
-<pre>git checkout -b gh-pages windup</pre>
+<pre>git checkout -b gh-pages windup/gh-pages</pre>
 </div>
 </div>
 </li>
 <li>
-<p>If the directory does not yet exist, create a docs/WINDUP-RELEASE-html/ directory.</p>
+<p>If the <code>WINDUP_HOME/docs/WINDUP_RELEASE/</code> directory does not yet exist, create a <code>docs/WINDUP_RELEASE/html/images/</code></p>
 <div class="listingblock">
 <div class="content">
-<pre>mkdir -p docs/2.0.0.VERSION/html (if it doesn't exist!)</pre>
+<pre>mkdir -p docs/WINDUP_RELEASE/html/images (if it doesn't exist!)</pre>
 </div>
 </div>
 </li>
 <li>
-<p>Copy any new images, stylesheets, and html files from windup-documentation:</p>
+<p>Copy any the images, stylesheets, and html files from windup-documentation:</p>
 <div class="listingblock">
 <div class="content">
-<pre>cp ../windup-documentation/html/*.html ../windup-documentation/*.css ../windup-documentation/images/* docs/2.0.0.VERSION/html</pre>
+<pre>cp WINDUP_DOCUMENTATION_HOME/html/*.html WINDUP_HOME/docs/WINDUP_RELEASE/html/
+cp WINDUP_DOCUMENTATION_HOME/*.css WINDUP_HOME/docs/WINDUP_RELEASE/html/
+cp WINDUP_DOCUMENTATION_HOME/images/* WINDUP_HOME/docs/WINDUP_RELEASE/html/images/</pre>
 </div>
 </div>
 </li>
@@ -5751,7 +5803,69 @@ <h4 id="_publish_the_html_docs_to_online_docs_at_github_io">Publish the HTML doc
 </div>
 </li>
 <li>
-<p>View the documentation at <a href="http://windup.github.io/windup/docs/2.0.0.VERSION/html/WindupUserGuide.html" class="bare">http://windup.github.io/windup/docs/2.0.0.VERSION/html/WindupUserGuide.html</a></p>
+<p>View the documentation at <a href="http://windup.github.io/windup/docs/WINDUP_RELEASE/html/WindupUserGuide.html" class="bare">http://windup.github.io/windup/docs/WINDUP_RELEASE/html/WindupUserGuide.html</a></p>
+</li>
+<li>
+<p>Update the symlink for <code>latest</code> to point to the new version.</p>
+<div class="ulist">
+<ul>
+<li>
+<p>Navigate to the <code>WINDUP_HOME/docs</code> directory.</p>
+</li>
+<li>
+<p>Remove the existing symlink for "latest".</p>
+<div class="literalblock">
+<div class="content">
+<pre>unlink latest</pre>
+</div>
+</div>
+</li>
+<li>
+<p>Create a symlink to the new documentation.</p>
+<div class="literalblock">
+<div class="content">
+<pre>Syntax: ln -s WINDUP_RELEASE latest
+Example: ln -s 2.0.0.Final latest</pre>
+</div>
+</div>
+</li>
+<li>
+<p>Add the modified "latest" directory to Git.</p>
+<div class="literalblock">
+<div class="content">
+<pre>git add latest</pre>
+</div>
+</div>
+</li>
+<li>
+<p>Commit the change.</p>
+<div class="literalblock">
+<div class="content">
+<pre>git commit -m 'Replace symlink for latest to point to 2.0.0.Final'</pre>
+</div>
+</div>
+</li>
+<li>
+<p>Push the changes to your own git repository, verify and issue a pull.</p>
+<div class="literalblock">
+<div class="content">
+<pre>git push origin HEAD</pre>
+</div>
+</div>
+</li>
+<li>
+<p>Push the changes upstream</p>
+<div class="literalblock">
+<div class="content">
+<pre>git push upstream gh-pages</pre>
+</div>
+</div>
+</li>
+<li>
+<p>View the documentation at <a href="http://windup.github.io/windup/docs/latest/html/WindupUserGuide.html" class="bare">http://windup.github.io/windup/docs/latest/html/WindupUserGuide.html</a></p>
+</li>
+</ul>
+</div>
 </li>
 </ul>
 </div>
@@ -5925,7 +6039,7 @@ <h4 id="_reporting_terms">Reporting Terms</h4>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-02-04 16:09:16 EST
+Last updated 2015-03-17 13:12:03 EDT
 </div>
 </div>
 </body>
diff --git a/html/WindupRulesDevelopmentGuide.html b/html/WindupRulesDevelopmentGuide.html
index 0fa2bb90ae..08449777c0 100644
--- a/html/WindupRulesDevelopmentGuide.html
+++ b/html/WindupRulesDevelopmentGuide.html
@@ -415,76 +415,75 @@ <h1>Windup Rules Development Guide</h1>
 <div id="toc" class="toc">
 <div id="toctitle">Table of Contents</div>
 <ul class="sectlevel1">
-<li><a href="#_overview">Overview</a>
+<li><a href="#_overview">1. Overview</a>
 <ul class="sectlevel2">
-<li><a href="#What-is-Windup">What is Windup?</a></li>
-<li><a href="#Features-of-Windup-2.0">Features of Windup 2.0</a></li>
-<li><a href="#Windup-Processing-Overview">Windup Processing Overview</a></li>
-<li><a href="#Get-Involved">Get Involved</a></li>
-<li><a href="#Report-Issues-with-Windup">Report Issues with Windup</a></li>
-<li><a href="#About-the-WINDUP_HOME-Variable">About the WINDUP_HOME Variable</a></li>
+<li><a href="#_what_is_windup">1.1. What is Windup?</a></li>
+<li><a href="#Features-of-Windup-2.0">1.2. Features of Windup 2.0</a></li>
+<li><a href="#Windup-Processing-Overview">1.3. Windup Processing Overview</a></li>
+<li><a href="#Get-Involved">1.4. Get Involved</a></li>
+<li><a href="#Report-Issues-with-Windup">1.5. Report Issues with Windup</a></li>
+<li><a href="#About-the-WINDUP_HOME-Variable">1.6. About the WINDUP_HOME Variable</a></li>
 </ul>
 </li>
-<li><a href="#_get_started">Get Started</a>
+<li><a href="#_get_started">2. Get Started</a>
 <ul class="sectlevel2">
-<li><a href="#Install-Windup">Install Windup</a></li>
-<li><a href="#Execute-Windup">Execute Windup</a></li>
-<li><a href="#Review-the-Report">Review the Report</a></li>
+<li><a href="#Install-Windup">2.1. Install Windup</a></li>
+<li><a href="#Execute-Windup">2.2. Execute Windup</a></li>
+<li><a href="#Review-the-Report">2.3. Review the Report</a></li>
 </ul>
 </li>
-<li><a href="#_configure_your_system_for_java_based_rules">Configure Your System for Java-based Rules</a>
+<li><a href="#_understand_the_rule_processing">3. Understand the Rule Processing</a>
 <ul class="sectlevel2">
-<li><a href="#Install-and-Configure-Maven">Install and Configure Maven</a></li>
+<li><a href="#Windup-Processing-Overview">3.1. Windup Processing Overview</a></li>
+<li><a href="#Rules-Rule-Execution-Lifecycle">3.2. Rule Execution Lifecycle</a></li>
+<li><a href="#Rules-Rule-Story-Points">3.3. Rule Story Points</a></li>
 </ul>
 </li>
-<li><a href="#_understand_the_rule_processing">Understand the Rule Processing</a>
+<li><a href="#_create_and_test_java_rule_addons">4. Create and Test Java Rule Addons</a>
 <ul class="sectlevel2">
-<li><a href="#Windup-Processing-Overview">Windup Processing Overview</a></li>
-<li><a href="#Rules-Rule-Execution-Lifecycle">Rule Execution Lifecycle</a></li>
-<li><a href="#Rules-Rule-Story-Points">Rule Story Points</a></li>
+<li><a href="#Install-and-Configure-Maven">4.1. Install and Configure Maven</a></li>
+<li><a href="#Rules-Java-based-Rule-Structure">4.2. Java-based Rule Structure</a></li>
+<li><a href="#Rules-Basic-Rule-Execution-Flow-Patterns">4.3. Basic Rule Execution Flow Patterns</a></li>
+<li><a href="#Rules-Create-a-Basic-Java-based-Rule-Add-on">4.4. Create a Basic Java-based Rule Add-on</a></li>
 </ul>
 </li>
-<li><a href="#_create_and_test_java_rule_addons">Create and Test Java Rule Addons</a>
+<li><a href="#_create_and_test_xml_rules">5. Create and Test XML Rules</a>
 <ul class="sectlevel2">
-<li><a href="#Rules-Java-based-Rule-Structure">Java-based Rule Structure</a></li>
-<li><a href="#Rules-Basic-Rule-Execution-Flow-Patterns">Basic Rule Execution Flow Patterns</a></li>
-<li><a href="#Rules-Create-a-Basic-Java-based-Rule-Add-on">Create a Basic Java-based Rule Add-on</a></li>
+<li><a href="#Rules-Create-am-Basic-XML-Rule">5.1. Create a Basic XML Rule</a></li>
+<li><a href="#Rules-XML-Rule-When-Condition-Syntax">5.2. XML Rule - When Condition Syntax</a></li>
+<li><a href="#Rules-XML-Rule-Perform-Action-Syntax">5.3. XML Rule - Perform Action Syntax</a></li>
+<li><a href="#Rules-Test-an-XML-Rule-In-Windup">5.4. Test an XML Rule in Windup</a></li>
 </ul>
 </li>
-<li><a href="#_create_and_test_xml_rules">Create and Test XML Rules</a>
+<li><a href="#_review_the_report">6. Review the Report</a>
 <ul class="sectlevel2">
-<li><a href="#Rules-Create-a-Basic-XML-Rule">Create a Basic XML Rule</a></li>
+<li><a href="#Review-the-Report">6.1. Review the Report</a></li>
 </ul>
 </li>
-<li><a href="#_review_the_report">Review the Report</a>
+<li><a href="#_external_rule_examples">7. External Rule Examples</a>
 <ul class="sectlevel2">
-<li><a href="#Review-the-Report">Review the Report</a></li>
+<li><a href="#Review-the-Windup-Quickstarts">7.1. Review the Windup Quickstarts</a></li>
 </ul>
 </li>
-<li><a href="#_external_rule_examples">External Rule Examples</a>
+<li><a href="#_debugging_and_troubleshooting">8. Debugging and Troubleshooting</a>
 <ul class="sectlevel2">
-<li><a href="#Review-the-Windup-Quickstarts">Review the Windup Quickstarts</a></li>
+<li><a href="#Dev-Debugging-and-Profiling">8.1. Debugging and Profiling</a></li>
+<li><a href="#_troubleshoot_windup_issues">8.2. Troubleshoot Windup Issues</a></li>
 </ul>
 </li>
-<li><a href="#_debugging_and_troubleshooting">Debugging and Troubleshooting</a>
+<li><a href="#_additional_resources_2">9. Additional Resources</a>
 <ul class="sectlevel2">
-<li><a href="#Dev-Debugging-and-Profiling">Debugging and Profiling</a></li>
-<li><a href="#_troubleshoot_windup_issues">Troubleshoot Windup Issues</a></li>
+<li><a href="#Rules-Available-Rules-Utilities">9.1. Available Rule Utilities</a></li>
+<li><a href="#Review-the-Windup-Quickstarts">9.2. Review the Windup Quickstarts</a></li>
+<li><a href="#Known-Issues">9.3. Known Windup Issues</a></li>
+<li><a href="#Glossary">9.4. Glossary of Terms Used in Windup</a></li>
 </ul>
 </li>
-<li><a href="#_additional_resources">Additional Resources</a>
+<li><a href="#_appendix">10. Appendix</a>
 <ul class="sectlevel2">
-<li><a href="#Rules-Available-Rules-Utilities">Available Rule Utilities</a></li>
-<li><a href="#Review-the-Windup-Quickstarts">Review the Windup Quickstarts</a></li>
-<li><a href="#Known-Issues">Known Windup Issues</a></li>
-<li><a href="#Glossary">Glossary of Terms Used in Windup</a></li>
-</ul>
-</li>
-<li><a href="#_appendix">Appendix</a>
-<ul class="sectlevel2">
-<li><a href="#Windup-Architectural-Components">Windup Architectural Components</a></li>
-<li><a href="#Dev-Dependencies">Dependencies (Forge add-ons)</a></li>
-<li><a href="#Rules-Windup-Models">Windup Models</a></li>
+<li><a href="#Windup-Architectural-Components">10.1. Windup Architectural Components</a></li>
+<li><a href="#Dev-Dependencies">10.2. Dependencies (Forge add-ons)</a></li>
+<li><a href="#Rules-Windup-Models">10.3. Windup Models</a></li>
 </ul>
 </li>
 </ul>
@@ -492,18 +491,18 @@ <h1>Windup Rules Development Guide</h1>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_overview">Overview</h2>
+<h2 id="_overview">1. Overview</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>This guide is for engineers, consultants, and others who plan to create
 custom rules for Windup 2.0.</p>
 </div>
-<div class="sect2">
-<h3 id="What-is-Windup">What is Windup?</h3>
 <div class="paragraph">
-<p><span class="image"><img src="images/windup-logo-wiki-header.jpg" alt="Windup Logo"></span></p>
+<p><span class="image"><img src="images/images/windup-logo-wiki-header.jpg" alt="Windup Logo"></span></p>
 </div>
 <hr>
+<div class="sect2">
+<h3 id="_what_is_windup">1.1. What is Windup?</h3>
 <div class="paragraph">
 <p>JBoss Windup is a rule-based tool to simplify application migrations.</p>
 </div>
@@ -514,13 +513,13 @@ <h3 id="What-is-Windup">What is Windup?</h3>
 migrating from other containers to JBoss EAP a piece of cake.</p>
 </div>
 <div class="sect3">
-<h4 id="_windup_2_0_vs_windup_0_7_x">Windup 2.0 vs. Windup 0.7.x</h4>
+<h4 id="_windup_2_0_vs_windup_0_7_x">1.1.1. Windup 2.0 vs. Windup 0.7.x</h4>
 <div class="paragraph">
 <p>Windup 2.0 aims to deliver the same functionality as legacy Windup, however, the internal architecture and rule structure is very different and allows for the creation of much more complex rules.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_how_does_windup_simplify_migration">How Does Windup Simplify Migration?</h4>
+<h4 id="_how_does_windup_simplify_migration">1.1.2. How Does Windup Simplify Migration?</h4>
 <div class="paragraph">
 <p>Windup looks for common resources and highlight technologies and known “trouble
 spots” in migrating applications. The goal of Windup is to provide a
@@ -560,14 +559,14 @@ <h4 id="_how_does_windup_simplify_migration">How Does Windup Simplify Migration?
 </table>
 </div>
 <div class="sect3">
-<h4 id="_follow_windup_on_twitter">Follow Windup on Twitter!</h4>
+<h4 id="_follow_windup_on_twitter">1.1.3. Follow Windup on Twitter!</h4>
 <div class="paragraph">
 <p>Follow Windup on Twitter <a href="https://twitter.com/jbosswindup">@JBossWindup</a> for updates and more!</p>
 </div>
 </div>
 </div>
 <div class="sect2">
-<h3 id="Features-of-Windup-2.0">Features of Windup 2.0</h3>
+<h3 id="Features-of-Windup-2.0">1.2. Features of Windup 2.0</h3>
 <div class="hdlist">
 <table>
 <tr>
@@ -701,7 +700,7 @@ <h3 id="Features-of-Windup-2.0">Features of Windup 2.0</h3>
 </div>
 </div>
 <div class="sect2">
-<h3 id="Windup-Processing-Overview">Windup Processing Overview</h3>
+<h3 id="Windup-Processing-Overview">1.3. Windup Processing Overview</h3>
 <div class="paragraph">
 <p>Windup is a rule-based migration tool that allows you to write customized rules to analyze the APIs, technologies, and architectures used by the applications you plan to migrate. The Windup tool also executes its own core rules through all phases of the migration process.</p>
 </div>
@@ -709,16 +708,19 @@ <h3 id="Windup-Processing-Overview">Windup Processing Overview</h3>
 <p>The following is a high level conceptual overview of what happens within Windup when you execute the tool against your application or archive.</p>
 </div>
 <div class="sect3">
-<h4 id="_discovery_phase">Discovery Phase</h4>
+<h4 id="_discovery_phase">1.3.1. Discovery Phase</h4>
+<div class="paragraph">
+<p>Wnen you run the <code>windup-migrate-app</code> command, Windup executes its own core rules to extract files from archives, decompile classes, and analyze the application. In this phase Windup builds a data model and stores component data and relationships in a graph database, which can then be queried and updated as needed by the migration rules and for reporting purposes.</p>
+</div>
 <div class="paragraph">
-<p>Wnen you run the <code>windup-migrate-app</code> command, Windup executes its own core rules to extract files from archives, decompile classes, and analyze the application. In this phase, Windup builds a datamodel, storing component data and relationships in a graph database, which can then be queried and updated as needed by the migration rules and for reporting purposes.</p>
+<p>For more information about the phases of rule execution and how to control rule dependencies, see <a href="#Rules-Rule-Execution-Lifecycle">Rule Execution Lifecycle</a>.</p>
 </div>
 <div class="paragraph">
 <p>For more information about the graph database components, see <a href="#Windup-Architectural-Components">Windup Architectural Components</a>.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_application_migration">Application Migration</h4>
+<h4 id="_application_migration">1.3.2. Application Migration</h4>
 <div class="paragraph">
 <p>The next step in the process is the execution of the migration rules. In this phase, the rules typically do not execute against the application input files. Instead, they execute against the graph database model. Windup rules are independent and decoupled and they communicate with each other using the graph database model. Rules query the graph database to obtain information needed to test the rule condition. They also update the data model with information based on the result of the rule execution. This allows rules to easily interact with other rules and enables the creation of very complex rules.</p>
 </div>
@@ -727,7 +729,7 @@ <h4 id="_application_migration">Application Migration</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_generate_findings_based_on_the_rule_execution_results">Generate Findings Based on the Rule Execution Results</h4>
+<h4 id="_generate_findings_based_on_the_rule_execution_results">1.3.3. Generate Findings Based on the Rule Execution Results</h4>
 <div class="paragraph">
 <p>The final step in the process is to pull data from the graph database model to generate of reports and optionally generate scripts. Again, Windup uses rules to generate the final output.</p>
 </div>
@@ -753,9 +755,9 @@ <h4 id="_generate_findings_based_on_the_rule_execution_results">Generate Finding
 </div>
 </div>
 <div class="sect2">
-<h3 id="Get-Involved">Get Involved</h3>
+<h3 id="Get-Involved">1.4. Get Involved</h3>
 <div class="sect3">
-<h4 id="_how_can_you_help">How can you help?</h4>
+<h4 id="_how_can_you_help">1.4.1. How can you help?</h4>
 <div class="paragraph">
 <p>To help us make Windup cover most application constructs and server configurations, including yours, you can help with any of the following items. Some items require only a few minutes of your time!</p>
 </div>
@@ -822,7 +824,7 @@ <h4 id="_how_can_you_help">How can you help?</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_helpful_links">Helpful links</h4>
+<h4 id="_helpful_links">1.4.2. Helpful links</h4>
 <div class="ulist">
 <ul>
 <li>
@@ -848,6 +850,9 @@ <h4 id="_helpful_links">Helpful links</h4>
 <p>Windup Forums: <a href="https://community.jboss.org/en/windup" class="bare">https://community.jboss.org/en/windup</a></p>
 </li>
 <li>
+<p>Windup Forums: <a href="https://developer.jboss.org/en/windup" class="bare">https://developer.jboss.org/en/windup</a> (inherited from Windup 0.x)</p>
+</li>
+<li>
 <p>Windup Issue Tracker: <a href="https://issues.jboss.org/browse/WINDUP" class="bare">https://issues.jboss.org/browse/WINDUP</a></p>
 </li>
 <li>
@@ -867,12 +872,12 @@ <h4 id="_helpful_links">Helpful links</h4>
 </div>
 </div>
 <div class="sect2">
-<h3 id="Report-Issues-with-Windup">Report Issues with Windup</h3>
+<h3 id="Report-Issues-with-Windup">1.5. Report Issues with Windup</h3>
 <div class="paragraph">
 <p>Windup uses JIRA as its issue tracking system. If you encounter an issue executing Windup, please file a Windup JIRA Issue.</p>
 </div>
 <div class="sect3">
-<h4 id="_create_a_jira_account">Create a JIRA Account</h4>
+<h4 id="_create_a_jira_account">1.5.1. Create a JIRA Account</h4>
 <div class="paragraph">
 <p>If you do not yet have a JIRA account, create one using the following procedure.</p>
 </div>
@@ -894,7 +899,7 @@ <h4 id="_create_a_jira_account">Create a JIRA Account</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_create_a_jira_issue">Create a JIRA Issue</h4>
+<h4 id="_create_a_jira_issue">1.5.2. Create a JIRA Issue</h4>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
@@ -953,7 +958,7 @@ <h4 id="_create_a_jira_issue">Create a JIRA Issue</h4>
 </div>
 </div>
 <div class="sect2">
-<h3 id="About-the-WINDUP_HOME-Variable">About the WINDUP_HOME Variable</h3>
+<h3 id="About-the-WINDUP_HOME-Variable">1.6. About the WINDUP_HOME Variable</h3>
 <div class="paragraph">
 <p>This documentation uses the <code>WINDUP_HOME</code> <strong>replaceable</strong> value to denote the path to the Windup distribution. When you encounter this value in the documentation, be sure to replace it with the actual path to your Windup installation.</p>
 </div>
@@ -971,10 +976,10 @@ <h3 id="About-the-WINDUP_HOME-Variable">About the WINDUP_HOME Variable</h3>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_get_started">Get Started</h2>
+<h2 id="_get_started">2. Get Started</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="Install-Windup">Install Windup</h3>
+<h3 id="Install-Windup">2.1. Install Windup</h3>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
@@ -1000,9 +1005,9 @@ <h3 id="Install-Windup">Install Windup</h3>
 </div>
 </div>
 <div class="sect2">
-<h3 id="Execute-Windup">Execute Windup</h3>
+<h3 id="Execute-Windup">2.2. Execute Windup</h3>
 <div class="sect3">
-<h4 id="_prerequisites">Prerequisites</h4>
+<h4 id="_prerequisites">2.2.1. Prerequisites</h4>
 <div class="paragraph">
 <p>Before you begin, you must gather the following information.</p>
 </div>
@@ -1067,7 +1072,7 @@ <h4 id="_prerequisites">Prerequisites</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_start_windup">Start Windup</h4>
+<h4 id="_start_windup">2.2.2. Start Windup</h4>
 <div class="paragraph">
 <p>For information about the use of WINDUP_HOME in the instructions below, see <a href="#About-the-WINDUP_HOME-Variable">About the WINDUP_HOME Variable</a>.</p>
 </div>
@@ -1108,7 +1113,7 @@ <h4 id="_start_windup">Start Windup</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_run_the_code_windup_migrate_app_code_command">Run the <code>windup-migrate-app</code> Command</h4>
+<h4 id="_run_the_code_windup_migrate_app_code_command">2.2.3. Run the <code>windup-migrate-app</code> Command</h4>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
@@ -1142,7 +1147,7 @@ <h4 id="_run_the_code_windup_migrate_app_code_command">Run the <code>windup-migr
 <div class="title">Note</div>
 </td>
 <td class="content">
-If the <strong>OUTPUT_REPORT_DIRECTORY</strong> directory exists, your are prompted to overwrite the contents. If you respond "y", it is deleted and recreated by Windup, so be careful not to specify an output directory that contains important information!
+If the <strong>OUTPUT_REPORT_DIRECTORY</strong> directory exists, you are prompted to overwrite the contents. If you respond "y", it is deleted and recreated by Windup, so be careful not to specify an output directory that contains important information!
 </td>
 </tr>
 </table>
@@ -1191,7 +1196,7 @@ <h4 id="_run_the_code_windup_migrate_app_code_command">Run the <code>windup-migr
 </div>
 </div>
 <div class="sect3">
-<h4 id="_run_windup_in_batch_mode">Run Windup in Batch Mode</h4>
+<h4 id="_run_windup_in_batch_mode">2.2.4. Run Windup in Batch Mode</h4>
 <div class="paragraph">
 <p>Windup can be also executed in batch mode within a shell or batch script using the <code>--evaluate</code> argument as follows.</p>
 </div>
@@ -1213,7 +1218,7 @@ <h4 id="_run_windup_in_batch_mode">Run Windup in Batch Mode</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_windup_help">Windup Help</h4>
+<h4 id="_windup_help">2.2.5. Windup Help</h4>
 <div class="paragraph">
 <p>To see the list of available parameters for the <code>windup-migrate-app</code> command, execute the following command in the Windup prompt:</p>
 </div>
@@ -1224,7 +1229,7 @@ <h4 id="_windup_help">Windup Help</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="windup-command-examples">Windup Command Examples</h4>
+<h4 id="windup-command-examples">2.2.6. Windup Command Examples</h4>
 <div class="paragraph">
 <p>The following Windup command examples report against applications located in the Windup source <a href="https://github.com/windup/windup/tree/master/test-files">test-files</a> directory.</p>
 </div>
@@ -1274,9 +1279,9 @@ <h5 id="_windup_quickstart_examples">Windup Quickstart Examples</h5>
 </div>
 </div>
 <div class="sect2">
-<h3 id="Review-the-Report">Review the Report</h3>
+<h3 id="Review-the-Report">2.3. Review the Report</h3>
 <div class="sect3">
-<h4 id="_about_the_report">About the Report</h4>
+<h4 id="_about_the_report">2.3.1. About the Report</h4>
 <div class="paragraph">
 <p>When you execute Windup, the report is generated in the <code>OUTPUT_REPORT_DIRECTORY</code> you specify for the <code>--output</code> argument in the command line. This output directory contains the following files and subdirectories:</p>
 </div>
@@ -1309,19 +1314,19 @@ <h4 id="_about_the_report">About the Report</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_open_the_report">Open the Report</h4>
+<h4 id="_open_the_report">2.3.2. Open the Report</h4>
 <div class="paragraph">
 <p>Use your favorite browser to open the <code>index.html</code> file located in the output report directory. You should see something like the following:</p>
 </div>
 <div class="paragraph">
-<p><span class="image"><img src="images/report-index-page.png" alt="Report Index Page" width="500"></span></p>
+<p><span class="image"><img src="images/images/report-index-page.png" alt="Report Index Page" width="500"></span></p>
 </div>
 <div class="paragraph">
 <p>Click on the link under the <strong>Name</strong> column to view the Windup application report page.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_report_sections">Report Sections</h4>
+<h4 id="_report_sections">2.3.3. Report Sections</h4>
 <div class="sect4">
 <h5 id="_application_report_page">Application Report Page</h5>
 <div class="paragraph">
@@ -1341,7 +1346,7 @@ <h5 id="_application_report_page">Application Report Page</h5>
 <p>The following is an example of a Windup Application Report.</p>
 </div>
 <div class="paragraph">
-<p><span class="image"><img src="images/report-javaee-ear-summary.png" alt="Report Summary Page" width="500"></span></p>
+<p><span class="image"><img src="images/images/report-javaee-ear-summary.png" alt="Report Summary Page" width="500"></span></p>
 </div>
 </div>
 <div class="sect4">
@@ -1404,7 +1409,7 @@ <h5 id="_archive_analysis_sections">Archive Analysis Sections</h5>
 <p>The following is an example of the archive analysis summary section of a Windup Report. In this example, it&#8217;s the analysis of the <code>WINDUP_SOURCE/test-files/jee-example-app-1.0.0.ear/jee-example-services.jar</code>.</p>
 </div>
 <div class="paragraph">
-<p><span class="image"><img src="images/report-javaee-ear-03-services-jar.png" alt="Report Archive Page" width="500"></span></p>
+<p><span class="image"><img src="images/images/report-javaee-ear-03-services-jar.png" alt="Report Archive Page" width="500"></span></p>
 </div>
 </div>
 <div class="sect4">
@@ -1426,18 +1431,18 @@ <h5 id="_file_analysis_pages">File Analysis Pages</h5>
 <p>In this example, warnings appear at the import of <code>weblogic.application.ApplicationLifecycleEvent</code> and report that the class is proprietary to WebLogic and must be removed.</p>
 </div>
 <div class="paragraph">
-<p><span class="image"><img src="images/report-javaee-ear-file-detail-part1.png" alt="File Detail - Part 1" width="500"></span></p>
+<p><span class="image"><img src="images/images/report-javaee-ear-file-detail-part1.png" alt="File Detail - Part 1" width="500"></span></p>
 </div>
 <div class="paragraph">
 <p>Later in the code, warnings appear for the creation of the InitialContext and for the object name when registering and unregistering an MBeans</p>
 </div>
 <div class="paragraph">
-<p><span class="image"><img src="images/report-javaee-ear-file-detail-part2.png" alt="File Detail - Part 2" width="500"></span></p>
+<p><span class="image"><img src="images/images/report-javaee-ear-file-detail-part2.png" alt="File Detail - Part 2" width="500"></span></p>
 </div>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_additional_reports">Additional Reports</h4>
+<h4 id="_additional_reports">2.3.4. Additional Reports</h4>
 <div class="paragraph">
 <p>Explore the Windup <code>OUTPUT_REPORT_DIRECTORY/reports</code> folder to find additional reporting information.</p>
 </div>
@@ -1447,7 +1452,7 @@ <h5 id="_rule_provider_execution_report">Rule Provider Execution Report</h5>
 <p>The <code>OUTPUT_REPORT_DIRECTORY/reports/windup_ruleproviders.html</code> page provides the list of rule providers that executed when running the Windup migration command against the application.</p>
 </div>
 <div class="paragraph">
-<p><span class="image"><img src="images/report-javaee-ear-ruleprovider.png" alt="RuleProvider Report" width="500"></span></p>
+<p><span class="image"><img src="images/images/report-javaee-ear-ruleprovider.png" alt="RuleProvider Report" width="500"></span></p>
 </div>
 </div>
 <div class="sect4">
@@ -1462,139 +1467,7 @@ <h5 id="_individual_file_analysis_reports">Individual File Analysis Reports</h5>
 <p>You can directly access the the file analysis report pages described above by browsing for them by name in the <code>OUTPUT_REPORT_DIRECTORY/reports/</code> directory. Because the same common file names can exist in multiple archives, for example "manifest.mf" or "web.xml", Windup adds a unique numeric suffix to each report file name.</p>
 </div>
 <div class="paragraph">
-<p><span class="image"><img src="images/report-directory-file-list.png" alt="Report Directory File List" width="500"></span></p>
-</div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_configure_your_system_for_java_based_rules">Configure Your System for Java-based Rules</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>If you plan to create Java-based rule addons, you must also do the following.</p>
-</div>
-<div class="sect2">
-<h3 id="Install-and-Configure-Maven">Install and Configure Maven</h3>
-<div class="sect3">
-<h4 id="_download_and_install_maven">Download and Install Maven</h4>
-<div class="paragraph">
-<p>If you plan to use Eclipse Luna (4.4) to build Windup, you can skip this
-step. This version of Eclipse embeds Maven 3.2.1 so you do not need to
-install it separately. Skip to the section entitled <a href="#configure-maven-to-build-windup">Configure Maven to Build Windup</a>.</p>
-</div>
-<div class="paragraph">
-<p>If you plan to run Maven using the command line or plan to use Red Hat
-JBoss Developer Studio 7.1.1 or an older version of Eclipse, you must
-install Maven 3.1.1. or later.</p>
-</div>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Go to <a href="http://maven.apache.org/download.html">Apache Maven Project -
-Download Maven</a> and download the latest distribution for your operating
-system.</p>
-</li>
-<li>
-<p>See the Maven documentation for information on how to download and
-install Apache Maven for your operating system.</p>
-</li>
-</ol>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_configure_the_maven_installation_in_your_ide">Configure the Maven Installation in Your IDE</h4>
-<div class="paragraph">
-<p>JBoss Developer Studio 7.1.1 is built upon Eclipse Kepler (4.3), which
-embeds Maven 3.0.4. If you plan to use JBoss Developer Studio 7.1.1 or
-an Eclipse version earier than Eclipse Luna (4.4), you must replace the
-embedded 3.0.4 version of Maven with this newer version.</p>
-</div>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>From the menu, choose <code>Window</code> -&#8594; <code>Preferences</code>.</p>
-</li>
-<li>
-<p>Expand <code>Maven</code> and click on <code>Installations</code>.</p>
-</li>
-<li>
-<p>Uncheck <code>Embedded (3.0.4/1.4.0.20130531-2315)</code></p>
-</li>
-<li>
-<p>Click <code>Add</code> and navigate to your Maven install directory. Select it
-and click <code>OK</code>.</p>
-</li>
-<li>
-<p>Make sure the new external Maven installation is checked and click
-<code>OK</code> to return to JBoss Developer Studio.</p>
-</li>
-</ol>
-</div>
-<div class="paragraph">
-<p><em>Note: If you use another IDE, refer to the product documentation to
-update the Maven installation.</em></p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="configure-maven-to-build-windup">Configure Maven to Build Windup</h4>
-<div class="paragraph">
-<p>Windup uses artifacts located in the
-<a href="http://repository.jboss.org/nexus/content/groups/public/">JBoss Nexus</a>
-repository. You must configure Maven to use this repository before you
-build Windup.</p>
-</div>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open your <code>${user.home}/.m2/settings.xml</code> file for editing.</p>
-</li>
-<li>
-<p>Copy the following <code>jboss-nexus-repository</code> profile XML prior to the
-ending <code>&lt;/profiles&gt;</code> element.</p>
-<div class="listingblock">
-<div class="content">
-<pre>&lt;profile&gt;
-  &lt;id&gt;jboss-nexus-repository&lt;/id&gt;
-  &lt;repositories&gt;
-    &lt;repository&gt;
-      &lt;id&gt;jboss-nexus-repository&lt;/id&gt;
-      &lt;url&gt;http://repository.jboss.org/nexus/content/groups/public/&lt;/url&gt;
-      &lt;releases&gt;
-        &lt;enabled&gt;true&lt;/enabled&gt;
-      &lt;/releases&gt;
-      &lt;snapshots&gt;
-        &lt;enabled&gt;true&lt;/enabled&gt;
-      &lt;/snapshots&gt;
-    &lt;/repository&gt;
-  &lt;/repositories&gt;
-  &lt;pluginRepositories&gt;
-    &lt;pluginRepository&gt;
-      &lt;id&gt;jboss-nexus-plugin-repository&lt;/id&gt;
-      &lt;url&gt;http://repository.jboss.org/nexus/content/groups/public/&lt;/url&gt;
-      &lt;releases&gt;
-        &lt;enabled&gt;true&lt;/enabled&gt;
-      &lt;/releases&gt;
-      &lt;snapshots&gt;
-        &lt;enabled&gt;true&lt;/enabled&gt;
-      &lt;/snapshots&gt;
-    &lt;/pluginRepository&gt;
-  &lt;/pluginRepositories&gt;
-&lt;/profile&gt;</pre>
-</div>
-</div>
-</li>
-<li>
-<p>Copy the following XML prior to the ending <code>&lt;/activeprofiles&gt;</code>
-element to make the profile active.</p>
-<div class="listingblock">
-<div class="content">
-<pre>    &lt;activeProfile&gt;jboss-nexus-repository&lt;/activeProfile&gt;</pre>
-</div>
-</div>
-</li>
-</ol>
+<p><span class="image"><img src="images/images/report-directory-file-list.png" alt="Report Directory File List" width="500"></span></p>
 </div>
 <div class="paragraph">
 <p>include::http://windup.github.io/windup/docs/javadoc/latest/[Windup API JavaDoc reference]: The JavaDoc can serve as a reference for creating Java-based rule addons.</p>
@@ -1603,11 +1476,12 @@ <h4 id="configure-maven-to-build-windup">Configure Maven to Build Windup</h4>
 </div>
 </div>
 </div>
+</div>
 <div class="sect1">
-<h2 id="_understand_the_rule_processing">Understand the Rule Processing</h2>
+<h2 id="_understand_the_rule_processing">3. Understand the Rule Processing</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="Windup-Processing-Overview">Windup Processing Overview</h3>
+<h3 id="Windup-Processing-Overview">3.1. Windup Processing Overview</h3>
 <div class="paragraph">
 <p>Windup is a rule-based migration tool that allows you to write customized rules to analyze the APIs, technologies, and architectures used by the applications you plan to migrate. The Windup tool also executes its own core rules through all phases of the migration process.</p>
 </div>
@@ -1615,16 +1489,19 @@ <h3 id="Windup-Processing-Overview">Windup Processing Overview</h3>
 <p>The following is a high level conceptual overview of what happens within Windup when you execute the tool against your application or archive.</p>
 </div>
 <div class="sect3">
-<h4 id="_discovery_phase_2">Discovery Phase</h4>
+<h4 id="_discovery_phase_2">3.1.1. Discovery Phase</h4>
+<div class="paragraph">
+<p>Wnen you run the <code>windup-migrate-app</code> command, Windup executes its own core rules to extract files from archives, decompile classes, and analyze the application. In this phase Windup builds a data model and stores component data and relationships in a graph database, which can then be queried and updated as needed by the migration rules and for reporting purposes.</p>
+</div>
 <div class="paragraph">
-<p>Wnen you run the <code>windup-migrate-app</code> command, Windup executes its own core rules to extract files from archives, decompile classes, and analyze the application. In this phase, Windup builds a datamodel, storing component data and relationships in a graph database, which can then be queried and updated as needed by the migration rules and for reporting purposes.</p>
+<p>For more information about the phases of rule execution and how to control rule dependencies, see <a href="#Rules-Rule-Execution-Lifecycle">Rule Execution Lifecycle</a>.</p>
 </div>
 <div class="paragraph">
 <p>For more information about the graph database components, see <a href="#Windup-Architectural-Components">Windup Architectural Components</a>.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_application_migration_2">Application Migration</h4>
+<h4 id="_application_migration_2">3.1.2. Application Migration</h4>
 <div class="paragraph">
 <p>The next step in the process is the execution of the migration rules. In this phase, the rules typically do not execute against the application input files. Instead, they execute against the graph database model. Windup rules are independent and decoupled and they communicate with each other using the graph database model. Rules query the graph database to obtain information needed to test the rule condition. They also update the data model with information based on the result of the rule execution. This allows rules to easily interact with other rules and enables the creation of very complex rules.</p>
 </div>
@@ -1633,7 +1510,7 @@ <h4 id="_application_migration_2">Application Migration</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_generate_findings_based_on_the_rule_execution_results_2">Generate Findings Based on the Rule Execution Results</h4>
+<h4 id="_generate_findings_based_on_the_rule_execution_results_2">3.1.3. Generate Findings Based on the Rule Execution Results</h4>
 <div class="paragraph">
 <p>The final step in the process is to pull data from the graph database model to generate of reports and optionally generate scripts. Again, Windup uses rules to generate the final output.</p>
 </div>
@@ -1659,11 +1536,11 @@ <h4 id="_generate_findings_based_on_the_rule_execution_results_2">Generate Findi
 </div>
 </div>
 <div class="sect2">
-<h3 id="Rules-Rule-Execution-Lifecycle">Rule Execution Lifecycle</h3>
+<h3 id="Rules-Rule-Execution-Lifecycle">3.2. Rule Execution Lifecycle</h3>
 <div class="sect3">
-<h4 id="_rule_lifecycle">Rule Lifecycle</h4>
+<h4 id="_rule_lifecycle">3.2.1. Rule Lifecycle</h4>
 <div class="paragraph">
-<p>Windup executes each rule in sequential order. The following
+<p>Windup executes each rule in a sequential order. The following
 sections describe the phases of rule execution and how rules may specify
 that one or more other rules must be executed before or after they are
 run.</p>
@@ -1675,7 +1552,7 @@ <h4 id="_rule_lifecycle">Rule Lifecycle</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_rule_phases">Rule Phases</h4>
+<h4 id="_rule_phases">3.2.2. Rule Phases</h4>
 <div class="listingblock">
 <div class="content">
 <pre>INFO: Loaded [67] org.jboss.windup.config.WindupRuleProvider [
@@ -1775,7 +1652,7 @@ <h4 id="_rule_phases">Rule Phases</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_execute_before_and_execute_after">Execute Before and Execute After</h4>
+<h4 id="_execute_before_and_execute_after">3.2.3. Execute Before and Execute After</h4>
 <div class="paragraph">
 <p>A rule may specify that one or more rules must be executed before it is
 run. In this case, all named rules will be fired in the order specified
@@ -1807,16 +1684,16 @@ <h4 id="_execute_before_and_execute_after">Execute Before and Execute After</h4>
 </div>
 </div>
 <div class="sect2">
-<h3 id="Rules-Rule-Story-Points">Rule Story Points</h3>
+<h3 id="Rules-Rule-Story-Points">3.3. Rule Story Points</h3>
 <div class="sect3">
-<h4 id="_what_are_story_points">What are Story Points?</h4>
+<h4 id="_what_are_story_points">3.3.1. What are Story Points?</h4>
 <div class="paragraph">
 <div class="title">DRAFT</div>
 <p>Story points are an abstract metric used in Scrum methodology to estimate the level of effort for various tasks. They are based on a <a href="http://scrummethodology.com/scrum-effort-estimation-and-story-points/">modified Fibonacci sequence</a>. In a similar manner, Windup uses story points to express the level of effort needed to migrate particular application constructs, and in a sum, the application as a whole.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_how_to_estimate_story_points_in_a_rule">How to Estimate Story Points in a Rule</h4>
+<h4 id="_how_to_estimate_story_points_in_a_rule">3.3.2. How to Estimate Story Points in a Rule</h4>
 <div class="paragraph">
 <p>Estimating story points for a rule can be tricky. The following are general guidelines or suggestions to use when estimating the level of effort required for a rule.</p>
 </div>
@@ -1868,17 +1745,146 @@ <h4 id="_how_to_estimate_story_points_in_a_rule">How to Estimate Story Points in
 </div>
 </div>
 <div class="sect1">
-<h2 id="_create_and_test_java_rule_addons">Create and Test Java Rule Addons</h2>
+<h2 id="_create_and_test_java_rule_addons">4. Create and Test Java Rule Addons</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="Rules-Java-based-Rule-Structure">Java-based Rule Structure</h3>
+<h3 id="Install-and-Configure-Maven">4.1. Install and Configure Maven</h3>
+<div class="paragraph">
+<p>If you plan to contribute to the core code base or create Java-based rule addons, you must first install and configure Maven to build Windup from source.</p>
+</div>
+<div class="sect3">
+<h4 id="_download_and_install_maven">4.1.1. Download and Install Maven</h4>
+<div class="paragraph">
+<p>If you plan to use Eclipse Luna (4.4) to build Windup, you can skip this
+step and go directly to the section entitled <a href="#configure-maven-to-build-windup">Configure Maven to Build Windup</a>. This version of Eclipse embeds Maven 3.2.1 so you do not need to
+install it separately.</p>
+</div>
+<div class="paragraph">
+<p>If you plan to run Maven using the command line or plan to use Red Hat
+JBoss Developer Studio 7.1.1 or an older version of Eclipse, you must
+install Maven 3.1.1. or later.</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>Go to <a href="http://maven.apache.org/download.html">Apache Maven Project -
+Download Maven</a> and download the latest distribution for your operating
+system.</p>
+</li>
+<li>
+<p>See the Maven documentation for information on how to download and
+install Apache Maven for your operating system.</p>
+</li>
+</ol>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_configure_the_maven_installation_in_your_ide">4.1.2. Configure the Maven Installation in Your IDE</h4>
+<div class="paragraph">
+<p>JBoss Developer Studio 7.1.1 is built upon Eclipse Kepler (4.3), which
+embeds Maven 3.0.4. If you plan to use JBoss Developer Studio 7.1.1 or
+an Eclipse version earier than Eclipse Luna (4.4), you must replace the
+embedded 3.0.4 version of Maven with this newer version.</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>From the menu, choose <code>Window</code> -&#8594; <code>Preferences</code>.</p>
+</li>
+<li>
+<p>Expand <code>Maven</code> and click on <code>Installations</code>.</p>
+</li>
+<li>
+<p>Uncheck <code>Embedded (3.0.4/1.4.0.20130531-2315)</code></p>
+</li>
+<li>
+<p>Click <code>Add</code> and navigate to your Maven install directory. Select it
+and click <code>OK</code>.</p>
+</li>
+<li>
+<p>Make sure the new external Maven installation is checked and click
+<code>OK</code> to return to JBoss Developer Studio.</p>
+</li>
+</ol>
+</div>
+<div class="paragraph">
+<p><em>Note: If you use another IDE, refer to the product documentation to
+update the Maven installation.</em></p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="configure-maven-to-build-windup">4.1.3. Configure Maven to Build Windup</h4>
+<div class="paragraph">
+<p>Windup uses artifacts located in the
+<a href="http://repository.jboss.org/nexus/content/groups/public/">JBoss Nexus</a>
+repository. You must configure Maven to use this repository before you
+build Windup.</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>Open your <code>${user.home}/.m2/settings.xml</code> file for editing.</p>
+</li>
+<li>
+<p>Copy the following <code>jboss-nexus-repository</code> profile XML prior to the
+ending <code>&lt;/profiles&gt;</code> element.</p>
+<div class="listingblock">
+<div class="content">
+<pre>&lt;profile&gt;
+  &lt;id&gt;jboss-nexus-repository&lt;/id&gt;
+  &lt;repositories&gt;
+    &lt;repository&gt;
+      &lt;id&gt;jboss-nexus-repository&lt;/id&gt;
+      &lt;url&gt;http://repository.jboss.org/nexus/content/groups/public/&lt;/url&gt;
+      &lt;releases&gt;
+        &lt;enabled&gt;true&lt;/enabled&gt;
+      &lt;/releases&gt;
+      &lt;snapshots&gt;
+        &lt;enabled&gt;true&lt;/enabled&gt;
+      &lt;/snapshots&gt;
+    &lt;/repository&gt;
+  &lt;/repositories&gt;
+  &lt;pluginRepositories&gt;
+    &lt;pluginRepository&gt;
+      &lt;id&gt;jboss-nexus-plugin-repository&lt;/id&gt;
+      &lt;url&gt;http://repository.jboss.org/nexus/content/groups/public/&lt;/url&gt;
+      &lt;releases&gt;
+        &lt;enabled&gt;true&lt;/enabled&gt;
+      &lt;/releases&gt;
+      &lt;snapshots&gt;
+        &lt;enabled&gt;true&lt;/enabled&gt;
+      &lt;/snapshots&gt;
+    &lt;/pluginRepository&gt;
+  &lt;/pluginRepositories&gt;
+&lt;/profile&gt;</pre>
+</div>
+</div>
+</li>
+<li>
+<p>Copy the following XML prior to the ending <code>&lt;/activeprofiles&gt;</code>
+element to make the profile active.</p>
+<div class="listingblock">
+<div class="content">
+<pre>&lt;activeProfile&gt;jboss-nexus-repository&lt;/activeProfile&gt;</pre>
+</div>
+</div>
+</li>
+</ol>
+</div>
+<div class="paragraph">
+<p>You are now configured to build Windup.</p>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="Rules-Java-based-Rule-Structure">4.2. Java-based Rule Structure</h3>
 <div class="paragraph">
 <p>TODO:
 * Add a how-to for compound rules, nested rules, rules over multiple sources, negative queries (not matched by anything).
 Points] <a href="https://issues.jboss.org/browse/WINDUP-255">WINDUP-255</a></p>
 </div>
 <div class="sect3">
-<h4 id="_windup_rule_provider">Windup Rule Provider</h4>
+<h4 id="_windup_rule_provider">4.2.1. Windup Rule Provider</h4>
 <div class="paragraph">
 <p>Windup rules are based on <a href="http://ocpsoft.org/rewrite/">OCPsoft Rewrite</a>, an open source routing and URL rewriting solution for Servlets, Java Web Frameworks, and Java EE. The <strong>rewrite</strong> framework allows you to create rule providers and rules in an easy to read format.</p>
 </div>
@@ -1930,7 +1936,7 @@ <h4 id="_windup_rule_provider">Windup Rule Provider</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_add_rule_code_structure">Add Rule Code Structure</h4>
+<h4 id="_add_rule_code_structure">4.2.2. Add Rule Code Structure</h4>
 <div class="paragraph">
 <p>Like most rule-based frameworks, Windup rules consist of the following:</p>
 </div>
@@ -2073,7 +2079,7 @@ <h5 id="_metadata">Metadata</h5>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_available_utilities">Available utilities</h4>
+<h4 id="_available_utilities">4.2.3. Available utilities</h4>
 <div class="paragraph">
 <p>For a list of what key services and constructs can be used in the rule,
 see <a href="#Rules-Available-Rules-Utilities">Available Rules Utilities</a>.</p>
@@ -2081,12 +2087,12 @@ <h4 id="_available_utilities">Available utilities</h4>
 </div>
 </div>
 <div class="sect2">
-<h3 id="Rules-Basic-Rule-Execution-Flow-Patterns">Basic Rule Execution Flow Patterns</h3>
+<h3 id="Rules-Basic-Rule-Execution-Flow-Patterns">4.3. Basic Rule Execution Flow Patterns</h3>
 <div class="paragraph">
 <p>SGILDA: TODO - Need some links to github to the respective example files.</p>
 </div>
 <div class="sect3">
-<h4 id="_operation_single_operation">operation();  - single operation</h4>
+<h4 id="_operation_single_operation">4.3.1. operation();  - single operation</h4>
 <div class="paragraph">
 <p>When no iteration or condition is needed.</p>
 </div>
@@ -2107,7 +2113,7 @@ <h4 id="_operation_single_operation">operation();  - single operation</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_if_operation_single_conditional_operation">if( &#8230;&#8203; ){ operation(); }  - single conditional operation</h4>
+<h4 id="_if_operation_single_conditional_operation">4.3.2. if( &#8230;&#8203; ){ operation(); }  - single conditional operation</h4>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight"><code class="language-java" data-lang="java">return ConfigurationBuilder.begin()
@@ -2123,7 +2129,7 @@ <h4 id="_if_operation_single_conditional_operation">if( &#8230;&#8203; ){ operat
 </div>
 </div>
 <div class="sect3">
-<h4 id="_for_foomodel_class_single_iteration">for( FooModel.class ){ &#8230;&#8203; } - Single iteration</h4>
+<h4 id="_for_foomodel_class_single_iteration">4.3.3. for( FooModel.class ){ &#8230;&#8203; } - Single iteration</h4>
 <div class="paragraph">
 <p>For simple iterations, <code>IteratingRuleProvider</code> can be used, which makes the <code>perform</code> a bit less verbose:</p>
 </div>
@@ -2154,7 +2160,7 @@ <h4 id="_for_foomodel_class_single_iteration">for( FooModel.class ){ &#8230;&#82
 </div>
 </div>
 <div class="sect3">
-<h4 id="_if_for_conditional_iteration">if( &#8230;&#8203; ){ for( &#8230;&#8203; ) } - conditional iteration</h4>
+<h4 id="_if_for_conditional_iteration">4.3.4. if( &#8230;&#8203; ){ for( &#8230;&#8203; ) } - conditional iteration</h4>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight"><code class="language-java" data-lang="java">return ConfigurationBuilder.begin()
@@ -2169,7 +2175,7 @@ <h4 id="_if_for_conditional_iteration">if( &#8230;&#8203; ){ for( &#8230;&#8203;
 </div>
 </div>
 <div class="sect3">
-<h4 id="_for_if_iteration_with_a_condition">for( &#8230;&#8203; ){ if( &#8230;&#8203; ){ &#8230;&#8203; } } - iteration with a condition</h4>
+<h4 id="_for_if_iteration_with_a_condition">4.3.5. for( &#8230;&#8203; ){ if( &#8230;&#8203; ){ &#8230;&#8203; } } - iteration with a condition</h4>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight"><code class="language-java" data-lang="java">return ConfigurationBuilder.begin()
@@ -2196,7 +2202,7 @@ <h4 id="_for_if_iteration_with_a_condition">for( &#8230;&#8203; ){ if( &#8230;&#
 </div>
 </div>
 <div class="sect3">
-<h4 id="_for_for_nested_iterations">for( &#8230;&#8203; ){ for( &#8230;&#8203; ) { &#8230;&#8203; } } - nested iterations</h4>
+<h4 id="_for_for_nested_iterations">4.3.6. for( &#8230;&#8203; ){ for( &#8230;&#8203; ) { &#8230;&#8203; } } - nested iterations</h4>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight"><code class="language-java" data-lang="java"></code></pre>
@@ -2205,12 +2211,12 @@ <h4 id="_for_for_nested_iterations">for( &#8230;&#8203; ){ for( &#8230;&#8203; )
 </div>
 </div>
 <div class="sect2">
-<h3 id="Rules-Create-a-Basic-Java-based-Rule-Add-on">Create a Basic Java-based Rule Add-on</h3>
+<h3 id="Rules-Create-a-Basic-Java-based-Rule-Add-on">4.4. Create a Basic Java-based Rule Add-on</h3>
 <div class="paragraph">
 <p>You can create a rule using Java or XML. This topic describes how to create a rule add-on using Java.</p>
 </div>
 <div class="sect3">
-<h4 id="_prerequisites_2">Prerequisites</h4>
+<h4 id="_prerequisites_2">4.4.1. Prerequisites</h4>
 <div class="ulist">
 <ul>
 <li>
@@ -2248,7 +2254,7 @@ <h4 id="_prerequisites_2">Prerequisites</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_create_a_rule_add_on">Create a Rule Add-on</h4>
+<h4 id="_create_a_rule_add_on">4.4.2. Create a Rule Add-on</h4>
 <div class="sect4">
 <h5 id="_create_a_maven_project">Create a Maven Project</h5>
 <div class="paragraph">
@@ -2418,7 +2424,10 @@ <h5 id="_create_the_java_ruleprovider">Create the Java RuleProvider</h5>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
-<p>Within your Maven project, create a Java class that extends the <code>WindupRuleProvider</code> class. It is suggested that you end the name of the class with <code>RuleProvider</code>. For example:</p>
+<p>Add <code>beans.xml</code> file to <code>META-INF/</code> dir in resources - typically, <code>$project-dir/src/main/resources/META-INF/beans.xml</code>. This file can be empty. It tells CDI to scan your addon for CDI beans.</p>
+</li>
+<li>
+<p>Within your Maven project, create a Java class that extends the <code>WindupRuleProvider</code> class. It is suggested that you end the name of the class with <code>RuleProvider</code>. For example:</p>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight"><code class="language-xml" data-lang="xml">public class MyCustomRuleProvider extends WindupRuleProvider
@@ -2526,7 +2535,7 @@ <h5 id="_create_the_java_ruleprovider">Create the Java RuleProvider</h5>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_install_the_java_based_rule_add_on">Install the Java-based Rule Add-on</h4>
+<h4 id="_install_the_java_based_rule_add_on">4.4.3. Install the Java-based Rule Add-on</h4>
 <div class="paragraph">
 <p>The easiest and fastest way to build the rule add-on, install it into the local Maven repository, and install it into Windup as a rule add-on is to use the Windup <code>addon-build-and-install</code> command.</p>
 </div>
@@ -2555,7 +2564,7 @@ <h4 id="_install_the_java_based_rule_add_on">Install the Java-based Rule Add-on<
 </div>
 </div>
 <div class="sect3">
-<h4 id="_test_the_java_based_rule_add_on">Test the Java-based Rule Add-on</h4>
+<h4 id="_test_the_java_based_rule_add_on">4.4.4. Test the Java-based Rule Add-on</h4>
 <div class="paragraph">
 <p>Test the Java-based rule add-on against your application file by running the <code>windup-migrate-app</code> command in the Windup console prompt.</p>
 </div>
@@ -2580,7 +2589,7 @@ <h4 id="_test_the_java_based_rule_add_on">Test the Java-based Rule Add-on</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_review_the_output_report">Review the Output Report</h4>
+<h4 id="_review_the_output_report">4.4.5. Review the Output Report</h4>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
@@ -2628,277 +2637,1001 @@ <h4 id="_review_the_output_report">Review the Output Report</h4>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Inter-rule action</p>
-</li>
-<li>
-<p><a href="#Rules:-Rules-Execution-Lifecycle">Inter-rule dependency</a></p>
-<div class="ulist">
-<ul>
-<li>
-<p>Short IDs - <a href="https://issues.jboss.org/browse/WINDUP-217">WINDUP-216</a>
-=== Create an Advanced Ruleset</p>
-</li>
-</ul>
+</li>
+<li>
+<p>Inter-rule action</p>
+</li>
+<li>
+<p><a href="#Rules:-Rules-Execution-Lifecycle">Inter-rule dependency</a></p>
+<div class="ulist">
+<ul>
+<li>
+<p>Short IDs - <a href="https://issues.jboss.org/browse/WINDUP-217">WINDUP-216</a>
+=== Create an Advanced Ruleset</p>
+</li>
+</ul>
+</div>
+</li>
+</ul>
+</div>
+</li>
+</ul>
+</div>
+<div class="olist arabic">
+<div class="title">DRAFT</div>
+<ol class="arabic">
+<li>
+<p>Create the Forge add-on</p>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="#Rules-Create-a-Basic-Java-based-Rule-Add-on">Create a Basic Java-based Rule Add-on</a></p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Add the dependencies you need</p>
+</li>
+<li>
+<p>Create the service with your functionality, if needed</p>
+</li>
+<li>
+<p>Create the rules
+(Add a the LINK)</p>
+</li>
+<li>
+<p>Add the information to the report
+(Add a the LINK)</p>
+</li>
+</ol>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_create_and_test_xml_rules">5. Create and Test XML Rules</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="Rules-Create-am-Basic-XML-Rule">5.1. Create a Basic XML Rule</h3>
+<div class="paragraph">
+<p>You can create a rule addon using Java or a rule using XML or Groovy. This topic describes how to create a rule using XML.</p>
+</div>
+<div class="sect3">
+<h4 id="_prerequisites_3">5.1.1. Prerequisites</h4>
+<div class="ulist">
+<ul>
+<li>
+<p>You should have already <a href="#Install-Windup">installed Windup</a>.</p>
+</li>
+<li>
+<p>Before you begin, you may also want to be familiar with the following documentation:</p>
+<div class="ulist">
+<ul>
+<li>
+<p>Windup rules are based on the ocpsoft <strong>rewrite</strong> project. You can find more information about ocpsoft <strong>rewrite</strong> here: <a href="http://ocpsoft.org/rewrite/" class="bare">http://ocpsoft.org/rewrite/</a></p>
+</li>
+<li>
+<p>The JavaDoc for the Windup API is located here: <a href="http://windup.github.io/windup/docs/javadoc/latest/" class="bare">http://windup.github.io/windup/docs/javadoc/latest/</a></p>
+</li>
+<li>
+<p>The XML rule schema is located here: <a href="https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd" class="bare">https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd</a>.</p>
+</li>
+</ul>
+</div>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_file_naming_convention_for_xml_rules">5.1.2. File Naming Convention for XML Rules</h4>
+<div class="paragraph">
+<p>You must name the file containing an XML rule with the <code>.windup.xml</code> extension. Windup identifies files with this extension as XML-base rules, so be sure to use this naming convention, otherwise the rule will not be evaluated!</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_basic_xml_rule_template">5.1.3. Basic XML Rule Template</h4>
+<div class="paragraph">
+<p>XML rules consist of <em>conditions</em> and <em>actions</em> and follow the familiar "if/then/else" construct:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>when(condition)
+    perform(action)
+otherwise
+    perform(action)</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The following is the basic syntax for XML rules.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>&lt;?xml version="1.0"?&gt;
+&lt;ruleset xmlns="http://windup.jboss.org/v1/xml" id="XmlFileMappings"&gt;
+    &lt;phase&gt;
+        &lt;!-- The phase in which to run the rules --&gt;
+    &lt;/phase&gt;
+    &lt;rules&gt;
+        &lt;rule&gt;
+            &lt;when&gt;
+                &lt;!-- Test a condition... --&gt;
+            &lt;/when&gt;
+            &lt;perform&gt;
+                &lt;!-- Perform this action when condition is satisfied --&gt;
+            &lt;/perform&gt;
+            &lt;otherwise&gt;
+                &lt;!-- Perform this action when condition is not satisfied --&gt;
+            &lt;/otherwise&gt;
+        &lt;/rule&gt;
+      &lt;rules&gt;
+    &lt;/ruleset&gt;</pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_create_the_rule_when_condition">5.1.4. Create the Rule When Condition</h4>
+<div class="paragraph">
+<p>The syntax is dependent on whether you are creating a rule to evaluate Java class, an XML file, a project, or file content and is described in more detail here: <a href="#Rules-XML-Rule-When-Condition-Syntax">XML Rule - When Condition Syntax</a></p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_create_the_rule_perform_action">5.1.5. Create the Rule Perform Action</h4>
+<div class="paragraph">
+<p>Operations allowed in the <code>perform</code> section of the rule include the classification of application resources, in-line hints for migration steps, links to migration information, and project lineitem reporting. The syntax is described in detail here: <a href="#Rules-XML-Rule-Perform-Action-Syntax">XML Rule - Perform Action Syntax</a>.</p>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="Rules-XML-Rule-When-Condition-Syntax">5.2. XML Rule - When Condition Syntax</h3>
+<div class="paragraph">
+<p>Conditions allowed in the <code>when</code> portion of a rule must extend <a href="http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/config/operation/GraphOperation.html">GraphOperaton</a> and currently include evaluation of Java classes, XML files, projects, and file content. Because XML rules are modeled after the Java-based rule addons, links to JavaDocs for the related Java classes are provided for a better understanding of how they behave.</p>
+</div>
+<div class="paragraph">
+<p>The complete XML rule schema is located here: <a href="https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd" class="bare">https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd</a>.</p>
+</div>
+<div class="paragraph">
+<p>The following sections describe the more common XML <code>when</code> rule conditions.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="#javaclass-syntax">javaclass Syntax</a></p>
+</li>
+<li>
+<p><a href="#xmlfile-syntax">xmlfile Syntax</a></p>
+</li>
+<li>
+<p><a href="#project-syntax">project Syntax</a></p>
+</li>
+<li>
+<p><a href="#filecontent-syntax">filecontent Syntax</a></p>
+</li>
+</ul>
+</div>
+<div class="sect3">
+<h4 id="javaclass-syntax">5.2.1. javaclass Syntax</h4>
+<div class="sect4">
+<h5 id="_summary">Summary</h5>
+<div class="paragraph">
+<p>Use the <code>javaclass</code> element to find imports, methods, variable declarations, annotations, class implementations, and other items related to Java classes. For a better understanding of the <code>javaclass</code> condition, see the JavaDoc for the <a href="http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/rules/apps/java/condition/JavaClass.html">JavaClass</a> class.</p>
+</div>
+<div class="paragraph">
+<p>The following is an example of a rule that tests for a <code>javaclass</code>.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>&lt;rule&gt;
+    &lt;when&gt;
+        &lt;javaclass references="org.jboss.ws.api.annotation.WebContext" in="org/jboss/{*}" as="webcontextclasses"&gt;
+            &lt;location&gt;IMPORT&lt;/location&gt;
+            &lt;location&gt;TYPE&lt;/location&gt;
+        &lt;/javaclass&gt;
+    &lt;/when&gt;
+    &lt;perform&gt;
+        &lt;hint message="WebContext is deprecated." effort="0"/&gt;
+    &lt;/perform&gt;
+&lt;/rule&gt;</pre>
+</div>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_construct_a_javaclass_element">Construct a javaclass Element</h5>
+<div class="sect5">
+<h6 id="_javaclass_element_attributes">javaclass Element Attributes</h6>
+<div class="dlist">
+<dl>
+<dt class="hdlist1">references="CLASS_NAME"</dt>
+<dd>
+<p>The package or class name to match on. Wildcard characters can be used.</p>
+<div class="literalblock">
+<div class="content">
+<pre>Example: references="org.apache.commons.{*}"</pre>
+</div>
+</div>
+</dd>
+<dt class="hdlist1">as="VARIABLE_NAME"</dt>
+<dd>
+<p>A variable name assigned to the rule so that it can be used as a reference in later processing. See the <code>from</code> attribute below.</p>
+<div class="literalblock">
+<div class="content">
+<pre>Example: as="MyEjbRule"</pre>
+</div>
+</div>
+</dd>
+<dt class="hdlist1">in="PATH_FILTER"</dt>
+<dd>
+<p>Used to filter input files matching this regex (regular expression) naming pattern. Wildcard characters can be used.</p>
+<div class="literalblock">
+<div class="content">
+<pre>Example: in="{*}File1"</pre>
+</div>
+</div>
+</dd>
+<dt class="hdlist1">from="VARIABLE_NAME"</dt>
+<dd>
+<p>Begin the search query with the filtered result from a previous search identified by its <code>as</code> VARIABLE_NAME.</p>
+<div class="literalblock">
+<div class="content">
+<pre>Example: from="MyEjbRule"</pre>
+</div>
+</div>
+</dd>
+</dl>
+</div>
+</div>
+<div class="sect5">
+<h6 id="_javaclass_element_child_elements">JavaClass Element Child Elements</h6>
+<div class="dlist">
+<dl>
+<dt class="hdlist1">location</dt>
+<dd>
+<p>The location where the reference was found in a Java class. Location can refer to annotations, field and variable declarations, imports, and methods. For the complete list of valid values, see the JavaDoc for <a href="http://windup.github.io/windup/docs/javadoc/latest/org/jboss/windup/rules/apps/java/scan/ast/TypeReferenceLocation.html">TypeReferenceLocation</a>.</p>
+<div class="literalblock">
+<div class="content">
+<pre>Example: &lt;location&gt;IMPORT&lt;/location&gt;</pre>
+</div>
+</div>
+</dd>
+</dl>
+</div>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="xmlfile-syntax">5.2.2. xmlfile Syntax</h4>
+<div class="sect4">
+<h5 id="_summary_2">Summary</h5>
+<div class="paragraph">
+<p>Use the <code>xmlfile</code> element to find information in XML files. For a better understanding of the <code>xmlfile</code> condition, see the <a href="http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/rules/apps/xml/condition/XmlFile.html">XmlFile</a> JavaDoc.</p>
+</div>
+<div class="paragraph">
+<p>The following is an example of a rule that tests for an <code>xmlfile</code>.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>&lt;rule&gt;
+    &lt;when&gt;
+        &lt;xmlfile matches="/w:web-app/w:resource-ref/w:res-auth[text() = 'Container']"&gt;
+            &lt;namespace prefix="w" uri="http://java.sun.com/xml/ns/javaee"/&gt;
+        &lt;/xmlfile&gt;
+    &lt;/when&gt;
+    &lt;perform&gt;
+        &lt;hint title="Title for Hint from XML"&gt;
+            &lt;message&gt;Container Auth&lt;/message&gt;
+        &lt;/hint&gt;
+        &lt;xslt description="Example XSLT Conversion" extension="-converted-example.xml"
+              template="/exampleconversion.xsl"/&gt;
+    &lt;/perform&gt;
+&lt;/rule&gt;</pre>
+</div>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_construct_an_xmlfile_element">Construct an xmlfile Element</h5>
+<div class="sect5">
+<h6 id="_xmlfile_element_attributes">xmlfile Element: Attributes</h6>
+<div class="dlist">
+<dl>
+<dt class="hdlist1">matches="XPATH"</dt>
+<dd>
+<p>Match on an XML file condition.</p>
+<div class="literalblock">
+<div class="content">
+<pre>Example: matches="/w:web-app/w:resource-ref/w:res-auth[text() = 'Container']"</pre>
+</div>
+</div>
+</dd>
+<dt class="hdlist1">xpathResultMatch="XPATH_RESULT_STRING"</dt>
+<dd>
+<p>Return results that match the given regex.</p>
+<div class="literalblock">
+<div class="content">
+<pre>Example: xpathResultMatch=""</pre>
+</div>
+</div>
+</dd>
+<dt class="hdlist1">as="VARIABLE_NAME"</dt>
+<dd>
+<p>A variable name assigned to the rule so that it can be used as a reference in later processing. See the <code>from</code> attribute below.</p>
+<div class="literalblock">
+<div class="content">
+<pre>Example: as="MyEjbRule"</pre>
+</div>
+</div>
+</dd>
+<dt class="hdlist1">in="PATH_FILTER"</dt>
+<dd>
+<p>Used to filter input files matching this regex (regular expression) naming pattern. Wildcard characters can be used.</p>
+<div class="literalblock">
+<div class="content">
+<pre>Example: in="{*}File1"</pre>
+</div>
+</div>
+</dd>
+<dt class="hdlist1">from="VARIABLE_NAME"</dt>
+<dd>
+<p>Begin the search query with the filtered result from a previous search identified by its <code>as</code> VARIABLE_NAME.</p>
+<div class="literalblock">
+<div class="content">
+<pre>Example: from="MyEjbRule"</pre>
+</div>
+</div>
+</dd>
+<dt class="hdlist1">public-id="PUBLIC_ID"</dt>
+<dd>
+<p>The DTD public-id regex.</p>
+<div class="literalblock">
+<div class="content">
+<pre>Example: public-id="public"</pre>
+</div>
+</div>
+</dd>
+</dl>
+</div>
+</div>
+<div class="sect5">
+<h6 id="_xmlfile_element_child_elements">xmlfile Element: Child Elements</h6>
+<div class="dlist">
+<dl>
+<dt class="hdlist1">namespace</dt>
+<dd>
+<p>The namespace to referenced in XML files. This element contains 2 attributes: The <code>prefix</code> and the <code>uri</code>.</p>
+<div class="literalblock">
+<div class="content">
+<pre>Example: &lt;namespace prefix="abc" uri="http://maven.apache.org/POM/4.0.0"/&gt;</pre>
+</div>
+</div>
+</dd>
+</dl>
+</div>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="project-syntax">5.2.3. project Syntax</h4>
+<div class="sect4">
+<h5 id="_summary_3">Summary</h5>
+<div class="paragraph">
+<p>Use the <code>project</code> element to find information in project files. For a better understanding of the <code>project</code> condition, see the JavaDoc for the <a href="http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/project/condition/Project.html">Project</a> class.</p>
+</div>
+<div class="paragraph">
+<p>The following is an example of a rule that tests for an <code>xmlfile</code>.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>&lt;rule&gt;
+    &lt;when&gt;
+        &lt;project&gt;
+            &lt;artifact groupId="junit" artifactId="junit" from="MyEjbRule" to="???"/&gt;
+        &lt;/project&gt;
+    &lt;/when&gt;
+    &lt;perform&gt;
+        &lt;hint title="Title for Hint for Project"&gt;
+            &lt;message&gt;Descriptive message&lt;/message&gt;
+        &lt;/hint&gt;
+    &lt;/perform&gt;
+&lt;/rule&gt;</pre>
+</div>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_construct_a_project_element">Construct a project Element</h5>
+<div class="sect5">
+<h6 id="_project_element_attributes">project Element Attributes</h6>
+<div class="paragraph">
+<p>The <code>project</code> element does not have any attributes.</p>
+</div>
+</div>
+<div class="sect5">
+<h6 id="_project_element_child_elements">project Element Child Elements</h6>
+<div class="dlist">
+<dl>
+<dt class="hdlist1">artifact</dt>
+<dd>
+<p>The namespace to referenced in XML files. This element contains the following attributes:</p>
+<div class="ulist">
+<ul>
+<li>
+<p>groupId="PROJECT_GROUP_ID"</p>
+<div class="paragraph">
+<p>Match on the project <code>&lt;groupId&gt;</code></p>
+</div>
+</li>
+<li>
+<p>artifactId="PROJECT_ARTIFACT_ID"
+Match on the project <code>&lt;artifactId&gt;</code></p>
+</li>
+<li>
+<p>from="VARIABLE_NAME"</p>
+<div class="paragraph">
+<p>Begin the search query with the filtered result from a previous search identified by its <code>as</code> VARIABLE_NAME. ???</p>
+</div>
+</li>
+<li>
+<p>to = "???"</p>
+</li>
+</ul>
+</div>
+</dd>
+</dl>
+</div>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="filecontent-syntax">5.2.4. filecontent Syntax</h4>
+<div class="paragraph">
+<p>Use the <code>filecontent</code> element to find information in file content.For a better understanding of the <code>filecontent</code> condition, see the JavaDoc for the <a href="http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/rules/files/condition/FileContent.html">FileContent</a> class.
+TBD : .Draft</p>
+</div>
+<div class="paragraph">
+<p>Use the <code>filecontent</code> element to test for content within files. The following is an example of a rule that tests for <code>filecontent</code>.</p>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="Rules-XML-Rule-Perform-Action-Syntax">5.3. XML Rule - Perform Action Syntax</h3>
+<div class="paragraph">
+<p>Operations allowed in the <code>perform</code> section of the rule include the classification of application resources, in-line hints for migration steps, links to migration information, and project lineitem reporting. Because XML rules are modeled after the Java-based rule addons, links to JavaDocs for the related Java classes are provided for a better understanding of how they behave.</p>
+</div>
+<div class="paragraph">
+<p>The complete XML rule schema is located here: <a href="https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd" class="bare">https://github.com/windup/windup/blob/master/config-xml/rule-schema.xsd</a>.</p>
+</div>
+<div class="paragraph">
+<p>The following sections describe the more common XML rule perform actions.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="#classification-syntax">classification Syntax</a></p>
+</li>
+<li>
+<p><a href="#link-syntax">link Syntax</a></p>
+</li>
+<li>
+<p><a href="#hint-syntax">hint Syntax</a></p>
+</li>
+<li>
+<p><a href="#xslt-syntax">xslt Syntax</a></p>
+</li>
+<li>
+<p><a href="#lineitem-syntax">lineitem Syntax</a></p>
+</li>
+<li>
+<p><a href="#iteration-syntax">iteration Syntax</a></p>
+</li>
+</ul>
+</div>
+<div class="sect3">
+<h4 id="classification-syntax">5.3.1. classification Syntax</h4>
+<div class="sect4">
+<h5 id="_summary_4">Summary</h5>
+<div class="paragraph">
+<p>The <code>classification</code> element is used to identify or classify application resources. It provides a level of effort and can also provide links to additional information about how to migrate this resource classification. For a better understanding of the <code>classification</code> action, see the JavaDoc for the <a href="http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/reporting/config/classification/Classification.html">Classification</a> class.</p>
+</div>
+<div class="paragraph">
+<p>The following is an example of a rule that classifies a resource as a WebLogic EAR application deployment descriptor file.</p>
+</div>
+<div class="paragraph">
+<p><em>Example:</em></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>&lt;rule id="XmlWebLogicRules_10vvyf"&gt;
+    &lt;when&gt;
+        &lt;xmlfile as="default" matches="/*[local-name()='weblogic-application']"&gt;
+        &lt;/xmlfile&gt;
+    &lt;/when&gt;
+    &lt;perform&gt;
+        &lt;iteration&gt;
+            &lt;classification classification="Weblogic EAR Application Descriptor" effort="3"/&gt;
+        &lt;/iteration&gt;
+    &lt;/perform&gt;
+&lt;/rule&gt;</pre>
+</div>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_construct_a_classification_element">Construct a classification Element</h5>
+<div class="sect5">
+<h6 id="_classification_element_attributes">classification Element Attributes</h6>
+<div class="dlist">
+<dl>
+<dt class="hdlist1">classification="STRING"</dt>
+<dd>
+<p>Classify the resource as the specified string.</p>
+<div class="paragraph">
+<p><em>Example:</em></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>classification="JBoss Seam Components"</pre>
+</div>
+</div>
+</dd>
+<dt class="hdlist1">effort="NUMBER"</dt>
+<dd>
+<p>The level of effort assigned to this resource.</p>
+<div class="paragraph">
+<p><em>Example:</em></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>effort="2"</pre>
+</div>
+</div>
+</dd>
+</dl>
+</div>
+</div>
+<div class="sect5">
+<h6 id="_classification_element_child_elements">classification Element Child Elements</h6>
+<div class="dlist">
+<dl>
+<dt class="hdlist1">xref</dt>
+<dd>
+<p>Provides a link URI and text description for additional information.</p>
+<div class="paragraph">
+<p><em>Example:</em></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>&lt;classification classification="Websphere Startup Service" effort="4"&gt;
+    &lt;link href="http://docs.oracle.com/javaee/6/api/javax/ejb/Singleton.html" description="EJB3.1 Singleton Bean"/&gt;
+    &lt;link href="http://docs.oracle.com/javaee/6/api/javax/ejb/Startup.html" description="EJB3.1 Startup Bean"/&gt;
+ &lt;/classification&gt;</pre>
+</div>
+</div>
+</dd>
+</dl>
+</div>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="link-syntax">5.3.2. link Syntax</h4>
+<div class="sect4">
+<h5 id="_summary_5">Summary</h5>
+<div class="paragraph">
+<p>The <code>link</code> element is used in classifications or hints to identify or classify links to informational content. For a better understanding of the <code>link</code> action, see the JavaDoc for the <a href="http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/reporting/config/Link.html">Link</a> class.</p>
+</div>
+<div class="paragraph">
+<p>The following is an example of a rule that creates links to additional information.</p>
+</div>
+<div class="paragraph">
+<p><em>Example:</em></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>&lt;rule id="SeamToCDIRules_2fmb"&gt;
+    &lt;when&gt;
+        &lt;javaclass references="org.jboss.seam.{*}" as="default"/&gt;
+    &lt;/when&gt;
+    &lt;perform&gt;
+        &lt;iteration&gt;
+            &lt;classification classification="SEAM Component" effort="1"&gt;
+                &lt;link href="http://www.seamframework.org/Seam3/Seam2ToSeam3MigrationNotes" description="Seam 2 to Seam 3 Migration Notes"/&gt;
+                &lt;link href="http://docs.jboss.org/weld/reference/latest/en-US/html/example.html" description="JSF Web Application Example"/&gt;
+                &lt;link href="http://docs.jboss.org/weld/reference/latest/en-US/html/contexts.html" description="JBoss Context Documentation"/&gt;
+                &lt;link href="http://www.andygibson.net/blog/tutorial/cdi-conversations-part-2/" description="CDI Conversations Blog Post"/&gt;
+            &lt;/classification&gt;
+        &lt;/iteration&gt;
+    &lt;/perform&gt;
+&lt;/rule&gt;</pre>
+</div>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_construct_a_link_element">Construct a link Element</h5>
+<div class="sect5">
+<h6 id="_link_element_attributes">link Element: Attributes</h6>
+<div class="dlist">
+<dl>
+<dt class="hdlist1">href="URI"</dt>
+<dd>
+<p>The URI for the referenced link/.</p>
+<div class="paragraph">
+<p><em>Example:</em></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>href="https://access.redhat.com/articles/1249423"</pre>
+</div>
+</div>
+</dd>
+<dt class="hdlist1">description="URI_DESCRIPTION"</dt>
+<dd>
+<p>A description for the link.</p>
+<div class="paragraph">
+<p><em>Example:</em></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>description="Migrate WebLogic Proprietary Servlet Annotations"</pre>
+</div>
+</div>
+</dd>
+</dl>
+</div>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="hint-syntax">5.3.3. hint Syntax</h4>
+<div class="sect4">
+<h5 id="_summary_6">Summary</h5>
+<div class="paragraph">
+<p>The <code>hint</code> element is used to provide a hint or inline information about how to migrate a section of code. For a better understanding of the <code>hint</code> action, see the JavaDoc for the <a href="http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/reporting/config/Hint.html">Hint</a> class.</p>
+</div>
+<div class="paragraph">
+<p>The following is an example of a rule that creates a hint.</p>
+</div>
+<div class="paragraph">
+<p><em>Example:</em></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>&lt;rule id="WebLogicWebServiceRules_8jyqn"&gt;
+    &lt;when&gt;
+        &lt;javaclass references="weblogic.wsee.connection.transport.http.HttpTransportInfo.setUsername({*})" as="default"&gt;
+            &lt;location&gt;METHOD&lt;/location&gt;
+        &lt;/javaclass&gt;
+    &lt;/when&gt;
+    &lt;perform&gt;
+        &lt;iteration&gt;
+            &lt;hint message="Replace proprietary web-service authentication with JAX-WS standards." effort="0"&gt;
+                &lt;link href="http://java-x.blogspot.com/2009/03/invoking-web-services-through-proxy.html" description="JAX-WS Proxy Password Example"/&gt;
+            &lt;/hint&gt;
+        &lt;/iteration&gt;
+    &lt;/perform&gt;
+&lt;/rule&gt;</pre>
+</div>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_construct_a_hint_element">Construct a hint Element</h5>
+<div class="sect5">
+<h6 id="_hint_element_attributes">hint Element:  Attributes</h6>
+<div class="dlist">
+<dl>
+<dt class="hdlist1">message="MESSAGE"</dt>
+<dd>
+<p>A message describing the migration hint</p>
+<div class="paragraph">
+<p><em>Example:</em></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>message=""</pre>
+</div>
+</div>
+</dd>
+<dt class="hdlist1">effort="NUMBER"</dt>
+<dd>
+<p>The level of effort assigned to this resource.</p>
+<div class="paragraph">
+<p><em>Example:</em></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>effort="2"</pre>
+</div>
+</div>
+</dd>
+</dl>
+</div>
+</div>
+<div class="sect5">
+<h6 id="_hint_element_child_elements">hint Element: Child Elements</h6>
+<div class="dlist">
+<dl>
+<dt class="hdlist1">xref</dt>
+<dd>
+<p>Identify or classify links to informational content. See the section on <a href="#link-syntax">link Syntax</a> for details.</p>
+<div class="paragraph">
+<p><em>Example:</em></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>link href="http://java-x.blogspot.com/2009/03/invoking-web-services-through-proxy.html" description="JAX-WS Proxy Password Example"/&gt;</pre>
+</div>
+</div>
+</dd>
+</dl>
+</div>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="xslt-syntax">5.3.4. xslt Syntax</h4>
+<div class="sect4">
+<h5 id="_summary_7">Summary</h5>
+<div class="paragraph">
+<p>The <code>xslt</code> element specifies how to transform an XML file. For a better understanding of the <code>xslt</code> action, see the JavaDoc for the <a href="http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/rules/apps/xml/operation/xslt/XSLTTransformation.html">XSLTTransformation</a>  class.</p>
+</div>
+<div class="paragraph">
+<p>The following is an example of rule that defines an XSLT action.</p>
+</div>
+<div class="paragraph">
+<p><em>Example:</em></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>&lt;rule id="XmlWebLogicRules_6bcvk"&gt;
+    &lt;when&gt;
+        &lt;xmlfile as="default" matches="/weblogic-ejb-jar"/&gt;
+    &lt;/when&gt;
+    &lt;perform&gt;
+        &lt;iteration&gt;
+            &lt;classification classification="Weblogic EJB XML" effort="3"/&gt;
+            &lt;xslt description="JBoss EJB Descriptor (Windup-Generated)" template="transformations/xslt/weblogic-ejb-to-jboss.xsl" extension="-jboss.xml"/&gt;
+        &lt;/iteration&gt;
+    &lt;/perform&gt;
+&lt;/rule&gt;</pre>
+</div>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_construct_an_xslt_element">Construct an xslt Element</h5>
+<div class="sect5">
+<h6 id="_xslt_element_attributes">xslt Element:  Attributes</h6>
+<div class="dlist">
+<dl>
+<dt class="hdlist1">of="STRING"</dt>
+<dd>
+<p>Create a new transformation for the given reference.</p>
+<div class="paragraph">
+<p><em>Example:</em></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>of="testVariable_instance"</pre>
+</div>
+</div>
+</dd>
+<dt class="hdlist1">description="String"</dt>
+<dd>
+<p>Sets the description of this XSLTTransformation.</p>
+<div class="paragraph">
+<p><em>Example:</em></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>description="XSLT Transformed Output"</pre>
+</div>
 </div>
-</li>
-</ul>
+</dd>
+<dt class="hdlist1">extension="String"</dt>
+<dd>
+<p>Sets the extension for this XSLTTransformation.</p>
+<div class="paragraph">
+<p><em>Example:</em></p>
 </div>
-</li>
-</ul>
+<div class="literalblock">
+<div class="content">
+<pre>extension="-result.html"</pre>
 </div>
-<div class="olist arabic">
-<div class="title">DRAFT</div>
-<ol class="arabic">
-<li>
-<p>Create the Forge add-on</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="#Rules-Create-a-Basic-Java-based-Rule-Add-on">Create a Basic Java-based Rule Add-on</a></p>
-</li>
-</ul>
 </div>
-</li>
-<li>
-<p>Add the dependencies you need</p>
-</li>
-<li>
-<p>Create the service with your functionality, if needed</p>
-</li>
-<li>
-<p>Create the rules
-(Add a the LINK)</p>
-</li>
-<li>
-<p>Add the information to the report
-(Add a the LINK)</p>
-</li>
-</ol>
+</dd>
+<dt class="hdlist1">template=String</dt>
+<dd>
+<p>Sets the XSL template.</p>
+<div class="paragraph">
+<p><em>Example:</em></p>
 </div>
+<div class="literalblock">
+<div class="content">
+<pre>template="simpleXSLT.xsl"</pre>
 </div>
 </div>
+</dd>
+</dl>
 </div>
 </div>
-<div class="sect1">
-<h2 id="_create_and_test_xml_rules">Create and Test XML Rules</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="Rules-Create-a-Basic-XML-Rule">Create a Basic XML Rule</h3>
+<div class="sect5">
+<h6 id="_xslt_element_child_elements">xslt Element: Child Elements</h6>
+<div class="dlist">
+<dl>
+<dt class="hdlist1">xslt-parameter=Map&lt;String,String&gt; </dt>
+<dd>
+<p>Specify XSLTTransformation parameters as property value pairs</p>
 <div class="paragraph">
-<p>You can create a rule addon using Java or a rule using XML or Groovy. This topic describes how to create a rule using XML.</p>
+<p><em>Example:</em></p>
 </div>
-<div class="sect3">
-<h4 id="_prerequisites_3">Prerequisites</h4>
-<div class="ulist">
-<ul>
-<li>
-<p>You should have already <a href="#Install-Windup">installed Windup</a>.</p>
-</li>
-<li>
-<p>Before you begin, you may also want to be familiar with the following documentation:</p>
-<div class="ulist">
-<ul>
-<li>
-<p>Windup rules are based on the ocpsoft <strong>rewrite</strong> project. You can find more information about ocpsoft <strong>rewrite</strong> here: <a href="http://ocpsoft.org/rewrite/" class="bare">http://ocpsoft.org/rewrite/</a></p>
-</li>
-<li>
-<p>The JavaDoc for the Windup API is located here: <a href="http://windup.github.io/windup/docs/javadoc/latest/" class="bare">http://windup.github.io/windup/docs/javadoc/latest/</a></p>
-</li>
-</ul>
+<div class="literalblock">
+<div class="content">
+<pre>&lt;xslt-parameter property="title" value="EJB Transformation"/&gt;</pre>
+</div>
+</div>
+</dd>
+</dl>
 </div>
-</li>
-</ul>
 </div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">
-Working examples of XML-based rules can be found in the Windup quickstarts GitHub repository located here: <a href="https://github.com/windup/windup-quickstarts" class="bare">https://github.com/windup/windup-quickstarts</a>
-</td>
-</tr>
-</table>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_create_a_rule">Create a Rule</h4>
+<h4 id="lineitem-syntax">5.3.5. lineitem Syntax</h4>
+<div class="sect4">
+<h5 id="_summary_8">Summary</h5>
+<div class="paragraph">
+<p>The <code>lineitem</code> element is used to provide line item information about a hint on the project or application overview page. For a better understanding of the <code>lineitem</code> action, see the JavaDoc for the <a href="http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/project/operation/LineItem.html">Lineitem</a> class.</p>
+</div>
 <div class="paragraph">
-<p>The following is an example of an XML rule.</p>
+<p>The following is an example of a rule that creates a lineitem message.</p>
+</div>
+<div class="paragraph">
+<p><em>Example:</em></p>
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>&lt;?xml version="1.0"?&gt;
-&lt;ruleset xmlns="http://windup.jboss.org/v1/xml"
-  id="customruleprovider"&gt;
-  &lt;!-- This defaults to MIGRATION_RULES --&gt;
-  &lt;phase&gt;
-    DISCOVERY
-  &lt;/phase&gt;
-  &lt;rules&gt;
-    &lt;rule&gt;
-      &lt;when&gt;
-        &lt;javaclass references="javax.servlet.http.HttpServletRequest"&gt;
-          &lt;location&gt;METHOD_PARAMETER&lt;/location&gt;
+<pre>&lt;rule&gt;
+    &lt;when&gt;
+        &lt;javaclass references="weblogic.servlet.annotation.WLServlet" as="default"&gt;
+            &lt;location&gt;ANNOTATION&lt;/location&gt;
         &lt;/javaclass&gt;
-      &lt;/when&gt;
-      &lt;perform&gt;
-        &lt;hint&gt;
-      &lt;message&gt;Message from XML Rule&lt;/message&gt;
-          &lt;link href="http://example.com" description="Description from XML Hint Link" /&gt;
-        &lt;/hint&gt;
-        &lt;log message="test log message"/&gt;
-      &lt;/perform&gt;
-      &lt;otherwise&gt;
-        &lt;!--  --&gt;
-      &lt;/otherwise&gt;
-    &lt;/rule&gt;
-    &lt;rule&gt;
-      &lt;when&gt;
-        &lt;xmlfile xpath="/w:web-app/w:resource-ref/w:res-auth[text() = 'Container']"&gt;
-          &lt;namespace prefix="w" uri="http://java.sun.com/xml/ns/javaee"/&gt;
-        &lt;/xmlfile&gt;
-      &lt;/when&gt;
-      &lt;perform&gt;
-        &lt;hint&gt;
-      &lt;message&gt;Container Auth&lt;/message&gt;
+    &lt;/when&gt;
+    &lt;perform&gt;
+        &lt;hint message="Replace the proprietary WebLogic @WLServlet annotation with the Java EE 6 standard @WebServlet annotation." effort="1"&gt;
+            &lt;link href="https://access.redhat.com/articles/1249423" description="Migrate WebLogic Proprietary Servlet Annotations" /&gt;
+            &lt;lineitem message="Proprietary WebLogic @WLServlet annotation found in file."/&gt;
         &lt;/hint&gt;
-        &lt;xslt description="Example XSLT Conversion" extension="-converted-example.xml"
-                 xsltFile="/exampleconversion.xsl"/&gt;
-        &lt;log message="test log message"/&gt;
-      &lt;/perform&gt;
-      &lt;otherwise&gt;
-        &lt;!--  --&gt;
-      &lt;/otherwise&gt;
-    &lt;/rule&gt;
-  &lt;/rules&gt;
-&lt;/ruleset&gt;</pre>
+    &lt;/perform&gt;
+&lt;/rule&gt;</pre>
+</div>
 </div>
 </div>
 <div class="sect4">
-<h5 id="_create_the_xml_rule">Create the XML Rule</h5>
+<h5 id="_construct_a_lineitem_element">Construct a lineitem Element</h5>
+<div class="sect5">
+<h6 id="_lineitem_element_attributes">lineitem Element:  Attributes</h6>
+<div class="dlist">
+<dl>
+<dt class="hdlist1">message="MESSAGE"</dt>
+<dd>
+<p>A lineitem message</p>
 <div class="paragraph">
-<p><strong>Note:</strong> Windup only analyzes XML files with names ending in <code>.windup.xml</code>. Be sure to name XML-based rules using this naming convention!</p>
+<p><em>Example:</em></p>
 </div>
-<div class="paragraph">
-<p>The XML rule consists of the following level elements:</p>
+<div class="literalblock">
+<div class="content">
+<pre>message="Proprietary code found."</pre>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>&lt;ruleset&gt;</strong>: This element defines this as a Windup rule.</p>
-</li>
-<li>
-<p><strong>&lt;phase&gt;</strong>: This element specifies when the ruleset should execute. See <a href="#Rules-Rule-Execution-Lifecycle">Rule Execution Lifecyle</a> for more information about rule phases.</p>
-</li>
-<li>
-<p><strong>&lt;rules&gt;</strong>: element contains the individual rules.</p>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>&lt;rule&gt;</strong>: This element is a child of the <strong>rules</strong> element. One or more rules can be defined for a ruleset. Each <code>rule</code> contains the following elements.</p>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>&lt;when&gt;</strong>: This element defines the condition to match on.</p>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>&lt;javaclass references="CLASS_NAME"&gt;</strong></p>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>&lt;location&gt;</strong>: The location where the reference was found in a Java source file. See the <a href="http://windup.github.io/windup/docs/javadoc/latest/org/jboss/windup/rules/apps/java/scan/ast/TypeReferenceLocation.html">Enum TypeReferenceLocation</a> Javadoc for valid values.</p>
-</li>
-</ul>
 </div>
-</li>
-</ul>
+</dd>
+</dl>
 </div>
-</li>
-<li>
-<p><strong>&lt;perform&gt;</strong>: This element is invoked when the condition is met.</p>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>&lt;hint&gt;</strong>: This child element of <strong>perform</strong> is used to create a <code>hint</code></p>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>&lt;message&gt;</strong>:</p>
-</li>
-<li>
-<p><strong>&lt;link&gt;</strong>:</p>
-</li>
-</ul>
 </div>
-</li>
-<li>
-<p><strong>&lt;xslt&gt;</strong>: This specifies how to transform the the specified XML file</p>
-</li>
-<li>
-<p><strong>&lt;log&gt;</strong>: This child element of <strong>perform</strong> is used to log a message. It takes the attribute <strong>message</strong> to define the text message.</p>
-</li>
-</ul>
 </div>
-</li>
-<li>
-<p>The <strong>&lt;otherwise&gt;</strong> element is invoked when the condition is not met.</p>
-</li>
-</ul>
 </div>
-</li>
-</ul>
+<div class="sect3">
+<h4 id="iteration-syntax">5.3.6. iteration Syntax</h4>
+<div class="sect4">
+<h5 id="_summary_9">Summary</h5>
+<div class="paragraph">
+<p>The <code>iteration</code> element specifies to iterate over an implicit or explicit variable defined within the rule. For a better understanding of the <code>iteration</code> action, see the JavaDoc for the <a href="http://windup.github.io/windup/docs/latest/javadoc/org/jboss/windup/config/operation/Iteration.html">Iteration</a> class.</p>
 </div>
-</li>
-</ul>
+<div class="paragraph">
+<p>The following is an example of a rule that preforms an iteration.</p>
+</div>
+<div class="paragraph">
+<p><em>Example:</em></p>
 </div>
+<div class="literalblock">
+<div class="content">
+<pre>&lt;rule id="XmlWebLogicRules_14wscy"&gt;
+     &lt;when&gt;
+         &lt;xmlfile as="1" matches="/wl:weblogic-webservices | /wl9:weblogic-webservices"&gt;
+             &lt;namespace prefix="wl9" uri="http://www.bea.com/ns/weblogic/90"/&gt;
+             &lt;namespace prefix="wl" uri="http://www.bea.com/ns/weblogic/weblogic-webservices"/&gt;
+         &lt;/xmlfile&gt;
+         &lt;xmlfile as="2" matches="//wl:webservice-type | //wl9:webservice-type" from="1"&gt;
+             &lt;namespace prefix="wl9" uri="http://www.bea.com/ns/weblogic/90"/&gt;
+             &lt;namespace prefix="wl" uri="http://www.bea.com/ns/weblogic/weblogic-webservices"/&gt;
+         &lt;/xmlfile&gt;
+     &lt;/when&gt;
+     &lt;perform&gt;
+         &lt;iteration over="1"&gt;
+             &lt;classification classification="Weblogic Webservice Descriptor" effort="0"/&gt;
+         &lt;/iteration&gt;
+         &lt;iteration over="2"&gt;
+             &lt;hint message="Webservice Type" effort="0"/&gt;
+         &lt;/iteration&gt;
+     &lt;/perform&gt;
+ &lt;/rule&gt;</pre>
 </div>
 </div>
-<div class="sect3">
-<h4 id="_add_the_rule_to_windup">Add the Rule to Windup</h4>
-<div class="paragraph">
-<p>A Windup rule is installed simply by copying the rule to the appropriate Windup folder. Windup scans for rules in the following locations:</p>
 </div>
+<div class="sect4">
+<h5 id="_construct_an_iteration_element">Construct an iteration Element</h5>
+<div class="sect5">
+<h6 id="_iteration_element_attributes">iteration Element:  Attributes</h6>
 <div class="dlist">
 <dl>
-<dt class="hdlist1">WINDUP_HOME/rules/</dt>
-<dd>
-<p>This is the Windup folder where you run the Windup executable. See <a href="#About-the-WINDUP_HOME-Variable">About the WINDUP_HOME Variable</a> for details.</p>
-</dd>
-<dt class="hdlist1">${user.home}/.windup/rules/</dt>
+<dt class="hdlist1">over="NUMBER"</dt>
 <dd>
-<p>This folder is created by Windup the first time you execute Windup.</p>
-<div class="listingblock">
+<p>??</p>
+<div class="paragraph">
+<p><em>Example:</em></p>
+</div>
+<div class="literalblock">
 <div class="content">
-<pre>For Linux or Mac:   ~/.windup/rules/
-For Windows: "\Documents and Settings\USER_NAME\.windup\rules\"  -or-  "\Users\USER_NAME\.windup\rules\"</pre>
+<pre>over="2"</pre>
 </div>
 </div>
 </dd>
 </dl>
 </div>
 </div>
+<div class="sect5">
+<h6 id="_iteration_element_child_elements">iteration Element: Child Elements</h6>
+<div class="paragraph">
+<p>iteration child elements include a <code>when</code> condition, along with the actions <code>iteration</code>, <code>classification</code>, <code>hint</code>, <code>xslt</code>, <code>lineitem</code>, and <code>otherwise</code>.</p>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="Rules-Test-an-XML-Rule-In-Windup">5.4. Test an XML Rule in Windup</h3>
 <div class="sect3">
-<h4 id="_test_the_xml_rule">Test the XML Rule</h4>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">
-If you have not started Windup, follow the instructions to <a href="#Execute-Windup">Execute Windup</a>.
-</td>
-</tr>
-</table>
+<h4 id="_add_the_rule_to_windup">5.4.1. Add the Rule to Windup</h4>
+<div class="paragraph">
+<p>A Windup rule is installed simply by copying the rule to the appropriate Windup folder. Windup scans for rules in the following locations:</p>
 </div>
+<div class="ulist">
+<ul>
+<li>
+<p>The <code>WINDUP_HOME/rules/</code> folder.</p>
 <div class="paragraph">
-<p>Test the XML rule against your application file by running the <code>windup-migrate-app</code> command in the Windup console prompt.</p>
+<p>This is the folder where you run the Windup executable. See <a href="#About-the-WINDUP_HOME-Variable">About the WINDUP_HOME Variable</a> for details.</p>
+</div>
+</li>
+<li>
+<p>The <code>${user.home}/.windup/rules/</code> folder.</p>
+<div class="paragraph">
+<p>This folder is created by Windup the first time you execute Windup. It used to track rules and addons and to contains the Windup log.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>For Linux or Mac:   ~/.windup/rules/
+For Windows: "\Documents and Settings\USER_NAME\.windup\rules\"  -or-  "\Users\USER_NAME\.windup\rules\"</pre>
+</div>
 </div>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_test_the_xml_rule">5.4.2. Test the XML Rule</h4>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>If you have not started Windup, follow the instructions to <a href="#Execute-Windup">Execute Windup</a>.</p>
+</li>
+<li>
+<p>Test the XML rule against your application file by running the <code>windup-migrate-app</code> command in the Windup console prompt.</p>
 <div class="paragraph">
 <p>The command uses this syntax:</p>
 </div>
@@ -2912,23 +3645,36 @@ <h4 id="_test_the_xml_rule">Test the XML Rule</h4>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>***SUCCESS*** Windup report created: QUICKSTART_HOME/windup-reports-java/index.html</pre>
+<pre>***SUCCESS*** Windup report created: OUTPUT_REPORT_DIRECTORY/index.html</pre>
 </div>
 </div>
-<div class="paragraph">
+</li>
+</ol>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_additional_resources">5.4.3. Additional Resources</h4>
+<div class="ulist">
+<ul>
+<li>
 <p>For more information and examples of how to run Windup, see: <a href="#Execute-Windup">Execute Windup</a></p>
+</li>
+<li>
+<p>Working examples of XML-based rules can be found on GitHub in the <a href="https://github.com/windup/windup/">Windup source code</a> GitHub repository and the Windup quickstarts <a href="https://github.com/windup/windup-quickstarts/">GitHub repository</a> or <a href="https://github.com/windup/windup-quickstarts/releases">latest release ZIP download</a>.</p>
+</li>
+</ul>
 </div>
 </div>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_review_the_report">Review the Report</h2>
+<h2 id="_review_the_report">6. Review the Report</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="Review-the-Report">Review the Report</h3>
+<h3 id="Review-the-Report">6.1. Review the Report</h3>
 <div class="sect3">
-<h4 id="_about_the_report_2">About the Report</h4>
+<h4 id="_about_the_report_2">6.1.1. About the Report</h4>
 <div class="paragraph">
 <p>When you execute Windup, the report is generated in the <code>OUTPUT_REPORT_DIRECTORY</code> you specify for the <code>--output</code> argument in the command line. This output directory contains the following files and subdirectories:</p>
 </div>
@@ -2961,19 +3707,19 @@ <h4 id="_about_the_report_2">About the Report</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_open_the_report_2">Open the Report</h4>
+<h4 id="_open_the_report_2">6.1.2. Open the Report</h4>
 <div class="paragraph">
 <p>Use your favorite browser to open the <code>index.html</code> file located in the output report directory. You should see something like the following:</p>
 </div>
 <div class="paragraph">
-<p><span class="image"><img src="images/report-index-page.png" alt="Report Index Page" width="500"></span></p>
+<p><span class="image"><img src="images/images/report-index-page.png" alt="Report Index Page" width="500"></span></p>
 </div>
 <div class="paragraph">
 <p>Click on the link under the <strong>Name</strong> column to view the Windup application report page.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_report_sections_2">Report Sections</h4>
+<h4 id="_report_sections_2">6.1.3. Report Sections</h4>
 <div class="sect4">
 <h5 id="_application_report_page_2">Application Report Page</h5>
 <div class="paragraph">
@@ -2993,7 +3739,7 @@ <h5 id="_application_report_page_2">Application Report Page</h5>
 <p>The following is an example of a Windup Application Report.</p>
 </div>
 <div class="paragraph">
-<p><span class="image"><img src="images/report-javaee-ear-summary.png" alt="Report Summary Page" width="500"></span></p>
+<p><span class="image"><img src="images/images/report-javaee-ear-summary.png" alt="Report Summary Page" width="500"></span></p>
 </div>
 </div>
 <div class="sect4">
@@ -3056,7 +3802,7 @@ <h5 id="_archive_analysis_sections_2">Archive Analysis Sections</h5>
 <p>The following is an example of the archive analysis summary section of a Windup Report. In this example, it&#8217;s the analysis of the <code>WINDUP_SOURCE/test-files/jee-example-app-1.0.0.ear/jee-example-services.jar</code>.</p>
 </div>
 <div class="paragraph">
-<p><span class="image"><img src="images/report-javaee-ear-03-services-jar.png" alt="Report Archive Page" width="500"></span></p>
+<p><span class="image"><img src="images/images/report-javaee-ear-03-services-jar.png" alt="Report Archive Page" width="500"></span></p>
 </div>
 </div>
 <div class="sect4">
@@ -3078,18 +3824,18 @@ <h5 id="_file_analysis_pages_2">File Analysis Pages</h5>
 <p>In this example, warnings appear at the import of <code>weblogic.application.ApplicationLifecycleEvent</code> and report that the class is proprietary to WebLogic and must be removed.</p>
 </div>
 <div class="paragraph">
-<p><span class="image"><img src="images/report-javaee-ear-file-detail-part1.png" alt="File Detail - Part 1" width="500"></span></p>
+<p><span class="image"><img src="images/images/report-javaee-ear-file-detail-part1.png" alt="File Detail - Part 1" width="500"></span></p>
 </div>
 <div class="paragraph">
 <p>Later in the code, warnings appear for the creation of the InitialContext and for the object name when registering and unregistering an MBeans</p>
 </div>
 <div class="paragraph">
-<p><span class="image"><img src="images/report-javaee-ear-file-detail-part2.png" alt="File Detail - Part 2" width="500"></span></p>
+<p><span class="image"><img src="images/images/report-javaee-ear-file-detail-part2.png" alt="File Detail - Part 2" width="500"></span></p>
 </div>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_additional_reports_2">Additional Reports</h4>
+<h4 id="_additional_reports_2">6.1.4. Additional Reports</h4>
 <div class="paragraph">
 <p>Explore the Windup <code>OUTPUT_REPORT_DIRECTORY/reports</code> folder to find additional reporting information.</p>
 </div>
@@ -3099,7 +3845,7 @@ <h5 id="_rule_provider_execution_report_3">Rule Provider Execution Report</h5>
 <p>The <code>OUTPUT_REPORT_DIRECTORY/reports/windup_ruleproviders.html</code> page provides the list of rule providers that executed when running the Windup migration command against the application.</p>
 </div>
 <div class="paragraph">
-<p><span class="image"><img src="images/report-javaee-ear-ruleprovider.png" alt="RuleProvider Report" width="500"></span></p>
+<p><span class="image"><img src="images/images/report-javaee-ear-ruleprovider.png" alt="RuleProvider Report" width="500"></span></p>
 </div>
 </div>
 <div class="sect4">
@@ -3114,7 +3860,7 @@ <h5 id="_individual_file_analysis_reports_2">Individual File Analysis Reports</h
 <p>You can directly access the the file analysis report pages described above by browsing for them by name in the <code>OUTPUT_REPORT_DIRECTORY/reports/</code> directory. Because the same common file names can exist in multiple archives, for example "manifest.mf" or "web.xml", Windup adds a unique numeric suffix to each report file name.</p>
 </div>
 <div class="paragraph">
-<p><span class="image"><img src="images/report-directory-file-list.png" alt="Report Directory File List" width="500"></span></p>
+<p><span class="image"><img src="images/images/report-directory-file-list.png" alt="Report Directory File List" width="500"></span></p>
 </div>
 </div>
 </div>
@@ -3122,10 +3868,10 @@ <h5 id="_individual_file_analysis_reports_2">Individual File Analysis Reports</h
 </div>
 </div>
 <div class="sect1">
-<h2 id="_external_rule_examples">External Rule Examples</h2>
+<h2 id="_external_rule_examples">7. External Rule Examples</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="Review-the-Windup-Quickstarts">Review the Windup Quickstarts</h3>
+<h3 id="Review-the-Windup-Quickstarts">7.1. Review the Windup Quickstarts</h3>
 <div class="paragraph">
 <p>The Windup quickstarts provide working examples of how to create custom Java-based rule addons and XML rules. You can use them as a starting point for creating your own custom rules. The quickstarts are available on GitHub here: <a href="https://github.com/windup/windup-quickstarts" class="bare">https://github.com/windup/windup-quickstarts</a></p>
 </div>
@@ -3133,7 +3879,7 @@ <h3 id="Review-the-Windup-Quickstarts">Review the Windup Quickstarts</h3>
 <p>You can fork and clone the project to have access to regular updates or you can download a ZIP file of the latest version.</p>
 </div>
 <div class="sect3">
-<h4 id="_download_the_latest_zip">Download the Latest ZIP</h4>
+<h4 id="_download_the_latest_zip">7.1.1. Download the Latest ZIP</h4>
 <div class="paragraph">
 <p>To download the latest quickstart ZIP file, browse to: <a href="https://github.com/windup/windup-quickstarts/releases" class="bare">https://github.com/windup/windup-quickstarts/releases</a></p>
 </div>
@@ -3142,7 +3888,7 @@ <h4 id="_download_the_latest_zip">Download the Latest ZIP</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_fork_and_clone_the_github_project">Fork and Clone the GitHub Project</h4>
+<h4 id="_fork_and_clone_the_github_project">7.1.2. Fork and Clone the GitHub Project</h4>
 <div class="paragraph">
 <p>If you don&#8217;t have the GitHub client (<code>git</code>), download it from: <a href="http://git-scm.com/" class="bare">http://git-scm.com/</a></p>
 </div>
@@ -3190,12 +3936,12 @@ <h4 id="_fork_and_clone_the_github_project">Fork and Clone the GitHub Project</h
 </div>
 </div>
 <div class="sect1">
-<h2 id="_debugging_and_troubleshooting">Debugging and Troubleshooting</h2>
+<h2 id="_debugging_and_troubleshooting">8. Debugging and Troubleshooting</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="Dev-Debugging-and-Profiling">Debugging and Profiling</h3>
+<h3 id="Dev-Debugging-and-Profiling">8.1. Debugging and Profiling</h3>
 <div class="sect3">
-<h4 id="_debug_the_windup_distribution_runtime">Debug the Windup Distribution Runtime</h4>
+<h4 id="_debug_the_windup_distribution_runtime">8.1.1. Debug the Windup Distribution Runtime</h4>
 <div class="paragraph">
 <p>You can debug the Windup distribution using one of the following approaches.</p>
 </div>
@@ -3222,13 +3968,13 @@ <h4 id="_debug_the_windup_distribution_runtime">Debug the Windup Distribution Ru
 </div>
 </div>
 <div class="sect3">
-<h4 id="_debug_a_test_using_netbeans">Debug a Test Using NetBeans</h4>
+<h4 id="_debug_a_test_using_netbeans">8.1.2. Debug a Test Using NetBeans</h4>
 <div class="paragraph">
 <p>Click the <code>Debug Test File</code> button, or choose <code>Menu</code> → <code>Debug</code> → <code>Debug Test File</code>.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_profile_a_test_using_netbeans">Profile a Test Using NetBeans</h4>
+<h4 id="_profile_a_test_using_netbeans">8.1.3. Profile a Test Using NetBeans</h4>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
@@ -3270,7 +4016,7 @@ <h4 id="_profile_a_test_using_netbeans">Profile a Test Using NetBeans</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_profile_forge_runtime_using_yourkit">Profile Forge Runtime Using YourKit</h4>
+<h4 id="_profile_forge_runtime_using_yourkit">8.1.4. Profile Forge Runtime Using YourKit</h4>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
@@ -3302,9 +4048,9 @@ <h4 id="_profile_forge_runtime_using_yourkit">Profile Forge Runtime Using YourKi
 </div>
 </div>
 <div class="sect2">
-<h3 id="_troubleshoot_windup_issues">Troubleshoot Windup Issues</h3>
+<h3 id="_troubleshoot_windup_issues">8.2. Troubleshoot Windup Issues</h3>
 <div class="sect3">
-<h4 id="_logging">Logging</h4>
+<h4 id="_logging">8.2.1. Logging</h4>
 <div class="paragraph">
 <p>Logging is currently broken and will not be fixed any time soon.</p>
 </div>
@@ -3313,7 +4059,7 @@ <h4 id="_logging">Logging</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_debugging_exceptions">Debugging Exceptions</h4>
+<h4 id="_debugging_exceptions">8.2.2. Debugging Exceptions</h4>
 <div class="paragraph">
 <p>Exceptions in Surefire reports are broken due to the way Forge wraps
 exceptions and the way Surefire handles them. You need to
@@ -3324,22 +4070,31 @@ <h4 id="_debugging_exceptions">Debugging Exceptions</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_classloading_problems">Classloading Problems</h4>
+<h4 id="_classloading_problems">8.2.3. Classloading Problems</h4>
 <div class="paragraph">
 <p>Configuring dependencies in a Forge-based project can be a little tricky.
 See <a href="#Dev-Dependencies">Dependencies</a> for some hints.</p>
 </div>
+<div class="listingblock">
+<div class="content">
+<pre>Caused by: java.lang.IllegalArgumentException: Type value for model 'org.jboss.windup.rules.files.model.FileReferenceModel' is already registered with model org.jboss.windup.rules.files.model.FileReferenceModel</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>This means that the model class is loaded twice. I.e. the module containing it is loaded twice. Or, in tests, you may be (accidentally) adding the class to the deployment.
+This may especially happen after Maven coordinates of some module are changed.</p>
+</div>
 </div>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_additional_resources">Additional Resources</h2>
+<h2 id="_additional_resources_2">9. Additional Resources</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="Rules-Available-Rules-Utilities">Available Rule Utilities</h3>
+<h3 id="Rules-Available-Rules-Utilities">9.1. Available Rule Utilities</h3>
 <div class="sect3">
-<h4 id="_programmatically_access_the_graph">Programmatically Access the Graph</h4>
+<h4 id="_programmatically_access_the_graph">9.1.1. Programmatically Access the Graph</h4>
 <div class="paragraph">
 <p><em>Note: Needs update. This is out of date!</em></p>
 </div>
@@ -3433,7 +4188,7 @@ <h6 id="_nested_iteration">Nested Iteration</h6>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_modify_graph_data">Modify Graph Data</h4>
+<h4 id="_modify_graph_data">9.1.2. Modify Graph Data</h4>
 <div class="paragraph">
 <p>For more custom operations dealing with Graph data that are not covered by the <code>Query</code> mechanism, use the GraphService.</p>
 </div>
@@ -3463,7 +4218,7 @@ <h4 id="_modify_graph_data">Modify Graph Data</h4>
 </div>
 </div>
 <div class="sect2">
-<h3 id="Review-the-Windup-Quickstarts">Review the Windup Quickstarts</h3>
+<h3 id="Review-the-Windup-Quickstarts">9.2. Review the Windup Quickstarts</h3>
 <div class="paragraph">
 <p>The Windup quickstarts provide working examples of how to create custom Java-based rule addons and XML rules. You can use them as a starting point for creating your own custom rules. The quickstarts are available on GitHub here: <a href="https://github.com/windup/windup-quickstarts" class="bare">https://github.com/windup/windup-quickstarts</a></p>
 </div>
@@ -3471,7 +4226,7 @@ <h3 id="Review-the-Windup-Quickstarts">Review the Windup Quickstarts</h3>
 <p>You can fork and clone the project to have access to regular updates or you can download a ZIP file of the latest version.</p>
 </div>
 <div class="sect3">
-<h4 id="_download_the_latest_zip_2">Download the Latest ZIP</h4>
+<h4 id="_download_the_latest_zip_2">9.2.1. Download the Latest ZIP</h4>
 <div class="paragraph">
 <p>To download the latest quickstart ZIP file, browse to: <a href="https://github.com/windup/windup-quickstarts/releases" class="bare">https://github.com/windup/windup-quickstarts/releases</a></p>
 </div>
@@ -3480,7 +4235,7 @@ <h4 id="_download_the_latest_zip_2">Download the Latest ZIP</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_fork_and_clone_the_github_project_2">Fork and Clone the GitHub Project</h4>
+<h4 id="_fork_and_clone_the_github_project_2">9.2.2. Fork and Clone the GitHub Project</h4>
 <div class="paragraph">
 <p>If you don&#8217;t have the GitHub client (<code>git</code>), download it from: <a href="http://git-scm.com/" class="bare">http://git-scm.com/</a></p>
 </div>
@@ -3526,15 +4281,15 @@ <h4 id="_fork_and_clone_the_github_project_2">Fork and Clone the GitHub Project<
 </div>
 </div>
 <div class="sect2">
-<h3 id="Known-Issues">Known Windup Issues</h3>
+<h3 id="Known-Issues">9.3. Known Windup Issues</h3>
 <div class="paragraph">
 <p>Windup known issues are tracked here: <a href="https://issues.jboss.org/browse/WINDUP-496?jql=project%20%3D%20WINDUP%20AND%20issuetype%20%3D%20Bug%20AND%20status%20in%20%28Open%2C%20%22Coding%20In%20Progress%22%2C%20Reopened%2C%20%22Pull%20Request%20Sent%22%29">Open Windup issues</a></p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="Glossary">Glossary of Terms Used in Windup</h3>
+<h3 id="Glossary">9.4. Glossary of Terms Used in Windup</h3>
 <div class="sect3">
-<h4 id="_rules_terms">Rules Terms</h4>
+<h4 id="_rules_terms">9.4.1. Rules Terms</h4>
 <div class="dlist">
 <dl>
 <dt class="hdlist1">Rule</dt>
@@ -3597,7 +4352,7 @@ <h4 id="_rules_terms">Rules Terms</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_reporting_terms">Reporting Terms</h4>
+<h4 id="_reporting_terms">9.4.2. Reporting Terms</h4>
 <div class="dlist">
 <dl>
 <dt class="hdlist1">Lift and Shift (Level of effort)</dt>
@@ -3623,10 +4378,10 @@ <h4 id="_reporting_terms">Reporting Terms</h4>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_appendix">Appendix</h2>
+<h2 id="_appendix">10. Appendix</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="Windup-Architectural-Components">Windup Architectural Components</h3>
+<h3 id="Windup-Architectural-Components">10.1. Windup Architectural Components</h3>
 <div class="paragraph">
 <p>The following open source software, tools, and APIs are used within
 Windup to analyze and provide migration information. If you plan to
@@ -3634,7 +4389,7 @@ <h3 id="Windup-Architectural-Components">Windup Architectural Components</h3>
 familiar with them.</p>
 </div>
 <div class="sect3">
-<h4 id="_forge">Forge</h4>
+<h4 id="_forge">10.1.1. Forge</h4>
 <div class="paragraph">
 <p>Forge is an open source, extendable, rapid application development tool
 for creating Java EE applications using Maven. For more information
@@ -3642,7 +4397,7 @@ <h4 id="_forge">Forge</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_forge_furnace">Forge Furnace</h4>
+<h4 id="_forge_furnace">10.1.2. Forge Furnace</h4>
 <div class="paragraph">
 <p>Forge Furnace is a modular runtime container behind Forge that provides
 the ability to run Forge addons in an embedded application. For more
@@ -3651,21 +4406,21 @@ <h4 id="_forge_furnace">Forge Furnace</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_tinkerpop">TinkerPop</h4>
+<h4 id="_tinkerpop">10.1.3. TinkerPop</h4>
 <div class="paragraph">
 <p>TinkerPop is an open source graph computing framework. For more
 information, see: <a href="http://www.tinkerpop.com/">TinkerPop</a>.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_titan">Titan</h4>
+<h4 id="_titan">10.1.4. Titan</h4>
 <div class="paragraph">
 <p>Titan is a scalable graph database optimized for storing and querying graphs.
 For more information, see: <a href="http://thinkaurelius.github.io/titan/">Titan Distributed Graph Database</a> and <a href="https://github.com/thinkaurelius/titan/wiki/Beginner%27s-Guide">Titan Beginner&#8217;s Guide</a>.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_frames">Frames</h4>
+<h4 id="_frames">10.1.5. Frames</h4>
 <div class="paragraph">
 <p>Frames represents graph data in the form of interrelated Java Objects or
 a collection of annotated Java Interfaces. For more information, see:
@@ -3677,7 +4432,7 @@ <h4 id="_frames">Frames</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_gremlin">Gremlin</h4>
+<h4 id="_gremlin">10.1.6. Gremlin</h4>
 <div class="paragraph">
 <p>Gremlin is a graph traversal language that allows you to query, analyze,
 and manipulate property graphs that implement the Blueprints property
@@ -3686,7 +4441,7 @@ <h4 id="_gremlin">Gremlin</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_blueprints">Blueprints</h4>
+<h4 id="_blueprints">10.1.7. Blueprints</h4>
 <div class="paragraph">
 <p>Blueprints is an industry standard API used to access graph databases.
 For more information about Blueprints, see:
@@ -3694,7 +4449,7 @@ <h4 id="_blueprints">Blueprints</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_pipes">Pipes</h4>
+<h4 id="_pipes">10.1.8. Pipes</h4>
 <div class="paragraph">
 <p>Pipes is a dataflow framework used to process graph data. It for the
 transformation of data from input to output. For more information, see:
@@ -3702,14 +4457,14 @@ <h4 id="_pipes">Pipes</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_rexster">Rexster</h4>
+<h4 id="_rexster">10.1.9. Rexster</h4>
 <div class="paragraph">
 <p>Rexster is a graph server that exposes any Blueprints graph through HTTP/REST and a binary protocol called RexPro. Rexster makes extensive use of Blueprints, Pipes, and Gremlin. For more information, see:
 <a href="https://github.com/tinkerpop/rexster/wiki">TinkerPop Rexster Wiki</a>.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_ocpsoft_rewrite">OCPsoft Rewrite</h4>
+<h4 id="_ocpsoft_rewrite">10.1.10. OCPsoft Rewrite</h4>
 <div class="paragraph">
 <p>OCPsoft Rewrite is an open source routing and URL rewriting solution for
 Servlets, Java Web Frameworks, and Java EE. For more information about
@@ -3718,7 +4473,7 @@ <h4 id="_ocpsoft_rewrite">OCPsoft Rewrite</h4>
 </div>
 </div>
 <div class="sect2">
-<h3 id="Dev-Dependencies">Dependencies (Forge add-ons)</h3>
+<h3 id="Dev-Dependencies">10.2. Dependencies (Forge add-ons)</h3>
 <div class="paragraph">
 <div class="title">DRAFT</div>
 <p><em>Based on
@@ -3726,7 +4481,7 @@ <h3 id="Dev-Dependencies">Dependencies (Forge add-ons)</h3>
 discussion.</em></p>
 </div>
 <div class="sect3">
-<h4 id="_maven_add_on_structure">Maven Add-on Structure</h4>
+<h4 id="_maven_add_on_structure">10.2.1. Maven Add-on Structure</h4>
 <div class="paragraph">
 <p>The following is the typical structure of Maven <code>add-on</code> modules.</p>
 </div>
@@ -3776,7 +4531,7 @@ <h4 id="_maven_add_on_structure">Maven Add-on Structure</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_add_on_sub_parts">Add-on sub-parts</h4>
+<h4 id="_add_on_sub_parts">10.2.2. Add-on sub-parts</h4>
 <div class="paragraph">
 <p>Add-on sub-parts declare dependency preferably on forge add-on APIs, not
 on the add-ons themselves, wherever possible (wherever an add-on has an
@@ -3834,7 +4589,7 @@ <h4 id="_add_on_sub_parts">Add-on sub-parts</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_test_dependencies">Test dependencies</h4>
+<h4 id="_test_dependencies">10.2.3. Test dependencies</h4>
 <div class="paragraph">
 <p>For test dependencies on add-ons: Any addon/sub-part requiring an addon
 for testing purposes should use <code>&lt;scope&gt;test&lt;/scope&gt;</code>.</p>
@@ -3852,7 +4607,7 @@ <h4 id="_test_dependencies">Test dependencies</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_dependencies_between_sub_parts_within_the_same_add_on">Dependencies between sub-parts within the same add-on</h4>
+<h4 id="_dependencies_between_sub_parts_within_the_same_add_on">10.2.4. Dependencies between sub-parts within the same add-on</h4>
 <div class="paragraph">
 <p>Subpart may declare dependency on other subpart. E.g. <code>impl</code> typically
 depends on <code>api</code>. In that case, the scope should be set appropriately
@@ -3870,7 +4625,7 @@ <h4 id="_dependencies_between_sub_parts_within_the_same_add_on">Dependencies bet
 </div>
 </div>
 <div class="sect2">
-<h3 id="Rules-Windup-Models">Windup Models</h3>
+<h3 id="Rules-Windup-Models">10.3. Windup Models</h3>
 <div class="paragraph">
 <p>Windup models are the classes extending WindupVertexFrame.
 They are used to model the data in the graph database to Java objects.</p>
@@ -3880,10 +4635,10 @@ <h3 id="Rules-Windup-Models">Windup Models</h3>
 The complete and up-to-date list of models is in <a href="#http://windup.github.io/windup/docs/javadoc/latest/org/jboss/windup/graph/model/WindupVertexFrame.html">Javadoc</a>.</p>
 </div>
 <div class="paragraph">
-<p><span class="image"><img src="images/WindupModels-NbScreenshot.png" alt="Windup Models Graphic"></span></p>
+<p><span class="image"><img src="images/images/WindupModels-NbScreenshot.png" alt="Windup Models Graphic"></span></p>
 </div>
 <div class="sect3">
-<h4 id="_meta_models">Meta Models</h4>
+<h4 id="_meta_models">10.3.1. Meta Models</h4>
 <div class="ulist">
 <ul>
 <li>
@@ -3896,17 +4651,17 @@ <h4 id="_meta_models">Meta Models</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_core_models">Core Models</h4>
+<h4 id="_core_models">10.3.2. Core Models</h4>
 <div class="paragraph">
 <p>FileModel ArchiveModel</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_reporting_models">Reporting Models</h4>
+<h4 id="_reporting_models">10.3.3. Reporting Models</h4>
 
 </div>
 <div class="sect3">
-<h4 id="_custom_models_coming_from_addons">Custom Models (coming from Addons)</h4>
+<h4 id="_custom_models_coming_from_addons">10.3.4. Custom Models (coming from Addons)</h4>
 <div class="paragraph">
 <p>See respective ruleset&#8217;s documentation.</p>
 </div>
@@ -3917,7 +4672,7 @@ <h4 id="_custom_models_coming_from_addons">Custom Models (coming from Addons)</h
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-02-04 16:09:16 EST
+Last updated 2015-03-17 13:12:03 EDT
 </div>
 </div>
 </body>
diff --git a/html/WindupUserGuide.html b/html/WindupUserGuide.html
index 4f3e9913a4..83c408d892 100644
--- a/html/WindupUserGuide.html
+++ b/html/WindupUserGuide.html
@@ -417,7 +417,7 @@ <h1>Windup User Guide</h1>
 <ul class="sectlevel1">
 <li><a href="#_overview">Overview</a>
 <ul class="sectlevel2">
-<li><a href="#What-is-Windup">What is Windup?</a></li>
+<li><a href="#_what_is_windup">What is Windup?</a></li>
 <li><a href="#Features-of-Windup-2.0">Features of Windup 2.0</a></li>
 <li><a href="#Windup-Processing-Overview">Windup Processing Overview</a></li>
 <li><a href="#Get-Involved">Get Involved</a></li>
@@ -451,12 +451,12 @@ <h2 id="_overview">Overview</h2>
 <p>This guide is for engineers, consultants, and others who plan to use
 Windup 2.0 to migrate Java applications or other components.</p>
 </div>
-<div class="sect2">
-<h3 id="What-is-Windup">What is Windup?</h3>
 <div class="paragraph">
 <p><span class="image"><img src="images/windup-logo-wiki-header.jpg" alt="Windup Logo"></span></p>
 </div>
 <hr>
+<div class="sect2">
+<h3 id="_what_is_windup">What is Windup?</h3>
 <div class="paragraph">
 <p>JBoss Windup is a rule-based tool to simplify application migrations.</p>
 </div>
@@ -664,7 +664,10 @@ <h3 id="Windup-Processing-Overview">Windup Processing Overview</h3>
 <div class="sect3">
 <h4 id="_discovery_phase">Discovery Phase</h4>
 <div class="paragraph">
-<p>Wnen you run the <code>windup-migrate-app</code> command, Windup executes its own core rules to extract files from archives, decompile classes, and analyze the application. In this phase, Windup builds a datamodel, storing component data and relationships in a graph database, which can then be queried and updated as needed by the migration rules and for reporting purposes.</p>
+<p>Wnen you run the <code>windup-migrate-app</code> command, Windup executes its own core rules to extract files from archives, decompile classes, and analyze the application. In this phase Windup builds a data model and stores component data and relationships in a graph database, which can then be queried and updated as needed by the migration rules and for reporting purposes.</p>
+</div>
+<div class="paragraph">
+<p>For more information about the phases of rule execution and how to control rule dependencies, see <a href="#Rules-Rule-Execution-Lifecycle">Rule Execution Lifecycle</a>.</p>
 </div>
 <div class="paragraph">
 <p>For more information about the graph database components, see <a href="#Windup-Architectural-Components">Windup Architectural Components</a>.</p>
@@ -801,6 +804,9 @@ <h4 id="_helpful_links">Helpful links</h4>
 <p>Windup Forums: <a href="https://community.jboss.org/en/windup" class="bare">https://community.jboss.org/en/windup</a></p>
 </li>
 <li>
+<p>Windup Forums: <a href="https://developer.jboss.org/en/windup" class="bare">https://developer.jboss.org/en/windup</a> (inherited from Windup 0.x)</p>
+</li>
+<li>
 <p>Windup Issue Tracker: <a href="https://issues.jboss.org/browse/WINDUP" class="bare">https://issues.jboss.org/browse/WINDUP</a></p>
 </li>
 <li>
@@ -1095,7 +1101,7 @@ <h4 id="_run_the_code_windup_migrate_app_code_command">Run the <code>windup-migr
 <div class="title">Note</div>
 </td>
 <td class="content">
-If the <strong>OUTPUT_REPORT_DIRECTORY</strong> directory exists, your are prompted to overwrite the contents. If you respond "y", it is deleted and recreated by Windup, so be careful not to specify an output directory that contains important information!
+If the <strong>OUTPUT_REPORT_DIRECTORY</strong> directory exists, you are prompted to overwrite the contents. If you respond "y", it is deleted and recreated by Windup, so be careful not to specify an output directory that contains important information!
 </td>
 </tr>
 </table>
@@ -1680,7 +1686,7 @@ <h4 id="_ocpsoft_rewrite">OCPsoft Rewrite</h4>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-02-04 16:09:16 EST
+Last updated 2015-03-17 13:12:03 EDT
 </div>
 </div>
 </body>
diff --git a/scripts/pagelinksCoreDevelopmentGuide.sh b/scripts/pagelinksCoreDevelopmentGuide.sh
index 34a5fe3d99..3e2ec99dd5 100755
--- a/scripts/pagelinksCoreDevelopmentGuide.sh
+++ b/scripts/pagelinksCoreDevelopmentGuide.sh
@@ -12,7 +12,7 @@ grep 'link:[A-Z]' `find . -name 'Get-Involved.adoc'`
 grep 'link:[A-Z]' `find . -name 'Dev-Windup-Project-Information.adoc'`
 grep 'link:[A-Z]' `find . -name 'Report-Issues-with-Windup.adoc'`
 grep 'link:[A-Z]' `find . -name 'About-the-WINDUP_HOME-Variable.adoc'`
-grep 'link:[A-Z]' `find . -name 'Dev-Development-Guidelines.adoc'`
+grep 'link:[A-Z]' `find . -name 'Dev-Development-Guidelines-and-Conventions.adoc'`
 grep 'link:[A-Z]' `find . -name 'Dev-Submit-Code-Updates-to-the-Windup-Project.adoc'`
 grep 'link:[A-Z]' `find . -name 'Windup-Architectural-Components.adoc'`
 grep 'link:[A-Z]' `find . -name 'Dev-Windup-Project-Structure.adoc'`
diff --git a/scripts/pagelinksCoreDevelopmentGuide.txt b/scripts/pagelinksCoreDevelopmentGuide.txt
deleted file mode 100644
index dc3b4b2607..0000000000
--- a/scripts/pagelinksCoreDevelopmentGuide.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-= Windup Core Development Guide
-
-:toc:
-:toclevels: 4
-
-== Overview
-
-This guide is for developers who plan to contribute source code updates
-or core rule add-ons to the Windup 2.0 project.
-
-NOTE: This is a very rough first draft! 
-
-include::What-is-Windup.adoc[tabsize=4]
-include::Features-of-Windup-2.0.adoc[tabsize=4]
-include::Get-Involved.adoc[tabsize=4]
-include::Dev-Windup-Project-Information.adoc[tabsize=4]
-include::Report-Issues-with-Windup.adoc[tabsize=4]
-include::About-the-WINDUP_HOME-Variable.adoc[tabsize=4]
-
-== Developer Contributing Information
-
-include::Dev-Development-Guidelines.adoc[tabsize=4]
-include::Dev-Submit-Code-Updates-to-the-Windup-Project.adoc[tabsize=4]
-
-== Understand the Windup Architecture and Structure
-
-include::Windup-Architectural-Components.adoc[tabsize=4]
-include::Dev-Windup-Project-Structure.adoc[tabsize=4]
-
-== Get Started
-include::Install-and-Configure-Maven.adoc[tabsize=4]
-include::Dev-Get-the-Windup-Source-Code.adoc[tabsize=4]
-include::Dev-Build-Windup-from-Source.adoc[tabsize=4]
-include::Dev-Execute-Windup-Built-from-Source.adoc[tabsize=4]
-include::Execute-Windup.adoc[tabsize=4]
-include::Review-the-Report.adoc[tabsize=4]
-
-== Rules and Rulesets
-include::Windup-Processing-Overview.adoc[tabsize=4]
-include::Rules-Rule-Execution-Lifecycle.adoc[tabsize=4]
-include::Rules-Rule-Story-Points.adoc[tabsize=4]
-
-== Create and Test Java Rule Add-ons
-include::Rules-Java-based-Rule-Structure.adoc[tabsize=4]
-include::Rules-Basic-Rule-Execution-Flow-Patterns.adoc[tabsize=4]
-include::Rules-Create-a-Basic-Java-based-Rule-Add-on.adoc[tabsize=4]
-include::Rules-Create-an-Advanced-Ruleset.adoc[tabsize=4]
-
-== Create and Test XML Rules
-
-include::Rules-Create-a-Basic-XML-Rule.adoc[tabsize=4]
-
-== Core Developer topics
-
-include::Dev-Windup-Bootstrap.adoc[tabsize=4]
-include::Dev-Classloading-Notes.adoc[tabsize=4]
-include::Dev-Connect-to-the-Graph-via-Rexster.adoc[tabsize=4]
-include::Dev-Decompiling.adoc[tabsize=4]
-include::Dev-Dependencies.adoc[tabsize=4]
-include::Dev-Frames-Extensions.adoc[tabsize=4]
-include::Dev-Internal-API-Features.adoc[tabsize=4]
-include::Dev-Logging.adoc[tabsize=4]
-include::Dev-Variables-Stack.adoc[tabsize=4]
-include::Dev-Port-WindRide-Functionality-to-Windup.adoc[tabsize=4]
-include::Dev-Git-Rebasing.adoc[tabsize=4]
-
-== Rules topics
-
-include::Rules-Available-Rules-Utilities.adoc[tabsize=4]
-include::Dev-Concepts-and-Philosophy.adoc[tabsize=4]
-include::Rules-Creating-Rule-Operations.adoc[tabsize=4]
-include::Rules-Rulesets.adoc[tabsize=4]
-include::Ruleset-Java-Basic-Ruleset.adoc[tabsize=4]
-include::Ruleset-Java-Classifications-and-Inline-Hints.adoc[tabsize=4]
-include::Ruleset-Java-EE-Apps.adoc[tabsize=4]
-include::Ruleset-Java-EE-Servers.adoc[tabsize=4]
-include::Ruleset-Reporting.adoc[tabsize=4]
-include::Ruleset-XML.adoc[tabsize=4]
-include::Rules-Windup-Models.adoc[tabsize=4]
-include::Rules-Create-Java-Queries.adoc[tabsize=4]
-include::Rules-Rules-Metadata.adoc[tabsize=4]
-include::Rules-Rules-Operations.adoc[tabsize=4]
-include::Rules-Ops-Reporting-Classification.adoc[tabsize=4]
-include::Rules-Ops-Reporting-Hint.adoc[tabsize=4]
-include::Rules-Ops-Reporting-TypeReference.adoc[tabsize=4]
-include::Rules-Ops-Xml-XsltTrasformation.adoc[tabsize=4]
-
-== Debugging and Troubleshooting
-
-include::Dev-Debugging-and-Profiling.adoc[tabsize=4]
-include::Dev-Troubleshoot-Windup-Issues.adoc[tabsize=4]
-
-==== Wiki and Product Documentation
-
-include::About-the-Windup-Wiki.adoc[tabsize=4]
-include::Dev-Add-Images-to-the-Windup-Wiki.adoc[tabsize=4]
-include::Dev-Create-Windup-JavaDoc.adoc[tabsize=4]
-include::Dev-Windup-Documentation-Process.adoc[tabsize=4]
-
-== Additional Resources
-
-include::Review-the-Windup-Quickstarts.adoc[tabsize=4]
-include::Known-Issues.adoc[tabsize=4] 
-include::Glossary.adoc[tabsize=4]
-
diff --git a/scripts/pagelinksRulesDevelopmentGuide.txt b/scripts/pagelinksRulesDevelopmentGuide.txt
deleted file mode 100644
index b9efdb3ae1..0000000000
--- a/scripts/pagelinksRulesDevelopmentGuide.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-= Windup Rules Development Guide
-
-:toc:
-:toclevels: 4
-
-
-== Overview
-
-This guide is for engineers, consultants, and others who plan to use 
-Windup 2.0 to migrate Java applications or other components.
-
-NOTE: This is a very rough first draft! 
-
-include::What-is-Windup.adoc[tabsize=4]
-
-include::Features-of-Windup-2.0.adoc[tabsize=4]
-
-include::Windup-Processing-Overview.adoc[tabsize=4]
-
-include::Get-Involved.adoc[tabsize=4]
-
-include::Report-Issues-with-Windup.adoc[tabsize=4]
-
-include::About-the-WINDUP_HOME-Variable.adoc[tabsize=4]
-
-
-== Get Started
-
-include::Install-Windup.adoc[tabsize=4]
-
-include::Execute-Windup.adoc[tabsize=4]
-
-include::Review-the-Report.adoc[tabsize=4]
-
-
-== Configure Your System for Java-based Rules 
-
-If you plan to create Java-based rule addons, you must also do the following.
-
-include::Install-and-Configure-Maven.adoc[tabsize=4]
-
-include::http://windup.github.io/windup/docs/javadoc/latest/[Windup API JavaDoc reference]: The JavaDoc can serve as a reference for creating Java-based rule addons.
-
-== Understand the Rule Processing
-
-include::Windup-Processing-Overview.adoc[tabsize=4]
-include::Rules-Rule-Execution-Lifecycle.adoc[tabsize=4]
-include::Rules-Rule-Story-Points.adoc[tabsize=4]
-
-== Create and Test Java Rule Addons
-
-include::Rules-Java-based-Rule-Structure.adoc[tabsize=4]
-include::Rules-Basic-Rule-Execution-Flow-Patterns.adoc[tabsize=4]
-include::Rules-Create-a-Basic-Java-based-Rule-Add-on.adoc[tabsize=4]
-include::Rules-Create-an-Advanced-Ruleset.adoc[tabsize=4]
-
-== Create and Test XML Rules
-
-include::Rules-Create-a-Basic-XML-Rule.adoc[tabsize=4]
-
-== Review the Report
-
-include::Review-the-Report.adoc[tabsize=4]
-
-== External Rule Examples
-
-include::Review-the-Windup-Quickstarts.adoc[tabsize=4]
-
-== Debugging and Troubleshooting
-
-include::Dev-Debugging-and-Profiling.adoc[tabsize=4]
-include::Dev-Troubleshoot-Windup-Issues.adoc[tabsize=4]
-
-
-== Additional Resources
-
-include::Rules-Available-Rules-Utilities.adoc[tabsize=4]
-include::Review-the-Windup-Quickstarts.adoc[tabsize=4]
-include::Known-Issues.adoc[tabsize=4] 
-include::Glossary.adoc[tabsize=4]
-
-== Appendix
-
-include::Windup-Architectural-Components.adoc[tabsize=4]
-include::Dev-Dependencies.adoc[tabsize=4]
-include::Rules-Windup-Models.adoc[tabsize=4]
-
-
-
diff --git a/scripts/windupDocUpdate.sh b/scripts/windupDocUpdate.sh
index eadb4a08fc..054686c7e0 100755
--- a/scripts/windupDocUpdate.sh
+++ b/scripts/windupDocUpdate.sh
@@ -96,6 +96,9 @@ cp $1/Rules-Create-a-Basic-Java-based-Rule-Add-on.asciidoc docs/Rules-Create-a-B
 cp $1/Rules-Create-an-Advanced-Ruleset.asciidoc docs/Rules-Create-an-Advanced-Ruleset.adoc
 ## Create and Test XML Rules
 cp $1/Rules-Create-a-Basic-XML-Rule.asciidoc docs/Rules-Create-a-Basic-XML-Rule.adoc
+cp $1/Rules-XML-Rule-When-Condition-Syntax.asciidoc docs/Rules-XML-Rule-When-Condition-Syntax.adoc
+cp $1/Rules-XML-Rule-Perform-Action-Syntax.asciidoc docs/Rules-XML-Rule-Perform-Action-Syntax.adoc
+cp $1/Rules-Test-a-Basic-XML-Rule-in-Windup.asciidoc docs/Rules-Test-a-Basic-XML-Rule-in-Windup.adoc
 ##  Debugging and Troubleshooting
 cp $1/Dev-Debugging-and-Profiling.asciidoc docs/Dev-Debugging-and-Profiling.adoc
 cp $1/Dev-Troubleshoot-Windup-Issues.asciidoc docs/Dev-Troubleshoot-Windup-Issues.adoc
@@ -131,7 +134,7 @@ cp $1/Report-Issues-with-Windup.asciidoc docs/Report-Issues-with-Windup.adoc
 cp $1/About-the-WINDUP_HOME-Variable.asciidoc docs/About-the-WINDUP_HOME-Variable.adoc
 
 ## Developer Contributing Information
-cp $1/Dev-Development-Guidelines.asciidoc docs/Dev-Development-Guidelines.adoc
+cp $1/Dev-Development-Guidelines-and-Conventions.asciidoc docs/Dev-Development-Guidelines-and-Conventions.adoc
 cp $1/Dev-Submit-Code-Updates-to-the-Windup-Project.asciidoc docs/Dev-Submit-Code-Updates-to-the-Windup-Project.adoc
 
 ## Understand the Windup Architecture and Structure
@@ -205,7 +208,7 @@ cp $1/Ruleset-Reporting.asciidoc docs/Ruleset-Reporting.adoc
 cp $1/Ruleset-XML.asciidoc docs/Ruleset-XML.adoc
 cp $1/Rules-Windup-Models.asciidoc docs/Rules-Windup-Models.adoc
 cp $1/Rules-Create-Java-Queries.asciidoc docs/Rules-Create-Java-Queries.adoc
-cp $1/Rules-Rules-Metadata.asciidoc docs/Rules-Rules-Metadata.adoc
+cp $1/Rule-Metadata.asciidoc docs/Rule-Metadata.adoc
 cp $1/Rules-Rules-Operations.asciidoc docs/Rules-Rules-Operations.adoc
 cp $1/Rules-Ops-Reporting-Classification.asciidoc docs/Rules-Ops-Reporting-Classification.adoc
 cp $1/Rules-Ops-Reporting-Hint.asciidoc docs/Rules-Ops-Reporting-Hint.adoc