diff --git a/src/java/org/apache/solr/common/util/RTimer.java b/src/java/org/apache/solr/common/util/RTimer.java
index f2d8e086a35..95c5b05c2e4 100644
--- a/src/java/org/apache/solr/common/util/RTimer.java
+++ b/src/java/org/apache/solr/common/util/RTimer.java
@@ -27,7 +27,7 @@ import java.util.*;
  * started automatically when created.
  *
  * @since solr 1.3
- * @revision $Id$
+ * @version $Id$
  */
 public class RTimer {
 
diff --git a/src/java/org/apache/solr/core/SolrConfig.java b/src/java/org/apache/solr/core/SolrConfig.java
index 59b86d8162a..12b8aa2a6a8 100644
--- a/src/java/org/apache/solr/core/SolrConfig.java
+++ b/src/java/org/apache/solr/core/SolrConfig.java
@@ -18,6 +18,7 @@
 package org.apache.solr.core;
 
 import org.apache.solr.common.util.NamedList;
+import org.apache.solr.handler.PingRequestHandler;
 import org.apache.solr.request.LocalSolrQueryRequest;
 import org.apache.solr.request.SolrQueryRequest;
 
@@ -189,7 +190,7 @@ public class SolrConfig extends Config {
    * Returns a Request object based on the admin/pingQuery section
    * of the Solr config file.
    * 
-   * @use {@link PingRequestHandler} instead 
+   * @deprecated use {@link PingRequestHandler} instead 
    */
   @Deprecated
   public SolrQueryRequest getPingQueryRequest(SolrCore core) {
diff --git a/src/java/org/apache/solr/core/SolrCore.java b/src/java/org/apache/solr/core/SolrCore.java
index bf271f597fc..5c7c7c8ddfd 100644
--- a/src/java/org/apache/solr/core/SolrCore.java
+++ b/src/java/org/apache/solr/core/SolrCore.java
@@ -541,7 +541,7 @@ public final class SolrCore {
    * Returns a Request object based on the admin/pingQuery section
    * of the Solr config file.
    * 
-   * @use {@link org.apache.solr.handler.PingRequestHandler} instead
+   * @deprecated use {@link org.apache.solr.handler.PingRequestHandler} instead
    */
   @Deprecated
   public SolrQueryRequest getPingQueryRequest() {
diff --git a/src/java/org/apache/solr/handler/component/SearchComponent.java b/src/java/org/apache/solr/handler/component/SearchComponent.java
index c8661f8ac92..fbb09cc4079 100644
--- a/src/java/org/apache/solr/handler/component/SearchComponent.java
+++ b/src/java/org/apache/solr/handler/component/SearchComponent.java
@@ -53,8 +53,10 @@ public abstract class SearchComponent implements SolrInfoMBean, NamedListInitial
    */
   public abstract void process(ResponseBuilder rb) throws IOException;
 
-  /** Process for a distributed search.
-   * @returns the next stage for this component */
+  /**
+   * Process for a distributed search.
+   * @return the next stage for this component
+   */
   public int distributedProcess(ResponseBuilder rb) throws IOException {
     return ResponseBuilder.STAGE_DONE;
   }
diff --git a/src/java/org/apache/solr/search/FunctionQParser.java b/src/java/org/apache/solr/search/FunctionQParser.java
index 93e13a4a7ce..cd59fbf6064 100755
--- a/src/java/org/apache/solr/search/FunctionQParser.java
+++ b/src/java/org/apache/solr/search/FunctionQParser.java
@@ -67,7 +67,6 @@ public class FunctionQParser extends QParser {
   /**
    * TODO: Doc
    * 
-   * @return
    * @throws ParseException
    */
   public String parseId() throws ParseException {
@@ -107,7 +106,6 @@ public class FunctionQParser extends QParser {
   /**
    * Parse an individual ValueSource.
    * 
-   * @return
    * @throws ParseException
    */
   public ValueSource parseValueSource() throws ParseException {
@@ -118,7 +116,6 @@ public class FunctionQParser extends QParser {
   /**
    * TODO: Doc
    * 
-   * @return
    * @throws ParseException
    */
   public Query parseNestedQuery() throws ParseException {
@@ -170,7 +167,6 @@ public class FunctionQParser extends QParser {
    * Parse an individual value source.
    * 
    * @param doConsumeDelimiter whether to consume a delimiter following the ValueSource  
-   * @return
    * @throws ParseException
    */
   protected ValueSource parseValueSource(boolean doConsumeDelimiter) throws ParseException {
diff --git a/src/java/org/apache/solr/search/QParser.java b/src/java/org/apache/solr/search/QParser.java
index 2e89c8e2dcf..21fd1c1d256 100755
--- a/src/java/org/apache/solr/search/QParser.java
+++ b/src/java/org/apache/solr/search/QParser.java
@@ -77,9 +77,10 @@ public abstract class QParser {
     this.qstr = s;
   }
 
-  /** Returns the resulting query from this QParser, calling parse() only the
+  /**
+   * Returns the resulting query from this QParser, calling parse() only the
    * first time and caching the Query result.
-   * @return
+   *
    * @throws ParseException
    */
   public Query getQuery() throws ParseException {
diff --git a/src/java/org/apache/solr/search/ValueSourceParser.java b/src/java/org/apache/solr/search/ValueSourceParser.java
index 1153778c7bc..5f2ce20dc6d 100755
--- a/src/java/org/apache/solr/search/ValueSourceParser.java
+++ b/src/java/org/apache/solr/search/ValueSourceParser.java
@@ -57,7 +57,6 @@ public abstract class ValueSourceParser implements NamedListInitializedPlugin
    * Parse the user input into a ValueSource.
    * 
    * @param fp
-   * @return
    * @throws ParseException
    */
   public abstract ValueSource parse(FunctionQParser fp) throws ParseException;
diff --git a/src/java/org/apache/solr/spelling/SolrSpellChecker.java b/src/java/org/apache/solr/spelling/SolrSpellChecker.java
index 99600d9a10a..d52ba0b4f6e 100644
--- a/src/java/org/apache/solr/spelling/SolrSpellChecker.java
+++ b/src/java/org/apache/solr/spelling/SolrSpellChecker.java
@@ -109,7 +109,6 @@ public abstract class SolrSpellChecker {
    * @param count The maximum number of suggestions to return
    * @param onlyMorePopular  TODO
    * @param extendedResults  TODO
-   * @return
    * @throws IOException
    */
   public abstract SpellingResult getSuggestions(Collection<Token> tokens, IndexReader reader, int count,
diff --git a/src/java/org/apache/solr/update/CommitUpdateCommand.java b/src/java/org/apache/solr/update/CommitUpdateCommand.java
index 171efc409f6..3cbbae97cee 100644
--- a/src/java/org/apache/solr/update/CommitUpdateCommand.java
+++ b/src/java/org/apache/solr/update/CommitUpdateCommand.java
@@ -27,7 +27,7 @@ public class CommitUpdateCommand extends UpdateCommand {
   /**
    * During optimize, optimize down to <= this many segments.  Must be >= 1
    *
-   * @see {@link org.apache.lucene.index.IndexWriter#optimize(int)}
+   * @see org.apache.lucene.index.IndexWriter#optimize(int)
    */
   public int maxOptimizeSegments = 1;
 
diff --git a/src/java/org/apache/solr/update/UpdateHandler.java b/src/java/org/apache/solr/update/UpdateHandler.java
index 9b4f8acd42d..94a9886a0a2 100644
--- a/src/java/org/apache/solr/update/UpdateHandler.java
+++ b/src/java/org/apache/solr/update/UpdateHandler.java
@@ -36,6 +36,7 @@ import org.apache.solr.schema.SchemaField;
 import org.apache.solr.schema.FieldType;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.util.DOMUtil;
+import org.apache.solr.util.plugin.SolrCoreAware;
 import org.apache.solr.core.*;
 
 import javax.xml.xpath.XPathConstants;