Improved: refactor javadocs in OFBiz to be standards compliant
(OFBIZ-9144)

This is the first commit to the above mentioned issue which fixes many javadoc
errors dispersed through the different components. The fixes are not
necessarily improvements to the javadocs but rather making them valid javadocs
to prevent reporting errors from gradle


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1774154 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java
index 77dade2..6b6d62b 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java
@@ -68,7 +68,7 @@
 import org.apache.ofbiz.entity.util.EntityQuery;
 
 /**
- * ValueLinkApi - Implementation of ValueLink Encryption & Transport
+ * ValueLinkApi - Implementation of ValueLink Encryption and Transport
  */
 public class ValueLinkApi {
 
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java
index 0e1f5e1..c1415c2 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java
@@ -499,8 +499,10 @@
 
     /**
      * Find the quantity on hand of products for MRP.
+     * <ul>
      * <li>PreConditions : none</li>
      * <li>Result : We get the quantity of product available in the stocks.</li>
+     * </ul>
      *
      * @param product the product for which the Quantity Available is required
      * @return the sum of all the totalAvailableToPromise of the inventoryItem related to the product, if the related facility is Mrp available (not yet implemented!!)
@@ -583,14 +585,13 @@
 
     /**
      * Launch the MRP.
+     * <ul>
      * <li>PreConditions : none</li>
-     * <li>Result : The date when we must order or begin to build the products and subproducts we need are calclated</li>
+     * <li>Result : The date when we must order or begin to build the products and subproducts we need are calculated</li>
+     * <li>INPUT : parameters to get from the context: <ul><li>String mrpName</li></ul></li>
+     * <li>OUTPUT : Result to put in the map : <ul><li>none</li></ul></li>
+     * </ul>
      *
-     * <li>INPUT : parameters to get from the context :</li><ul>
-     * <li>String mrpName</li></ul>
-     *
-     * <li>OUTPUT : Result to put in the map :</li><ul>
-     * <li>none</li></ul>
      * @param ctx The DispatchContext that this service is operating in.
      * @param context Map containing the input parameters, productId routingId, quantity, startDate.
      * @return Map with the result of the service, the output parameters.
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java
index ef07849..3d49283 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java
@@ -88,14 +88,21 @@
     }
     /**
      * calculate the ProposedOrder requirementStartDate and update the requirementStartDate property.
-     * <li>For the build product, <ul>
-     *         <li>read the routing associated to the product,
-     *         <li>read the routingTask associated to the routing
-     *         <li> step by step calculate from the endDate the startDate</ul>
-     * <li>For the bought product, the first ProductFacility.daysToShip is used to calculated the startDate
-     * @return <ul>
-     * <li>if ProposedOrder.isBuild a Map with all the routingTaskId as keys and estimatedStartDate as value.
-     * <li>else null.
+     * <ul>
+     *   <li>For the build product,
+     *     <ul>
+     *       <li>read the routing associated to the product,</li>
+     *       <li>read the routingTask associated to the routing</li>
+     *       <li> step by step calculate from the endDate the startDate</li>
+     *     </ul>
+     *   </li>
+     *   <li>For the bought product, the first ProductFacility.daysToShip is used to calculated the startDate</li>
+     * </ul>
+     * @return
+     * <ul> 
+     * <li>if ProposedOrder.isBuild a Map with all the routingTaskId as keys and estimatedStartDate as value.</li>
+     * <li>else null.</li>
+     * </ul>
      **/
     public Map<String, Object> calculateStartDate(int daysToShip, GenericValue routing, Delegator delegator, LocalDispatcher dispatcher, GenericValue userLogin) {
         Map<String, Object> result = null;
@@ -191,7 +198,7 @@
 
     /**
      * calculate the ProposedOrder quantity and update the quantity property.
-     * Read the first ProductFacility.reorderQuantity and calculate the quantity : if (quantity < reorderQuantity) quantity = reorderQuantity;
+     * Read the first ProductFacility.reorderQuantity and calculate the quantity : if (quantity &lt; reorderQuantity) quantity = reorderQuantity;
      **/
     // FIXME: facilityId
     public void calculateQuantityToSupply(BigDecimal reorderQuantity, BigDecimal minimumStock, ListIterator<GenericValue>  listIterIEP) {
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java
index 3102c72..433054d 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java
@@ -100,8 +100,6 @@
 
     /**
      * Initialize url regular express configuration.
-     * 
-     * @return result to indicate the status of initialization.
      */
     public static void init() {
         FileInputStream configFileIS = null;
@@ -440,7 +438,7 @@
     /**
      * Get user exception url pattern configures.
      * 
-     * @return user exception url pattern configures (java.util.List<Pattern>)
+     * @return user exception url pattern configures (java.util.List&lt;Pattern&gt;)
      */
     public static List<Pattern> getUserExceptionPatterns() {
         return userExceptionPatterns;
@@ -449,7 +447,7 @@
     /**
      * Get char filters.
      * 
-     * @return char filters (java.util.Map<String, String>)
+     * @return char filters (java.util.Map&lt;String, String&gt;)
      */
     public static Map<String, String> getCharFilters() {
         return charFilters;
@@ -458,7 +456,7 @@
     /**
      * Get seo url pattern configures.
      * 
-     * @return seo url pattern configures (java.util.Map<String, Pattern>)
+     * @return seo url pattern configures (java.util.Map&lt;String, Pattern&gt;)
      */
     public static Map<String, Pattern> getSeoPatterns() {
         return seoPatterns;
@@ -467,7 +465,7 @@
     /**
      * Get seo replacement configures.
      * 
-     * @return seo replacement configures (java.util.Map<String, String>)
+     * @return seo replacement configures (java.util.Map&lt;String, String&gt;)
      */
     public static Map<String, String> getSeoReplacements() {
         return seoReplacements;
@@ -476,7 +474,7 @@
     /**
      * Get forward replacement configures.
      * 
-     * @return forward replacement configures (java.util.Map<String, String>)
+     * @return forward replacement configures (java.util.Map&lt;String, String&gt;)
      */
     public static Map<String, String> getForwardReplacements() {
         return forwardReplacements;
@@ -485,7 +483,7 @@
     /**
      * Get forward response codes.
      * 
-     * @return forward response code configures (java.util.Map<String, Integer>)
+     * @return forward response code configures (java.util.Map&lt;String, Integer&gt;)
      */
     public static Map<String, Integer> getForwardResponseCodes() {
         return forwardResponseCodes;
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/feature/ParametricSearch.java b/applications/product/src/main/java/org/apache/ofbiz/product/feature/ParametricSearch.java
index 9502ee7..b7747b4 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/feature/ParametricSearch.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/feature/ParametricSearch.java
@@ -48,9 +48,11 @@
 
     public static final int DEFAULT_PER_TYPE_MAX_SIZE = 1000;
 
-    /** Gets all features associated with the specified category through:
-     * ProductCategory -> ProductFeatureCategoryAppl -> ProductFeatureCategory -> ProductFeature.
-     * Returns a Map of Lists of ProductFeature GenericValue objects organized by productFeatureTypeId.
+    /**
+     * Gets all features associated with the specified category through:<br>
+     * ProductCategory -&gt; ProductFeatureCategoryAppl -&gt; ProductFeatureCategory -&gt; ProductFeature.
+     *
+     * @return a Map of Lists of ProductFeature GenericValue objects organized by productFeatureTypeId.
      */
     public static Map<String, List<GenericValue>> makeCategoryFeatureLists(String productCategoryId, Delegator delegator) {
         return makeCategoryFeatureLists(productCategoryId, delegator, DEFAULT_PER_TYPE_MAX_SIZE);
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java
index 25df703..e02e61f 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java
@@ -76,17 +76,16 @@
 
     /**
      * <p>Create or update package lines.</p>
-     * <p>Context parameters:
+     * Context parameters:
      * <ul>
      * <li>selInfo - selected rows</li>
      * <li>iteInfo - orderItemIds</li>
      * <li>prdInfo - productIds</li>
      * <li>pkgInfo - package numbers</li>
      * <li>wgtInfo - weights to pack</li>
-     * <li>numPackagesInfo - number of packages to pack per line (>= 1, default: 1)<br/>
+     * <li>numPackagesInfo - number of packages to pack per line (&gt;= 1, default: 1)<br>
      * Packs the same items n times in consecutive packages, starting from the package number retrieved from pkgInfo.</li>
      * </ul>
-     * </p>
      * @param dctx the dispatch context
      * @param context the context
      * @return returns the result of the service execution
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
index 32880bb..c7eb53e 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
@@ -332,13 +332,14 @@
 
     /**
      * <p>Delivers all the packing lines grouped by package.</p>
-     * <p>Output map:
+     * Output map:
      * <ul>
-     * <li>packageMap - a Map of type Map<Integer, List<PackingSessionLine>>
+     * <li>packageMap - a Map of type {@code Map<Integer, List<PackingSessionLine>>}
      * that maps package sequence ids to the lines that belong in
      * that package</li>
-     * <li>sortedKeys - a List of type List<Integer> with the sorted package
+     * <li>sortedKeys - a List of type List&lt;Integer&gt; with the sorted package
      * sequence numbers to index the packageMap</li>
+     * </ul>
      * @return result Map with packageMap and sortedKeys
      */
     public Map<Object, Object> getPackingSessionLinesByPackage() {
diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java
index b0508a7..5c6f08e 100644
--- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java
+++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java
@@ -434,16 +434,16 @@
      * This method takes the following parameters:
      * </p>
      * <ul>
-     * <li>start - TimeStamp (Period start date/time)</li>
-     * <li>numPeriods - Integer</li>
-     * <li>periodType - Integer (see java.util.Calendar)</li>
-     * <li>eventStatus - String</li>
-     * <li>partyId - String</li>
-     * <li>partyIds - List</li>
-     * <li>facilityId - String</li>
-     * <li>fixedAssetId - String</li>
-     * <li>filterOutCanceledEvents - Boolean</li>
-     * <li>entityExprList - List</li>
+     *   <li>start - TimeStamp (Period start date/time)</li>
+     *   <li>numPeriods - Integer</li>
+     *   <li>periodType - Integer (see java.util.Calendar)</li>
+     *   <li>eventStatus - String</li>
+     *   <li>partyId - String</li>
+     *   <li>partyIds - List</li>
+     *   <li>facilityId - String</li>
+     *   <li>fixedAssetId - String</li>
+     *   <li>filterOutCanceledEvents - Boolean</li>
+     *   <li>entityExprList - List</li>
      * </ul>
      * <p>
      * The method will find all matching Work Effort events and return them as a List called
@@ -456,15 +456,14 @@
      * key/value pairs:
      * </p>
      * <ul>
-     * <li>start - TimeStamp (Period start date/time)</li>
-     * <li>end - TimeStamp (Period end date/time)</li>
-     * <li>calendarEntries - List of Maps. Each Map contains the following
-     * key/value pairs:</li>
-     * <ul>
-     * <li>workEffort - GenericValue</li>
-     * <li>periodSpan - Integer (Number of periods this Work Effort spans)</li>
-     * <li>startOfPeriod - Boolean (true if this is the first occurrence in the period range)</li>
-     * </ul>
+     *   <li>start - TimeStamp (Period start date/time)</li>
+     *   <li>end - TimeStamp (Period end date/time)</li>
+     *   <li>calendarEntries - List of Maps. Each Map contains the following key/value pairs</li>
+     *   <li><ul>
+     *       <li>workEffort - GenericValue</li>
+     *       <li>periodSpan - Integer (Number of periods this Work Effort spans)</li>
+     *       <li>startOfPeriod - Boolean (true if this is the first occurrence in the period range)</li>
+     *   </ul></li>
      * </ul>
      */
 
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java b/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java
index dcda955..d1e715c 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java
@@ -33,7 +33,7 @@
  * An object that tracks service metrics.
  * <p>This interface and its default implementation are based on the
  * <code>seda.sandstorm.internal.StageStats</code> class written by
- * Matt Welsh.</code>
+ * Matt Welsh.
  * @see <a href="http://www.eecs.harvard.edu/~mdw/proj/seda/">SEDA</a>
  */
 public interface Metrics {
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/metrics/MetricsFactory.java b/framework/base/src/main/java/org/apache/ofbiz/base/metrics/MetricsFactory.java
index aee5cec..89aedf3 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/metrics/MetricsFactory.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/metrics/MetricsFactory.java
@@ -51,15 +51,38 @@
     /**
      * Creates a <code>Metrics</code> instance based on <code>element</code> attributes.
      * If an instance with the same name already exists, it will be returned.
-     * <p><strong>Element Attributes</strong>
      * <table border="1">
-     * <tr><th>Attribute Name</th><th>Requirements</th><th>Description</th><th>Notes</th></tr>
-     * <tr><td>name</td><td>Required</td><td>The metric name.</td><td>&nbsp;</td></tr>
-     * <tr><td>estimation-size</td><td>Optional</td><td>Positive integer number of events to include in the metrics calculation.</td><td>Defaults to "100".</td></tr>
-     * <tr><td>estimation-time</td><td>Optional</td><td>Positive integer number of milliseconds to include in the metrics calculation.</td><td>Defaults to "1000".</td></tr>
-     * <tr><td>smoothing</td><td>Optional</td><td>Smoothing factor - used to smooth the differences between calculations.</td><td>A value of "1" disables smoothing. Defaults to "0.7".</td></tr>
-     * <tr><td>threshold</td><td>Optional</td><td>The metric threshold. The meaning of the threshold is determined by client code.</td><td>Defaults to "0.0".</td></tr>
-     * </table></p>
+     *   <caption><strong>Element Attributes</strong></caption>
+     *   <tr><th>Attribute Name</th><th>Requirements</th><th>Description</th><th>Notes</th></tr>
+     *   <tr>
+     *     <td>name</td>
+     *     <td>Required</td>
+     *     <td>The metric name.</td>
+     *     <td>&nbsp;</td>
+     *   <tr>
+     *     <td>estimation-size</td>
+     *     <td>Optional</td>
+     *     <td>Positive integer number of events to include in the metrics calculation.</td>
+     *     <td>Defaults to "100".</td>
+     *   </tr>
+     *   <tr>
+     *     <td>estimation-time</td>
+     *     <td>Optional</td>
+     *     <td>Positive integer number of milliseconds to include in the metrics calculation.</td>
+     *     <td>Defaults to "1000".</td>
+     *   </tr>
+     *   <tr>
+     *     <td>smoothing</td>
+     *     <td>Optional</td>
+     *     <td>Smoothing factor - used to smooth the differences between calculations.</td>
+     *     <td>A value of "1" disables smoothing. Defaults to "0.7".</td>
+     *   </tr>
+     *   <tr>
+     *     <td>threshold</td>
+     *     <td>Optional</td>
+     *     <td>The metric threshold. The meaning of the threshold is determined by client code.</td>
+     *     <td>Defaults to "0.0".</td></tr>
+     * </table>
      * 
      * @param element The element whose attributes will be used to create the <code>Metrics</code> instance
      * @return A <code>Metrics</code> instance based on <code>element</code> attributes
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java
index 6e513fb..bb1e7b7 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java
@@ -23,13 +23,13 @@
 
 /**
  * An observable object.
- * <p>This class is similar to <code>java.util.Observable</code> but it has some differences:
+ * <p>This class is similar to <code>java.util.Observable</code> but it has some differences:</p>
  * <ul>
- * <li>It has improved concurrency</li>
- * <li>It cannot be subclassed</li>
- * <li>The <code>notifyObservers</code> method does not clear the changed flag</li>
- * <li>Protected methods have been made public</li>
- * </ul></p>
+ *   <li>It has improved concurrency</li>
+ *   <li>It cannot be subclassed</li>
+ *   <li>The <code>notifyObservers</code> method does not clear the changed flag</li>
+ *   <li>Protected methods have been made public</li>
+ * </ul>
  *
  */
 public final class Observable {
@@ -92,8 +92,10 @@
      * <p>Each <code>Observer</code> has its <code>update</code> method called with two
      * arguments: this observable object and <code>null</code>. In other 
      * words, this method is equivalent to:
-     * <blockquote><tt>
-     * notifyObservers(null)</tt></blockquote></p>
+     * </p>
+     * <blockquote>
+     *   <tt>notifyObservers(null)</tt>
+     * </blockquote>
      *
      */
     public void notifyObservers() {
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java
index e33296f..8597615 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java
@@ -24,11 +24,14 @@
 import javax.script.ScriptException;
 
 /**
- * A script helper object. The OFBiz scripting framework will include an instance of this class in the script's bindings.
- * <p>The scripting language will determine how the helper is used. Most languages will access it as a variable:<br />
- * <code>partyValue = ofbiz.findOne("Party");</code><br />
- * while other languages might access it as a native method or function:<br />
- * <code>partyValue = findOne("Party");</code></p>
+ * A script helper object. The OFBiz scripting framework will include an
+ * instance of this class in the script's bindings.
+ * <p>The scripting language will determine how the helper is used. Most
+ * languages will access it as a variable:<br>
+ * <code>partyValue = ofbiz.findOne("Party");</code><br>
+ * while other languages might access it as a native method or function:<br>
+ * <code>partyValue = findOne("Party");</code>
+ * </p>
  */
 public interface ScriptHelper {
 
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
index 595a36b..c47bfba 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
@@ -509,15 +509,17 @@
 
     /** Converts operator substitutions (@and, @or, etc) back to their original form.
      * <p>OFBiz script syntax provides special forms of common operators to make
-     * it easier to embed logical expressions in XML:
+     * it easier to embed logical expressions in XML</p>
      * <table border="1" cellpadding="2">
-     * <tr><td><strong>@and</strong></td><td>&amp;&amp;</td></tr>
-     * <tr><td><strong>@or</strong></td><td>||</td></tr>
-     * <tr><td><strong>@gt</strong></td><td>&gt;</td></tr>
-     * <tr><td><strong>@gteq</strong></td><td>&gt;=</td></tr>
-     * <tr><td><strong>@lt</strong></td><td>&lt;</td></tr>
-     * <tr><td><strong>@lteq</strong></td><td>&lt;=</td></tr>
-     * </table></p>
+     *   <caption>OFBiz XML operators</caption>
+     *   <tr><th>OFBiz operator</th><th>Substitution</th></tr>
+     *   <tr><td><strong>@and</strong></td><td>&amp;&amp;</td></tr>
+     *   <tr><td><strong>@or</strong></td><td>||</td></tr>
+     *   <tr><td><strong>@gt</strong></td><td>&gt;</td></tr>
+     *   <tr><td><strong>@gteq</strong></td><td>&gt;=</td></tr>
+     *   <tr><td><strong>@lt</strong></td><td>&lt;</td></tr>
+     *   <tr><td><strong>@lteq</strong></td><td>&lt;=</td></tr>
+     * </table>
      * @param expression The <code>String</code> to convert
      * @return The converted <code>String</code>
      */
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
index 64d35e4..65bee31 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
@@ -237,7 +237,10 @@
 
     /**
      * Uses a black-list approach for necessary characters for HTML.
-     * Does not allow various characters (after canonicalization), including "<", ">", "&" (if not followed by a space), and "%" (if not followed by a space).
+     * <p>
+     * Does not allow various characters (after canonicalization), including
+     * "&lt;", "&gt;", "&amp;" (if not followed by a space), and "%" (if not 
+     * followed by a space).
      *
      * @param value
      * @param errorMessageList
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java
index 7d55c7a..3d5464f 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java
@@ -474,7 +474,10 @@
     }
 
     // ------------------- web encode handlers -------------------
-    /** Encodes an HTTP URL query String, replacing characters used for other things in HTTP URL query strings, but not touching the separator characters '?', '=', and '&'
+    /** 
+     * Encodes an HTTP URL query String, replacing characters used for other
+     * things in HTTP URL query strings, but not touching the separator
+     * characters '?', '=', and '&amp;'
      * @param query The plain query String
      * @return The encoded String
      */
@@ -527,7 +530,8 @@
     }
 
     // ------------------- web encode handlers -------------------
-    /** Encodes an XML string replacing the characters '<', '>', '"', ''', '&'
+    /** 
+     * Encodes an XML string replacing the characters '&lt;', '&gt;', '&quot;', '&#39;', '&amp;'
      * @param inString The plain value String
      * @return The encoded String
      */
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
index dad3283..65e086a 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
@@ -1216,9 +1216,13 @@
      * the composite according to compositeType. For example, consider the following
      * form widget field,
      *
-     *   <field name="meetingDate">
+     * <pre>
+     * {@code
+     * <field name="meetingDate">
      *     <date-time type="timestamp" input-method="time-dropdown">
-     *   </field>
+     * </field>
+     * }
+     * </pre>
      *
      * The result in HTML is three input boxes to input the date, hour and minutes separately.
      * The parameter names are named meetingDate_c_date, meetingDate_c_hour, meetingDate_c_minutes.
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java
index ab54888..1215bee 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java
@@ -871,23 +871,26 @@
         return propertiesNotFound.contains(createResourceName(resource, locale, removeExtension));
     }
 
-    /** Resolve a properties file URL.
-     * <p>This method uses the following strategy:<br />
+    /** 
+     * Resolve a properties file URL.
+     * <p>This method uses the following strategy:</p>
      * <ul>
-     * <li>Locate the XML file specified in <code>resource (MyProps.xml)</code></li>
-     * <li>Locate the file that starts with the name specified in
-     * <code>resource</code> and ends with the locale's string and
-     * <code>.xml (MyProps_en.xml)</code></li>
-     * <li>Locate the file that starts with the name specified in
-     * <code>resource</code> and ends with the locale's string and
-     * <code>.properties (MyProps_en.properties)</code></li>
-     * <li>Locate the file that starts with the name specified in
-     * <code>resource and ends with the locale's string (MyProps_en)</code></li>
+     *   <li>Locate the XML file specified in <code>resource (MyProps.xml)</code></li>
+     *   <li>Locate the file that starts with the name specified in
+     *     <code>resource</code> and ends with the locale's string and
+     *     <code>.xml (MyProps_en.xml)</code>
+     *   </li>
+     *   <li>Locate the file that starts with the name specified in
+     *     <code>resource</code> and ends with the locale's string and
+     *     <code>.properties (MyProps_en.properties)</code>
+     *   </li>
+     *   <li>Locate the file that starts with the name specified in
+     *     <code>resource and ends with the locale's string (MyProps_en)</code>
+     *   </li>
      * </ul>
-     * <br />
+     *
      * The <code>component://</code> protocol is supported in the
      * <code>resource</code> parameter.
-     * </p>
      *
      * @param resource The resource to resolve
      * @param locale The desired locale
@@ -961,22 +964,25 @@
         return null;
     }
 
-    /** Convert XML property file to Properties instance. This method will convert
+    /** 
+     * Convert XML property file to Properties instance. This method will convert
      * both the Java XML properties file format and the OFBiz custom XML
      * properties file format.
-     * <p>
-     * The format of the custom XML properties file is:<br />
-     * <br />
-     * <code>
-     * &lt;resource&gt;<br />
-     * &nbsp;&lt;property key="key"&gt;<br />
-     * &nbsp;&nbsp;&lt;value xml:lang="locale 1"&gt;Some value&lt;/value&gt<br />
-     * &nbsp;&nbsp;&lt;value xml:lang="locale 2"&gt;Some value&lt;/value&gt<br />
-     * &nbsp;&nbsp;...<br />
-     * &nbsp;&lt;/property&gt;<br />
-     * &nbsp;...<br />
-     * &lt;/resource&gt;<br /><br /></code> where <em>"locale 1", "locale 2"</em> are valid xml:lang values..
-     * </p>
+     *
+     * <p>The format of the custom XML properties file is:</p>
+     * <pre>
+     * {@code
+     * <resource>
+     *     <property key="key">
+     *     <value xml:lang="locale 1">Some value</value>
+     *     <value xml:lang="locale 2">Some value</value>
+     *     ...
+     *     </property>
+     *     ...
+     * </resource>
+     * }
+     * </pre>
+     * where <em>"locale 1", "locale 2"</em> are valid xml:lang values..
      *
      * @param in XML file InputStream
      * @param locale The desired locale
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java
index a0cb744..3cf57a8 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java
@@ -32,33 +32,33 @@
  * Utility methods for validating data, especially input.
  * See detailed description below.
  *
- * <br/> SUMMARY
- * <br/>
- * <br/> This is a set of meethods for validating input. Functions are provided to validate:
- * <br/>    - U.S. and international phone/fax numbers
- * <br/>    - U.S. ZIP codes(5 or 9 digit postal codes)
- * <br/>    - U.S. Postal Codes(2 letter abbreviations for names of states)
- * <br/>    - U.S. Social Security Numbers(abbreviated as SSNs)
- * <br/>    - email addresses
- * <br/>       - dates(entry of year, month, and day and validity of combined date)
- * <br/>       - credit card numbers
- * <br/>
- * <br/> Supporting utility functions validate that:
- * <br/>    - characters are Letter, Digit, or LetterOrDigit
- * <br/>    - strings are a Signed, Positive, Negative, Nonpositive, or Nonnegative integer
- * <br/>    - strings are a Float or a SignedFloat
- * <br/>    - strings are Alphabetic, Alphanumeric, or Whitespace
- * <br/>    - strings contain an integer within a specified range
- * <br/>
- * <br/> Other utility functions are provided to:
- * <br/>    - remove from a string characters which are/are not in a "bag" of selected characters
- * <br/>       - strip whitespace/leading whitespace from a string
- * <br/>
- * <br/> ==============================================================================
- * <br/> NOTE: This code was adapted from the Netscape JavaScript form validation code,
- * <br/> usually found in "FormChek.js". Credit card verification functions Originally
- * <br/> included as Starter Application 1.0.0 in LivePayment.
- * <br/> ==============================================================================
+ * <br> SUMMARY
+ * <br>
+ * <br> This is a set of meethods for validating input. Functions are provided to validate:
+ * <br>    - U.S. and international phone/fax numbers
+ * <br>    - U.S. ZIP codes(5 or 9 digit postal codes)
+ * <br>    - U.S. Postal Codes(2 letter abbreviations for names of states)
+ * <br>    - U.S. Social Security Numbers(abbreviated as SSNs)
+ * <br>    - email addresses
+ * <br>       - dates(entry of year, month, and day and validity of combined date)
+ * <br>       - credit card numbers
+ * <br>
+ * <br> Supporting utility functions validate that:
+ * <br>    - characters are Letter, Digit, or LetterOrDigit
+ * <br>    - strings are a Signed, Positive, Negative, Nonpositive, or Nonnegative integer
+ * <br>    - strings are a Float or a SignedFloat
+ * <br>    - strings are Alphabetic, Alphanumeric, or Whitespace
+ * <br>    - strings contain an integer within a specified range
+ * <br>
+ * <br> Other utility functions are provided to:
+ * <br>    - remove from a string characters which are/are not in a "bag" of selected characters
+ * <br>       - strip whitespace/leading whitespace from a string
+ * <br>
+ * <br> ==============================================================================
+ * <br> NOTE: This code was adapted from the Netscape JavaScript form validation code,
+ * <br> usually found in "FormChek.js". Credit card verification functions Originally
+ * <br> included as Starter Application 1.0.0 in LivePayment.
+ * <br> ==============================================================================
  */
 public final class UtilValidate {
 
@@ -389,7 +389,10 @@
         }
     }
 
-    /** Returns true if string s is an integer > 0. NOTE: using the Java Long object for greatest precision */
+    /**
+     * Returns true if string s is an integer &gt; 0.
+     * NOTE: using the Java Long object for greatest precision
+     */
     public static boolean isPositiveInteger(String s) {
         if (isEmpty(s)) return defaultEmptyOK;
 
@@ -403,7 +406,9 @@
         }
     }
 
-    /** Returns true if string s is an integer >= 0. */
+    /**
+     * Returns true if string s is an integer &gt;= 0
+     */
     public static boolean isNonnegativeInteger(String s) {
         if (isEmpty(s)) return defaultEmptyOK;
 
@@ -417,7 +422,9 @@
         }
     }
 
-    /** Returns true if string s is an integer < 0. */
+    /**
+     * Returns true if string s is an integer &lt; 0
+     */
     public static boolean isNegativeInteger(String s) {
         if (isEmpty(s)) return defaultEmptyOK;
 
@@ -431,7 +438,9 @@
         }
     }
 
-    /** Returns true if string s is an integer <= 0. */
+    /** 
+     * Returns true if string s is an integer &lt;= 0
+     */
     public static boolean isNonpositiveInteger(String s) {
         if (isEmpty(s)) return defaultEmptyOK;
 
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java
index c490c5c..00210e2 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java
@@ -80,7 +80,7 @@
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
 
 /**
- * Utilities methods to simplify dealing with JAXP & DOM XML parsing
+ * Utilities methods to simplify dealing with JAXP and DOM XML parsing
  *
  */
 public final class UtilXml {
diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java
index 9050f1e..38a9697 100644
--- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java
+++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java
@@ -27,8 +27,11 @@
 import org.apache.catalina.valves.ValveBase;
 
 /**
- * To use add (or uncomment) the following line to the Tomcat/Catalina configuarion (ie in ofbiz-containers.xml under the <property name="default-server" value="engine"> element)
- *    <property name="ssl-accelerator-port" value="8443"/>
+ * To use add (or uncomment) the following line to the Tomcat/Catalina configuarion
+ * (ie in ofbiz-containers.xml under the &lt;property name="default-server" value="engine"&gt; element):
+ * <p>
+ *    &lt;property name="ssl-accelerator-port" value="8443"/&gt;
+ * <p>
  *
  * Once that is done just setup a connector just like the example http-connector and have it listen on the port you set in the ssl-accelerator-port value.
  */
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java
index d73a78f..d060732 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java
@@ -34,20 +34,22 @@
      * Compares its two arguments for order.  Returns a negative integer,
      * zero, or a positive integer as the first argument is less than, equal
      * to, or greater than the second.<p>
-     * <p/>
+     * <p>
      * The implementor must ensure that <tt>sgn(compare(x, y)) ==
      * -sgn(compare(y, x))</tt> for all <tt>x</tt> and <tt>y</tt>.  (This
      * implies that <tt>compare(x, y)</tt> must throw an exception if and only
      * if <tt>compare(y, x)</tt> throws an exception.)<p>
-     * <p/>
+     * </p>
+     * <p>
      * The implementor must also ensure that the relation is transitive:
      * <tt>((compare(x, y)&gt;0) &amp;&amp; (compare(y, z)&gt;0))</tt> implies
      * <tt>compare(x, z)&gt;0</tt>.<p>
-     * <p/>
+     * </p>
+     * <p>
      * Finally, the implementer must ensure that <tt>compare(x, y)==0</tt>
      * implies that <tt>sgn(compare(x, z))==sgn(compare(y, z))</tt> for all
-     * <tt>z</tt>.<p>
-     * <p/>
+     * <tt>z</tt>.
+     * </p>
      * It is generally the case, but <i>not</i> strictly required that
      * <tt>(compare(x, y)==0) == (x.equals(y))</tt>.  Generally speaking,
      * any comparator that violates this condition should clearly indicate
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java
index 935dc76..3661bdb 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java
@@ -44,40 +44,43 @@
 import freemarker.template.TemplateException;
 
 /**
- * Provides generic services related to preparing and
- * delivering notifications via email.
+ * Provides generic services related to preparing and delivering notifications
+ * via email.
  * <p>
  * To use the NotificationService, a message specific service should be
- * defined for a particular <a href="http://freemarker.sourceforge.net/docs/dgui_quickstart_template.html">
- * Freemarker Template</a> mapping the required fields of the
- * template to the required attributes of the service.
+ * defined for a particular 
+ * <a href="http://freemarker.sourceforge.net/docs/dgui_quickstart_template.html">
+ * Freemarker Template</a> mapping the required fields of the template to the
+ * required attributes of the service.
+ * </p>
  * <p>
- * This service definition should extend the <code>sendNotificationInterface<code>
+ * This service definition should extend the <code>sendNotificationInterface</code>
  * or the <code>prepareNotificationInterface</code> service interface
  * and simply invoke the associated method defined in this class.
- * <p>
- * <blockquote>
+ * </p>
  * <pre>
- *     &lt;service name="sendPoPickupNotification" engine="java"
- *             location="org.apache.ofbiz.content.email.NotificationServices" invoke="sendNotification"&gt;
- *         &lt;description&gt;Sends notification based on a message template&lt;/description&gt;
- *         &lt;implements service="sendNotificationInterface"/&gt;
- *         &lt;attribute name="orderId" type="String" mode="IN" optional="false"/&gt;
- *     &lt;/service&gt;
+ * {@code
+ * <service name="sendPoPickupNotification" engine="java"
+ *         location="org.apache.ofbiz.content.email.NotificationServices"
+ *         invoke="sendNotification">
+ *     <description>Sends notification based on a message template</description>
+ *     <implements service="sendNotificationInterface"/>
+ *     <attribute name="orderId" type="String" mode="IN" optional="false"/>
+ * </service>
+ * }
  * </pre>
- * </blockquote>
  * <p>
- * An optional parameter available to all message templates is <code>baseUrl</code>
- * which can either be specified when the service is invoked or let the
- * <code>NotificationService</code> attempt to resolve it as best it can,
- * see {@link #setBaseUrl(Delegator, String, Map) setBaseUrl(Map)} for details on how this is achieved.
- * <p>
+ * An optional parameter available to all message templates is 
+ * <code>baseUrl</code> which can either be specified when the service is
+ * invoked or let the <code>NotificationService</code> attempt to resolve it
+ * as best it can, see {@link #setBaseUrl(Delegator, String, Map) setBaseUrl(Map)}
+ * for details on how this is achieved.
+ * </p>
  * The following example shows what a simple notification message template,
  * associated with the above service, might contain:
  * <blockquote>
  * <pre>
  *     Please use the following link to schedule a delivery date:
- *     &lt;p&gt;
  *     ${baseUrl}/ordermgr/control/schedulepo?orderId=${orderId}"
  * </pre>
  * </blockquote>
@@ -85,6 +88,7 @@
  * The template file must be found on the classpath at runtime and
  * match the "templateName" field passed to the service when it
  * is invoked.
+ * </p>
  * <p>
  * For complex messages with a large number of dynamic fields, it may be wise
  * to implement a custom service that takes one or two parameters that can
@@ -92,7 +96,7 @@
  * the {@link #prepareNotification(DispatchContext, Map) prepareNotification(DispatchContext, Map)}
  * or {@link #sendNotification(DispatchContext, Map) sendNotification(DispatchContext, Map)}
  * methods directly to generate or generate and send the notification respectively.
- *
+ * </p>
  */
 public class NotificationServices {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
index 1b9c8c8..5c4cfe5 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
@@ -76,7 +76,7 @@
  * </li>
  * </ul>
  * </p>
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-The{{%3Csimplemethod%3E}}element">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class SimpleMethod extends MiniLangElement {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java
index dcfbdd4..1c24d86 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java
@@ -27,7 +27,7 @@
 /**
  * Implements the &lt;field&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cfield%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class FieldObject<T> extends MethodObject<T> {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java
index 5dc72cf..c5dbb2d 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java
@@ -30,7 +30,7 @@
 /**
  * Implements the &lt;fail-message&gt; and &lt;fail-property&gt; elements.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{<failmessage>}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class MessageElement extends MiniLangElement {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java
index 8ed256c..6702499 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java
@@ -40,7 +40,7 @@
 /**
  * Implements the &lt;call-class-method&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccallclassmethod%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class CallClassMethod extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java
index f51c21c..f8be559 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java
@@ -39,7 +39,7 @@
 /**
  * Implements the &lt;call-object-method&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccallobjectmethod%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class CallObjectMethod extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java
index 1ce0c48..1e21354 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java
@@ -34,7 +34,7 @@
 /**
  * Implements the &lt;script&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cscript%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class CallScript extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java
index bdb1f38..138f78d 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java
@@ -49,7 +49,7 @@
 /**
  * Implements the &lt;call-service&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccallservice%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class CallService extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java
index 808711e..b5dc7f0 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java
@@ -38,7 +38,7 @@
 /**
  * Implements the &lt;call-service-asynch&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccallserviceasynch%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class CallServiceAsynch extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java
index 2dd2d00..0b38f26 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java
@@ -37,7 +37,7 @@
 /**
  * Implements the &lt;call-map-processor&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccallmapprocessor%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class CallSimpleMapProcessor extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java
index dacb41d..3239406 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java
@@ -43,7 +43,7 @@
 /**
  * Implements the &lt;call-simple-method&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccallsimplemethod%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class CallSimpleMethod extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java
index a684ec8..901460a 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java
@@ -29,7 +29,7 @@
 /**
  * Implements the &lt;return&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Creturn%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class Return extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java
index 3e4d2f7..e4e400c 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java
@@ -41,7 +41,7 @@
 /**
  * Implements the &lt;set-service-fields&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Csetservicefields%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class SetServiceFields extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java
index 7b158b1..dd0d5f0 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java
@@ -33,7 +33,7 @@
 /**
  * Implements the &lt;and&gt;, &lt;or&gt;, &lt;not&gt;, and &lt;xor&gt; elements.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-Conditional%2FLoopingStatements">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public abstract class CombinedCondition extends MiniLangElement implements Conditional {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java
index 28f132a..7ced772 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java
@@ -40,7 +40,7 @@
 /**
  * Implements the &lt;if-compare&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cifcompare%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class CompareCondition extends MethodOperation implements Conditional {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java
index de1ca7d..f1faf43 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java
@@ -39,7 +39,7 @@
 /**
  * Implements the &lt;if-compare-field&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cifcomparefield%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class CompareFieldCondition extends MethodOperation implements Conditional {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java
index 5a6317f..17495d4 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java
@@ -34,7 +34,7 @@
 /**
  * Implements the &lt;else-if&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Celseif%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class ElseIf extends MiniLangElement {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java
index f654b1c..d3976a5 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java
@@ -35,7 +35,7 @@
 /**
  * Implements the &lt;if-empty&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cifempty%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class EmptyCondition extends MethodOperation implements Conditional {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java
index a25d260..b14f69a 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java
@@ -37,7 +37,7 @@
 /**
  * Implements the &lt;if-has-permission&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cifhaspermission%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class HasPermissionCondition extends MethodOperation implements Conditional {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java
index e1a67b2..f0f85d5 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java
@@ -43,7 +43,7 @@
 /**
  * Implements the &lt;if-regexp&gt; element.
  *
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{<ifregexp>}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public class RegexpCondition extends MethodOperation implements Conditional {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java
index 4403015..4253e2a 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java
@@ -37,7 +37,7 @@
 /**
  * Implements the &lt;if-validate-method&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cifvalidatemethod%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class ValidateMethodCondition extends MethodOperation implements Conditional {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java
index cf0ecfa..30bd35c 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java
@@ -32,7 +32,7 @@
 /**
  * Implements the &lt;clear-cache-line&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cclearcacheline%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class ClearCacheLine extends EntityOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java
index 4f138d5..d86440a 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java
@@ -28,7 +28,7 @@
 /**
  * Implements the &lt;clear-entity-caches&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cclearentitycaches%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class ClearEntityCaches extends EntityOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java
index 7d726b1..0aeea62 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java
@@ -30,7 +30,7 @@
 /**
  * Implements the &lt;clone-value&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cclonevalue%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class CloneValue extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java
index 7308ce3..ae5feaf 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java
@@ -32,7 +32,7 @@
 /**
  * Implements the &lt;create-value&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccreatevalue%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class CreateValue extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java
index 007ada0..37997b7 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java
@@ -32,7 +32,7 @@
 /**
  * Implements the &lt;entity-and&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Centityand%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class EntityAnd extends EntityOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCondition.java
index c747c32..40408df 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCondition.java
@@ -32,7 +32,7 @@
 /**
  * Implements the &lt;entity-condition&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Centitycondition%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class EntityCondition extends EntityOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java
index 3bbd45b..28dbf5a 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java
@@ -41,7 +41,7 @@
 /**
  * Implements the &lt;entity-count&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Centitycount%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class EntityCount extends EntityOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java
index cdcb49b..7b15422 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java
@@ -39,7 +39,7 @@
 /**
  * Implements the &lt;entity-data&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Centitydata%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class EntityData extends EntityOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java
index 6e938ef..7eeda57 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java
@@ -32,7 +32,7 @@
 /**
  * Implements the &lt;entity-one&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Centityone%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class EntityOne extends EntityOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByAnd.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByAnd.java
index 9d3f095..db45691 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByAnd.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByAnd.java
@@ -34,7 +34,7 @@
 /**
  * Implements the &lt;filter-list-by-and&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cfilterlistbyand%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class FilterListByAnd extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java
index a0adbb9..4dc10b3 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java
@@ -35,7 +35,7 @@
 /**
  * Implements the &lt;filter-list-by-date&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cfilterlistbydate%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class FilterListByDate extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java
index b51e399..46e3825 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java
@@ -40,7 +40,7 @@
 /**
  * Implements the &lt;find-by-and&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cfindbyand%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class FindByAnd extends EntityOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
index 7be6a7c..6287caa 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
@@ -41,7 +41,7 @@
 /**
  * Implements the &lt;find-by-primary-key&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cfindbyprimarykey%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class FindByPrimaryKey extends EntityOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java
index b6cda03..0d5653f 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java
@@ -38,7 +38,7 @@
 /**
  * Implements the &lt;get-related&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cgetrelated%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class GetRelated extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java
index 2229767..37161da 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java
@@ -35,7 +35,7 @@
 /**
  * Implements the &lt;get-related-one&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cgetrelatedone%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class GetRelatedOne extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java
index 389dd25..29161e7 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java
@@ -32,7 +32,7 @@
 /**
  * Implements the &lt;make-next-seq-id&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cmakenextseqid%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class MakeNextSeqId extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeValue.java
index bb3eb96..3e6f583 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeValue.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeValue.java
@@ -35,7 +35,7 @@
 /**
  * Implements the &lt;make-value&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cmakevalue%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class MakeValue extends EntityOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/OrderValueList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/OrderValueList.java
index 05eaab5..a907d49 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/OrderValueList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/OrderValueList.java
@@ -33,7 +33,7 @@
 /**
  * Implements the &lt;order-value-list&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cordervaluelist%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class OrderValueList extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RefreshValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RefreshValue.java
index 64de9bf..0f83ce4 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RefreshValue.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RefreshValue.java
@@ -33,7 +33,7 @@
 /**
  * Implements the &lt;refresh-value&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Crefreshvalue%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class RefreshValue extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java
index 8e3aa82..88fa2ee 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java
@@ -36,7 +36,7 @@
 /**
  * Implements the &lt;remove-by-and&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cremovebyand%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class RemoveByAnd extends EntityOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveList.java
index 01c9883..d971ea9 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveList.java
@@ -35,7 +35,7 @@
 /**
  * Implements the &lt;remove-list&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cremovelist%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class RemoveList extends EntityOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveRelated.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveRelated.java
index 43f3b78..d41b142 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveRelated.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveRelated.java
@@ -35,7 +35,7 @@
 /**
  * Implements the &lt;remove-related&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cremoverelated%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class RemoveRelated extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveValue.java
index 942b818..a1b71fe 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveValue.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveValue.java
@@ -33,7 +33,7 @@
 /**
  * Implements the &lt;remove-value&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cremovevalue%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class RemoveValue extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SequencedIdToEnv.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SequencedIdToEnv.java
index 798580c..dd596b9 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SequencedIdToEnv.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SequencedIdToEnv.java
@@ -30,7 +30,7 @@
 /**
  * Implements the &lt;sequenced-id&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Csequencedid%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class SequencedIdToEnv extends EntityOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java
index e6eed4b..7ab53e2 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java
@@ -31,7 +31,7 @@
 /**
  * Implements the &lt;set-current-user-login&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Csetcurrentuserlogin%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class SetCurrentUserLogin extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetNonpkFields.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetNonpkFields.java
index 1623cd2..0ac41b7 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetNonpkFields.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetNonpkFields.java
@@ -34,7 +34,7 @@
 /**
  * Implements the &lt;set-nonpk-fields&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Csetnonpkfields%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class SetNonpkFields extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetPkFields.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetPkFields.java
index 4a9d0be..af59de1 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetPkFields.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetPkFields.java
@@ -34,7 +34,7 @@
 /**
  * Implements the &lt;set-pk-fields&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Csetpkfields%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class SetPkFields extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreList.java
index 54bdf1f..6d48c76 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreList.java
@@ -35,7 +35,7 @@
 /**
  * Implements the &lt;store-list&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cstorelist%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class StoreList extends EntityOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreValue.java
index 2f2bc26..44770e6 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreValue.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreValue.java
@@ -33,7 +33,7 @@
 /**
  * Implements the &lt;store-value&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cstorevalue%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class StoreValue extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java
index d0779cc..a1e03c7 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java
@@ -32,7 +32,7 @@
 /**
  * Implements the &lt;transaction-begin&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ctransactionbegin%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class TransactionBegin extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java
index 09337ed..67bdca5 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java
@@ -32,7 +32,7 @@
 /**
  * Implements the &lt;transaction-commit&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ctransactioncommit%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class TransactionCommit extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java
index 4792f4f..1005bda 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java
@@ -32,7 +32,7 @@
 /**
  * Implements the &lt;transaction-rollback&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ctransactionrollback%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class TransactionRollback extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java
index 10e0c84..9134508 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java
@@ -33,8 +33,8 @@
 /**
  * Implements the &lt;add-error&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cadderror%3E}}">Mini-language Reference</a>
-*/
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
+ */
 public final class AddError extends MethodOperation {
 
     private final FlexibleMapAccessor<List<String>> errorListFma;
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java
index b02bc15..dc14c53 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java
@@ -38,7 +38,7 @@
 /**
  * Implements the &lt;assert&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cassert%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class Assert extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java
index 3e435c7..537ef5a 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java
@@ -27,7 +27,7 @@
 /**
  * Implements the &lt;break&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cbreak%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public class Break extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java
index 16e9d34..2f656d2 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java
@@ -31,7 +31,7 @@
 /**
  * Implements the &lt;check-errors&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccheckerrors%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class CheckErrors extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java
index c7fd266..01cff83 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java
@@ -36,7 +36,7 @@
 /**
  * Implements the &lt;check-id&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccheckid%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class CheckId extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ClearField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ClearField.java
index 72f2c76..5fe47b2 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ClearField.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ClearField.java
@@ -29,7 +29,7 @@
 /**
  * Implements the &lt;clear-field&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{<clearfield>}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class ClearField extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java
index a6bb303..1d03800 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java
@@ -27,7 +27,7 @@
 /**
  * Implements the &lt;continue&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccontinue%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public class Continue extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java
index be468b8..9aa969d 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java
@@ -41,7 +41,7 @@
 /**
  * Implements the &lt;create-object&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{<createobject>}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class CreateObject extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java
index 30421c1..2049ffc 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java
@@ -32,8 +32,8 @@
 /**
  * Implements the &lt;field-to-list&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cfieldtolist%3E}}">Mini-language Reference</a>
-*/
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
+ */
 public final class FieldToList extends MethodOperation {
 
     private final FlexibleMapAccessor<Object> fieldFma;
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FirstFromList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FirstFromList.java
index caeb0b1..9166629 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FirstFromList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FirstFromList.java
@@ -32,7 +32,7 @@
 /**
  * Implements the &lt;first-from-list&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cfirstfromlist%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class FirstFromList extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java
index b3ca15b..923278e 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java
@@ -43,7 +43,7 @@
 /**
  * Implements the &lt;iterate&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Citerate%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class Iterate extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java
index 4b941e7..a8358bd 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java
@@ -38,7 +38,7 @@
 /**
  * Implements the &lt;iterate-map&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Citeratemap%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class IterateMap extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java
index 8f97c07..b01ca89 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java
@@ -32,7 +32,7 @@
 /**
  * Implements the &lt;list-to-list&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Clisttolist%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class ListToList extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Loop.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Loop.java
index 785b23f..3130eca 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Loop.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Loop.java
@@ -37,7 +37,7 @@
 /**
  * Implements the &lt;loop&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cloop%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class Loop extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java
index 17e9181..78c961c 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java
@@ -32,7 +32,7 @@
 /**
  * Implements the &lt;map-to-map&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cmaptomap%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class MapToMap extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Now.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Now.java
index e0e595d..fd6463b 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Now.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Now.java
@@ -37,7 +37,7 @@
 /**
  * Implements the &lt;now&gt;, &lt;now-date-to-env&gt;, and &lt;now-timestamp&gt; elements.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cnow%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class Now extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java
index 35a00bb..cebfcf8 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java
@@ -37,7 +37,7 @@
 /**
  * Implements the &lt;order-map-list&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cordermaplist%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class OrderMapList extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java
index a737ee1..4a0e41a 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java
@@ -43,7 +43,7 @@
 /**
  * Implements the &lt;set-calendar&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Csetcalendar%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class SetCalendar extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java
index 84922f5..f6a0920 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java
@@ -39,7 +39,7 @@
 /**
  * Implements the &lt;set&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cset%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class SetOperation extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringAppend.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringAppend.java
index b19b85b..8728ee8 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringAppend.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringAppend.java
@@ -34,7 +34,7 @@
 /**
  * Implements the &lt;string-append&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cstringappend%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class StringAppend extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java
index dcaf04d..a32c835 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java
@@ -37,7 +37,7 @@
 /**
  * Implements the &lt;string-to-list&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cstringtolist%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class StringToList extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java
index 2f643a0..e8ddac3 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java
@@ -32,7 +32,7 @@
 /**
  * Implements the &lt;to-string&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ctostring%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class ToString extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java
index b5d2484..cb30d61 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java
@@ -37,7 +37,7 @@
 /**
  * Implements the &lt;while&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cwhile%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class While extends MethodOperation {
 
@@ -96,7 +96,7 @@
     /**
      * A factory for the &lt;while&gt; element.
      * 
-     * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cwhile%3E}}">Mini-language Reference</a>
+     * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
      */
     public static final class WhileFactory implements Factory<While> {
         @Override
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToRequest.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToRequest.java
index 292a05b..2525c71 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToRequest.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToRequest.java
@@ -30,7 +30,7 @@
 /**
  * Implements the &lt;field-to-request&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cfieldtorequest%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class FieldToRequest extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToSession.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToSession.java
index c284657..322a9eb 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToSession.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToSession.java
@@ -30,7 +30,7 @@
 /**
  * Implements the &lt;field-to-session&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cfieldtosession%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class FieldToSession extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java
index d7ebe92..8dd7b13 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java
@@ -34,7 +34,7 @@
 /**
  * Implements the &lt;request-parameters-to-list&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Crequestparameterstolist%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class RequestParametersToList extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestToField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestToField.java
index dfdce2e..6a5d632 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestToField.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestToField.java
@@ -30,7 +30,7 @@
 /**
  * Implements the &lt;request-to-field&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Crequesttofield%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class RequestToField extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/SessionToField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/SessionToField.java
index 2c34b33..6062f78 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/SessionToField.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/SessionToField.java
@@ -30,7 +30,7 @@
 /**
  * Implements the &lt;session-to-field&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Csessiontofield%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public class SessionToField extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java
index 3113a09..f8ccfbd 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java
@@ -36,7 +36,7 @@
 /**
  * Implements the &lt;webapp-property-to-field&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cwebapppropertytofield%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class WebappPropertyToField extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java
index ad6c634..9671a93 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java
@@ -39,7 +39,7 @@
 /**
  * Implements the &lt;check-permission&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccheckpermission%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class CheckPermission extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfInstanceOf.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfInstanceOf.java
index 2556d26..b1a0d73 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfInstanceOf.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfInstanceOf.java
@@ -36,7 +36,7 @@
 /**
  * Implements the &lt;if-instance-of&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cifinstanceof%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class IfInstanceOf extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfNotEmpty.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfNotEmpty.java
index 56595c7..49cd022 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfNotEmpty.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfNotEmpty.java
@@ -34,7 +34,7 @@
 /**
  * Implements the &lt;if-not-empty&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cifnotempty%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
  */
 public final class IfNotEmpty extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java
index efb729d..0a812fb 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java
@@ -39,7 +39,7 @@
 /**
  * Implements the &lt;calculate&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccalculate%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class Calculate extends MethodOperation {
 
@@ -202,7 +202,7 @@
     /**
      * Implements the &lt;calcop&gt; element.
      * 
-     * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ccalcop%3E}}">Mini-language Reference</a>
+     * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
      */
     public final class CalcOp extends MiniLangElement implements SubCalc {
         private static final int OPERATOR_ADD = 1;
@@ -306,7 +306,7 @@
     /**
      * Implements the &lt;number&gt; element.
      * 
-     * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cnumber%3E}}">Mini-language Reference</a>
+     * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
      */
     public final class NumberOp extends MiniLangElement implements SubCalc {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java
index 0ab6c28..94a40f3 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java
@@ -31,7 +31,7 @@
 /**
  * Implements the &lt;log&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Clog%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class Log extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/PropertyToField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/PropertyToField.java
index 1624c82..bbc3891 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/PropertyToField.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/PropertyToField.java
@@ -36,7 +36,7 @@
 /**
  * Implements the &lt;property-to-field&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cpropertytofield%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class PropertyToField extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java
index 0831491..fbb7994 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java
@@ -32,7 +32,7 @@
 /**
  * Implements the &lt;trace&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Ctrace%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class Trace extends MethodOperation {
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/serviceops/FieldToResult.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/serviceops/FieldToResult.java
index e5e1aff..dd8d7b1 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/serviceops/FieldToResult.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/serviceops/FieldToResult.java
@@ -30,7 +30,7 @@
 /**
  * Implements the &lt;field-to-result&gt; element.
  * 
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cfieldtoresult%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class FieldToResult extends MethodOperation {
 
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java b/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java
index 1b5a69b..6d937f6 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java
@@ -75,7 +75,7 @@
     /**
      * Initialize the container
      *
-     * @param args       args from calling class
+     * @param ofbizCommands command line arguments
      * @param configFile Location of master OFBiz configuration file
      * @throws org.apache.ofbiz.base.container.ContainerException
      *
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/RequestHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/RequestHandler.java
index 17f52b3..d253268 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/RequestHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/RequestHandler.java
@@ -26,13 +26,14 @@
 import javax.servlet.http.HttpServletResponse;
 
 public interface RequestHandler {
-    /** Called by the the WebDAV servlet to handle a WebDAV request.
-     * <p>The <code>HttpServletRequest</code> contains the following attributes:<br/>
-     * <table cellspacing="0" cellpadding="2" border="1">
-     *   <tr><td>delegator</td><td>A <code>GenericDelgator</code> instance</td></tr>
-     *   <tr><td>dispatcher</td><td>A <code>LocalDispatcher</code> instance</td></tr>
-     *   <tr><td>security</td><td>A <code>Security</code> instance</td></tr>
-     * </table></p>
+    /**
+     *  Called by the the WebDAV servlet to handle a WebDAV request.
+     *  <table cellspacing="0" cellpadding="2" border="1">
+     *    <caption>HTTPServletRequest attributes</caption>
+     *    <tr><td>delegator</td><td>A <code>GenericDelgator</code> instance</td></tr>
+     *    <tr><td>dispatcher</td><td>A <code>LocalDispatcher</code> instance</td></tr>
+     *    <tr><td>security</td><td>A <code>Security</code> instance</td></tr>
+     *  </table>
      */
     public void handleRequest(HttpServletRequest request, HttpServletResponse response, ServletContext context) throws ServletException, IOException;
 }
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/RequestHandlerFactory.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/RequestHandlerFactory.java
index f044872..f51e862 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/RequestHandlerFactory.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/RequestHandlerFactory.java
@@ -19,7 +19,7 @@
 package org.apache.ofbiz.webapp.webdav;
 
 public interface RequestHandlerFactory {
-    /** Returns a <code>RequestHandler<code> instance appropriate
+    /** Returns a <code>RequestHandler</code> instance appropriate
      * for the WebDAV HTTP method.
      *
      * @param method The WebDAV HTTP method. Implementations MUST
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java
index deca576..5426e18 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java
@@ -51,16 +51,18 @@
  * to pages.
  *
  * Accepts the following arguments (all of which can alternatively be present in the template context):
- * - List<Map<String, ? extends Object>> globalNodeTrail
- * - String contentAssocPredicateId
- * - String nullThruDatesOnly
- * - String subDataResourceTypeId
- * - String renderOnStart
- * - String renderOnClose
- * - String menuDefFile
- * - String menuName
- * - String menuWrapperClassName
- * - String associatedContentId
+ * <ul>
+ *   <li><code>List&lt;Map&lt;String, ? extends Object&gt;&gt; globalNodeTrail</code></li>
+ *   <li><code>String contentAssocPredicateId</code></li>
+ *   <li><code>String nullThruDatesOnly</code></li>
+ *   <li><code>String subDataResourceTypeId</code></li>
+ *   <li><code>String renderOnStart</code></li>
+ *   <li><code>String renderOnClose</code></li>
+ *   <li><code>String menuDefFile</code></li>
+ *   <li><code>String menuName</code></li>
+ *   <li><code>String menuWrapperClassName</code></li>
+ *   <li><code>String associatedContentId</code></li>
+ * </ul>
  *
  * This is an interactive FreeMarker transform that allows the user to modify the contents that are placed within it.
  */
diff --git a/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java b/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java
index 498bf43..f5a7b5e 100644
--- a/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java
+++ b/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java
@@ -65,12 +65,8 @@
     }

     

     /**

-     * Prepare display an html report.<p>

+     * Prepare display an html report.

      * 

-     * @throws JspException if dialog actions fail

-     * @throws IOException 

-     * @throws ServletException 

-     * @throws TemplateException 

      * @throws IOException 

      */

     public void prepareDisplayReport(HttpServletRequest request, HttpServletResponse response, String name, String dialogUri) throws IOException {

diff --git a/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java b/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java
index 31eb597..2e86a40 100644
--- a/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java
+++ b/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java
@@ -49,9 +49,7 @@
     private Locale locale;

 

     /**

-     * Constructs a new report Thread with the given name.<p>

-     *

-     * @param name the name of the Thread

+     * Constructs a new report Thread with the given name.

      */

     protected AbstractReportThread(HttpServletRequest request, HttpServletResponse response, String name) {

 

@@ -76,7 +74,7 @@
     }

 

     /**

-     * Adds an error object to the list of errors that occured during the report.<p>

+     * Adds an error object to the list of errors that occured during the report.

      * 

      * @param obj the error object

      */

@@ -89,7 +87,7 @@
 

     /**

      * Returns the error exception in case there was an error during the execution of

-     * this Thread, null otherwise.<p>

+     * this Thread, null otherwise.

      * 

      * @return the error exception in case there was an error, null otherwise

      */

@@ -99,7 +97,7 @@
     }

 

     /**

-     * Returns a list of all errors that occured during the report.<p>

+     * Returns a list of all errors that occured during the report.

      * 

      * @return an error list that occured during the report

      */

@@ -113,14 +111,14 @@
     }

 

     /**

-     * Returns the part of the report that is ready for output.<p>

+     * Returns the part of the report that is ready for output.

      * 

      * @return the part of the report that is ready for output

      */

     public abstract String getReportUpdate();

 

     /** 

-     * Returns the time this report has been running.<p>

+     * Returns the time this report has been running.

      * 

      * @return the time this report has been running

      */

@@ -134,7 +132,7 @@
     }

 

     /**

-     * Returns if the report generated an error output.<p>

+     * Returns if the report generated an error output.

      * 

      * @return true if the report generated an error, otherwise false

      */

@@ -148,11 +146,11 @@
     }

 

     /**

-     * Returns true if this thread is already "doomed" to be deleted.<p>

+     * Returns true if this thread is already "doomed" to be deleted.

      * 

      * A OFBiz deamon Thread (the "Grim Reaper") will collect all 

      * doomed Threads, i.e. threads that are not longer active for some

-     * time.<p>

+     * time.

      * 

      * @return true if this thread is already "doomed" to be deleted

      */

@@ -173,7 +171,7 @@
     }

 

     /**

-     * Returns the report where the output of this Thread is written to.<p>

+     * Returns the report where the output of this Thread is written to.

      * 

      * @return the report where the output of this Thread is written to

      */

@@ -183,9 +181,8 @@
     }

 

     /**

-     * Initialize a HTML report for this Thread.<p>

+     * Initialize a HTML report for this Thread.

      * 

-     * @param locale the locale for the report output messages

      */

     protected void initHtmlReport(HttpServletRequest request, HttpServletResponse response) {

 

@@ -194,9 +191,8 @@
     }

     

     /**

-     * Initialize a HTML report for this Thread.<p>

+     * Initialize a HTML report for this Thread.

      * 

-     * @param locale the locale for the report output messages

      */

     protected void initHtmlReport(HttpServletRequest request, HttpServletResponse response, boolean writeHtml, boolean isTransient) {

 

diff --git a/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReport.java b/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReport.java
index 9d97f04..931ee50 100644
--- a/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReport.java
+++ b/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReport.java
@@ -159,11 +159,11 @@
 

     /**

      * Prints a localized message to the report, using the indicated formatting.<p>

-     * 

-     * Use the contants starting with <code>FORMAT</code> from this interface

-     * to indicate which formatting to use.<p>

      *

-     * @param container the message container to add

+     * Use the contents starting with <code>FORMAT</code> from this interface

+     * to indicate which formatting to use.

+     *

+     * @param uiLabel the message container to add

      * @param format the formatting to use for the output

      */

     void println(String uiLabel, int format);

diff --git a/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlReport.java b/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlReport.java
index 560f956..7c5bfde 100644
--- a/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlReport.java
+++ b/specialpurpose/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlReport.java
@@ -33,8 +33,8 @@
     /**
      * Public constructor with report variables.<p>
      * 
-     * @param req the HttpServletRequest request
-     * @param res the HttpServletResponse response
+     * @param request the HttpServletRequest request
+     * @param response the HttpServletResponse response
      */
     public SampleHtmlReport(HttpServletRequest request, HttpServletResponse response) {