diff --git a/core/java/android/app/ActionBar.java b/core/java/android/app/ActionBar.java
index cbad72e3f7f77..8df3f257f7c9b 100644
--- a/core/java/android/app/ActionBar.java
+++ b/core/java/android/app/ActionBar.java
@@ -52,7 +52,7 @@ public abstract class ActionBar {
     
     /**
      * Custom navigation mode. This navigation mode is set implicitly whenever
-     * a custom navigation view is set. See {@link #setCustomNavigationView(View)}.
+     * a custom navigation view is set. See {@link #setCustomNavigationMode(View)}.
      */
     public static final int NAVIGATION_MODE_CUSTOM = 3;
 
diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java
index c734737e0e50d..591b7a2dc70d2 100644
--- a/core/java/android/app/Fragment.java
+++ b/core/java/android/app/Fragment.java
@@ -360,7 +360,7 @@ public class Fragment implements ComponentCallbacks {
     
     /**
      * Report that this fragment would like to participate in populating
-     * the options menu by receiving a call to {@link #onCreateOptionsMenu(Menu)}
+     * the options menu by receiving a call to {@link #onCreateOptionsMenu}
      * and related methods.
      * 
      * @param hasMenu If true, the fragment has menu items to contribute.
@@ -556,13 +556,12 @@ public class Fragment implements ComponentCallbacks {
     /**
      * Initialize the contents of the Activity's standard options menu.  You
      * should place your menu items in to <var>menu</var>.  For this method
-     * to be called, you must have first called {@link #setHasMenu}.  See
-     * {@link Activity#onCreateOptionsMenu(Menu) Activity.onCreateOptionsMenu}
-     * for more information.
+     * to be called, you must have first called {@link #setHasOptionsMenu}.
+     * See {@link Activity#onCreateOptionsMenu} for more information.
      * 
      * @param menu The options menu in which you place your items.
      * 
-     * @see #setHasMenu
+     * @see #setHasOptionsMenu
      * @see #onPrepareOptionsMenu
      * @see #onOptionsItemSelected
      */
@@ -580,7 +579,7 @@ public class Fragment implements ComponentCallbacks {
      * @param menu The options menu as last shown or first initialized by
      *             onCreateOptionsMenu().
      * 
-     * @see #setHasMenu
+     * @see #setHasOptionsMenu
      * @see #onCreateOptionsMenu
      */
     public void onPrepareOptionsMenu(Menu menu) {
diff --git a/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java b/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java
index 5241088b8c38d..0d9f3839ad194 100644
--- a/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java
+++ b/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java
@@ -27,7 +27,7 @@ import android.text.TextWatcher;
 import java.util.Locale;
 
 /**
- * Watches a {@link TextView} and if a phone number is entered will format it.
+ * Watches a TextView and if a phone number is entered will format it.
  * <p>
  * Stop formatting when the user
  * <ul>