diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpCodecUtil.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpCodecUtil.java
index a9021db7d8..f9c3778b23 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpCodecUtil.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpCodecUtil.java
@@ -57,7 +57,7 @@ final class HttpCodecUtil {
/**
* Validates the specified header value
*
- * @param value The value being validated
+ * @param headerValue The value being validated
*/
static void validateHeaderValue(String headerValue) {
//Check to see if the value is null
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java
index 1b4e216b58..e7a2ec8837 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java
@@ -24,7 +24,7 @@ import io.netty.handler.codec.MessageToMessageDecoder;
/**
* Decodes the content of the received {@link HttpRequest} and {@link HttpChunk}.
* The original content is replaced with the new content decoded by the
- * {@link DecoderEmbedder}, which is created by {@link #newContentDecoder(String)}.
+ * {@link EmbeddedByteChannel}, which is created by {@link #newContentDecoder(String)}.
* Once decoding is finished, the value of the 'Content-Encoding'
* header is set to the target content encoding, as returned by {@link #getTargetContentEncoding(String)}.
* Also, the 'Content-Length' header is updated to the length of the
@@ -127,11 +127,11 @@ public abstract class HttpContentDecoder extends MessageToMessageDecoder