Merge pull request #1100 from xfxyjwf/javadoc

Update version number and fix javadoc errors.

java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java

@@ -119,7 +119,7 @@ public class FieldMaskUtil {
   /**
    * Constructs a FieldMask from the passed field numbers.
    *
-   * @throws IllegalArugmentException if any of the fields are invalid for the message.
+   * @throws IllegalArgumentException if any of the fields are invalid for the message.
    */
   public static FieldMask fromFieldNumbers(Class<? extends Message> type, int... fieldNumbers) {
     return fromFieldNumbers(type, Ints.asList(fieldNumbers));
@@ -128,7 +128,7 @@ public class FieldMaskUtil {
   /**
    * Constructs a FieldMask from the passed field numbers.
    *
-   * @throws IllegalArugmentException if any of the fields are invalid for the message.
+   * @throws IllegalArgumentException if any of the fields are invalid for the message.
    */
   public static FieldMask fromFieldNumbers(
       Class<? extends Message> type, Iterable<Integer> fieldNumbers) {

javanano/pom.xml

@@ -10,7 +10,7 @@
   </parent>
   <groupId>com.google.protobuf.nano</groupId>
   <artifactId>protobuf-javanano</artifactId>
-  <version>3.0.0-alpha-4</version>
+  <version>3.0.0-alpha-5</version>
   <packaging>bundle</packaging>
   <name>Protocol Buffer JavaNano API</name>
   <description>
@@ -165,7 +165,7 @@
           <instructions>
             <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
             <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
-            <Export-Package>com.google.protobuf;version=3.0.0-alpha-4</Export-Package>
+            <Export-Package>com.google.protobuf;version=3.0.0-alpha-5</Export-Package>
           </instructions>
         </configuration>
       </plugin>

javanano/src/main/java/com/google/protobuf/nano/FieldArray.java

@@ -32,13 +32,13 @@ package com.google.protobuf.nano;
 
 
 /**
- * A custom version of {@link android.util.SparseArray} with the minimal API
+ * A custom version of {@code android.util.SparseArray} with the minimal API
  * for storing {@link FieldData} objects.
  *
  * <p>This class is an internal implementation detail of nano and should not
  * be called directly by clients.
  *
- * Based on {@link android.support.v4.util.SpareArrayCompat}.
+ * Based on {@code android.support.v4.util.SpareArrayCompat}.
  */
 public final class FieldArray implements Cloneable {
     private static final FieldData DELETED = new FieldData();