diff --git a/hadoop-hdfs-project/hadoop-hdfs-raid/src/main/java/org/apache/hadoop/raid/Decoder.java b/hadoop-hdfs-project/hadoop-hdfs-raid/src/main/java/org/apache/hadoop/raid/Decoder.java
index c38885ce9dc..65060085c6f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-raid/src/main/java/org/apache/hadoop/raid/Decoder.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-raid/src/main/java/org/apache/hadoop/raid/Decoder.java
@@ -166,9 +166,9 @@ public abstract class Decoder {
    *
    * @param srcFs The filesystem containing the source file.
    * @param srcPath The damaged source file.
-   * @param parityPath The filesystem containing the parity file. This could be
+   * @param parityFs The filesystem containing the parity file. This could be
    *        different from fs in case the parity file is part of a HAR archive.
-   * @param parityFile The parity file.
+   * @param parityPath The parity file.
    * @param blockSize The block size of the file.
    * @param blockOffset Known location of error in the source file. There could
    *        be additional errors in the source file that are discovered during
diff --git a/hadoop-hdfs-project/hadoop-hdfs-raid/src/main/java/org/apache/hadoop/raid/DistRaidNode.java b/hadoop-hdfs-project/hadoop-hdfs-raid/src/main/java/org/apache/hadoop/raid/DistRaidNode.java
index d2219ae7452..43be2a725d6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-raid/src/main/java/org/apache/hadoop/raid/DistRaidNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-raid/src/main/java/org/apache/hadoop/raid/DistRaidNode.java
@@ -52,7 +52,7 @@ public class DistRaidNode extends RaidNode {
   }
 
   /**
-   * {@inheritDocs}
+   * {@inheritDoc}
    */
   @Override
   public void join() {
@@ -65,7 +65,7 @@ public class DistRaidNode extends RaidNode {
   }
   
   /**
-   * {@inheritDocs}
+   * {@inheritDoc}
    */
   @Override
   public void stop() {
@@ -79,7 +79,7 @@ public class DistRaidNode extends RaidNode {
 
 
   /**
-   * {@inheritDocs}
+   * {@inheritDoc}
    */
   @Override
   void raidFiles(PolicyInfo info, List<FileStatus> paths) throws IOException {
@@ -95,7 +95,7 @@ public class DistRaidNode extends RaidNode {
   }
 
   /**
-   * {@inheritDocs}
+   * {@inheritDoc}
    */
   @Override
   int getRunningJobsForPolicy(String policyName) {
diff --git a/hadoop-hdfs-project/hadoop-hdfs-raid/src/main/java/org/apache/hadoop/raid/Encoder.java b/hadoop-hdfs-project/hadoop-hdfs-raid/src/main/java/org/apache/hadoop/raid/Encoder.java
index f74b3a025d4..b87bad4f807 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-raid/src/main/java/org/apache/hadoop/raid/Encoder.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-raid/src/main/java/org/apache/hadoop/raid/Encoder.java
@@ -331,7 +331,6 @@ public abstract class Encoder {
    * The implementation of generating parity data for a stripe.
    *
    * @param blocks The streams to blocks in the stripe.
-   * @param srcFile The source file.
    * @param stripeStartOffset The start offset of the stripe
    * @param blockSize The maximum size of a block.
    * @param outs output streams to the parity blocks.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-raid/src/main/java/org/apache/hadoop/raid/RaidConfigurationException.java b/hadoop-hdfs-project/hadoop-hdfs-raid/src/main/java/org/apache/hadoop/raid/RaidConfigurationException.java
index 7335999ada0..891863ae927 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-raid/src/main/java/org/apache/hadoop/raid/RaidConfigurationException.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-raid/src/main/java/org/apache/hadoop/raid/RaidConfigurationException.java
@@ -19,7 +19,7 @@
 package org.apache.hadoop.raid;
 
 /**
- * Thrown when the config file for {@link CronNode} is malformed.  
+ * Thrown when the config file for {@link RaidNode} is malformed.
  */
 public class RaidConfigurationException extends Exception {
   private static final long serialVersionUID = 4046516718965587999L;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index fc632047c8e..954b8ec1daa 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -154,6 +154,8 @@ Trunk (unreleased changes)
     HDFS-3462. TestDFSClientRetries.busyTest() should restore default
     xceiver count in the config. (Madhukara Phatak via harsh)
 
+    HDFS-3550. Fix raid javadoc warnings. (Jason Lowe via daryn)
+
 Branch-2 ( Unreleased changes )
  
   INCOMPATIBLE CHANGES