diff --git a/pmd-java/src/main/resources/rulesets/java/controversial.xml b/pmd-java/src/main/resources/rulesets/java/controversial.xml
index f964cb5fb6..02e340615c 100644
--- a/pmd-java/src/main/resources/rulesets/java/controversial.xml
+++ b/pmd-java/src/main/resources/rulesets/java/controversial.xml
@@ -770,7 +770,7 @@ public void checkRequests() {
     <description>
 When you write a public method, you should be thinking in terms of an API. If your method is public, it means other class
 will use it, therefore, you want (or need) to offer a comprehensive and evolutive API. If you pass a lot of information
-as a simple series of Strings, you may think of using an Object to represent all those information. You'll get a simplier
+as a simple series of Strings, you may think of using an Object to represent all those information. You'll get a simpler
 API (such as doWork(Workload workload), rather than a tedious series of Strings) and more importantly, if you need at some
 point to pass extra data, you'll be able to do so by simply modifying or extending Workload without any modification to
 your API.
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/BrokenNullCheck.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/BrokenNullCheck.xml
index 708a751a91..ed5b2ea8b7 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/BrokenNullCheck.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/BrokenNullCheck.xml
@@ -155,7 +155,7 @@ public class Foo {
     </test-code>
     <test-code>
         <description><![CDATA[
-Assigments in checks are OK
+Assignments in checks are OK
         ]]></description>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidReassigningParameters.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidReassigningParameters.xml
index 8584a954fb..a5f51d2172 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidReassigningParameters.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidReassigningParameters.xml
@@ -153,7 +153,7 @@ public class Foo {
     </test-code>
     <test-code>
         <description><![CDATA[
-The rule should also detect parameter reassignement in constructors (at least to help young programmers still learning java basic)
+The rule should also detect parameter reassignment in constructors (at least to help young programmers still learning java basic)
      ]]></description>
         <expected-problems>3</expected-problems>
         <code><![CDATA[
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/CloseResource.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/CloseResource.xml
index 916bcd9ce3..06163b1fdc 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/CloseResource.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/CloseResource.xml
@@ -445,7 +445,7 @@ public class Foo {
   ]]></code>
     </test-code>
     <test-code>
-        <description>bug #1131 CloseResource should complain if code betwen declaration of resource and try: Code betwen declaration and try, should fail</description>
+        <description>bug #1131 CloseResource should complain if code between declaration of resource and try: Code between declaration and try, should fail</description>
         <rule-property name="types">Connection</rule-property>
         <expected-problems>1</expected-problems>
         <code><![CDATA[
@@ -466,7 +466,7 @@ public class Foo {
         ]]></code>
     </test-code>
     <test-code>
-        <description>bug #1131 CloseResource should complain if code betwen declaration of resource and try: Creation inside try, ok</description>
+        <description>bug #1131 CloseResource should complain if code between declaration of resource and try: Creation inside try, ok</description>
         <rule-property name="types">Connection</rule-property>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
@@ -491,7 +491,7 @@ public class Foo {
         ]]></code>
     </test-code>
     <test-code>
-        <description>bug #1131 CloseResource should complain if code betwen declaration of resource and try: No sentences between creation and try, ok</description>
+        <description>bug #1131 CloseResource should complain if code between declaration of resource and try: No sentences between creation and try, ok</description>
         <rule-property name="types">Connection</rule-property>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
@@ -515,7 +515,7 @@ public class Foo {
         ]]></code>
     </test-code>
     <test-code>
-        <description>#1259 CloseResource rule ignores conditionnals within finally blocks</description>
+        <description>#1259 CloseResource rule ignores conditionals within finally blocks</description>
         <expected-problems>1</expected-problems>
         <code><![CDATA[
 public class Bar {
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimpleDateFormatNeedsLocale.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimpleDateFormatNeedsLocale.xml
index 026b85238f..e5be99501c 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimpleDateFormatNeedsLocale.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimpleDateFormatNeedsLocale.xml
@@ -13,7 +13,7 @@ class Foo {
     </test-code>
     <test-code>
         <description><![CDATA[
-bad, using the single-arg contructor
+bad, using the single-arg constructor
      ]]></description>
         <expected-problems>1</expected-problems>
         <code><![CDATA[
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitSpelling.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitSpelling.xml
index 446c34afeb..8b94c2dbf9 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitSpelling.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitSpelling.xml
@@ -15,7 +15,7 @@ public class Foo extends TestCase {
     </test-code>
     <test-code>
         <description><![CDATA[
-tearDown mispellings
+tearDown misspellings
      ]]></description>
         <expected-problems>2</expected-problems>
         <code><![CDATA[
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitStaticSuite.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitStaticSuite.xml
index 6fff67e034..039172b89c 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitStaticSuite.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitStaticSuite.xml
@@ -2,7 +2,7 @@
 <test-data>
     <test-code>
         <description><![CDATA[
-nonstatic is bad
+non-static is bad
      ]]></description>
         <expected-problems>1</expected-problems>
         <code><![CDATA[
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/ProperLogger.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/ProperLogger.xml
index 920a64e015..1a7fa4b506 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/ProperLogger.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/ProperLogger.xml
@@ -38,7 +38,7 @@ public class Foo {
     </test-code>
     <test-code>
         <description><![CDATA[
-bug 1626232, a seperate variable initialization should not confuse the rule
+bug 1626232, a separate variable initialization should not confuse the rule
         ]]></description>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseTestAnnotation.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseTestAnnotation.xml
index db751fe6ba..84ab2d4f8c 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseTestAnnotation.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseTestAnnotation.xml
@@ -40,7 +40,7 @@ public class Foo extends TestCase{
     </test-code>
     <test-code>
         <description><![CDATA[
-One test propper, the other incorrect
+One test proper, the other incorrect
      ]]></description>
         <expected-problems>1</expected-problems>
         <code><![CDATA[
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessParentheses.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessParentheses.xml
index 120cd03e2b..c6852323ba 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessParentheses.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessParentheses.xml
@@ -15,7 +15,7 @@ public class Foo {
     </test-code>
     <test-code>
         <description><![CDATA[
-failure case, assignement
+failure case, assignment
      ]]></description>
         <expected-problems>1</expected-problems>
         <code><![CDATA[
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedPrivateMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedPrivateMethod.xml
index 18890176e8..f13f5cfd81 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedPrivateMethod.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedPrivateMethod.xml
@@ -481,7 +481,7 @@ public class Foo {
 
         //call private method.  Flagged method
         setInnateFilterFields(filter, request);
-        //perfrom logic
+        //perform logic
 
         //return
         return filter;
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/dfa/StatementAndBraceFinderTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/dfa/StatementAndBraceFinderTest.java
index b3b943e8ec..c25a89e707 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/dfa/StatementAndBraceFinderTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/dfa/StatementAndBraceFinderTest.java
@@ -41,7 +41,7 @@ public class StatementAndBraceFinderTest extends AbstractPLSQLParserTst {
         assertEquals(2, parentDfn.getLine());
         assertTrue(parentDfn.getNode() instanceof ASTProgramUnit);
         ASTProgramUnit exParent = (ASTProgramUnit) parentDfn.getNode();
-       //Validate the two-way link betwen Program Unit and Statement 
+       //Validate the two-way link between Program Unit and Statement
         assertEquals(ex, exParent.getDataFlowNode().getChildren().get(0).getNode());
         assertEquals(exParent, ex.getDataFlowNode().getParents().get(0).getNode());
     }
@@ -51,7 +51,7 @@ public class StatementAndBraceFinderTest extends AbstractPLSQLParserTst {
         ASTVariableOrConstantDeclarator vd = getOrderedNodes(ASTVariableOrConstantDeclarator.class, TEST2).get(0);
         //ASTMethodDeclaration vdParent = (ASTMethodDeclaration) ((DataFlowNode) vd.getDataFlowNode().getParents().get(0)).getNode();
         ASTProgramUnit vdParent = (ASTProgramUnit) vd.getDataFlowNode().getParents().get(0).getNode();
-        //Validate the two-way link betwen Program Unit and Variable 
+        //Validate the two-way link between Program Unit and Variable
         assertEquals(vd, vdParent.getDataFlowNode().getChildren().get(0).getNode());
         assertEquals(vdParent, vd.getDataFlowNode().getParents().get(0).getNode());
     }
diff --git a/src/site/markdown/overview/changelog-old.md b/src/site/markdown/overview/changelog-old.md
index ee6d937015..f0c33b6528 100644
--- a/src/site/markdown/overview/changelog-old.md
+++ b/src/site/markdown/overview/changelog-old.md
@@ -716,7 +716,7 @@ The binary package still contains all languages and can be used as usual. Have a
 * Fixed [bug 1125]: Missing Static Method In Non Instantiatable Class
 * Fixed [bug 1126]: False positive with FieldDeclarationsShouldBeAtStartOfClass for static enums
 * Fixed [bug 1130]: CloseResource doesn't recognize custom close method
-* Fixed [bug 1131]: CloseResource should complain if code betwen declaration of resource and try
+* Fixed [bug 1131]: CloseResource should complain if code between declaration of resource and try
 * Fixed [bug 1134]: UseStringBufferLength: false positives
 * Fixed [bug 1135]: CheckResultSet ignores results set declared outside of try/catch
 * Fixed [bug 1136]: ECMAScript: NullPointerException in getLeft() and getRight()