diff --git a/lucene/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java b/lucene/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java
index e684cb36a02..81e3676246b 100644
--- a/lucene/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java
+++ b/lucene/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java
@@ -25,18 +25,18 @@ import org.apache.lucene.index.DocumentsWriterPerThreadPool.ThreadState;
  * {@link IndexWriterConfig}.
  * 
  * <ul>
- * <li>{@link #onDelete(DocumentsWriterFlushControl, ThreadState)} - flushes
+ * <li>{@link #onDelete(DocumentsWriterFlushControl, DocumentsWriterPerThreadPool.ThreadState)} - flushes
  * based on the global number of buffered delete terms iff
  * {@link IndexWriterConfig#getMaxBufferedDeleteTerms()} is enabled</li>
- * <li>{@link #onInsert(DocumentsWriterFlushControl, ThreadState)} - flushes
+ * <li>{@link #onInsert(DocumentsWriterFlushControl, DocumentsWriterPerThreadPool.ThreadState)} - flushes
  * either on the number of documents per {@link DocumentsWriterPerThread} (
  * {@link DocumentsWriterPerThread#getNumDocsInRAM()}) or on the global active
  * memory consumption in the current indexing session iff
  * {@link IndexWriterConfig#getMaxBufferedDocs()} or
  * {@link IndexWriterConfig#getRAMBufferSizeMB()} is enabled respectively</li>
- * <li>{@link #onUpdate(DocumentsWriterFlushControl, ThreadState)} - calls
- * {@link #onInsert(DocumentsWriterFlushControl, ThreadState)} and
- * {@link #onDelete(DocumentsWriterFlushControl, ThreadState)} in order</li>
+ * <li>{@link #onUpdate(DocumentsWriterFlushControl, DocumentsWriterPerThreadPool.ThreadState)} - calls
+ * {@link #onInsert(DocumentsWriterFlushControl, DocumentsWriterPerThreadPool.ThreadState)} and
+ * {@link #onDelete(DocumentsWriterFlushControl, DocumentsWriterPerThreadPool.ThreadState)} in order</li>
  * </ul>
  * All {@link IndexWriterConfig} settings are used to mark
  * {@link DocumentsWriterPerThread} as flush pending during indexing with
diff --git a/lucene/src/java/org/apache/lucene/index/FlushPolicy.java b/lucene/src/java/org/apache/lucene/index/FlushPolicy.java
index c5a300807c8..13f8a45e847 100644
--- a/lucene/src/java/org/apache/lucene/index/FlushPolicy.java
+++ b/lucene/src/java/org/apache/lucene/index/FlushPolicy.java
@@ -43,7 +43,7 @@ import org.apache.lucene.util.SetOnce;
  * {@link DocumentsWriterFlushControl}, the {@link FlushPolicy} decides if a
  * {@link DocumentsWriterPerThread} needs flushing and mark it as
  * flush-pending via
- * {@link DocumentsWriterFlushControl#setFlushPending(ThreadState)}.
+ * {@link DocumentsWriterFlushControl#setFlushPending(DocumentsWriterPerThreadPool.ThreadState)}.
  * 
  * @see ThreadState
  * @see DocumentsWriterFlushControl
@@ -92,7 +92,7 @@ public abstract class FlushPolicy {
       ThreadState state);
 
   /**
-   * Called by {@link DocumentsWriter} to initialize the FlushPolicy
+   * Called by DocumentsWriter to initialize the FlushPolicy
    */
   protected synchronized void init(DocumentsWriter docsWriter) {
     writer.set(docsWriter);
diff --git a/lucene/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/src/java/org/apache/lucene/index/IndexWriter.java
index 478674a8a38..166a6d594dd 100644
--- a/lucene/src/java/org/apache/lucene/index/IndexWriter.java
+++ b/lucene/src/java/org/apache/lucene/index/IndexWriter.java
@@ -82,7 +82,7 @@ import org.apache.lucene.util.MapBackedSet;
   documents (see {@link IndexWriterConfig#setRAMBufferSizeMB}) or the
   number of added documents (see {@link IndexWriterConfig#setMaxBufferedDocs(int)}).
   The default is to flush when RAM usage hits
-  {@value IndexWriterConfig#DEFAULT_RAM_BUFFER_SIZE_MB} MB. For
+  {@link IndexWriterConfig#DEFAULT_RAM_BUFFER_SIZE_MB} MB. For
   best indexing speed you should flush by RAM usage with a
   large RAM buffer. Additionally, if IndexWriter reaches the configured number of
   buffered deletes (see {@link IndexWriterConfig#setMaxBufferedDeleteTerms})
diff --git a/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java b/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java
index 72002bcd17c..742043dd5cb 100644
--- a/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java
+++ b/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java
@@ -538,7 +538,7 @@ public final class IndexWriterConfig implements Cloneable {
    * IndexWriter to assign thread-states to incoming indexing threads. If no
    * {@link DocumentsWriterPerThreadPool} is set {@link IndexWriter} will use
    * {@link ThreadAffinityDocumentsWriterThreadPool} with max number of
-   * thread-states set to {@value DocumentsWriterPerThreadPool#DEFAULT_MAX_THREAD_STATES} (see
+   * thread-states set to {@link DocumentsWriterPerThreadPool#DEFAULT_MAX_THREAD_STATES} (see
    * {@link DocumentsWriterPerThreadPool#DEFAULT_MAX_THREAD_STATES}).
    * </p>
    * <p>
diff --git a/lucene/src/java/org/apache/lucene/index/ThreadAffinityDocumentsWriterThreadPool.java b/lucene/src/java/org/apache/lucene/index/ThreadAffinityDocumentsWriterThreadPool.java
index 9df6b5aebf9..e5442e98845 100644
--- a/lucene/src/java/org/apache/lucene/index/ThreadAffinityDocumentsWriterThreadPool.java
+++ b/lucene/src/java/org/apache/lucene/index/ThreadAffinityDocumentsWriterThreadPool.java
@@ -19,6 +19,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.lucene.document.Document;
+import org.apache.lucene.index.DocumentsWriterPerThreadPool.ThreadState; //javadoc
 
 /**
  * A {@link DocumentsWriterPerThreadPool} implementation that tries to assign an