Merge pull request ESAPI#551 from kwwall/misc-cleanup

Misc cleanup

Author: xeno6696

README.md

@@ -9,7 +9,7 @@ Enterprise Security API for Java (Legacy)
 <table border=0>
 <tr>
 <td>
-OWASP ESAPI (The OWASP Enterprise Security API) is a free, open source, web application security control library that makes it easier for programmers to write lower-risk applications. The ESAPI for Java library is designed to make it easier for programmers to retrofit security into existing applications. ESAPI for Java also serves as a solid foundation for new development.
+OWASP® ESAPI (The OWASP Enterprise Security API) is a free, open source, web application security control library that makes it easier for programmers to write lower-risk applications. The ESAPI for Java library is designed to make it easier for programmers to retrofit security into existing applications. ESAPI for Java also serves as a solid foundation for new development.
 </td>
 </tr>
 </table>
@@ -61,7 +61,7 @@ More detail is available in the file '[SECURITY.md](https://raw.githubuserconten
 
 ## Where to Find More Information on ESAPI
 
-*Wiki:* https://www.owasp.org/index.php/Category:OWASP_Enterprise_Security_API
+*Wiki:* https://owasp.org/www-project-enterprise-security-api/
 
 *Nightly Build:* Travis CI - https://travis-ci.org/bkimminich/esapi-java-legacy
 
@@ -85,3 +85,6 @@ Old archives for the old Mailman mailing lists for ESAPI-Users and ESAPI-Dev are
 For a general overview of Google Groups and its web interface, see https://groups.google.com/forum/#!overview
 
 For assistance subscribing and unsubscribing to Google Groups, see https://webapps.stackexchange.com/questions/13508/how-can-i-subscribe-to-a-google-mailing-list-with-a-non-google-e-mail-address/15593#15593
+
+----------
+OWASP is a registered trademark of the OWASP Foundation, Inc.

configuration/esapi/waf-policy.xsd

@@ -50,6 +50,7 @@ Issue #         GitHub Issue Title
 538             Addressing log4j 1.x CVE-2019-17571
 552             Rewrite implementation of some ESAPI classes to remove Java 8 dependencies
 
+
 -----------------------------------------------------------------------------
 
         Changes requiring special attention
@@ -105,8 +106,10 @@ sempf           1               1
 
 -----------------------------------------------------------------------------
 
+
 53 Closed PRs since 2.2.0.0 release (those rejected not listed)
 ===============================================================
+
 504 New scripts to suppress noise for 'mvn test'
 510 Resolve #509 - Properly throw exception when HTML fails
 513 Close issue #512 by updating to 1.9.4 of Commons Beans Util.\