diff --git a/pmd-javascript/src/main/resources/rulesets/ecmascript/basic.xml b/pmd-javascript/src/main/resources/rulesets/ecmascript/basic.xml
index 775763483f..32e7ba49ab 100644
--- a/pmd-javascript/src/main/resources/rulesets/ecmascript/basic.xml
+++ b/pmd-javascript/src/main/resources/rulesets/ecmascript/basic.xml
@@ -1,91 +1,91 @@
 <?xml version="1.0"?>
 
 <ruleset name="Basic Ecmascript"
-	xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+    xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
 
-	<description>Rules concerning basic ECMAScript guidelines.</description>
+  <description>Rules concerning basic ECMAScript guidelines.</description>
 
-    <rule name="AssignmentInOperand"
-      language="ecmascript"
-      since="5.0"
-      message="Avoid assignments in operands"
-      class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/basic.html#AssignmentInOperand">
-<description>
+  <rule name="AssignmentInOperand"
+        language="ecmascript"
+        since="5.0"
+        message="Avoid assignments in operands"
+        class="net.sourceforge.pmd.lang.rule.XPathRule"
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_basic.html#assignmentinoperand">
+    <description>
 Avoid assignments in operands; this can make code more complicated and harder to read.  This is sometime
 indicative of the bug where the assignment operator '=' was used instead of the equality operator '=='.
-  </description>
+    </description>
     <priority>2</priority>
     <properties>
-       <property name="xpath">
-          <value>
+        <property name="xpath">
+            <value>
  <![CDATA[
-	//IfStatement[$allowIf = "false"]/child::node()[1]/descendant-or-self::node()[self::Assignment or self::UnaryExpression[$allowIncrementDecrement = "false" and (@Image = "--" or @Image = "++")]]
+    //IfStatement[$allowIf = "false"]/child::node()[1]/descendant-or-self::node()[self::Assignment or self::UnaryExpression[$allowIncrementDecrement = "false" and (@Image = "--" or @Image = "++")]]
 |
-	//WhileLoop[$allowWhile = "false"]/child::node()[1]/descendant-or-self::node()[self::Assignment or self::UnaryExpression[$allowIncrementDecrement = "false" and (@Image = "--" or @Image = "++")]]
+    //WhileLoop[$allowWhile = "false"]/child::node()[1]/descendant-or-self::node()[self::Assignment or self::UnaryExpression[$allowIncrementDecrement = "false" and (@Image = "--" or @Image = "++")]]
 |
-	//DoLoop[$allowWhile = "false"]/child::node()[2]/descendant-or-self::node()[self::Assignment or self::UnaryExpression[$allowIncrementDecrement = "false" and (@Image = "--" or @Image = "++")]]
+    //DoLoop[$allowWhile = "false"]/child::node()[2]/descendant-or-self::node()[self::Assignment or self::UnaryExpression[$allowIncrementDecrement = "false" and (@Image = "--" or @Image = "++")]]
 |
-	//ForLoop[$allowFor = "false"]/child::node()[2]/descendant-or-self::node()[self::Assignment or self::UnaryExpression[$allowIncrementDecrement = "false" and (@Image = "--" or @Image = "++")]]
+    //ForLoop[$allowFor = "false"]/child::node()[2]/descendant-or-self::node()[self::Assignment or self::UnaryExpression[$allowIncrementDecrement = "false" and (@Image = "--" or @Image = "++")]]
 |
    //ConditionalExpression[$allowTernary = "false"]/child::node()[1]/descendant-or-self::node()[self::Assignment or self::UnaryExpression[$allowIncrementDecrement = "false" and (@Image = "--" or @Image = "++")]]
 |
    //ConditionalExpression[$allowTernaryResults = "false"]/child::node()[position() = 2 or position() = 3]/descendant-or-self::node()[self::Assignment or self::UnaryExpression[$allowIncrementDecrement = "false" and (@Image = "--" or @Image = "++")]]
 ]]>
-          </value>
-       </property>
-       <property name="allowIf" type="Boolean" value="false" description="Allow assignment within the conditional expression of an if statement" />
-       <property name="allowFor" type="Boolean" value="false" description="Allow assignment within the conditional expression of a for statement" />
-       <property name="allowWhile" type="Boolean" value="false" description="Allow assignment within the conditional expression of a while statement" />
-       <property name="allowTernary" type="Boolean" value="false" description="Allow assignment within the conditional expression of a ternary operator" />
-       <property name="allowTernaryResults" type="Boolean" value="false" description="Allow assignment within the result expressions of a ternary operator" />
-       <property name="allowIncrementDecrement" type="Boolean" value="false" description="Allow increment or decrement operators within the conditional expression of an if, for, or while statement" />
+            </value>
+        </property>
+        <property name="allowIf" type="Boolean" value="false" description="Allow assignment within the conditional expression of an if statement" />
+        <property name="allowFor" type="Boolean" value="false" description="Allow assignment within the conditional expression of a for statement" />
+        <property name="allowWhile" type="Boolean" value="false" description="Allow assignment within the conditional expression of a while statement" />
+        <property name="allowTernary" type="Boolean" value="false" description="Allow assignment within the conditional expression of a ternary operator" />
+        <property name="allowTernaryResults" type="Boolean" value="false" description="Allow assignment within the result expressions of a ternary operator" />
+        <property name="allowIncrementDecrement" type="Boolean" value="false" description="Allow increment or decrement operators within the conditional expression of an if, for, or while statement" />
     </properties>
-  <example>
-  <![CDATA[
+    <example>
+<![CDATA[
 var x = 2;
 // Bad
 if ((x = getX()) == 3) {
-   alert('3!');
+    alert('3!');
 }
 
 function getX() {
-  return 3;
+    return 3;
 }
-  ]]>
-  </example>
-</rule>
+]]>
+    </example>
+  </rule>
 
-    <rule name="UnreachableCode"
-    		 language="ecmascript"
-    		  since="5.0"
-       message="A ''return'', ''break'', ''continue'', or ''throw'' statement should be the last in a block."
-          class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/basic.html#UnreachableCode">
-      <description>
+  <rule name="UnreachableCode"
+        language="ecmascript"
+        since="5.0"
+        message="A ''return'', ''break'', ''continue'', or ''throw'' statement should be the last in a block."
+        class="net.sourceforge.pmd.lang.rule.XPathRule"
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_basic.html#unreachablecode">
+    <description>
 A 'return', 'break', 'continue', or 'throw' statement should be the last in a block. Statements after these
 will never execute.  This is a bug, or extremely poor style.
-      </description>
-      <priority>1</priority>
-        <properties>
-            <property name="xpath">
-                <value>
+    </description>
+    <priority>1</priority>
+    <properties>
+        <property name="xpath">
+            <value>
  <![CDATA[
-	//ReturnStatement[following-sibling::node()]
+    //ReturnStatement[following-sibling::node()]
 |
-	//ContinueStatement[following-sibling::node()]
+    //ContinueStatement[following-sibling::node()]
 |
-	//BreakStatement[following-sibling::node()]
+    //BreakStatement[following-sibling::node()]
 |
-	//ThrowStatement[following-sibling::node()]
+    //ThrowStatement[following-sibling::node()]
 ]]>
-                </value>
-            </property>
-        </properties>
-      <example>
-  <![CDATA[
+            </value>
+        </property>
+    </properties>
+    <example>
+<![CDATA[
 // Ok
 function foo() {
    return 1;
@@ -97,35 +97,35 @@ function bar() {
    x = 2;
 }
 ]]>
-      </example>
-    </rule>
+    </example>
+  </rule>
 
-    <rule name="InnaccurateNumericLiteral"
-    		 language="ecmascript"
-    		  since="5.0"
-       message="The numeric literal ''{0}'' will have at different value at runtime."
-          class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/basic.html#InnaccurateNumericLiteral">
-      <description>
+  <rule name="InnaccurateNumericLiteral"
+        language="ecmascript"
+        since="5.0"
+        message="The numeric literal ''{0}'' will have at different value at runtime."
+        class="net.sourceforge.pmd.lang.rule.XPathRule"
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_basic.html#innaccuratenumericliteral">
+    <description>
 The numeric literal will have at different value at runtime, which can happen if you provide too much
 precision in a floating point number.  This may result in numeric calculations being in error.
-      </description>
-      <priority>2</priority>
-        <properties>
-            <property name="xpath">
-                <value>
- <![CDATA[
+    </description>
+    <priority>2</priority>
+    <properties>
+        <property name="xpath">
+            <value>
+<![CDATA[
 //NumberLiteral[
-	@Image != @Number
-	and translate(@Image, "e", "E") != @Number
-	and concat(@Image, ".0") != @Number
-	and @Image != substring-before(translate(@Number, ".", ""), "E")]
+    @Image != @Number
+    and translate(@Image, "e", "E") != @Number
+    and concat(@Image, ".0") != @Number
+    and @Image != substring-before(translate(@Number, ".", ""), "E")]
 ]]>
-                </value>
-            </property>
-        </properties>
-      <example>
-  <![CDATA[
+            </value>
+        </property>
+    </properties>
+    <example>
+<![CDATA[
 var a = 9; // Ok
 var b = 999999999999999; // Ok
 var c = 999999999999999999999; // Not good
@@ -134,112 +134,112 @@ var x = 1.12; // Ok
 var y = 1.1234567890123; // Ok
 var z = 1.12345678901234567; // Not good
 ]]>
-      </example>
-    </rule>
+    </example>
+  </rule>
 
-    <rule name="ConsistentReturn"
-    		  since="5.0"
-       message="A function should not mix 'return' statements with and without a result."
-          class="net.sourceforge.pmd.lang.ecmascript.rule.basic.ConsistentReturnRule"
-          externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/basic.html#ConsistentReturn">
-      <description>
+  <rule name="ConsistentReturn"
+        since="5.0"
+        message="A function should not mix 'return' statements with and without a result."
+        class="net.sourceforge.pmd.lang.ecmascript.rule.basic.ConsistentReturnRule"
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_basic.html#consistentreturn">
+    <description>
 ECMAScript does provide for return types on functions, and therefore there is no solid rule as to their usage.
 However, when a function does use returns they should all have a value, or all with no value.  Mixed return
 usage is likely a bug, or at best poor style.
-      </description>
-      <priority>2</priority>
-      <example>
-  <![CDATA[
+    </description>
+    <priority>2</priority>
+    <example>
+<![CDATA[
 // Ok
 function foo() {
-   if (condition1) {
-      return true;
-   }
-   return false;
+    if (condition1) {
+        return true;
+    }
+    return false;
 }
 
 // Bad
 function bar() {
-   if (condition1) {
-      return;
-   }
-   return false;
+    if (condition1) {
+        return;
+    }
+    return false;
 }
 ]]>
-      </example>
-    </rule>
+    </example>
+  </rule>
 
-    <rule name="ScopeForInVariable"
-          language="ecmascript"
-          since="5.0"
-          message="The for-in loop variable ''{0}'' should be explicitly scoped with 'var' to avoid pollution."
-          class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/basic.html#ScopeForInVariable">
-      <description>
+  <rule name="ScopeForInVariable"
+        language="ecmascript"
+        since="5.0"
+        message="The for-in loop variable ''{0}'' should be explicitly scoped with 'var' to avoid pollution."
+        class="net.sourceforge.pmd.lang.rule.XPathRule"
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_basic.html#scopeforinvariable">
+    <description>
 A for-in loop in which the variable name is not explicitly scoped to the enclosing scope with the 'var' keyword can
 refer to a variable in an enclosing scope outside the nearest enclosing scope.  This will overwrite the
 existing value of the variable in the outer scope when the body of the for-in is evaluated.  When the for-in loop
 has finished, the variable will contain the last value used in the for-in, and the original value from before
 the for-in loop will be gone.  Since the for-in variable name is most likely intended to be a temporary name, it
 is better to explicitly scope the variable name to the nearest enclosing scope with 'var'.
-      </description>
-      <priority>1</priority>
-        <properties>
-            <property name="xpath">
-                <value>
- <![CDATA[
-	//ForInLoop[not(child::VariableDeclaration)]/Name[1]
+    </description>
+    <priority>1</priority>
+    <properties>
+        <property name="xpath">
+            <value>
+<![CDATA[
+//ForInLoop[not(child::VariableDeclaration)]/Name[1]
 ]]>
-                </value>
-            </property>
-        </properties>
-      <example>
-  <![CDATA[
+            </value>
+        </property>
+    </properties>
+    <example>
+<![CDATA[
 // Ok
 function foo() {
-   var p = 'clean';
-   function() {
-	   var obj = { dirty: 'dirty' };
-	   for (var p in obj) { // Use 'var' here.
-	     obj[p] = obj[p];
-	   }
-	   return x;
-   }();
+    var p = 'clean';
+    function() {
+        var obj = { dirty: 'dirty' };
+        for (var p in obj) { // Use 'var' here.
+            obj[p] = obj[p];
+        }
+        return x;
+    }();
 
-   // 'p' still has value of 'clean'.
+    // 'p' still has value of 'clean'.
 }
 // Bad
 function bar() {
-   var p = 'clean';
-   function() {
-	   var obj = { dirty: 'dirty' };
-	   for (p in obj) { // Oh no, missing 'var' here!
-	     obj[p] = obj[p];
-	   }
-	   return x;
-   }();
+    var p = 'clean';
+    function() {
+        var obj = { dirty: 'dirty' };
+        for (p in obj) { // Oh no, missing 'var' here!
+            obj[p] = obj[p];
+        }
+        return x;
+    }();
 
-   // 'p' is trashed and has value of 'dirty'!
+    // 'p' is trashed and has value of 'dirty'!
 }
 ]]>
-      </example>
-    </rule>
+    </example>
+  </rule>
 
-    <rule name="EqualComparison"
-          language="ecmascript"
-          since="5.0"
-          message="Use '==='/'!==' to compare with true/false or Numbers"
-          class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/basic.html#EqualComparison">
-      <description>
-      Using == in condition may lead to unexpected results, as the variables are automatically casted to be of the
-      same type. The === operator avoids the casting.
-      </description>
-      <priority>3</priority>
-        <properties>
-            <property name="xpath">
-                <value>
- <![CDATA[
+  <rule name="EqualComparison"
+        language="ecmascript"
+        since="5.0"
+        message="Use '==='/'!==' to compare with true/false or Numbers"
+        class="net.sourceforge.pmd.lang.rule.XPathRule"
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_basic.html#equalcomparison">
+    <description>
+Using == in condition may lead to unexpected results, as the variables are automatically casted to be of the
+same type. The === operator avoids the casting.
+    </description>
+    <priority>3</priority>
+    <properties>
+        <property name="xpath">
+            <value>
+<![CDATA[
 //InfixExpression[(@Image = "==" or @Image = "!=")
   and
  (child::KeywordLiteral[@Image = "true" or @Image = "false"]
@@ -247,11 +247,11 @@ function bar() {
  child::NumberLiteral)
 ]
 ]]>
-                </value>
-            </property>
-        </properties>
-      <example>
-  <![CDATA[
+            </value>
+        </property>
+    </properties>
+    <example>
+<![CDATA[
 // Ok
 if (someVar === true) {
   ...
@@ -268,100 +268,112 @@ if (someVar == true) {
 if (someVar != 3) {
   ...
 }
-
 ]]>
-      </example>
-    </rule>
+    </example>
+  </rule>
 
-    <rule name="GlobalVariable"
-          message="Avoid using global variables"
-          language="ecmascript"
-          since="5.0"
-          class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/basic.html#GlobalVariable">
+  <rule name="GlobalVariable"
+        message="Avoid using global variables"
+        language="ecmascript"
+        since="5.0"
+        class="net.sourceforge.pmd.lang.rule.XPathRule"
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_basic.html#globalvariable">
     <description>
 This rule helps to avoid using accidently global variables by simply missing the "var" declaration.
 Global variables can lead to side-effects that are hard to debug.
     </description>
-  <priority>1</priority>
-  <properties>
-    <property name="xpath">
-    <value>
+    <priority>1</priority>
+    <properties>
+        <property name="xpath">
+            <value>
 <![CDATA[
 //Assignment[Name/@GlobalName = 'true']
 ]]>
-    </value>
-    </property>
-  </properties>
-  <example>
+            </value>
+        </property>
+    </properties>
+    <example>
 <![CDATA[
 function(arg) {
-    notDeclaredVariable = 1; // this will create a global variable and trigger the rule
+    notDeclaredVariable = 1;    // this will create a global variable and trigger the rule
 
-    var someVar = 1; // this is a local variable, that's ok
+    var someVar = 1;            // this is a local variable, that's ok
 
-    window.otherGlobal = 2; // this will not trigger the rule, although it is a global variable.
+    window.otherGlobal = 2;     // this will not trigger the rule, although it is a global variable.
 }
 ]]>
-        </example>
-    </rule>
+    </example>
+  </rule>
 
-    <rule name="AvoidTrailingComma"
-          message="Avoid trailing commas in object or array literals"
-          language="ecmascript"
-          since="5.1"
-          class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/basic.html#AvoidTrailingComma">
+  <rule name="AvoidTrailingComma"
+        message="Avoid trailing commas in object or array literals"
+        language="ecmascript"
+        since="5.1"
+        class="net.sourceforge.pmd.lang.rule.XPathRule"
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_basic.html#avoidtrailingcomma">
     <description>
 This rule helps improve code portability due to differences in browser treatment of trailing commas in object or array literals.
     </description>
-  <priority>1</priority>
-  <properties>
-    <property name="xpath">
-    <value>
+    <priority>1</priority>
+    <properties>
+        <property name="xpath">
+            <value>
 <![CDATA[
-	//ObjectLiteral[$allowObjectLiteral = "false" and @TrailingComma = 'true']
+//ObjectLiteral[$allowObjectLiteral = "false" and @TrailingComma = 'true']
 |
-	//ArrayLiteral[$allowArrayLiteral = "false" and @TrailingComma = 'true']
+//ArrayLiteral[$allowArrayLiteral = "false" and @TrailingComma = 'true']
 ]]>
-    </value>
-    </property>
-    <property name="allowObjectLiteral" type="Boolean" value="false" description="Allow a trailing comma within an object literal" />
-    <property name="allowArrayLiteral" type="Boolean" value="false" description="Allow a trailing comma within an array literal" />
+            </value>
+        </property>
+        <property name="allowObjectLiteral" type="Boolean" value="false" description="Allow a trailing comma within an object literal" />
+        <property name="allowArrayLiteral" type="Boolean" value="false" description="Allow a trailing comma within an array literal" />
     </properties>
-  <example>
+    <example>
 <![CDATA[
 function(arg) {
-    var obj1 = { a : 1 }; // Ok
-    var arr1 = [ 1, 2 ]; // Ok
+    var obj1 = { a : 1 };   // Ok
+    var arr1 = [ 1, 2 ];    // Ok
 
-    var obj2 = { a : 1, }; // Syntax error in some browsers!
-    var arr2 = [ 1, 2, ]; // Length 2 or 3 depending on the browser!
+    var obj2 = { a : 1, };  // Syntax error in some browsers!
+    var arr2 = [ 1, 2, ];   // Length 2 or 3 depending on the browser!
 }
 ]]>
-        </example>
-    </rule>
+    </example>
+  </rule>
 
   <rule name="UseBaseWithParseInt"
         message="Always provide a base when using parseInt() functions"
         language="ecmascript" since="5.0.1"
         class="net.sourceforge.pmd.lang.rule.XPathRule"
-        externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/basic.html#UseBaseWithParseInt">
-    <description>TODO</description>
-  <priority>1</priority>
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_basic.html#usebasewithparseint">
+    <description>
+This rule checks for usages of parseInt. While the second parameter is optional and usually defaults
+to 10 (base/radix is 10 for a decimal number), different implementations may behave differently.
+It also improves readability, if the base is given.
+
+See also: [parseInt()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/parseInt)
+    </description>
+    <priority>1</priority>
     <properties>
-      <property name="xpath">
-      <value><![CDATA[
+        <property name="xpath">
+            <value>
+<![CDATA[
 //FunctionCall/Name[
      @Image = 'parseInt'
      and
      count(../*) < 3
 ]
-   ]]></value>
-    </property>
-  </properties>
-  <example><![CDATA[
-parseInt("10",base);
-  ]]></example>
+]]>
+            </value>
+        </property>
+    </properties>
+    <example>
+<![CDATA[
+parseInt("010");    // unclear, could be interpreted as 10 or 7 (with a base of 7)
+
+parseInt("10", 10); // good
+]]>
+    </example>
   </rule>
+
 </ruleset>
diff --git a/pmd-javascript/src/main/resources/rulesets/ecmascript/braces.xml b/pmd-javascript/src/main/resources/rulesets/ecmascript/braces.xml
index e1fdfda54a..7a45898ea0 100644
--- a/pmd-javascript/src/main/resources/rulesets/ecmascript/braces.xml
+++ b/pmd-javascript/src/main/resources/rulesets/ecmascript/braces.xml
@@ -8,144 +8,144 @@
 The Braces Ruleset contains a collection of braces rules.
   </description>
 
-   <rule name="IfStmtsMustUseBraces"
-   		language="ecmascript"
-   		since="5.0"
-         message="Avoid using if statements without curly braces"
-         class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/braces.html#IfStmtsMustUseBraces">
-     <description>
+  <rule name="IfStmtsMustUseBraces"
+        language="ecmascript"
+        since="5.0"
+        message="Avoid using if statements without curly braces"
+        class="net.sourceforge.pmd.lang.rule.XPathRule"
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_braces.html#ifstmtsmustusebraces">
+    <description>
 Avoid using if statements without using curly braces.
-     </description>
-     <priority>3</priority>
-       <properties>
-           <property name="xpath">
-               <value>
-                   <![CDATA[
+    </description>
+    <priority>3</priority>
+    <properties>
+        <property name="xpath">
+            <value>
+<![CDATA[
 //IfStatement[@Else = "false" and not(child::Scope)]
-                   ]]>
-               </value>
-           </property>
-       </properties>
-     <example>
- <![CDATA[
+]]>
+            </value>
+        </property>
+    </properties>
+    <example>
+<![CDATA[
 // Ok
 if (foo) {
-   x++;
+    x++;
 }
 
 // Bad
 if (foo)
-   x++;
- ]]>
-     </example>
-     </rule>
+    x++;
+]]>
+    </example>
+  </rule>
 
-      <rule name="IfElseStmtsMustUseBraces"
-   		language="ecmascript"
-      	  since="5.0"
-           message="Avoid using 'if...else' statements without curly braces"
-           class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/braces.html#IfElseStmtsMustUseBraces">
-       <description>
+  <rule name="IfElseStmtsMustUseBraces"
+        language="ecmascript"
+        since="5.0"
+        message="Avoid using 'if...else' statements without curly braces"
+        class="net.sourceforge.pmd.lang.rule.XPathRule"
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_braces.html#ifelsestmtsmustusebraces">
+    <description>
 Avoid using if..else statements without using curly braces.
-       </description>
-       <priority>3</priority>
-         <properties>
-             <property name="xpath">
-                 <value>
+    </description>
+    <priority>3</priority>
+    <properties>
+        <property name="xpath">
+            <value>
 <![CDATA[
 //ExpressionStatement[parent::IfStatement[@Else = "true"]]
    [not(child::Scope)]
    [not(child::IfStatement)]
- ]]>
-                 </value>
-             </property>
-         </properties>
-       <example>
+]]>
+            </value>
+        </property>
+    </properties>
+    <example>
 <![CDATA[
 // Ok
 if (foo) {
-   x++;
+    x++;
 } else {
-   y++;
+    y++;
 }
 
 // Bad
 if (foo)
-   x++;
+    x++;
 else
-   y++;
+    y++;
 ]]>
-       </example>
-     </rule>
+    </example>
+  </rule>
 
-    <rule name="WhileLoopsMustUseBraces"
-   		language="ecmascript"
-    		 since="5.0"
-          message="Avoid using 'while' statements without curly braces"
-          class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/braces.html#WhileLoopsMustUseBraces">
-      <description>
+  <rule name="WhileLoopsMustUseBraces"
+        language="ecmascript"
+        since="5.0"
+        message="Avoid using 'while' statements without curly braces"
+        class="net.sourceforge.pmd.lang.rule.XPathRule"
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_braces.html#whileloopsmustusebraces">
+    <description>
 Avoid using 'while' statements without using curly braces.
-      </description>
-      <priority>3</priority>
-        <properties>
-            <property name="xpath">
-                <value>
+    </description>
+    <priority>3</priority>
+    <properties>
+        <property name="xpath">
+            <value>
 <![CDATA[
 //WhileLoop[not(child::Scope)]
 ]]>
-                </value>
-            </property>
-        </properties>
-      <example>
+            </value>
+        </property>
+    </properties>
+    <example>
 <![CDATA[
 // Ok
 while (true) {
-   x++;
+    x++;
 }
 
 // Bad
 while (true)
-   x++;
+    x++;
 ]]>
-      </example>
-    </rule>
+    </example>
+  </rule>
 
-     <rule name="ForLoopsMustUseBraces"
-   		language="ecmascript"
-     		  since="5.0"
-           message="Avoid using 'for' statements without curly braces"
-           class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/braces.html#ForLoopsMustUseBraces">
-       <description>
+  <rule name="ForLoopsMustUseBraces"
+        language="ecmascript"
+        since="5.0"
+        message="Avoid using 'for' statements without curly braces"
+        class="net.sourceforge.pmd.lang.rule.XPathRule"
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_braces.html#forloopsmustusebraces">
+    <description>
 Avoid using 'for' statements without using curly braces.
-       </description>
-       <priority>3</priority>
-         <properties>
-             <property name="xpath">
-                 <value>
+    </description>
+    <priority>3</priority>
+    <properties>
+        <property name="xpath">
+            <value>
 <![CDATA[
-	//ForLoop[not(child::Scope)]
+//ForLoop[not(child::Scope)]
 |
-	//ForInLoop[not(child::Scope)]
+//ForInLoop[not(child::Scope)]
 ]]>
-                 </value>
-             </property>
-         </properties>
-       <example>
+            </value>
+        </property>
+    </properties>
+    <example>
 <![CDATA[
 // Ok
 for (var i = 0; i < 42; i++) {
-   foo();
+    foo();
 }
 
 // Bad
 for (var i = 0; i < 42; i++)
-   foo();
+    foo();
 ]]>
-       </example>
-     </rule>
+    </example>
+  </rule>
 
 </ruleset>
diff --git a/pmd-javascript/src/main/resources/rulesets/ecmascript/controversial.xml b/pmd-javascript/src/main/resources/rulesets/ecmascript/controversial.xml
index a7318ba6e4..3383da9f4f 100644
--- a/pmd-javascript/src/main/resources/rulesets/ecmascript/controversial.xml
+++ b/pmd-javascript/src/main/resources/rulesets/ecmascript/controversial.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 
 <ruleset name="Controversial Ecmascript"
-	xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+    xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
 
   <description>
 The Controversial ruleset contains rules that, for whatever reason, are considered controversial.
@@ -12,22 +12,28 @@ They are held here to allow people to include them as they see fit within their
 
   <rule name="AvoidWithStatement"
         message="Avoid using with - it's bad news"
-        language="ecmascript" since="5.0.1"
+        language="ecmascript"
+        since="5.0.1"
         class="net.sourceforge.pmd.lang.rule.XPathRule"
-        externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/basic.html#AvoidWithStatement">
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_controversial.html#avoidwithstatement">
     <description>Avoid using with - it's bad news</description>
+    <priority>1</priority>
     <properties>
-      <property name="xpath">
-      <value><![CDATA[
+        <property name="xpath">
+            <value>
+<![CDATA[
 //WithStatement
-   ]]></value>
-    </property>
-  </properties>
-  <priority>1</priority>
-  <example><![CDATA[
+]]>
+            </value>
+        </property>
+    </properties>
+    <example>
+<![CDATA[
 with (object) {
-  property = 3; // Might be on object, might be on window: who knows.
+    property = 3; // Might be on object, might be on window: who knows.
 }
-      ]]></example>
-    </rule>
+]]>
+    </example>
+  </rule>
+
 </ruleset>
diff --git a/pmd-javascript/src/main/resources/rulesets/ecmascript/rulesets.properties b/pmd-javascript/src/main/resources/rulesets/ecmascript/rulesets.properties
index 0cd6f8a321..f16abf3841 100644
--- a/pmd-javascript/src/main/resources/rulesets/ecmascript/rulesets.properties
+++ b/pmd-javascript/src/main/resources/rulesets/ecmascript/rulesets.properties
@@ -2,4 +2,8 @@
 # BSD-style license; for more info see http://pmd.sourceforge.net/license.html
 #
 
-rulesets.filenames=rulesets/ecmascript/basic.xml,rulesets/ecmascript/braces.xml,rulesets/ecmascript/unnecessary.xml
+rulesets.filenames=\
+    rulesets/ecmascript/basic.xml,\
+    rulesets/ecmascript/braces.xml,\
+    rulesets/ecmascript/controversial.xml,\
+    rulesets/ecmascript/unnecessary.xml
diff --git a/pmd-javascript/src/main/resources/rulesets/ecmascript/unnecessary.xml b/pmd-javascript/src/main/resources/rulesets/ecmascript/unnecessary.xml
index 473f9827b3..f5a7ad8eef 100644
--- a/pmd-javascript/src/main/resources/rulesets/ecmascript/unnecessary.xml
+++ b/pmd-javascript/src/main/resources/rulesets/ecmascript/unnecessary.xml
@@ -9,65 +9,67 @@ The Unnecessary Ruleset contains a collection of rules for unnecessary code.
   </description>
 
   <rule name="UnnecessaryParentheses"
-  		language="ecmascript"
+        language="ecmascript"
         since="5.0"
         message="Unnecessary parentheses."
         class="net.sourceforge.pmd.lang.rule.XPathRule"
-        externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/unnecessary.html#UnnecessaryParentheses">
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_unnecessary.html#unnecessaryparentheses">
     <description>Unnecessary parentheses should be removed.</description>
     <priority>4</priority>
     <properties>
-       <property name="xpath">
-          <value>
-          <![CDATA[
+        <property name="xpath">
+            <value>
+<![CDATA[
 //ParenthesizedExpression/ParenthesizedExpression
-          ]]>
-          </value>
-       </property>
+]]>
+            </value>
+        </property>
     </properties>
     <example>
-    <![CDATA[
+<![CDATA[
 var x = 1; // Ok
 var y = (1 + 1); // Ok
 var z = ((1 + 1)); // Bad
-    ]]>
+]]>
     </example>
   </rule>
 
   <rule name="UnnecessaryBlock"
-  		language="ecmascript"
+        language="ecmascript"
         since="5.0"
         message="Unnecessary block."
         class="net.sourceforge.pmd.lang.rule.XPathRule"
-        externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/unnecessary.html#UnnecessaryBlock">
-    <description>An unnecessary Block is present.  Such Blocks are often used in other languages to
-    introduce a new variable scope.  Blocks do not behave like this in ECMAScipt, and using them can
-    be misleading.  Considering removing this unnecessary Block.</description>
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_unnecessary.html#unnecessaryblock">
+    <description>
+An unnecessary Block is present.  Such Blocks are often used in other languages to
+introduce a new variable scope.  Blocks do not behave like this in ECMAScipt, and using them can
+be misleading.  Considering removing this unnecessary Block.
+    </description>
     <priority>3</priority>
     <properties>
-       <property name="xpath">
-          <value>
-          <![CDATA[
-	//Block[not(parent::FunctionNode or parent::IfStatement or parent::ForLoop or parent::ForInLoop
-			or parent::WhileLoop or parent::DoLoop or parent::TryStatement or parent::CatchClause)]
+        <property name="xpath">
+            <value>
+<![CDATA[
+//Block[not(parent::FunctionNode or parent::IfStatement or parent::ForLoop or parent::ForInLoop
+    or parent::WhileLoop or parent::DoLoop or parent::TryStatement or parent::CatchClause)]
 |
-	//Scope[not(parent::FunctionNode or parent::IfStatement or parent::ForLoop or parent::ForInLoop
-			or parent::WhileLoop or parent::DoLoop or parent::TryStatement or parent::CatchClause)]
-          ]]>
-          </value>
-       </property>
+//Scope[not(parent::FunctionNode or parent::IfStatement or parent::ForLoop or parent::ForInLoop
+    or parent::WhileLoop or parent::DoLoop or parent::TryStatement or parent::CatchClause)]
+]]>
+            </value>
+        </property>
     </properties>
     <example>
-    <![CDATA[
+<![CDATA[
 if (foo) {
-   // Ok
+    // Ok
 }
 if (bar) {
-   {
-      // Bad
-   }
+    {
+        // Bad
+    }
 }
-    ]]>
+]]>
     </example>
   </rule>
 
@@ -76,32 +78,39 @@ if (bar) {
         since="5.5.0"
         message="The else block is unnecessary"
         class="net.sourceforge.pmd.lang.rule.XPathRule"
-        externalInfoUrl="${pmd.website.baseurl}/rules/ecmascript/unnecessary.html#NoElseReturn">
-    <description>The else block in a if-else-construct is unnecessary if the `if` block contains a return.
-    Then the content of the else block can be put outside.
-    
-    See also: http://eslint.org/docs/rules/no-else-return
+        externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_unnecessary.html#noelsereturn">
+    <description>
+The else block in a if-else-construct is unnecessary if the `if` block contains a return.
+Then the content of the else block can be put outside.
+
+See also: &lt;http://eslint.org/docs/rules/no-else-return>
     </description>
     <priority>3</priority>
     <properties>
-        <property name="xpath"><value><![CDATA[
+        <property name="xpath">
+            <value>
+<![CDATA[
 //IfStatement[@Else="true"][Scope[1]/ReturnStatement]
-        ]]></value></property>
+]]>
+            </value>
+        </property>
     </properties>
-    <example><![CDATA[
+    <example>
+<![CDATA[
 // Bad:
 if (x) {
-  return y;
+    return y;
 } else {
-  return z;
+    return z;
 }
 
 // Good:
 if (x) {
-  return y;
+    return y;
 }
 return z;
-    ]]></example>
+]]>
+    </example>
   </rule>
 
-</ruleset>
\ No newline at end of file
+</ruleset>