diff --git a/src/java/org/apache/poi/ddf/EscherRecord.java b/src/java/org/apache/poi/ddf/EscherRecord.java
index 382333ba3..2fa56d5b5 100644
--- a/src/java/org/apache/poi/ddf/EscherRecord.java
+++ b/src/java/org/apache/poi/ddf/EscherRecord.java
@@ -297,7 +297,7 @@ public abstract class EscherRecord {
/**
* @param tab - each children must be a right of his parent
- * @return
+ * @return xml representation of this record
*/
public String toXml(String tab){
StringBuilder builder = new StringBuilder();
diff --git a/src/java/org/apache/poi/hssf/record/DConRefRecord.java b/src/java/org/apache/poi/hssf/record/DConRefRecord.java
index ed3581635..629dc00e5 100644
--- a/src/java/org/apache/poi/hssf/record/DConRefRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DConRefRecord.java
@@ -278,7 +278,7 @@ public class DConRefRecord extends StandardRecord
/**
* @return the link's path, with the special characters stripped/replaced. May be null.
- * @see MS-XLS 2.5.277 (VirtualPath)
+ * See MS-XLS 2.5.277 (VirtualPath)
*/
public String getReadablePath()
{
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java b/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
index ac199e005..75f3b4ece 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
@@ -180,7 +180,7 @@ public final class HSSFClientAnchor extends HSSFAnchor implements ClientAnchor {
}
/**
- * @return the row(0 based) of the second cell.
+ * @param row2 the row(0 based) of the second cell.
*/
public void setRow2(int row2) {
checkRange(row2, 0, 256 * 256, "row2");
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java b/src/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java
index c6cba8f72..779455d5c 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java
@@ -22,7 +22,6 @@ import org.apache.poi.hssf.record.*;
/**
* @author Evgeniy Berlog
- * @date 12.07.12
*/
public class HSSFCombobox extends HSSFSimpleShape {
diff --git a/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java b/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
index e3c812ad5..ea59fa639 100644
--- a/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
+++ b/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
@@ -719,7 +719,7 @@ public final class WorkbookEvaluator {
*
*
* @param ignore whether to ignore missing references to external workbooks
- * @see Bug 52575 for details
+ * @see Bug 52575 for details
*/
public void setIgnoreMissingWorkbooks(boolean ignore){
_ignoreMissingWorkbooks = ignore;
diff --git a/src/java/org/apache/poi/ss/usermodel/DateUtil.java b/src/java/org/apache/poi/ss/usermodel/DateUtil.java
index 31942449f..12e862d4d 100644
--- a/src/java/org/apache/poi/ss/usermodel/DateUtil.java
+++ b/src/java/org/apache/poi/ss/usermodel/DateUtil.java
@@ -256,7 +256,7 @@ public class DateUtil {
/**
* Get EXCEL date as Java Calendar with given time zone.
- * @see getJavaDate(double, TimeZone)
+ * @see #getJavaDate(double, TimeZone)
* @return Java representation of the date, or null if date is not a valid Excel date
*/
public static Calendar getJavaCalendar(double date, boolean use1904windowing, TimeZone timeZone) {
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java
index bcb6afbc7..3a2089184 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java
@@ -52,9 +52,6 @@ public interface XSLFShapeContainer extends Iterable