diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/AllocateResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/AllocateResponse.java
index 98346ce861..655c6dc8ed 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/AllocateResponse.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/AllocateResponse.java
@@ -376,7 +376,7 @@ public abstract class AllocateResponse {
    * Get the list of running containers as viewed by
    * <code>ResourceManager</code> from previous application attempts which
    * have not been reported to the Application Master yet.
-   * <br/>
+   * <br>
    * These containers were recovered by the RM after the application master
    * had already registered. This may happen after RM restart when some NMs get
    * delayed in connecting to the RM and reporting the active containers.
@@ -394,7 +394,7 @@ public abstract class AllocateResponse {
    * Set the list of running containers as viewed by
    * <code>ResourceManager</code> from previous application attempts which have
    * not been reported to the Application Master yet.
-   * <br/>
+   * <br>
    * These containers were recovered by the RM after the application master
    * had already registered. This may happen after RM restart when some NMs get
    * delayed in connecting to the RM and reporting the active containers.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java
index 39fd0c50bc..17567e8297 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceUtils.java
@@ -422,7 +422,7 @@ public class ResourceUtils {
    * Extract unit and actual value from resource value.
    * @param resourceValue Value of the resource
    * @return Array containing unit and value. [0]=unit, [1]=value
-   * @throws IllegalArgumentExcpetion if units contain non alpha characters
+   * @throws IllegalArgumentException if units contain non alpha characters
    */
   public static String[] parseResourceValue(String resourceValue) {
     String[] resource = new String[2];
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/AbstractFpgaVendorPlugin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/AbstractFpgaVendorPlugin.java
index 60ea57c89a..4db97291c2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/AbstractFpgaVendorPlugin.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/AbstractFpgaVendorPlugin.java
@@ -77,7 +77,7 @@ public interface AbstractFpgaVendorPlugin extends Configurable{
   /**
    * The vendor plugin configure an IP file to a device
    * @param ipPath The absolute path of the IP file
-   * @param majorMinorNumber The device in format <major:minor>
+   * @param majorMinorNumber The device in format &lt;major:minor&gt;
    * @return configure device ok or not
    * */
   boolean configureIP(String ipPath, String majorMinorNumber);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/IntelFpgaOpenclPlugin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/IntelFpgaOpenclPlugin.java
index f2e82b8961..2d6cf6f8de 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/IntelFpgaOpenclPlugin.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/IntelFpgaOpenclPlugin.java
@@ -221,26 +221,26 @@ public class IntelFpgaOpenclPlugin implements AbstractFpgaVendorPlugin {
    * While per Intel's guide, the output(should be outdated or prior SDK version's) is as below:
    *
    * "
-   * aocl diagnose: Running diagnostic from ALTERAOCLSDKROOT/board/<board_name>/
-   * <platform>/libexec
+   * aocl diagnose: Running diagnostic from ALTERAOCLSDKROOT/board/&lt;board_name&gt;/
+   * &lt;platform&gt;/libexec
    * Verified that the kernel mode driver is installed on the host machine.
-   * Using board package from vendor: <board_vendor_name>
+   * Using board package from vendor: &lt;board_vendor_name&gt;
    * Querying information for all supported devices that are installed on the host
    * machine ...
    *
    * device_name Status Information
    *
-   * acl0 Passed <descriptive_board_name>
-   *             PCIe dev_id = <device_ID>, bus:slot.func = 02:00.00,
+   * acl0 Passed &lt;descriptive_board_name&gt;
+   *             PCIe dev_id = &lt;device_ID&gt;, bus:slot.func = 02:00.00,
    *               at Gen 2 with 8 lanes.
    *             FPGA temperature=43.0 degrees C.
-   * acl1 Passed <descriptive_board_name>
-   *             PCIe dev_id = <device_ID>, bus:slot.func = 03:00.00,
+   * acl1 Passed &lt;descriptive_board_name&gt;
+   *             PCIe dev_id = &lt;device_ID&gt;, bus:slot.func = 03:00.00,
    *               at Gen 2 with 8 lanes.
    *             FPGA temperature = 35.0 degrees C.
    *
    * Found 2 active device(s) installed on the host machine, to perform a full
-   * diagnostic on a specific device, please run aocl diagnose <device_name>
+   * diagnostic on a specific device, please run aocl diagnose &lt;device_name&gt;
    *
    * DIAGNOSTIC_PASSED
    * "
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMApp.java
index b357d91cbf..39321ccd2d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMApp.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMApp.java
@@ -307,7 +307,7 @@ public interface RMApp extends EventHandler<RMAppEvent> {
   boolean isAppInCompletedStates();
 
   /**
-   * Get the application -> queue placement context
+   * Get the application -&gt; queue placement context
    * @return ApplicationPlacementContext
    */
   ApplicationPlacementContext getApplicationPlacementContext();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueueUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueueUtils.java
index 3901398b2c..0dfce83413 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueueUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueueUtils.java
@@ -279,10 +279,12 @@ public class CSQueueUtils {
    * <p>
    * Update Queue Statistics:
    * </p>
-   *  
-   * <li>used-capacity/absolute-used-capacity by partition</li> 
-   * <li>non-partitioned max-avail-resource to queue</li>
-   * 
+   *
+   * <ul>
+   *   <li>used-capacity/absolute-used-capacity by partition</li>
+   *   <li>non-partitioned max-avail-resource to queue</li>
+   * </ul>
+   *
    * <p>
    * When nodePartition is null, all partition of
    * used-capacity/absolute-used-capacity will be updated.