From eeaa300b7bfb09dbbb023c319c92f2f1b958536b Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 14 Oct 2021 09:32:51 +0200
Subject: [PATCH] [doc] Update release notes (#3532, #3538)

---
 docs/pages/release_notes.md                       | 15 +++++++++++++++
 .../main/resources/rulesets/apex/quickstart.xml   |  1 +
 .../src/main/resources/rulesets/releases/6400.xml | 13 +++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 pmd-core/src/main/resources/rulesets/releases/6400.xml

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index b8f8783555..81630e5bd7 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -14,11 +14,26 @@ This is a {{ site.pmd.release_type }} release.
 
 ### New and noteworthy
 
+#### New rules
+
+*   The new Apex rule {% rule apex/performance/EagerlyLoadedDescribeSObjectResult %} finds
+    `DescribeSObjectResult`s which could have been loaded eagerly via `SObjectType.getDescribe()`.
+
+```xml
+    <rule ref="category/apex/performance.xml/EagerlyLoadedDescribeSObjectResult" />
+```
+
+
 ### Fixed Issues
 
+*   apex
+    *   [#3532](https://github.com/pmd/pmd/issues/3532): \[apex] Promote usage of consistent getDescribe() info
+
 ### API Changes
 
 ### External Contributions
 
+*   [#3538](https://github.com/pmd/pmd/pull/3538): \[apex] New rule EagerlyLoadedDescribeSObjectResult - [Jonathan Wiesel](https://github.com/jonathanwiesel)
+
 {% endtocmaker %}
 
diff --git a/pmd-apex/src/main/resources/rulesets/apex/quickstart.xml b/pmd-apex/src/main/resources/rulesets/apex/quickstart.xml
index 803f786571..5fd3386416 100644
--- a/pmd-apex/src/main/resources/rulesets/apex/quickstart.xml
+++ b/pmd-apex/src/main/resources/rulesets/apex/quickstart.xml
@@ -162,6 +162,7 @@
       </properties>
    </rule>
 <!--    <rule ref="category/apex/performance.xml/AvoidDebugStatements" /> -->
+<!--    <rule ref="category/apex/performance.xml/EagerlyLoadedDescribeSObjectResult" /> -->
 
    <!-- NAMING -->
    <rule ref="category/apex/codestyle.xml/ClassNamingConventions" message="Class names should begin with an uppercase character">
diff --git a/pmd-core/src/main/resources/rulesets/releases/6400.xml b/pmd-core/src/main/resources/rulesets/releases/6400.xml
new file mode 100644
index 0000000000..a2b5bf9e31
--- /dev/null
+++ b/pmd-core/src/main/resources/rulesets/releases/6400.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<ruleset name="6400"
+    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 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+  <description>
+This ruleset contains links to rules that are new in PMD v6.40.0
+  </description>
+
+    <rule ref="category/apex/performance.xml/EagerlyLoadedDescribeSObjectResult" />
+
+</ruleset>