From 71fbb81b14958b80fe55738607740c6630e4e9da Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Mon, 30 Nov 2015 09:51:33 +0000 Subject: [PATCH] Fix @code escapes The body of {@code} must not be HTML escaped. This is one of several changes that fix the source in conjunction with a doclava fix. Bug: 25757239 Change-Id: Ib38a0fa2dd2a3d68e467f78a812071e763d7e881 --- core/java/android/annotation/BinderThread.java | 6 +- core/java/android/annotation/CallSuper.java | 4 +- core/java/android/annotation/CheckResult.java | 2 +- core/java/android/annotation/ColorInt.java | 2 +- core/java/android/annotation/FloatRange.java | 4 +- core/java/android/annotation/IntDef.java | 19 ++-- core/java/android/annotation/IntRange.java | 4 +- core/java/android/annotation/MainThread.java | 4 +- .../android/annotation/RequiresPermission.java | 20 ++-- core/java/android/annotation/Size.java | 2 +- core/java/android/annotation/StringDef.java | 12 +-- core/java/android/annotation/UiThread.java | 6 +- core/java/android/annotation/WorkerThread.java | 6 +- core/java/android/app/ActivityManager.java | 4 +- core/java/android/hardware/Camera.java | 6 +- core/java/android/hardware/package.html | 2 +- core/java/android/net/PskKeyManager.java | 2 +- core/java/android/nfc/NfcAdapter.java | 4 +- core/java/android/os/PowerManager.java | 4 +- core/java/android/service/dreams/DreamService.java | 2 +- core/java/android/service/textservice/package.html | 4 +- core/java/android/speech/RecognitionListener.java | 2 +- core/java/android/speech/RecognitionService.java | 2 +- core/java/android/text/format/Time.java | 4 +- core/java/android/transition/ArcMotion.java | 9 +- core/java/android/transition/PathMotion.java | 6 +- .../java/android/transition/PatternPathMotion.java | 9 +- core/java/android/transition/Transition.java | 30 +++--- core/java/android/view/View.java | 2 +- .../android/view/inputmethod/InputMethodInfo.java | 2 +- .../view/inputmethod/InputMethodSubtype.java | 2 +- core/java/android/webkit/WebView.java | 2 +- core/java/android/widget/ProgressBar.java | 2 +- core/res/AndroidManifest.xml | 4 +- core/res/res/values/attrs_manifest.xml | 6 +- core/res/res/values/themes_holo.xml | 2 +- core/res/res/values/themes_material.xml | 2 +- .../intl/es/distribute/googleplay/quality/tv.jd | 2 +- docs/html-intl/intl/es/google/play/filters.jd | 18 ++-- docs/html-intl/intl/es/preview/api-overview.jd | 6 +- .../intl/ja/distribute/googleplay/quality/tv.jd | 2 +- docs/html-intl/intl/ja/google/play/filters.jd | 14 +-- .../html-intl/intl/ja/guide/topics/fundamentals.jd | 10 +- docs/html-intl/intl/ja/preview/api-overview.jd | 6 +- .../training/basics/activity-lifecycle/starting.jd | 2 +- .../intl/ja/training/basics/intents/filters.jd | 18 ++-- docs/html-intl/intl/ja/training/tv/start/start.jd | 2 +- .../intl/ko/distribute/googleplay/quality/tv.jd | 2 +- docs/html-intl/intl/ko/google/play/filters.jd | 16 ++-- docs/html-intl/intl/ko/preview/api-overview.jd | 4 +- .../training/basics/activity-lifecycle/starting.jd | 2 +- .../intl/ko/training/basics/intents/filters.jd | 20 ++-- docs/html-intl/intl/pt-br/preview/api-overview.jd | 6 +- .../training/basics/activity-lifecycle/starting.jd | 2 +- .../intl/pt-br/training/basics/intents/filters.jd | 20 ++-- .../intl/ru/distribute/googleplay/quality/tv.jd | 2 +- docs/html-intl/intl/ru/google/play/filters.jd | 18 ++-- docs/html-intl/intl/ru/preview/api-overview.jd | 6 +- .../training/basics/activity-lifecycle/starting.jd | 2 +- .../intl/ru/training/basics/intents/filters.jd | 20 ++-- .../intl/zh-cn/distribute/googleplay/quality/tv.jd | 2 +- docs/html-intl/intl/zh-cn/google/play/filters.jd | 16 ++-- docs/html-intl/intl/zh-cn/preview/api-overview.jd | 4 +- .../training/basics/activity-lifecycle/starting.jd | 2 +- .../intl/zh-cn/training/basics/intents/filters.jd | 20 ++-- .../intl/zh-tw/distribute/googleplay/quality/tv.jd | 2 +- docs/html-intl/intl/zh-tw/google/play/filters.jd | 14 +-- docs/html-intl/intl/zh-tw/preview/api-overview.jd | 6 +- .../training/basics/activity-lifecycle/starting.jd | 2 +- .../intl/zh-tw/training/basics/intents/filters.jd | 18 ++-- docs/html/about/dashboards/index.jd | 4 +- docs/html/about/versions/android-1.6.jd | 6 +- docs/html/about/versions/android-2.0-highlights.jd | 2 +- docs/html/about/versions/android-2.3.jd | 2 +- docs/html/about/versions/android-3.0.jd | 34 +++---- docs/html/about/versions/android-3.1.jd | 8 +- docs/html/about/versions/android-3.2.jd | 2 +- docs/html/about/versions/android-4.0.3.jd | 2 +- docs/html/about/versions/android-4.0.jd | 34 +++---- docs/html/about/versions/android-4.1.jd | 14 +-- docs/html/about/versions/android-4.2.jd | 24 ++--- docs/html/about/versions/android-4.3.jd | 38 ++++---- docs/html/about/versions/android-4.4.jd | 8 +- docs/html/about/versions/android-5.0.jd | 6 +- docs/html/distribute/essentials/quality/tv.jd | 2 +- docs/html/google/play/billing/billing_integrate.jd | 4 +- docs/html/google/play/expansion-files.jd | 18 ++-- docs/html/google/play/filters.jd | 18 ++-- docs/html/google/play/licensing/setting-up.jd | 4 +- docs/html/google/play/publishing/multiple-apks.jd | 20 ++-- docs/html/guide/components/activities.jd | 22 ++--- docs/html/guide/components/aidl.jd | 2 +- docs/html/guide/components/fragments.jd | 6 +- docs/html/guide/components/fundamentals.jd | 2 +- docs/html/guide/components/intents-common.jd | 26 ++--- docs/html/guide/components/intents-filters.jd | 40 ++++---- .../html/guide/components/processes-and-threads.jd | 10 +- docs/html/guide/components/services.jd | 8 +- docs/html/guide/components/tasks-and-back-stack.jd | 14 +-- docs/html/guide/practices/compatibility.jd | 6 +- docs/html/guide/practices/optimizing-for-3.0.jd | 28 +++--- docs/html/guide/practices/screen-compat-mode.jd | 22 ++--- docs/html/guide/practices/screens-distribution.jd | 24 ++--- docs/html/guide/practices/screens-support-1.5.jd | 4 +- docs/html/guide/practices/screens_support.jd | 24 ++--- docs/html/guide/practices/tablets-and-handsets.jd | 4 +- .../html/guide/topics/connectivity/bluetooth-le.jd | 2 +- docs/html/guide/topics/connectivity/nfc/hce.jd | 2 +- docs/html/guide/topics/data/backup.jd | 8 +- docs/html/guide/topics/data/data-storage.jd | 4 +- docs/html/guide/topics/graphics/opengl.jd | 8 +- docs/html/guide/topics/manifest/action-element.jd | 6 +- .../topics/manifest/activity-alias-element.jd | 4 +- .../html/guide/topics/manifest/activity-element.jd | 14 +-- .../guide/topics/manifest/application-element.jd | 8 +- .../html/guide/topics/manifest/category-element.jd | 4 +- .../topics/manifest/compatible-screens-element.jd | 16 ++-- docs/html/guide/topics/manifest/data-element.jd | 8 +- .../manifest/grant-uri-permission-element.jd | 2 +- docs/html/guide/topics/manifest/manifest-intro.jd | 4 +- .../guide/topics/manifest/meta-data-element.jd | 4 +- .../html/guide/topics/manifest/provider-element.jd | 4 +- .../html/guide/topics/manifest/receiver-element.jd | 2 +- docs/html/guide/topics/manifest/service-element.jd | 4 +- .../topics/manifest/supports-screens-element.jd | 4 +- .../topics/manifest/uses-configuration-element.jd | 4 +- .../guide/topics/manifest/uses-feature-element.jd | 8 +- docs/html/guide/topics/media/mediarouter.jd | 4 +- .../guide/topics/providers/document-provider.jd | 4 +- .../guide/topics/resources/accessing-resources.jd | 18 ++-- .../guide/topics/resources/color-list-resource.jd | 4 +- .../guide/topics/resources/drawable-resource.jd | 40 ++++---- .../html/guide/topics/resources/layout-resource.jd | 2 +- docs/html/guide/topics/resources/more-resources.jd | 36 +++---- .../guide/topics/resources/providing-resources.jd | 28 +++--- .../html/guide/topics/resources/runtime-changes.jd | 2 +- .../html/guide/topics/resources/string-resource.jd | 30 +++--- docs/html/guide/topics/resources/style-resource.jd | 4 +- .../topics/search/adding-custom-suggestions.jd | 6 +- .../search/adding-recent-query-suggestions.jd | 2 +- docs/html/guide/topics/search/search-dialog.jd | 34 +++---- docs/html/guide/topics/search/searchable-config.jd | 12 +-- docs/html/guide/topics/security/permissions.jd | 2 +- docs/html/guide/topics/ui/accessibility/apps.jd | 4 +- .../html/guide/topics/ui/accessibility/services.jd | 6 +- docs/html/guide/topics/ui/actionbar.jd | 28 +++--- docs/html/guide/topics/ui/controls/button.jd | 4 +- docs/html/guide/topics/ui/controls/spinner.jd | 2 +- docs/html/guide/topics/ui/controls/text.jd | 2 +- docs/html/guide/topics/ui/dialogs.jd | 4 +- docs/html/guide/topics/ui/menus.jd | 18 ++-- docs/html/guide/topics/ui/settings.jd | 26 ++--- docs/html/guide/topics/ui/themes.jd | 26 ++--- docs/html/guide/webapps/best-practices.jd | 4 +- docs/html/guide/webapps/targeting.jd | 6 +- docs/html/guide/webapps/webview.jd | 4 +- docs/html/ndk/downloads/revision_history.jd | 24 ++--- docs/html/ndk/guides/abis.jd | 6 +- docs/html/ndk/guides/android_mk.jd | 4 +- docs/html/ndk/guides/application_mk.jd | 6 +- docs/html/ndk/guides/concepts.jd | 10 +- docs/html/ndk/guides/cpp-support.jd | 2 +- docs/html/ndk/guides/cpu-features.jd | 2 +- docs/html/ndk/guides/ndk-build.jd | 12 +-- docs/html/ndk/guides/ndk-gdb.jd | 32 +++---- docs/html/ndk/guides/ndk-stack.jd | 4 +- docs/html/ndk/guides/prebuilts.jd | 4 +- docs/html/ndk/guides/setup.jd | 2 +- docs/html/ndk/guides/stable_apis.jd | 52 +++++----- docs/html/ndk/guides/standalone_toolchain.jd | 28 +++--- docs/html/ndk/samples/sample_na.jd | 2 +- docs/html/preview/api-overview.jd | 6 +- docs/html/tools/adk/adk2.jd | 4 +- docs/html/tools/devices/emulator.jd | 4 +- docs/html/tools/devices/managing-avds.jd | 2 +- docs/html/tools/extras/oem-usb.jd | 8 +- docs/html/tools/help/adb.jd | 2 +- docs/html/tools/help/desktop-head-unit.jd | 4 +- docs/html/tools/help/emulator.jd | 4 +- docs/html/tools/help/jobb.jd | 16 ++-- docs/html/tools/help/lint.jd | 4 +- docs/html/tools/help/shell.jd | 106 ++++++++++----------- docs/html/tools/help/uiautomator/index.jd | 12 +-- docs/html/tools/help/zipalign.jd | 2 +- docs/html/tools/sdk/eclipse-adt.jd | 8 +- docs/html/tools/sdk/tools-notes.jd | 2 +- docs/html/tools/support-library/features.jd | 34 +++---- docs/html/tools/support-library/index.jd | 2 +- docs/html/tools/support-library/setup.jd | 12 +-- docs/html/tools/testing-support-library/index.jd | 12 +-- docs/html/tools/testing/testing_ui.jd | 8 +- .../activity-testing/activity-basic-testing.jd | 4 +- .../activity-testing/activity-ui-testing.jd | 8 +- docs/html/training/app-indexing/deep-linking.jd | 8 +- .../training/app-indexing/enabling-app-indexing.jd | 12 +-- docs/html/training/articles/memory.jd | 2 +- docs/html/training/articles/security-tips.jd | 6 +- docs/html/training/auto/start/index.jd | 6 +- .../training/basics/actionbar/adding-buttons.jd | 8 +- docs/html/training/basics/actionbar/setting-up.jd | 4 +- docs/html/training/basics/actionbar/styling.jd | 4 +- .../training/basics/activity-lifecycle/starting.jd | 2 +- .../training/basics/firstapp/starting-activity.jd | 4 +- docs/html/training/basics/fragments/fragment-ui.jd | 4 +- docs/html/training/basics/intents/filters.jd | 20 ++-- docs/html/training/basics/network-ops/managing.jd | 6 +- .../basics/supporting-devices/languages.jd | 8 +- .../basics/supporting-devices/platforms.jd | 4 +- docs/html/training/camera/photobasics.jd | 2 +- docs/html/training/camera/videobasics.jd | 2 +- docs/html/training/custom-views/create-view.jd | 6 +- .../training/displaying-bitmaps/manage-memory.jd | 2 +- docs/html/training/gestures/detector.jd | 4 +- docs/html/training/gestures/movement.jd | 4 +- docs/html/training/id-auth/custom_auth.jd | 2 +- docs/html/training/id-auth/identify.jd | 2 +- .../training/implementing-navigation/ancestral.jd | 12 +-- .../training/implementing-navigation/lateral.jd | 2 +- .../training/implementing-navigation/temporal.jd | 8 +- .../training/improving-layouts/loading-ondemand.jd | 2 +- .../improving-layouts/optimizing-layout.jd | 2 +- .../training/improving-layouts/reusing-layouts.jd | 16 ++-- .../training/in-app-billing/preparing-iab-app.jd | 2 +- docs/html/training/keyboard-input/visibility.jd | 10 +- docs/html/training/location/display-address.jd | 2 +- docs/html/training/scheduling/alarms.jd | 2 +- .../testing/ui-testing/uiautomator-testing.jd | 2 +- .../unit-testing/instrumented-unit-tests.jd | 10 +- .../testing/unit-testing/local-unit-tests.jd | 30 +++--- docs/html/training/tv/discovery/searchable.jd | 6 +- docs/html/training/tv/start/start.jd | 2 +- docs/html/training/volley/request-custom.jd | 10 +- .../graphics/drawable/AnimationDrawable.java | 4 +- .../android/graphics/drawable/ScaleDrawable.java | 2 +- keystore/java/android/security/KeyChain.java | 4 +- .../java/android/security/keystore/KeyInfo.java | 18 ++-- telecomm/java/android/telecom/InCallService.java | 14 +-- wifi/java/android/net/wifi/WifiManager.java | 2 +- wifi/java/android/net/wifi/p2p/package.html | 2 +- wifi/java/android/net/wifi/package.html | 2 +- 240 files changed, 1102 insertions(+), 1105 deletions(-) diff --git a/core/java/android/annotation/BinderThread.java b/core/java/android/annotation/BinderThread.java index c69ba10bd748..6f85e0457e0e 100644 --- a/core/java/android/annotation/BinderThread.java +++ b/core/java/android/annotation/BinderThread.java @@ -29,10 +29,10 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; * on the binder thread. *

* Example: - * 

{@code
- *  (@BinderThread
+ * 

+ *  @BinderThread
  *  public BeamShareData createBeamShareData() { ... }
- * }

+ *
* * {@hide} */ diff --git a/core/java/android/annotation/CallSuper.java b/core/java/android/annotation/CallSuper.java index 82e27232abb6..b10a28acf7a4 100644 --- a/core/java/android/annotation/CallSuper.java +++ b/core/java/android/annotation/CallSuper.java @@ -25,10 +25,10 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; * Denotes that any overriding methods should invoke this method as well. *

* Example: - * 

{@code
+ * 

  *  @CallSuper
  *  public abstract void onFocusLost();
- * }

+ *
* * @hide */ diff --git a/core/java/android/annotation/CheckResult.java b/core/java/android/annotation/CheckResult.java index 787514e9f8c3..97d031a760a6 100644 --- a/core/java/android/annotation/CheckResult.java +++ b/core/java/android/annotation/CheckResult.java @@ -29,7 +29,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; *

* Example: * 

{@code
- *  public @CheckResult String trim(String s) { return s.trim(); }
+ *  public @CheckResult String trim(String s) { return s.trim(); }
  *  ...
  *  s.trim(); // this is probably an error
  *  s = s.trim(); // ok
diff --git a/core/java/android/annotation/ColorInt.java b/core/java/android/annotation/ColorInt.java
index 69d196c6b5e4..4671b1b9f887 100644
--- a/core/java/android/annotation/ColorInt.java
+++ b/core/java/android/annotation/ColorInt.java
@@ -31,7 +31,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
  * 

  * Example:
  * 
{@code
- *  public abstract void setTextColor(@ColorInt int color);
+ *  public abstract void setTextColor(@ColorInt int color);
  * }

  *
  * @hide
diff --git a/core/java/android/annotation/FloatRange.java b/core/java/android/annotation/FloatRange.java
index 3a7c15015b49..05b51680b1b0 100644
--- a/core/java/android/annotation/FloatRange.java
+++ b/core/java/android/annotation/FloatRange.java
@@ -28,12 +28,12 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
  * Denotes that the annotated element should be a float or double in the given range
  * 

  * Example:
- * 
{@code
+ * 

  *  @FloatRange(from=0.0,to=1.0)
  *  public float getAlpha() {
  *      ...
  *  }
- * }

+ * 

  *
  * @hide
  */
diff --git a/core/java/android/annotation/IntDef.java b/core/java/android/annotation/IntDef.java
index 3cae9c522829..a18bfa5a5702 100644
--- a/core/java/android/annotation/IntDef.java
+++ b/core/java/android/annotation/IntDef.java
@@ -27,25 +27,24 @@ import static java.lang.annotation.RetentionPolicy.CLASS;
  * named constants. If the {@link #flag()} attribute is set to true,
  * multiple constants can be combined.
  * 

- * Example:
- * 
{@code
- *  @Retention(CLASS)
- *  @IntDef({NAVIGATION_MODE_STANDARD, NAVIGATION_MODE_LIST, NAVIGATION_MODE_TABS})
- *  public @interface NavigationMode {}
+ * 

+ *  @Retention(SOURCE)
+ *  @IntDef({NAVIGATION_MODE_STANDARD, NAVIGATION_MODE_LIST, NAVIGATION_MODE_TABS})
+ *  public @interface NavigationMode {}
  *  public static final int NAVIGATION_MODE_STANDARD = 0;
  *  public static final int NAVIGATION_MODE_LIST = 1;
  *  public static final int NAVIGATION_MODE_TABS = 2;
  *  ...
- *  public abstract void setNavigationMode(@NavigationMode int mode);
+ *  public abstract void setNavigationMode(@NavigationMode int mode);
  *  @NavigationMode
  *  public abstract int getNavigationMode();
- * }

+ * 

  * For a flag, set the flag attribute:
- * 
{@code
+ * 

  *  @IntDef(
  *      flag = true
- *      value = {NAVIGATION_MODE_STANDARD, NAVIGATION_MODE_LIST, NAVIGATION_MODE_TABS})
- * }

+ *      value = {NAVIGATION_MODE_STANDARD, NAVIGATION_MODE_LIST, NAVIGATION_MODE_TABS})
+ * 

  *
  * @hide
  */
diff --git a/core/java/android/annotation/IntRange.java b/core/java/android/annotation/IntRange.java
index b489c01dfd69..c043e2db6a98 100644
--- a/core/java/android/annotation/IntRange.java
+++ b/core/java/android/annotation/IntRange.java
@@ -29,12 +29,12 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
  * Denotes that the annotated element should be an int or long in the given range
  * 

  * Example:
- * 
{@code
+ * 

  *  @IntRange(from=0,to=255)
  *  public int getAlpha() {
  *      ...
  *  }
- * }

+ * 

  *
  * @hide
  */
diff --git a/core/java/android/annotation/MainThread.java b/core/java/android/annotation/MainThread.java
index 18a4283b2532..52f8dfb2dbb1 100644
--- a/core/java/android/annotation/MainThread.java
+++ b/core/java/android/annotation/MainThread.java
@@ -29,10 +29,10 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
  * on the main thread.
  * 

  * Example:
- * 
{@code
+ * 

  *  @MainThread
  *  public void deliverResult(D data) { ... }
- * }

+ * 

  *
  * {@hide}
  */
diff --git a/core/java/android/annotation/RequiresPermission.java b/core/java/android/annotation/RequiresPermission.java
index 113c0554ccbe..59d419f78ee0 100644
--- a/core/java/android/annotation/RequiresPermission.java
+++ b/core/java/android/annotation/RequiresPermission.java
@@ -32,26 +32,26 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
  * 

  * Example of requiring a single permission:
  * 
{@code
- *   @RequiresPermission(Manifest.permission.SET_WALLPAPER)
+ *   {@literal @}RequiresPermission(Manifest.permission.SET_WALLPAPER)
  *   public abstract void setWallpaper(Bitmap bitmap) throws IOException;
  *
- *   @RequiresPermission(ACCESS_COARSE_LOCATION)
+ *   {@literal @}RequiresPermission(ACCESS_COARSE_LOCATION)
  *   public abstract Location getLastKnownLocation(String provider);
  * }

  * Example of requiring at least one permission from a set:
  * 
{@code
- *   @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION})
+ *   {@literal @}RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION})
  *   public abstract Location getLastKnownLocation(String provider);
  * }

  * Example of requiring multiple permissions:
  * 
{@code
- *   @RequiresPermission(allOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION})
+ *   {@literal @}RequiresPermission(allOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION})
  *   public abstract Location getLastKnownLocation(String provider);
  * }

  * Example of requiring separate read and write permissions for a content provider:
  * 
{@code
- *   @RequiresPermission.Read(@RequiresPermission(READ_HISTORY_BOOKMARKS))
- *   @RequiresPermission.Write(@RequiresPermission(WRITE_HISTORY_BOOKMARKS))
+ *   {@literal @}RequiresPermission.Read(@RequiresPermission(READ_HISTORY_BOOKMARKS))
+ *   {@literal @}RequiresPermission.Write(@RequiresPermission(WRITE_HISTORY_BOOKMARKS))
  *   public static final Uri BOOKMARKS_URI = Uri.parse("content://browser/bookmarks");
  * }

  * 

@@ -59,7 +59,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
  * a permission which depends on the value of the parameter. For example, consider
  * {@link android.app.Activity#startActivity(Intent)}:
  * 
{@code
- *   public void startActivity(@RequiresPermission Intent intent) { ... }
+ *   public void startActivity(@RequiresPermission Intent intent) { ... }
  * }

  * Notice how there are no actual permission names listed in the annotation. The actual
  * permissions required will depend on the particular intent passed in. For example,
@@ -71,7 +71,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
  * and the actual permission requirement for this particular intent is described on
  * the Intent name itself:
  * 
{@code
- *   @RequiresPermission(Manifest.permission.CALL_PHONE)
+ *   {@literal @}RequiresPermission(Manifest.permission.CALL_PHONE)
  *   public static final String ACTION_CALL = "android.intent.action.CALL";
  * }

  *
@@ -115,7 +115,7 @@ public @interface RequiresPermission {
      * When specified on a parameter, the annotation indicates that the method requires
      * a permission which depends on the value of the parameter (and typically
      * the corresponding field passed in will be one of a set of constants which have
-     * been annotated with a {@code @RequiresPermission} annotation.)
+     * been annotated with a @RequiresPermission annotation.)
      */
     @Target({FIELD, METHOD, PARAMETER})
     @interface Read {
@@ -128,7 +128,7 @@ public @interface RequiresPermission {
      * When specified on a parameter, the annotation indicates that the method requires
      * a permission which depends on the value of the parameter (and typically
      * the corresponding field passed in will be one of a set of constants which have
-     * been annotated with a {@code @RequiresPermission} annotation.)
+     * been annotated with a @RequiresPermission annotation.)
      */
     @Target({FIELD, METHOD, PARAMETER})
     @interface Write {
diff --git a/core/java/android/annotation/Size.java b/core/java/android/annotation/Size.java
index 389b819bb41a..7c3e70f658e9 100644
--- a/core/java/android/annotation/Size.java
+++ b/core/java/android/annotation/Size.java
@@ -31,7 +31,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
  * 

  * Example:
  * 
{@code
- *  public void getLocationInWindow(@Size(2) int[] location) {
+ *  public void getLocationInWindow(@Size(2) int[] location) {
  *      ...
  *  }
  * }

diff --git a/core/java/android/annotation/StringDef.java b/core/java/android/annotation/StringDef.java
index 5f7f380c40ec..8c8d5d8794dc 100644
--- a/core/java/android/annotation/StringDef.java
+++ b/core/java/android/annotation/StringDef.java
@@ -26,20 +26,20 @@ import static java.lang.annotation.RetentionPolicy.CLASS;
  * type and that its value should be one of the explicitly named constants.
  * 

  * Example:
- * 
{@code
+ * 

  *  @Retention(SOURCE)
- *  @StringDef({
+ *  @StringDef({
  *     POWER_SERVICE,
  *     WINDOW_SERVICE,
  *     LAYOUT_INFLATER_SERVICE
- *  })
- *  public @interface ServiceName {}
+ *  })
+ *  public @interface ServiceName {}
  *  public static final String POWER_SERVICE = "power";
  *  public static final String WINDOW_SERVICE = "window";
  *  public static final String LAYOUT_INFLATER_SERVICE = "layout_inflater";
  *  ...
- *  public abstract Object getSystemService(@ServiceName String name);
- * }

+ *  public abstract Object getSystemService(@ServiceName String name);
+ * 

  *
  * @hide
  */
diff --git a/core/java/android/annotation/UiThread.java b/core/java/android/annotation/UiThread.java
index b81460023112..53121e7d532f 100644
--- a/core/java/android/annotation/UiThread.java
+++ b/core/java/android/annotation/UiThread.java
@@ -29,10 +29,10 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
  * on the UI thread.
  * 

  * Example:
- * 
{@code
+ * 

  *  @UiThread
- *  public abstract void setText(@NonNull String text) { ... }
- * }

+ *  public abstract void setText(@NonNull String text) { ... }
+ * 

  *
  * {@hide}
  */
diff --git a/core/java/android/annotation/WorkerThread.java b/core/java/android/annotation/WorkerThread.java
index dd12e05ed71a..0d2c43e8fc00 100644
--- a/core/java/android/annotation/WorkerThread.java
+++ b/core/java/android/annotation/WorkerThread.java
@@ -29,10 +29,10 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
  * on a worker thread.
  * 

  * Example:
- * 
{@code
- *  (@WorkerThread
+ * 

+ *  @WorkerThread
  *  protected abstract FilterResults performFiltering(CharSequence constraint);
- * }

+ * 

  *
  * {@hide}
  */
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index f7aee759f3b9..0b94632aa47f 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -81,9 +81,9 @@ public class ActivityManager {
 
     /**
      * {@code
-     * <meta-data>} name for a 'home' Activity that declares a package that is to be
+     * } name for a 'home' Activity that declares a package that is to be
      * uninstalled in lieu of the declaring one.  The package named here must be
-     * signed with the same certificate as the one declaring the {@code <meta-data>}.
+     * signed with the same certificate as the one declaring the {@code }.
      */
     public static final String META_HOME_ALTERNATE = "android.app.home.alternate";
 
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 73bb4266e649..8a87bff2c8b5 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -2891,8 +2891,7 @@ public class Camera {
          * y for the Y plane and row c for the U and V
          * planes:
          *
-         * {@code
-         * 
+         * 
{@code
          * yStride   = (int) ceil(width / 16.0) * 16;
          * uvStride  = (int) ceil( (yStride / 2) / 16.0) * 16;
          * ySize     = yStride * height;
@@ -2900,8 +2899,9 @@ public class Camera {
          * yRowIndex = yStride * y;
          * uRowIndex = ySize + uvSize + uvStride * c;
          * vRowIndex = ySize + uvStride * c;
-         * size      = ySize + uvSize * 2;

+         * size      = ySize + uvSize * 2;
          * }
+         *

          *
          * @param pixel_format the desired preview picture format, defined by
          *   one of the {@link android.graphics.ImageFormat} constants.  (E.g.,
diff --git a/core/java/android/hardware/package.html b/core/java/android/hardware/package.html
index 5b04da11e4fe..ee54476d97b8 100644
--- a/core/java/android/hardware/package.html
+++ b/core/java/android/hardware/package.html
@@ -4,6 +4,6 @@
 not all Android-powered devices support all hardware features, so you should declare hardware
 that your application requires using the {@code
-<uses-feature>} manifest element.

+} manifest element.

 
 
diff --git a/core/java/android/net/PskKeyManager.java b/core/java/android/net/PskKeyManager.java
index f82e6355961c..667abb49a81c 100644
--- a/core/java/android/net/PskKeyManager.java
+++ b/core/java/android/net/PskKeyManager.java
@@ -97,7 +97,7 @@ import javax.net.ssl.SSLEngine;
  *
  * SSLContext sslContext = SSLContext.getInstance("TLS");
  * sslContext.init(
- *         new KeyManager[] {pskKeyManager},
+ *         new KeyManager[] { pskKeyManager },
  *         new TrustManager[0], // No TrustManagers needed for TLS-PSK
  *         null // Use the default source of entropy
  *         );
diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java
index b492debdd7c8..ff6eb40f4408 100644
--- a/core/java/android/nfc/NfcAdapter.java
+++ b/core/java/android/nfc/NfcAdapter.java
@@ -914,7 +914,7 @@ public final class NfcAdapter {
      *
      * 
If you want to prevent the Android OS from sending default NDEF
      * messages completely (for all activities), you can include a
-     * {@code <meta-data>} element inside the {@code <application>}
+     * {@code } element inside the {@code }
      * element of your AndroidManifest.xml file, like this:
      * 
      * <application ...>
@@ -1022,7 +1022,7 @@ public final class NfcAdapter {
      *
      * 
If you want to prevent the Android OS from sending default NDEF
      * messages completely (for all activities), you can include a
-     * {@code <meta-data>} element inside the {@code <application>}
+     * {@code } element inside the {@code }
      * element of your AndroidManifest.xml file, like this:
      * 
      * <application ...>
diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java
index 1cffa8321dfb..a0a006044751 100644
--- a/core/java/android/os/PowerManager.java
+++ b/core/java/android/os/PowerManager.java
@@ -96,7 +96,7 @@ import android.util.Log;
  * 
  * 

  * Any application using a WakeLock must request the {@code android.permission.WAKE_LOCK}
- * permission in an {@code <uses-permission>} element of the application's manifest.
+ * permission in an {@code } element of the application's manifest.
  * 

  */
 public final class PowerManager {
@@ -1033,7 +1033,7 @@ public final class PowerManager {
      * to have the device stay on.
      * 

      * Any application using a WakeLock must request the {@code android.permission.WAKE_LOCK}
-     * permission in an {@code <uses-permission>} element of the application's manifest.
+     * permission in an {@code } element of the application's manifest.
      * Obtain a wake lock by calling {@link PowerManager#newWakeLock(int, String)}.
      * 

      * Call {@link #acquire()} to acquire the wake lock and force the device to stay
diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java
index 01718694e811..bb46e8302de6 100644
--- a/core/java/android/service/dreams/DreamService.java
+++ b/core/java/android/service/dreams/DreamService.java
@@ -98,7 +98,7 @@ import com.android.internal.util.DumpUtils.Dump;
  * </service>
  * 

  *
- * 
If specified with the {@code <meta-data>} element,
+ * 
If specified with the {@code } element,
  * additional information for the dream is defined using the
  * {@link android.R.styleable#Dream <dream>} element in a separate XML file.
  * Currently, the only addtional
diff --git a/core/java/android/service/textservice/package.html b/core/java/android/service/textservice/package.html
index 0b5113b11b9d..41249228af77 100644
--- a/core/java/android/service/textservice/package.html
+++ b/core/java/android/service/textservice/package.html
@@ -12,9 +12,9 @@ spelling suggestions as {@link android.view.textservice.SuggestionsInfo} objects
 
 
Applications with a spell checker service must declare the {@link
 android.Manifest.permission#BIND_TEXT_SERVICE} permission as required by the service. The service
-must also declare an intent filter with {@code <action
+must also declare an intent filter with {@code } as the intent’s action and should
-include a {@code <meta-data>} element that declares configuration information for the spell
+include a {@code } element that declares configuration information for the spell
 checker. For example:

 
 
diff --git a/core/java/android/speech/RecognitionListener.java b/core/java/android/speech/RecognitionListener.java
index bdb3ba9bbc50..1ffdf0823f5f 100644
--- a/core/java/android/speech/RecognitionListener.java
+++ b/core/java/android/speech/RecognitionListener.java
@@ -69,7 +69,7 @@ public interface RecognitionListener {
      * Called when recognition results are ready.
      * 
      * @param results the recognition results. To retrieve the results in {@code
-     *        ArrayList<String>} format use {@link Bundle#getStringArrayList(String)} with
+     *        ArrayList} format use {@link Bundle#getStringArrayList(String)} with
      *        {@link SpeechRecognizer#RESULTS_RECOGNITION} as a parameter. A float array of
      *        confidence values might also be given in {@link SpeechRecognizer#CONFIDENCE_SCORES}.
      */
diff --git a/core/java/android/speech/RecognitionService.java b/core/java/android/speech/RecognitionService.java
index 3e74d220c0ba..674f809ef0f5 100644
--- a/core/java/android/speech/RecognitionService.java
+++ b/core/java/android/speech/RecognitionService.java
@@ -303,7 +303,7 @@ public abstract class RecognitionService extends Service {
          * The service should call this method when recognition results are ready.
          * 
          * @param results the recognition results. To retrieve the results in {@code
-         *        ArrayList<String>} format use {@link Bundle#getStringArrayList(String)} with
+         *        ArrayList} format use {@link Bundle#getStringArrayList(String)} with
          *        {@link SpeechRecognizer#RESULTS_RECOGNITION} as a parameter
          */
         public void results(Bundle results) throws RemoteException {
diff --git a/core/java/android/text/format/Time.java b/core/java/android/text/format/Time.java
index d567d90dfe70..66e2ec30a697 100644
--- a/core/java/android/text/format/Time.java
+++ b/core/java/android/text/format/Time.java
@@ -842,7 +842,7 @@ public class Time {
      * the given time.
      *
      * 

-     * Equivalent to {@code Time.compare(this, that) < 0}. See
+     * Equivalent to {@code Time.compare(this, that) < 0}. See
      * {@link #compare(Time, Time)} for details.
      *
      * @param that a given Time object to compare against
@@ -858,7 +858,7 @@ public class Time {
      * the given time.
      *
      * 

-     * Equivalent to {@code Time.compare(this, that) > 0}. See
+     * Equivalent to {@code Time.compare(this, that) > 0}. See
      * {@link #compare(Time, Time)} for details.
      *
      * @param that a given Time object to compare against
diff --git a/core/java/android/transition/ArcMotion.java b/core/java/android/transition/ArcMotion.java
index 70dfe7f3a7cf..fa4c8d29897d 100644
--- a/core/java/android/transition/ArcMotion.java
+++ b/core/java/android/transition/ArcMotion.java
@@ -36,13 +36,12 @@ import android.util.AttributeSet;
  * arc between two points.
  * 

  * 
This may be used in XML as an element inside a transition.

- * 
- * {@code
- * <changeBounds>
- *   <arcMotion android:minimumHorizontalAngle="15"
+ * 
{@code
+ * 
+ *   
- * </changeBounds>}
+ * }
  * 

  */
 public class ArcMotion extends PathMotion {
diff --git a/core/java/android/transition/PathMotion.java b/core/java/android/transition/PathMotion.java
index 651223db3230..01102a4dd660 100644
--- a/core/java/android/transition/PathMotion.java
+++ b/core/java/android/transition/PathMotion.java
@@ -31,9 +31,9 @@ import android.util.AttributeSet;
  * 
This may be used in XML as an element inside a transition.

  * 
  * {@code
- * <changeBounds>
- *     <pathMotion class="my.app.transition.MyPathMotion"/>
- * </changeBounds>
+ * 
+ *     
+ * 
  * }
  * 

  */
diff --git a/core/java/android/transition/PatternPathMotion.java b/core/java/android/transition/PatternPathMotion.java
index 773c387b7d96..f23863f8851f 100644
--- a/core/java/android/transition/PatternPathMotion.java
+++ b/core/java/android/transition/PatternPathMotion.java
@@ -30,11 +30,10 @@ import android.util.PathParser;
  * The starting point of the Path will be moved to the origin and the end point will be scaled
  * and rotated so that it matches with the target end point.
  * 
This may be used in XML as an element inside a transition.

- * 
- * {@code
- * <changeBounds>
- *     <patternPathMotion android:patternPathData="M0 0 L0 100 L100 100"/>
- * </changeBounds>}
+ * 
{@code
+ * 
+ *     
+ * }
  * 

  */
 public class PatternPathMotion extends PathMotion {
diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java
index e958058c28f9..48614c0c1014 100644
--- a/core/java/android/transition/Transition.java
+++ b/core/java/android/transition/Transition.java
@@ -2052,18 +2052,18 @@ public abstract class Transition implements Cloneable {
      *     attributed with the fully-described class name. For example:

      * 
      * {@code
-     * <changeBounds>
-     *     <pathMotion class="my.app.transition.MyPathMotion"/>
-     * </changeBounds>
+     * 
+     *     
+     * 
      * }
      * 

      * 
or

      * 
      * {@code
-     * <changeBounds>
-     *   <arcMotion android:minimumHorizontalAngle="15"
+     * 
+     *   
-     * </changeBounds>
+     * 
      * }
      * 

      *
@@ -2090,20 +2090,18 @@ public abstract class Transition implements Cloneable {
      *     the built-in tags arcMotion or patternPathMotion or it can
      *     be a custom PathMotion using pathMotion with the class
      *     attributed with the fully-described class name. For example:

-     * 
-     * {@code
-     * <changeBounds>
-     *     <pathMotion class="my.app.transition.MyPathMotion"/>
-     * </changeBounds>}
+     * 
{@code
+     * 
+     *     
+     * }
      * 

      * 
or

-     * 
-     * {@code
-     * <changeBounds>
-     *   <arcMotion android:minimumHorizontalAngle="15"
+     * 
{@code
+     * 
+     *   
-     * </changeBounds>}
+     * }
      * 

      *
      * @return The algorithm object used to interpolate along two dimensions.
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index ab1943c49c6e..956fde4f1d05 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -580,7 +580,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * 

  * Tags may be specified with character sequence values in layout XML as either
  * a single tag using the {@link android.R.styleable#View_tag android:tag}
- * attribute or multiple tags using the {@code <tag>} child element:
+ * attribute or multiple tags using the {@code } child element:
  * 
  *     <View ...
  *           android:tag="@string/mytag_value" />
diff --git a/core/java/android/view/inputmethod/InputMethodInfo.java b/core/java/android/view/inputmethod/InputMethodInfo.java
index 4ac547a16866..4fc66656f625 100644
--- a/core/java/android/view/inputmethod/InputMethodInfo.java
+++ b/core/java/android/view/inputmethod/InputMethodInfo.java
@@ -48,7 +48,7 @@ import java.util.Map;
 /**
  * This class is used to specify meta information of an input method.
  *
- * 
It should be defined in an XML resource file with an {@code <input-method>} element.
+ * 
It should be defined in an XML resource file with an {@code } element.
  * For more information, see the guide to
  * 
  * Creating an Input Method.

diff --git a/core/java/android/view/inputmethod/InputMethodSubtype.java b/core/java/android/view/inputmethod/InputMethodSubtype.java
index 4ee155c1d4a2..fbaf51c27b61 100644
--- a/core/java/android/view/inputmethod/InputMethodSubtype.java
+++ b/core/java/android/view/inputmethod/InputMethodSubtype.java
@@ -41,7 +41,7 @@ import java.util.Locale;
  * the specified subtype of the designated IME directly.
  *
  * 
It should be defined in an XML resource file of the input method with the
- * <subtype> element, which resides within an {@code <input-method>} element.
+ * <subtype> element, which resides within an {@code } element.
  * For more information, see the guide to
  * 
  * Creating an Input Method.

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 358f939c62e2..7443bce5e4d0 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -93,7 +93,7 @@ import java.util.Map;
  * 

  * 
See {@link android.content.Intent} for more information.

  *
- * 
To provide a WebView in your own Activity, include a {@code <WebView>} in your layout,
+ * 
To provide a WebView in your own Activity, include a {@code } in your layout,
  * or set the entire Activity window as a WebView during {@link
  * android.app.Activity#onCreate(Bundle) onCreate()}:

  * 
diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java
index 04c68ae600ea..2099b040fd0b 100644
--- a/core/java/android/widget/ProgressBar.java
+++ b/core/java/android/widget/ProgressBar.java
@@ -121,7 +121,7 @@ import java.util.ArrayList;
  *     }
  * }

  *
- * 
To add a progress bar to a layout file, you can use the {@code <ProgressBar>} element.
+ * 
To add a progress bar to a layout file, you can use the {@code } element.
  * By default, the progress bar is a spinning wheel (an indeterminate indicator). To change to a
  * horizontal progress bar, apply the {@link android.R.style#Widget_ProgressBar_Horizontal
  * Widget.ProgressBar.Horizontal} style, like so:

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 57338bee6366..aba44a571eaa 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -709,8 +709,8 @@
 
     
     
         
     
diff --git a/core/res/res/values/themes_holo.xml b/core/res/res/values/themes_holo.xml
index d9599b3e1be9..4cbaacb51703 100644
--- a/core/res/res/values/themes_holo.xml
+++ b/core/res/res/values/themes_holo.xml
@@ -46,7 +46,7 @@ please see themes_device_defaults.xml.
          with API level 14, the default system theme is supplied by {@link #Theme_DeviceDefault},
          which might apply a different style on different devices. If you want to ensure that your
          app consistently uses the Holo theme at all times, you must explicitly declare it in your
-         manifest. For example, {@code <application android:theme="@android:style/Theme.Holo">}.
+         manifest. For example, {@code }.
          For more information, read Holo
          Everywhere.

diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml
index a5b8476c4eea..b01109463bff 100644
--- a/core/res/res/values/themes_material.xml
+++ b/core/res/res/values/themes_material.xml
@@ -33,7 +33,7 @@ please see themes_device_defaults.xml.
     
 
{@code android:parentActivityName}

 
The class name of the logical parent of the activity. The name here must match the class
-  name given to the corresponding {@code <activity>} element's
+  name given to the corresponding {@code } element's
   android:name attribute.
 
 
The system reads this attribute to determine which activity should be started when
@@ -708,7 +708,7 @@ This attribute was introduced in API Level 3.
   synthesize a back stack of activities with {@link android.app.TaskStackBuilder}.

 
 
To support API levels 4 - 16, you can also declare the parent activity with a {@code
-<meta-data>} element that specifies a value for {@code "android.support.PARENT_ACTIVITY"}.
+} element that specifies a value for {@code "android.support.PARENT_ACTIVITY"}.
 For example:

 
 <activity
@@ -888,7 +888,7 @@ example, if you declare either {@code "landscape"}, {@code "reverseLandscape"},
 {@code "sensorLandscape"}, then your application will be available only to devices that support
 landscape orientation. However, you should also explicitly declare that
 your application requires either portrait or landscape orientation with the {@code <uses-feature>}
+href="{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code }
 element. For example, <uses-feature
 android:name="android.hardware.screen.portrait"/>. This is purely a filtering behavior
 provided by Google Play (and other services that support it) and the platform itself does not
diff --git a/docs/html/guide/topics/manifest/application-element.jd b/docs/html/guide/topics/manifest/application-element.jd
index e63ba712fd2d..5600b5c5c469 100644
--- a/docs/html/guide/topics/manifest/application-element.jd
+++ b/docs/html/guide/topics/manifest/application-element.jd
@@ -109,7 +109,7 @@ There is no default.  The name must be specified.
 
{@code android:banner}

 
A drawable resource
 providing an extended graphical banner for its associated item. Use with the
-{@code <application>} tag to supply a default banner for all application activities, or with the
+{@code } tag to supply a default banner for all application activities, or with the
 <activity>
 tag to supply a banner for a specific activity.
 
@@ -119,7 +119,7 @@ should only be specified by applications with an activity that handles the
 {@link android.content.Intent#CATEGORY_LEANBACK_LAUNCHER} intent.

 
 
This attribute must be set as a reference to a drawable resource containing
-the image (for example {@code "@drawable/banner"}). There is no default banner.
+the image (for example "@drawable/banner"). There is no default banner.
 

 
 

@@ -197,7 +197,7 @@ each of the application's components.  See the individual
 
 

 This attribute must be set as a reference to a drawable resource containing
-the image (for example {@code "@drawable/icon"}). There is no default icon.
+the image (for example "@drawable/icon"). There is no default icon.
 

 
 
{@code android:isGame}

@@ -252,7 +252,7 @@ it can also be set as a raw string.
 
{@code android:logo}

 
A logo for the application as whole, and the default logo for activities.
 
This attribute must be set as a reference to a drawable resource containing
-the image (for example {@code "@drawable/logo"}).  There is no default logo.

+the image (for example "@drawable/logo").  There is no default logo.

 
 
{@code android:manageSpaceActivity}

 
The fully qualified name of an Activity subclass that the system
diff --git a/docs/html/guide/topics/manifest/category-element.jd b/docs/html/guide/topics/manifest/category-element.jd
index 563ed10d4221..0034119fe7b2 100644
--- a/docs/html/guide/topics/manifest/category-element.jd
+++ b/docs/html/guide/topics/manifest/category-element.jd
@@ -20,10 +20,10 @@ specifications within a filter.

 

 
{@code android:name}

 
The name of the category.  Standard categories are defined in the 
-{@link android.content.Intent} class as {@code CATEGORY_name} 
+{@link android.content.Intent} class as CATEGORY_name
 constants.  The name assigned here can be derived from those constants 
 by prefixing "{@code android.intent.category.}" to the 
-{@code name} that follows {@code CATEGORY_}.  For example,
+name that follows {@code CATEGORY_}.  For example,
 the string value for {@code CATEGORY_LAUNCHER} is 
 "{@code android.intent.category.LAUNCHER}".
 
diff --git a/docs/html/guide/topics/manifest/compatible-screens-element.jd b/docs/html/guide/topics/manifest/compatible-screens-element.jd
index de921d2e03cd..9c7f0365199f 100644
--- a/docs/html/guide/topics/manifest/compatible-screens-element.jd
+++ b/docs/html/guide/topics/manifest/compatible-screens-element.jd
@@ -21,11 +21,11 @@ href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest>description:
 
Specifies each screen configuration with which the application is compatible. Only one instance
-of the {@code <compatible-screens>} element is allowed in the manifest, but it can
+of the <compatible-screens> element is allowed in the manifest, but it can
 contain multiple <screen> elements. Each <screen> element
 specifies a specific screen size-density combination with which the application is compatible.
 
-  
The Android system does not read the {@code <compatible-screens>} manifest
+  
The Android system does not read the {@code } manifest
 element (neither at install-time nor at runtime). This element is informational only and may be used
 by external services (such as Google Play) to better understand the application's compatibility
 with specific screen configurations and enable filtering for users. Any screen configuration that is
@@ -45,14 +45,14 @@ for different screen sizes and densities.

 
   
If you want to set only a minimum screen size for your your application, then you
 should use the {@code
-<supports-screens>} element. For example, if you want your application to be available
+} element. For example, if you want your application to be available
 only for large and xlarge screen devices, the {@code
-<supports-screens>} element allows you to declare that your application does not
+} element allows you to declare that your application does not
 support small and normal screen sizes. External services (such as Google
 Play) will filter your application accordingly. You can also use the {@code
-<supports-screens>} element to declare whether the system should resize your
+} element to declare whether the system should resize your
 application for different screen sizes.

 
   
Also see the Filters on Google Play
@@ -65,10 +65,10 @@ other manifest elements.

 

   

 
-    
{@code <screen>}

+    
{@code }

     
Specifies a single screen configuration with which the application is compatible.
       
At least one instance of this element must be placed inside the {@code
-<compatible-screens>} element. This element must include both the {@code
+} element. This element must include both the {@code
 android:screenSize} and {@code android:screenDensity} attributes (if you do not declare both
 attributes, then the element is ignored).

 
@@ -108,7 +108,7 @@ href="{@docRoot}guide/practices/screens_support.html#range">Supporting Multiple
 
example

 

 
If your application is compatible with only small and normal screens, regardless
-of screen density, then you must specify twelve different {@code <screen>} elements,
+of screen density, then you must specify twelve different {@code } elements,
 because each screen size has six different density configurations. You must declare each one of
 these; any combination of size and density that you do not specify is considered a screen
 configuration with which your application is not compatible. Here's what the manifest
diff --git a/docs/html/guide/topics/manifest/data-element.jd b/docs/html/guide/topics/manifest/data-element.jd
index 77f16dd335ea..30020ade4c77 100644
--- a/docs/html/guide/topics/manifest/data-element.jd
+++ b/docs/html/guide/topics/manifest/data-element.jd
@@ -24,7 +24,7 @@ just a URI, or both a data type and a URI.  A URI is specified by separate
 attributes for each of its parts:
 
 

-{@code <scheme>://<host>:<port>[<path>|<pathPrefix>|<pathPattern>]}

+{@code ://:[||]}

 
 

 These attributes that specify the URL format are optional, but also mutually dependent:
@@ -36,7 +36,7 @@ is not specified for the filter, the {@code port} attribute and all the path att
 
 
 

-All the {@code <data>} elements contained within the same
+All the {@code } elements contained within the same
 <intent-filter> element contribute to
 the same filter.  So, for example, the following filter specification,
 

@@ -55,7 +55,7 @@ the same filter.  So, for example, the following filter specification,
 </intent-filter>

 
 

-You can place any number of {@code <data>} elements inside an
+You can place any number of {@code } elements inside an
 <intent-filter> to give it multiple data
 options.  None of its attributes have default values.
 

@@ -157,7 +157,7 @@ attributes are also specified for the filter.
 The subtype can be the asterisk wildcard ({@code *}) to indicate that any
 subtype matches.
 
-
It's common for an intent filter to declare a {@code <data>} that includes
+
It's common for an intent filter to declare a {@code } that includes
 only the {@code android:mimeType} attribute.

 
 
diff --git a/docs/html/guide/topics/manifest/grant-uri-permission-element.jd b/docs/html/guide/topics/manifest/grant-uri-permission-element.jd
index 217935940543..b2d9bb7a104e 100644
--- a/docs/html/guide/topics/manifest/grant-uri-permission-element.jd
+++ b/docs/html/guide/topics/manifest/grant-uri-permission-element.jd
@@ -26,7 +26,7 @@ If a content provider's } elements.
 Each one can specify only one path (only one of the three possible attributes).
 

 
diff --git a/docs/html/guide/topics/manifest/manifest-intro.jd b/docs/html/guide/topics/manifest/manifest-intro.jd
index d2a930898cd1..c8d68f5f03d5 100644
--- a/docs/html/guide/topics/manifest/manifest-intro.jd
+++ b/docs/html/guide/topics/manifest/manifest-intro.jd
@@ -279,7 +279,7 @@ example, a label and an icon for an activity.  The values of these attributes
 should be localized and therefore set from a resource or theme.  Resource 
 values are expressed in the following format,

 
-
{@code @[package:]type:name}

+
@[package:]type:name

 
 

 where the package name can be omitted if the resource is in the same package 
@@ -295,7 +295,7 @@ Values from a theme are expressed in a similar manner, but with an initial '{@co
 rather than '{@code @}':
 

 
-
{@code ?[package:]type:name}
+
?[package:]type:name
 

 
 
String values

diff --git a/docs/html/guide/topics/manifest/meta-data-element.jd b/docs/html/guide/topics/manifest/meta-data-element.jd
index 241153bc041f..d3b41c391195 100644
--- a/docs/html/guide/topics/manifest/meta-data-element.jd
+++ b/docs/html/guide/topics/manifest/meta-data-element.jd
@@ -20,7 +20,7 @@ parent.link=manifest-intro.html
 
description:

 
A name-value pair for an item of additional, arbitrary data that can
 be supplied to the parent component.  A component element can contain any 
-number of {@code <meta-data>} subelements.  The values from all of
+number of {@code } subelements.  The values from all of
 them are collected in a single {@link android.os.Bundle} object and made 
 available to the component as the 
 {@link android.content.pm.PackageItemInfo#metaData 
@@ -45,7 +45,7 @@ the numeric ID of the resource, not the value stored in the resource:
 
 

 It is highly recommended that you avoid supplying related data as 
-multiple separate {@code <meta-data>} entries. Instead, if you 
+multiple separate {@code } entries. Instead, if you
 have complex data to associate with a component, store it as a resource and 
 use the {@code resource} attribute to inform the component of its ID.
 

diff --git a/docs/html/guide/topics/manifest/provider-element.jd b/docs/html/guide/topics/manifest/provider-element.jd
index f3ffd5883e93..4b5c0c35bc2c 100644
--- a/docs/html/guide/topics/manifest/provider-element.jd
+++ b/docs/html/guide/topics/manifest/provider-element.jd
@@ -40,7 +40,7 @@ parent.link=manifest-intro.html
     Declares a content provider component. A content provider is a subclass of 
     {@link android.content.ContentProvider} that supplies structured access to data managed by the 
     application.  All content providers in your application must be defined in a 
-    {@code <provider>} element in the manifest file; otherwise, the system is unaware of them 
+    {@code } element in the manifest file; otherwise, the system is unaware of them
     and doesn't run them.
     

         You only declare content providers that are part of your application. Content providers in
@@ -100,7 +100,7 @@ content://com.example.project.healthcareprovider/nurses/rn
 The <application> element has its own 
 enabled attribute that applies to all 
 application components, including content providers.  The 
-<application> and {@code <provider>} 
+<application> and {@code }
 attributes must both be "{@code true}" (as they both
 are by default) for the content provider to be enabled.  If either is 
 "{@code false}", the provider is disabled; it cannot be instantiated.
diff --git a/docs/html/guide/topics/manifest/receiver-element.jd b/docs/html/guide/topics/manifest/receiver-element.jd
index df2437e61719..081a191c38e1 100644
--- a/docs/html/guide/topics/manifest/receiver-element.jd
+++ b/docs/html/guide/topics/manifest/receiver-element.jd
@@ -49,7 +49,7 @@ The <
 enabled attribute that applies to all 
 application components, including broadcast receivers.  The 
 <application> and
-{@code <receiver>} attributes must both be "{@code true}" for 
+{@code } attributes must both be "{@code true}" for
 the broadcast receiver to be enabled.  If either is "{@code false}", it is
 disabled; it cannot be instantiated.
 

diff --git a/docs/html/guide/topics/manifest/service-element.jd b/docs/html/guide/topics/manifest/service-element.jd
index e26f26383dd5..fca85f5793c8 100644
--- a/docs/html/guide/topics/manifest/service-element.jd
+++ b/docs/html/guide/topics/manifest/service-element.jd
@@ -31,7 +31,7 @@ operations or a rich communications API that can be called by other
 applications.
 
 

-All services must be represented by {@code <service>} elements in 
+All services must be represented by {@code } elements in
 the manifest file.  Any that are not declared there will not be seen 
 by the system and will never be run.
 

@@ -47,7 +47,7 @@ is "{@code true}".
 The <application> element has its own 
 enabled attribute that applies to all 
 application components, including services.  The 
-<application> and {@code <service>} 
+<application> and {@code }
 attributes must both be "{@code true}" (as they both
 are by default) for the service to be enabled.  If either is 
 "{@code false}", the service is disabled; it cannot be instantiated.
diff --git a/docs/html/guide/topics/manifest/supports-screens-element.jd b/docs/html/guide/topics/manifest/supports-screens-element.jd
index bbeceb705404..a4546fa98f12 100644
--- a/docs/html/guide/topics/manifest/supports-screens-element.jd
+++ b/docs/html/guide/topics/manifest/supports-screens-element.jd
@@ -38,7 +38,7 @@ layout resources. For instance, you might want to modify the layout of an ac
 when it is on a tablet compared to when running on a handset device.

 
 
However, if your application does not work well when resized to fit different screen sizes, you
-can use the attributes of the {@code <supports-screens>} element to control whether your
+can use the attributes of the {@code } element to control whether your
 application should be distributed to smaller screens or have its UI scaled up ("zoomed") to fit
 larger screens using the system's screen compatibility mode. When you
@@ -152,7 +152,7 @@ orientation.

 not need to use this attribute. Otherwise, you should use a value for this attribute that
 matches the smallest value used by your application for the 
-smallest screen width qualifier ({@code sw<N>dp}).

+smallest screen width qualifier ({@code swdp}).

 
   
Caution: The Android system does not pay attention to this
 attribute, so it does not affect how your application behaves at runtime. Instead, it is used
diff --git a/docs/html/guide/topics/manifest/uses-configuration-element.jd b/docs/html/guide/topics/manifest/uses-configuration-element.jd
index 15fd49c1aa70..f5516723c306 100644
--- a/docs/html/guide/topics/manifest/uses-configuration-element.jd
+++ b/docs/html/guide/topics/manifest/uses-configuration-element.jd
@@ -38,7 +38,7 @@ users and support devices that provide d-pad input in addition to or instead of
 information about how to support d-pad input in your app, read Enabling Focus Navigation. If
 your app absolutely cannot function without a touchscreen, then instead use the {@code <uses-feature>} tag to
+"{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code } tag to
 declare the required touchscreen type, ranging from {@code "android.hardware.faketouch"} for basic
 touch-style events to more advanced touch types such as {@code
 "android.hardware.touchscreen.multitouch.jazzhand"} for distinct input from multiple fingers.

@@ -160,7 +160,7 @@ The value must be one of the following strings:
       
Note: If some type of touch input is required for your app,
       you should instead use the
       {@code
-      <uses-feature>} tag to declare the required touchscreen
+      } tag to declare the required touchscreen
       type, beginning with {@code "android.hardware.faketouch"} for basic touch-style events.

    
 
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd
index 21e3057aaf04..e746a671a4d1 100644
--- a/docs/html/guide/topics/manifest/uses-feature-element.jd
+++ b/docs/html/guide/topics/manifest/uses-feature-element.jd
@@ -719,10 +719,10 @@ href="{@docRoot}guide/topics/manifest/activity-element.html#screen">{@code
 android:screenOrientation} with either {@code "landscape"}, {@code "reverseLandscape"}, or
 {@code "sensorLandscape"}, then your application will be available only to devices that support
 landscape orientation. As a best practice, you should still declare your requirement for this
-orientation using a {@code <uses-feature>} element. If you declare an orientation for your
+orientation using a {@code } element. If you declare an orientation for your
 activity using {@code
 android:screenOrientation}, but don't actually require it, you can disable the
-requirement by declaring the orientation with a {@code <uses-feature>} element and include
+requirement by declaring the orientation with a {@code } element and include
 {@code android:required="false"}.

     
For backwards compatibility, any device running a platform version that supports only API
 level 12 or lower is assumed to support both landscape and portrait.

@@ -780,9 +780,9 @@ devices that offer more complex touch interfaces.

   
Note: Because applications require the {@code
 android.hardware.touchscreen} feature by default, if you want your application to be available to
 devices that provide a fake touch interface, you must also explicitly declare that a touch screen is
-not required by declaring {@code <uses-feature
+not required by declaring <uses-feature
 android:name="android.hardware.touchscreen" android:required="false"
-/>}

+/>

 
 
 
diff --git a/docs/html/guide/topics/media/mediarouter.jd b/docs/html/guide/topics/media/mediarouter.jd
index e0bf88914899..54d52a643892 100644
--- a/docs/html/guide/topics/media/mediarouter.jd
+++ b/docs/html/guide/topics/media/mediarouter.jd
@@ -95,7 +95,7 @@ page.tags="mediarouter","cast","chromecast","wireless display","miracast"
   {@link android.support.v7.media.MediaRouteProvider} and distributing it as an application.
   For more information on implementing a media route provider, see the {@link
   android.support.v7.media.MediaRouteProvider} reference documentation and the v7-mediarouter
-  support library sample {@code <sdk>/extras/android/compatibility/v7/mediarouter}.
+  support library sample {@code /extras/android/compatibility/v7/mediarouter}.
 

 
 
@@ -540,7 +540,7 @@ private void updateRemotePlayer(RouteInfo route) {
   multiple media items for playback and management of the media queue. For a comprehensive sample
   implementation of these features, see {@code SampleMediaRouterActivity} and its associated
   classes in the v7 mediarouter support library sample
-  {@code <sdk>/extras/android/compatibility/v7/mediarouter}.
+  {@code /extras/android/compatibility/v7/mediarouter}.
 

 
 

diff --git a/docs/html/guide/topics/providers/document-provider.jd b/docs/html/guide/topics/providers/document-provider.jd
index 8ea08bdf4a36..9d036166e113 100644
--- a/docs/html/guide/topics/providers/document-provider.jd
+++ b/docs/html/guide/topics/providers/document-provider.jd
@@ -282,7 +282,7 @@ intent, it launches a picker that displays all matching document providers.
 
  • Adding the category {@link android.content.Intent#CATEGORY_OPENABLE} to the
 intent filters the results to display only documents that can be opened, such as image files.
    • 
 
-
  • The statement {@code intent.setType("image/*")} further filters to
+
  • The statement intent.setType("image/*") further filters to
 display only documents that have the image MIME data type.
    • 
 
 
@@ -580,7 +580,7 @@ This restriction is important for security.
 
 
  • The {@code android:enabled} attribute set to a boolean value defined in a resource
 file. The purpose of this attribute is to disable the provider on devices running Android 4.3 or lower.
-For example, {@code android:enabled="@bool/atLeastKitKat"}. In
+For example, android:enabled="@bool/atLeastKitKat". In
 addition to including this attribute in the manifest, you need to do the following:
 
      
 
    • In your {@code bool.xml} resources file under {@code res/values/}, add
diff --git a/docs/html/guide/topics/resources/accessing-resources.jd b/docs/html/guide/topics/resources/accessing-resources.jd
index 8f99653f751b..b971238c1773 100644
--- a/docs/html/guide/topics/resources/accessing-resources.jd
+++ b/docs/html/guide/topics/resources/accessing-resources.jd
@@ -9,8 +9,8 @@ parent.link=index.html
   
        
     
      • Resources can be referenced from code using integers from {@code R.java}, such as
 {@code R.drawable.myimage}
        • 
-    
      • Resources can be referenced from resources using a special XML syntax, such as {@code
-@drawable/myimage}
        • 
+    
      • Resources can be referenced from resources using a special XML syntax, such as
+@drawable/myimage
        • 
     
      • You can also access your app resources with methods in
 {@link android.content.res.Resources}
        • 
   
      
@@ -129,10 +129,10 @@ android.content.res.Resources#openRawResource(int) openRawResource()}.
      
 
    • 
 
 
      
-  
    • {@code <package_name>} is the name of the package in which the resource is located (not
+  
    • {@code } is the name of the package in which the resource is located (not
 required when referencing resources from your own package).
      • 
-  
    • {@code <resource_type>} is the {@code R} subclass for the resource type.
      • 
-  
    • {@code <resource_name>} is either the resource filename
+  
    • {@code } is the {@code R} subclass for the resource type.
      • 
+  
    • {@code } is either the resource filename
 without the extension or the {@code android:name} attribute value in the XML element (for simple
 values).
      • 
 
    
@@ -210,11 +210,11 @@ a string resource for the button text:
    
 
    
 
 
      
-  
    • {@code <package_name>} is the name of the package in which the resource is located (not
+  
    • {@code } is the name of the package in which the resource is located (not
 required when referencing resources from the same package)
      • 
-  
    • {@code <resource_type>} is the
+  
    • {@code } is the
 {@code R} subclass for the resource type
      • 
-  
    • {@code <resource_name>} is either the resource filename
+  
    • {@code } is either the resource filename
 without the extension or the {@code android:name} attribute value in the XML element (for simple
 values).
      • 
 
    
@@ -295,7 +295,7 @@ current theme, instead of supplying a hard-coded value. Referencing a style attr
 essentially says, "use the style that is defined by this attribute, in the current theme."
    
 
 
    To reference a style attribute, the name syntax is almost identical to the normal resource
-format, but instead of the at-symbol ({@code @}), use a question-mark ({@code ?}), and the
+format, but instead of the at-symbol (@), use a question-mark ({@code ?}), and the
 resource type portion is optional. For instance:
    
 
 
    diff --git a/docs/html/guide/topics/resources/color-list-resource.jd b/docs/html/guide/topics/resources/color-list-resource.jd
index b20915c36d67..61f6665558d9 100644
--- a/docs/html/guide/topics/resources/color-list-resource.jd
+++ b/docs/html/guide/topics/resources/color-list-resource.jd
@@ -20,7 +20,7 @@ android.widget.Button} widget can exist in one of several different states (pres
 or niether) and, using a color state list, you can provide a different color during each state.
    
 
 
    You can describe the state list in an XML file. Each color is defined in an {@code
-<item>} element inside a single {@code <selector>} element. Each {@code <item>}
+} element inside a single {@code } element. Each {@code }
 uses various attributes to describe the state in which it should be used.
    
 
 
    During each state change, the state list is traversed top to bottom and the first item that
@@ -69,7 +69,7 @@ In XML: @[package:]color/filename
 
   
    <selector>
    
     
    Required. This must be the root element. Contains one or more {@code
-<item>} elements.
+} elements.
       
    attributes:
    
       
    
         
    xmlns:android
    
diff --git a/docs/html/guide/topics/resources/drawable-resource.jd b/docs/html/guide/topics/resources/drawable-resource.jd
index 06bd2d07314b..dd2c4c28effd 100644
--- a/docs/html/guide/topics/resources/drawable-resource.jd
+++ b/docs/html/guide/topics/resources/drawable-resource.jd
@@ -139,11 +139,11 @@ Drawable drawable = res.{@link android.content.res.Resources#getDrawable(int) ge
 
    An XML bitmap is a resource defined in XML that points to a bitmap file. The effect is an alias for a
 raw bitmap file. The XML can specify additional properties for the bitmap such as dithering and tiling.
    
 
-
    Note: You can use a {@code <bitmap>} element as a child of
-an {@code <item>} element. For
+
    Note: You can use a {@code } element as a child of
+an {@code } element. For
 example, when creating a state list or layer list,
 you can exclude the {@code android:drawable}
-attribute from an {@code <item>} element and nest a {@code <bitmap>} inside it
+attribute from an {@code } element and nest a {@code } inside it
 that defines the drawable item.
    
 
 
    
@@ -448,8 +448,8 @@ screen).
    
 that manages an array of other drawables. Each drawable in the list is drawn in the order of the
 list—the last drawable in the list is drawn on top.
    
 
-
    Each drawable is represented by an {@code <item>} element inside a single {@code
-<layer-list>} element.
    
+
    Each drawable is represented by an {@code } element inside a single {@code
+} element.
    
 
 
    
 
@@ -492,7 +492,7 @@ In XML: @[package:]drawable/filename
 
   
    <layer-list>
    
     
    Required. This must be the root element. Contains one or more {@code
-<item>} elements.
+} elements.
       
    attributes:
    
       
    
         
    xmlns:android
    
@@ -502,7 +502,7 @@ In XML: @[package:]drawable/filename
     
    
   
    <item>
    
     
    Defines a drawable to place in the layer drawable, in a position defined by its attributes.
-Must be a child of a <selector> element. Accepts child {@code <bitmap>}
+Must be a child of a <selector> element. Accepts child {@code }
 elements.
       
    attributes:
    
       
    
@@ -528,15 +528,15 @@ View.findViewById()} or {@link android.app.Activity#findViewById(int) Activity.f
       
    All drawable items are scaled to fit the size of the containing View, by default. Thus,
 placing your images in a layer list at different positions might increase the size of the View and
 some images scale as appropriate. To avoid
-scaling items in the list, use a {@code <bitmap>} element inside the {@code
-<item>} element to specify the drawable and define the gravity to something that does not
-scale, such as {@code "center"}. For example, the following {@code <item>} defines an item
+scaling items in the list, use a {@code } element inside the {@code
+} element to specify the drawable and define the gravity to something that does not
+scale, such as {@code "center"}. For example, the following {@code } defines an item
 that scales to fit its container View:
    
 
     <item android:drawable="@drawable/image" />
 
    
 
-
    To avoid scaling, the following example uses a {@code <bitmap>} element with centered
+
    To avoid scaling, the following example uses a {@code } element with centered
 gravity:
    
 
     <item>
@@ -569,7 +569,7 @@ gravity:
    
     </item>
 </layer-list>
 
    
-
    Notice that this example uses a nested {@code <bitmap>} element to define the drawable
+
    Notice that this example uses a nested {@code } element to define the drawable
 resource for each item with a "center" gravity. This ensures that none of the images are scaled to
 fit the size of the container, due to resizing caused by the offset images.
    
 
@@ -611,7 +611,7 @@ or niether) and, using a state list drawable, you can provide a different backgr
 state.
    
 
 
    You can describe the state list in an XML file. Each graphic is represented by an {@code
-<item>} element inside a single {@code <selector>} element. Each {@code <item>}
+} element inside a single {@code } element. Each {@code }
 uses various attributes to describe the state in which it should be used as the graphic for the
 drawable.
    
 
@@ -666,7 +666,7 @@ In XML: @[package:]drawable/filename
 
   
    <selector>
    
     
    Required. This must be the root element. Contains one or more {@code
-<item>} elements.
+} elements.
       
    attributes:
    
       
    
         
    xmlns:android
    
@@ -828,7 +828,7 @@ In XML: @[package:]drawable/filename
 
    
 
   
    <level-list>
    
-  
    This must be the root element. Contains one or more {@code <item>} elements.
+  
    This must be the root element. Contains one or more {@code } elements.
     
    attributes:
    
     
    
       
    xmlns:android
    
@@ -895,8 +895,8 @@ android.widget.ImageView#setImageLevel(int) setImageLevel()}.
    
 
    A {@link android.graphics.drawable.TransitionDrawable} is a drawable object
 that can cross-fade between the two drawable resources.
    
 
-
    Each drawable is represented by an {@code <item>} element inside a single {@code
-<transition>} element. No more than two items are supported. To transition forward, call
+
    Each drawable is represented by an {@code } element inside a single {@code
+} element. No more than two items are supported. To transition forward, call
 {@link android.graphics.drawable.TransitionDrawable#startTransition(int) startTransition()}. To
 transition backward, call {@link android.graphics.drawable.TransitionDrawable#reverseTransition(int)
 reverseTransition()}.
    
@@ -942,7 +942,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" >
 
   
    <transition>
    
     
    Required. This must be the root element. Contains one or more {@code
-<item>} elements.
+} elements.
       
    attributes:
    
       
    
         
    xmlns:android
    
@@ -952,7 +952,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" >
     
    
   
    <item>
    
     
    Defines a drawable to use as part of the drawable transition.
-Must be a child of a <transition> element. Accepts child {@code <bitmap>}
+Must be a child of a <transition> element. Accepts child {@code }
 elements.
       
    attributes:
    
       
    
@@ -1516,7 +1516,7 @@ In XML: @[package:]drawable/filename
                 An oval shape that fits the dimensions of the containing View.
             {@code "line"}
                 A horizontal line that spans the width of the containing View. This
-                shape requires the {@code <stroke>} element to define the width of the
+                shape requires the {@code } element to define the width of the
                 line.
             {@code "ring"}
                 A ring shape.
diff --git a/docs/html/guide/topics/resources/layout-resource.jd b/docs/html/guide/topics/resources/layout-resource.jd
index 366ddc89c910..8c5708a4b122 100644
--- a/docs/html/guide/topics/resources/layout-resource.jd
+++ b/docs/html/guide/topics/resources/layout-resource.jd
@@ -54,7 +54,7 @@ In XML: @[package:]layout/filename
 
    
 
    Note: The root element can be either a
 {@link android.view.ViewGroup}, a {@link android.view.View}, or a {@code <merge>} element, but there must be only
+href="#merge-element">{@code } element, but there must be only
 one root element and it must contain the {@code xmlns:android} attribute with the {@code android}
 namespace as shown.
    
 
diff --git a/docs/html/guide/topics/resources/more-resources.jd b/docs/html/guide/topics/resources/more-resources.jd
index b5f449a18ada..1afbf70731e4 100644
--- a/docs/html/guide/topics/resources/more-resources.jd
+++ b/docs/html/guide/topics/resources/more-resources.jd
@@ -34,13 +34,13 @@ for an array of drawables).
 
    Note: A bool is a simple resource that is referenced
 using the value provided in the {@code name} attribute (not the name of the XML file). As
 such, you can combine bool resources with other simple resources in the one XML file,
-under one {@code <resources>} element.
    
+under one {@code } element.
    
 
 
    
 
 
    file location:
    
 
    res/values/filename.xml
    
-The filename is arbitrary. The {@code <bool>} element's {@code name} will be used as the resource
+The filename is arbitrary. The {@code } element's {@code name} will be used as the resource
 ID.
    
 
 
    resource reference:
    
@@ -130,13 +130,13 @@ Alpha-Red-Green-Blue information in one of the following formats:
    
 
    Note: A color is a simple resource that is referenced
 using the value provided in the {@code name} attribute (not the name of the XML file). As
 such, you can combine color resources with other simple resources in the one XML file,
-under one {@code <resources>} element.
    
+under one {@code } element.
    
 
 
    
 
 
    file location:
    
 
    res/values/colors.xml
    
-The filename is arbitrary. The {@code <color>} element's {@code name} will be used as the
+The filename is arbitrary. The {@code } element's {@code name} will be used as the
 resource ID.
    
 
 
    resource reference:
    
@@ -244,13 +244,13 @@ devices.
 
    Note: A dimension is a simple resource that is referenced
 using the value provided in the {@code name} attribute (not the name of the XML file). As
 such, you can combine dimension resources with other simple resources in the one XML file,
-under one {@code <resources>} element.
    
+under one {@code } element.
    
 
 
    
 
 
    file location:
    
 
    res/values/filename.xml
    
-The filename is arbitrary. The {@code <dimen>} element's {@code name} will be used as the
+The filename is arbitrary. The {@code } element's {@code name} will be used as the
 resource ID.
    
 
 
    resource reference:
    
@@ -329,7 +329,7 @@ float fontSize = res.{@link android.content.res.Resources#getDimension(int) getD
 
 
    ID
    
 
-
    A unique resource ID defined in XML. Using the name you provide in the {@code <item>}
+
    A unique resource ID defined in XML. Using the name you provide in the {@code }
 element, the Android developer tools create a unique integer in your project's {@code
 R.java} class, which you can use as an
 identifier for an application resources (for example, a {@link android.view.View} in your UI layout)
@@ -339,7 +339,7 @@ result code).
    
 
    Note: An ID is a simple resource that is referenced
 using the value provided in the {@code name} attribute (not the name of the XML file). As
 such, you can combine ID resources with other simple resources in the one XML file,
-under one {@code <resources>} element. Also, remember that an ID resources does not reference
+under one {@code } element. Also, remember that an ID resources does not reference
 an actual resource item; it is simply a unique ID that you can attach to other resources or use
 as a unique integer in your application.
    
 
@@ -446,13 +446,13 @@ protected Dialog {@link android.app.Activity#onCreateDialog(int)}(int id) {
 
    Note: An integer is a simple resource that is referenced
 using the value provided in the {@code name} attribute (not the name of the XML file). As
 such, you can combine integer resources with other simple resources in the one XML file,
-under one {@code <resources>} element.
    
+under one {@code } element.
    
 
 
    
 
 
    file location:
    
 
    res/values/filename.xml
    
-The filename is arbitrary. The {@code <integer>} element's {@code name} will be used as the
+The filename is arbitrary. The {@code } element's {@code name} will be used as the
 resource ID.
    
 
 
    resource reference:
    
@@ -525,14 +525,14 @@ int maxSpeed = res.{@link android.content.res.Resources#getInteger(int) getInteg
 
    Note: An integer array is a simple resource that is referenced
 using the value provided in the {@code name} attribute (not the name of the XML file). As
 such, you can combine integer array resources with other simple resources in the one XML file,
-under one {@code <resources>} element.
    
+under one {@code } element.
    
 
 
 
    
 
 
    file location:
    
 
    res/values/filename.xml
    
-The filename is arbitrary. The {@code <integer-array>} element's {@code name} will be used as the
+The filename is arbitrary. The {@code } element's {@code name} will be used as the
 resource ID.
    
 
 
    compiled resource datatype:
    
@@ -566,7 +566,7 @@ In XML: @[package:]array.integer_array_name
       
    No attributes.
    
     
   
    <integer-array>
    
-    
    Defines an array of integers. Contains one or more child {@code <item>} elements.
+    
    Defines an array of integers. Contains one or more child {@code } elements.
       
    attributes:
    
       
    
         
    android:name
    
@@ -576,7 +576,7 @@ ID to reference the array.
    
     
   
    <item>
    
     
    An integer. The value can be a reference to another
-integer resource. Must be a child of a {@code <integer-array>} element.
+integer resource. Must be a child of a {@code } element.
       
    No attributes.
    
     
    
 
    
@@ -620,14 +620,14 @@ each item with the {@link android.content.res.TypedArray}'s {@code get...()} met
 
    Note: A typed array is a simple resource that is referenced
 using the value provided in the {@code name} attribute (not the name of the XML file). As
 such, you can combine typed array resources with other simple resources in the one XML file,
-under one {@code <resources>} element.
    
+under one {@code } element.
    
 
 
 
    
 
 
    file location:
    
 
    res/values/filename.xml
    
-The filename is arbitrary. The {@code <array>} element's {@code name} will be used as the
+The filename is arbitrary. The {@code } element's {@code name} will be used as the
 resource ID.
    
 
 
    compiled resource datatype:
    
@@ -660,7 +660,7 @@ In XML: @[package:]array.array_name
       
    No attributes.
    
     
   
    <array>
    
-    
    Defines an array. Contains one or more child {@code <item>} elements.
+    
    Defines an array. Contains one or more child {@code } elements.
       
    attributes:
    
       
    
         
    android:name
    
@@ -670,7 +670,7 @@ ID to reference the array.
    
     
   
    <item>
    
     
    A generic resource. The value can be a reference to a resource or a simple data type.
-Must be a child of an {@code <array>} element.
+Must be a child of an {@code } element.
       
    No attributes.
    
     
    
 
    
diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd
index c179a2e8cae4..c919ed5e777d 100644
--- a/docs/html/guide/topics/resources/providing-resources.jd
+++ b/docs/html/guide/topics/resources/providing-resources.jd
@@ -148,7 +148,7 @@ Menu. See Menu Resource.
     raw/
     
    Arbitrary files to save in their raw form. To open these resources with a raw
 {@link java.io.InputStream}, call {@link android.content.res.Resources#openRawResource(int)
-Resources.openRawResource()} with the resource ID, which is {@code R.raw.filename}.
    
+Resources.openRawResource()} with the resource ID, which is R.raw.filename.
    
       
    However, if you need access to original file names and file hierarchy, you might consider
 saving some resources in the {@code
 assets/} directory (instead of {@code res/raw/}). Files in {@code assets/} are not given a
@@ -160,9 +160,9 @@ resource ID, so you can read them only using {@link android.content.res.AssetMan
     
    XML files that contain simple values, such as strings, integers, and colors.
    
       
    Whereas XML resource files in other {@code res/} subdirectories define a single resource
 based on the XML filename, files in the {@code values/} directory describe multiple resources.
-For a file in this directory, each child of the {@code <resources>} element defines a single
-resource. For example, a {@code <string>} element creates an
-{@code R.string} resource and a  {@code <color>} element creates an {@code R.color}
+For a file in this directory, each child of the {@code } element defines a single
+resource. For example, a {@code } element creates an
+{@code R.string} resource and a  {@code } element creates an {@code R.color}
 resource.
    
       
    Because each resource is defined with its own XML element, you can name the file
 whatever you want and place different resource types in one file. However, for clarity, you might
@@ -229,15 +229,15 @@ resources for your application.
    
 
 
    To specify configuration-specific alternatives for a set of resources:
    
 
      
-  
    1. Create a new directory in {@code res/} named in the form {@code
-<resources_name>-<config_qualifier>}.
+  
    2. Create a new directory in {@code res/} named in the form
+  <resources_name>-<config_qualifier>.
     
        
-      
      • {@code <resources_name>} is the directory name of the corresponding default
+      
      • {@code } is the directory name of the corresponding default
 resources (defined in table 1).
        • 
-      
      • {@code <qualifier>} is a name that specifies an individual configuration
+      
      • {@code } is a name that specifies an individual configuration
 for which these resources are to be used (defined in table 2).
        • 
     
      
-    
      You can append more than one {@code <qualifier>}. Separate each
+    
      You can append more than one {@code }. Separate each
 one with a dash.
      
     
      Caution: When appending multiple qualifiers, you must
 place them in the same order in which they are listed in table 2. If the qualifiers are ordered
@@ -384,7 +384,7 @@ res/
 screen area. Specifically, the device's smallestWidth is the shortest of the screen's available
 height and width (you may also think of it as the "smallest possible width" for the screen). You can
 use this qualifier to ensure that, regardless of the screen's current orientation, your
-application has at least {@code <N>} dps of width available for its UI.
      
+application has at least {@code } dps of width available for its UI.
      
         
      For example, if your layout requires that its smallest dimension of screen area be at
 least 600 dp at all times, then you can use this qualifer to create the layout resources, {@code
 res/layout-sw600dp/}. The system will use these resources only when the smallest dimension of
@@ -899,13 +899,13 @@ not true. Instead, you can save the image that's used for both as {@code icon_ca
 name other than {@code icon.png}) and put
 it in the default {@code res/drawable/} directory. Then create an {@code icon.xml} file in {@code
 res/drawable-en-rCA/} and {@code res/drawable-fr-rCA/} that refers to the {@code icon_ca.png}
-resource using the {@code <bitmap>} element. This allows you to store just one version of the
+resource using the {@code } element. This allows you to store just one version of the
 PNG file and two small XML files that point to it. (An example XML file is shown below.)
      
 
 
 
      Drawable
      
 
-
      To create an alias to an existing drawable, use the {@code <bitmap>} element.
+
      To create an alias to an existing drawable, use the {@code } element.
 For example:
      
 
 
      @@ -922,8 +922,8 @@ R.drawable.icon_ca} resource (which is saved in {@code res/drawable/}).
      
 
 
      Layout
      
 
-
      To create an alias to an existing layout, use the {@code <include>}
-element, wrapped in a {@code <merge>}. For example:
      
+
      To create an alias to an existing layout, use the {@code }
+element, wrapped in a {@code }. For example:
      
 
 
       <?xml version="1.0" encoding="utf-8"?>
diff --git a/docs/html/guide/topics/resources/runtime-changes.jd b/docs/html/guide/topics/resources/runtime-changes.jd
index 0e03fe057c5f..8781d208d6ea 100644
--- a/docs/html/guide/topics/resources/runtime-changes.jd
+++ b/docs/html/guide/topics/resources/runtime-changes.jd
@@ -190,7 +190,7 @@ for you. This technique should be considered a last resort when you must avoid r
 configuration change and is not recommended for most applications.
      
 
 
      To declare that your activity handles a configuration change, edit the appropriate {@code <activity>} element in
+href="{@docRoot}guide/topics/manifest/activity-element.html">{@code } element in
 your manifest file to include the {@code
 android:configChanges} attribute with a value that represents the configuration you want to
diff --git a/docs/html/guide/topics/resources/string-resource.jd b/docs/html/guide/topics/resources/string-resource.jd
index 743e69233645..9adf6def4c7f 100644
--- a/docs/html/guide/topics/resources/string-resource.jd
+++ b/docs/html/guide/topics/resources/string-resource.jd
@@ -28,13 +28,13 @@ as an XML layout).
      
 
      Note: A string is a simple resource that is referenced
 using the value provided in the {@code name} attribute (not the name of the XML file). So, you can
 combine string resources with other simple resources in the one XML file,
-under one {@code <resources>} element.
      
+under one {@code } element.
      
 
 
      
 
 
      file location:
      
 
      res/values/filename.xml
      
-The filename is arbitrary. The {@code <string>} element's {@code name} will be used as the
+The filename is arbitrary. The {@code } element's {@code name} will be used as the
 resource ID.
      
 
 
      compiled resource datatype:
      
@@ -125,13 +125,13 @@ android.content.Context#getText(int)} will retain any rich text styling applied
 
      Note: A string array is a simple resource that is referenced
 using the value provided in the {@code name} attribute (not the name of the XML file). As
 such, you can combine string array resources with other simple resources in the one XML file,
-under one {@code <resources>} element.
      
+under one {@code } element.
      
 
 
      
 
 
      file location:
      
 
      res/values/filename.xml
      
-The filename is arbitrary. The {@code <string-array>} element's {@code name} will be used as the
+The filename is arbitrary. The {@code } element's {@code name} will be used as the
 resource ID.
      
 
 
      compiled resource datatype:
      
@@ -164,7 +164,7 @@ In Java: R.array.string_array_name
       
      No attributes.
      
     
   
      <string-array>
      
-    
      Defines an array of strings. Contains one or more {@code <item>} elements.
+    
      Defines an array of strings. Contains one or more {@code } elements.
       
      attributes:
      
       
      
         
      name
      
@@ -175,7 +175,7 @@ ID to reference the array.
      
     
   
      <item>
      
     
      A string, which can include styling tags. The value can be a reference to another
-string resource. Must be a child of a {@code <string-array>} element. Beware that you
+string resource. Must be a child of a {@code } element. Beware that you
 must escape apostrophes and
 quotation marks. See Formatting and Styling, below, for
 information about to properly style and format your strings.
@@ -252,13 +252,13 @@ in keeping with your application.
 
      Note: A plurals collection is a simple resource that is
 referenced using the value provided in the {@code name} attribute (not the name of the XML
 file). As such, you can combine plurals resources with other simple resources in the one
-XML file, under one {@code <resources>} element.
      
+XML file, under one {@code } element.
      
 
 
      
 
 
      file location:
      
 
      res/values/filename.xml
      
-The filename is arbitrary. The {@code <plurals>} element's {@code name} will be used as the
+The filename is arbitrary. The {@code } element's {@code name} will be used as the
 resource ID.
      
 
 
      resource reference:
      
@@ -291,7 +291,7 @@ In Java: R.plurals.plural_name
     
      
   
      <plurals>
      
     
      A collection of strings, of which, one string is provided depending on the amount of
-something. Contains one or more {@code <item>} elements.
+something. Contains one or more {@code } elements.
       
      attributes:
      
       
      
         
      name
      
@@ -302,7 +302,7 @@ resource ID.
      
     
   
      <item>
      
     
      A plural or singular string. The value can be a reference to another
-string resource. Must be a child of a {@code <plurals>} element. Beware that you must
+string resource. Must be a child of a {@code } element. Beware that you must
 escape apostrophes and quotation marks. See Formatting and
 Styling, below, for information about to properly style and format your strings.
       
      attributes:
      
@@ -465,9 +465,9 @@ java.lang.Object...)">format(res.getString(R.string.welcome_messages), usern
 
      
 
      Supported HTML elements include:
      
 
        
-  
      • {@code <b>} for bold text.
        • 
-  
      • {@code <i>} for italic text.
        • 
-  
      • {@code <u>} for underline text.
        • 
+  
      • {@code } for bold text.
        • 
+  
      • {@code } for italic text.
        • 
+  
      • {@code } for underline text.
        • 
 
      
 
 
      Sometimes you may want to create a styled text resource that is also used as a format
@@ -486,8 +486,8 @@ after the formatting takes place. For example:
      
   <string name="welcome_messages">Hello, %1$s! You have &lt;b>%2$d new messages&lt;/b>.</string>
 </resources>
 
      
-
      In this formatted string, a {@code <b>} element is added. Notice that the opening bracket is
-HTML-escaped, using the {@code &lt;} notation.
      
+
      In this formatted string, a {@code } element is added. Notice that the opening bracket is
+HTML-escaped, using the {@code <} notation.
      
   
      3. 
   
    3. Then format the string as usual, but also call {@link android.text.Html#fromHtml} to
 convert the HTML text into styled text:
diff --git a/docs/html/guide/topics/resources/style-resource.jd b/docs/html/guide/topics/resources/style-resource.jd
index f6252dba3ee9..dc3d23f7b224 100644
--- a/docs/html/guide/topics/resources/style-resource.jd
+++ b/docs/html/guide/topics/resources/style-resource.jd
@@ -23,7 +23,7 @@ an entire {@link android.app.Activity} or application (from within the manifest
 
      Note: A style is a simple resource that is referenced
 using the value provided in the {@code name} attribute (not the name of the XML file). As
 such, you can combine style resources with other simple resources in the one XML file,
-under one {@code <resources>} element.
      
+under one {@code } element.
      
 
 
      
 
@@ -61,7 +61,7 @@ In XML: @[package:]style/style_name
       
      No attributes.
      
     
   
      <style>
      
-    
      Defines a single style. Contains {@code <item>} elements.
+    
      Defines a single style. Contains {@code } elements.
       
      attributes:
      
       
      
         
      name
      
diff --git a/docs/html/guide/topics/search/adding-custom-suggestions.jd b/docs/html/guide/topics/search/adding-custom-suggestions.jd
index 6ebef08f80e2..a251ce12cca4 100644
--- a/docs/html/guide/topics/search/adding-custom-suggestions.jd
+++ b/docs/html/guide/topics/search/adding-custom-suggestions.jd
@@ -128,7 +128,7 @@ custom action and custom data so that your application can open the suggested co
 
      Modifying the searchable configuration
      
 
 
      To add support for custom suggestions, add the {@code android:searchSuggestAuthority} attribute
-to the {@code <searchable>} element in your searchable configuration file. For example:
      
+to the {@code } element in your searchable configuration file. For example:
      
 
 
       <?xml version="1.0" encoding="utf-8"?>
@@ -608,7 +608,7 @@ include {@code android:includeInGlobalSearch} as "true".
      
 
 
      The only scenario in which additional work is necessary is when your content provider demands a
 read permission. In which case, you need to add a special
-{@code <path-permission>} element for the provider to grant Quick Search Box read access to
+{@code } element for the provider to grant Quick Search Box read access to
 your content provider. For example:
      
 
 
      @@ -622,7 +622,7 @@ your content provider. For example:
      
 
      
 
 
      In this example, the provider restricts read and write access to the content. The
-{@code <path-permission>} element amends the restriction by granting read access to content
+{@code } element amends the restriction by granting read access to content
 inside the {@code "/search_suggest_query"} path prefix when the {@code
 "android.permission.GLOBAL_SEARCH"} permission exists. This grants access to Quick Search Box
 so that it may query your content provider for suggestions.
      
diff --git a/docs/html/guide/topics/search/adding-recent-query-suggestions.jd b/docs/html/guide/topics/search/adding-recent-query-suggestions.jd
index e1020dd18565..8bd180efd2ac 100644
--- a/docs/html/guide/topics/search/adding-recent-query-suggestions.jd
+++ b/docs/html/guide/topics/search/adding-recent-query-suggestions.jd
@@ -154,7 +154,7 @@ searchable configuration). For example:
      
 
 
      To configure the system to use your suggestions provider, you need to add
 the {@code android:searchSuggestAuthority} and {@code android:searchSuggestSelection} attributes to
-the {@code <searchable>} element in your searchable configuration file. For example:
      
+the {@code } element in your searchable configuration file. For example:
      
 
 
       <?xml version="1.0" encoding="utf-8"?>
diff --git a/docs/html/guide/topics/search/search-dialog.jd b/docs/html/guide/topics/search/search-dialog.jd
index fcaaed36da03..1af3e5d7ad61 100644
--- a/docs/html/guide/topics/search/search-dialog.jd
+++ b/docs/html/guide/topics/search/search-dialog.jd
@@ -158,7 +158,7 @@ runtime—you must declare the searchable configuration in XML.
      
 
 
      The searchable configuration file must include the {@code
-<searchable>} element as the root node and specify one
+} element as the root node and specify one
 or more attributes. For example:
      
 
 
      @@ -186,7 +186,7 @@ YouTube".
      
 
 
      The {@code
-<searchable>} element accepts several other attributes. However, you don't need
+} element accepts several other attributes. However, you don't need
 most attributes until you add features such as search suggestions
 and voice search. For detailed information about the searchable
 configuration file, see the If you don't have one already, create an {@link android.app.Activity} that will perform
 searches and present results. You don't need to implement the search functionality yet—just
 create an activity that you can declare in the manifest. Inside the manifest's {@code <activity>}
+href="{@docRoot}guide/topics/manifest/activity-element.html">{@code }
 element:
      
 
        
   
      1. Declare the activity to accept the {@link android.content.Intent#ACTION_SEARCH} intent, in an
 {@code
-<intent-filter>}
+}
 element.
        2. 
   
      2. Specify the searchable configuration to use, in a {@code <meta-data>}
+href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code }
 element.
        3. 
 
      
 
@@ -243,17 +243,17 @@ element.
      4. 
 </application>
 
    
 
-
    The {@code <meta-data>} element must include the {@code android:name} attribute with a
+
    The {@code } element must include the {@code android:name} attribute with a
 value of {@code "android.app.searchable"} and the {@code android:resource} attribute with a
 reference to the searchable configuration file (in this example, it
 refers to the {@code res/xml/searchable.xml} file).
    
 
 
    Note: The {@code
-<intent-filter>} does not need a {@code <category>} with the
+} does not need a {@code } with the
 {@code DEFAULT} value (which you usually see in {@code <activity>} elements),
+href="{@docRoot}guide/topics/manifest/activity-element.html">{@code } elements),
 because the system delivers the {@link android.content.Intent#ACTION_SEARCH} intent explicitly to
 your searchable activity, using its component name.
    
 
@@ -416,10 +416,10 @@ SearchableActivity}, you must declare in the manifest that {@code SearchableActi
 searchable activity to use for the search dialog in {@code OtherActivity}.
    
 
 
    To declare the searchable activity for an activity's search dialog,
-add a {@code <meta-data>}
+add a {@code }
 element inside the respective activity's {@code <activity>} element.
-The {@code <meta-data>}
+href="{@docRoot}guide/topics/manifest/activity-element.html">{@code } element.
+The {@code }
 element must include the {@code android:value} attribute that specifies the searchable activity's
 class name and the {@code android:name} attribute with a value of {@code
 "android.app.default_searchable"}.
    
@@ -452,7 +452,7 @@ search dialog:
    
 
    
 
 
    Because the {@code OtherActivity} now includes a {@code <meta-data>}
+href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code }
 element to declare which searchable activity to use for searches, the activity has enabled the
 search dialog.
 While the user is in this activity, the {@link
@@ -464,15 +464,15 @@ the {@link android.content.Intent#ACTION_SEARCH} intent.
    
 by default, so you don't need to add this declaration to {@code SearchableActivity}.
    
 
 
    If you want every activity in your application to provide the search dialog, insert the above {@code <meta-data>}
+href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code }
 element as a child of the {@code <application>}
+href="{@docRoot}guide/topics/manifest/application-element.html">{@code }
 element, instead of each {@code <activity>}. This
+href="{@docRoot}guide/topics/manifest/activity-element.html">{@code }. This
 way, every activity inherits the value, provides the search dialog, and delivers searches to
 the same searchable activity. (If you have multiple searchable activities, you can override the
 default searchable activity by placing a different {@code <meta-data>}
+href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code }
 declaration inside individual activities.)
    
 
 
    With the search dialog now enabled for your activities, your application is ready to perform
diff --git a/docs/html/guide/topics/search/searchable-config.jd b/docs/html/guide/topics/search/searchable-config.jd
index 4874bb4fc851..e6c1a0d70a35 100644
--- a/docs/html/guide/topics/search/searchable-config.jd
+++ b/docs/html/guide/topics/search/searchable-config.jd
@@ -72,9 +72,9 @@ Android uses the filename as the resource ID.
       
    android:label
    
       
    String resource. (Required.) The name of your application.
 It should be the same as the name applied to the {@code android:label} attribute of your {@code <activity>} or
+href="{@docRoot}guide/topics/manifest/activity-element.html#label">{@code } or
 {@code
-<application>} manifest element. This label is only visible to the user when you set
+} manifest element. This label is only visible to the user when you set
 android:includeInGlobalSearch to "true", in which case, this label is used to identify
 your application as a searchable item in the system's search settings.
    
 
@@ -136,13 +136,13 @@ for this attribute.
     
    If you have defined a content provider to generate search suggestions, you need to
     define additional attributes that configure communications with the content
     provider. When providing search suggestions, you need some of the following
-    {@code <searchable>} attributes:

    
+    {@code } attributes:

    
 
       
    
       
    android:searchSuggestAuthority
    
         
    String. (Required to provide search suggestions.)
         This value must match the authority string provided in the {@code android:authorities}
-attribute of the Android manifest {@code <provider>} element.
    
+attribute of the Android manifest {@code } element.
 
       
    android:searchSuggestPath
    
         
    String. This path is used as a portion of the suggestions
@@ -189,7 +189,7 @@ android.app.SearchManager#SUGGEST_COLUMN_INTENT_DATA} column), this value is
     
    Quick Search Box attributes
    
 
     
    To make your custom search suggestions available to Quick Search Box, you need some of the
-    following {@code <searchable>} attributes:

    
+    following {@code } attributes:

    
 
       
    
       
    android:includeInGlobalSearch
    
@@ -219,7 +219,7 @@ content provider again). The default value is false.
    
     
    Voice search attributes
    
 
     
    To enable voice search, you'll need some of the
-    following {@code <searchable>} attributes:

    
+    following {@code } attributes:

    
 
       
    
         
    android:voiceSearchMode
    
diff --git a/docs/html/guide/topics/security/permissions.jd b/docs/html/guide/topics/security/permissions.jd
index cfab3c9afb2d..6158e40f2f23 100644
--- a/docs/html/guide/topics/security/permissions.jd
+++ b/docs/html/guide/topics/security/permissions.jd
@@ -452,7 +452,7 @@ methods.
    
     
    Information about how requesting some permissions will implicitly restrict your app
     to devices that include the corresponding hardware or software feature.
    
     
    {@code
-    <uses-permission>}
    
+    }
     
    API reference for the manifest tag that declare's your app's required system permissions.
     
    
     
    {@link android.Manifest.permission}
    
diff --git a/docs/html/guide/topics/ui/accessibility/apps.jd b/docs/html/guide/topics/ui/accessibility/apps.jd
index da24d03adf60..567dc5b51f28 100644
--- a/docs/html/guide/topics/ui/accessibility/apps.jd
+++ b/docs/html/guide/topics/ui/accessibility/apps.jd
@@ -357,7 +357,7 @@ higher, to your project. Then, within your custom view class, call the
 ViewCompat.setAccessibilityDelegate()} method to implement the accessibility methods
 above. For an example of this approach, see the Android Support Library (revision 5 or higher)
 sample {@code AccessibilityDelegateSupportActivity} in
-({@code <sdk>/extras/android/support/v4/samples/Support4Demos/})
+({@code /extras/android/support/v4/samples/Support4Demos/})
   
 
 
@@ -536,7 +536,7 @@ ViewCompat.setAccessibilityDelegate(new AccessibilityDelegateCompat() {
 directly in your custom view class. For another example of this approach, see the Android
 Support Library (revision 5 or higher)
 sample {@code AccessibilityDelegateSupportActivity} in
-({@code <sdk>/extras/android/support/v4/samples/Support4Demos/}).
    
+({@code /extras/android/support/v4/samples/Support4Demos/}).
    
 
 
    Note: You may find information on implementing accessibility for
 custom views written prior to Android 4.0 that describes the use of the
diff --git a/docs/html/guide/topics/ui/accessibility/services.jd b/docs/html/guide/topics/ui/accessibility/services.jd
index d69af9f1ca86..3ccdbc498493 100644
--- a/docs/html/guide/topics/ui/accessibility/services.jd
+++ b/docs/html/guide/topics/ui/accessibility/services.jd
@@ -111,7 +111,7 @@ configuration using an instance of this class and {@link
 android.accessibilityservice.AccessibilityService#setServiceInfo setServiceInfo()} at runtime.
 However, not all configuration options are available using this method.
    
 
-
    Beginning with Android 4.0, you can include a {@code <meta-data>} element in your manifest
+
    Beginning with Android 4.0, you can include a {@code } element in your manifest
 with a reference to a configuration file, which allows you to set the full range of options for
 your accessibility service, as shown in the following example:
    
 
@@ -125,7 +125,7 @@ your accessibility service, as shown in the following example:
    
 
    
 
 
    This meta-data element refers to an XML file that you create in your application’s resource
-directory ({@code <project_dir>/res/xml/accessibility_service_config.xml}). The following code
+directory ({@code /res/xml/accessibility_service_config.xml}). The following code
 shows example contents for the service configuration file:
    
 
 
    @@ -445,7 +445,7 @@ public class MyAccessibilityService extends AccessibilityService {
 
 
    The API Demo project contains two samples which can be used as a starting point for generating
 accessibility services
-({@code <sdk>/samples/<platform>/ApiDemos/src/com/example/android/apis/accessibility}):
+({@code /samples//ApiDemos/src/com/example/android/apis/accessibility}):
 
    
 
 
      
diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd
index b2f98ada5adc..c21671fa5d99 100644
--- a/docs/html/guide/topics/ui/actionbar.jd
+++ b/docs/html/guide/topics/ui/actionbar.jd
@@ -184,9 +184,9 @@ href="#Style">Styling the Action Bar.
      
 
      By default, the system uses your application icon in the action bar, as specified by the {@code icon}
 attribute in the {@code
-<application>} or } or {@code
-<activity>} element. However, if you also specify the } element. However, if you also specify the {@code logo}
 attribute, then the action bar uses the logo image instead of the icon.
      
 
@@ -249,7 +249,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
 
      To request that an item appear directly in the action bar
 as an action button, include {@code
-showAsAction="ifRoom"} in the {@code <item>} tag. For example:
      
+showAsAction="ifRoom"} in the {@code } tag. For example:
      
 
 
       <menu xmlns:android="http://schemas.android.com/apk/res/android"
@@ -269,7 +269,7 @@ overflow.
      
 
      
 
      Using XML attributes from the support library
      
 Notice that the {@code showAsAction} attribute above uses a custom namespace defined in the
-{@code <menu>} tag. This is necessary when using any XML attributes defined by the support
+{@code } tag. This is necessary when using any XML attributes defined by the support
 library, because these attributes do not exist in the Android framework on older devices.
 So you must use your own namespace as a prefix for all attributes defined by the support library.
 
      
@@ -319,7 +319,7 @@ must always be visible to provide access to a critical feature.
      
 
      When the user presses an action, the system calls your activity's {@link
 android.app.Activity#onOptionsItemSelected(MenuItem) onOptionsItemSelected()} method. Using the
 {@link android.view.MenuItem} passed to this method, you can identify the action by calling {@link
-android.view.MenuItem#getItemId()}. This returns the unique ID provided by the {@code <item>}
+android.view.MenuItem#getItemId()}. This returns the unique ID provided by the {@code }
 tag's {@code id} attribute so you can perform the appropriate action. For example:
      
 
 
      @@ -373,15 +373,15 @@ items on a narrow screen, while leaving room for navigation and title elements a
 
      To enable split action bar when using the support library, you must do two things:
      
 
        
   
      1. Add {@code uiOptions="splitActionBarWhenNarrow"} to each
-{@code <activity>}
+{@code }
 element or to the
-{@code <application>}
+{@code }
 element. This attribute is understood only by API level 14 and higher (it is ignored
 by older versions).
        2. 
   
      2. To support older versions, add a {@code <meta-data>}
+  href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code }
   element as a child of each
-  {@code <activity>}
+  {@code }
   element that declares the same value for {@code "android.support.UI_OPTIONS"}.
        3. 
 
      
 
@@ -460,10 +460,10 @@ correct action when the user presses the Up button.
      
     
      Beginning in Android 4.1 (API level 16), you can declare the parent with the {@code parentActivityName}
 attribute in the {@code
-<activity>} element.
      
+} element.
      
     
      To support older devices with the support library, also
 include a {@code
-<meta-data>} element that specifies
+} element that specifies
 the parent activity as the value for {@code android.support.PARENT_ACTIVITY}. For example:
      
 
       <application ... >
@@ -681,7 +681,7 @@ unlike an action view, an action provider takes control of all the action's beha
 and an action provider can display a submenu when pressed.
      
 
 
      To declare an action provider, supply the {@code actionViewClass} attribute in the
-menu {@code <item>} tag with a fully-qualified class name for an
+menu {@code } tag with a fully-qualified class name for an
 {@link android.support.v4.view.ActionProvider}.
      
 
 
      You can build your own action provider by extending the {@link
@@ -709,7 +709,7 @@ onOptionsItemSelected()} when the user opens the list or selects one of the subm
 
      Using the ShareActionProvider
      
 
 
      To add a "share" action with {@link android.support.v7.widget.ShareActionProvider},
-define the {@code actionProviderClass} for an {@code <item>} tag with
+define the {@code actionProviderClass} for an {@code } tag with
 the {@link android.support.v7.widget.ShareActionProvider} class. For example:
      
 
 
      @@ -1489,7 +1489,7 @@ the system uses the style property from the support library. The effect for each
 
 
 
      Caution: Be certain that each theme and style declares a parent
-theme in the {@code <style>} tag, from which it inherits all styles not explicitly declared
+theme in the {@code