summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2010-07-07 18:43:10 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-07-07 18:43:10 -0700
commit1082ae033dbe7d278b3fef6e4fd9af149d360fc1 (patch)
tree295dcf46252e12e93e3056723c9767bcbfa66b5e
parenta5402dabec84eabcdb9008dc343dd67de325bbac (diff)
parent5183ae3b0f27dfff5ecdceabaa4950eef38b31e8 (diff)
am 5183ae3b: Merge "docs: add caution about adt in eclipse 3.6" into froyo
Merge commit '5183ae3b0f27dfff5ecdceabaa4950eef38b31e8' into gingerbread * commit '5183ae3b0f27dfff5ecdceabaa4950eef38b31e8': docs: add caution about adt in eclipse 3.6
-rw-r--r--docs/html/sdk/eclipse-adt.jd3
-rw-r--r--docs/html/sdk/requirements.jd3
2 files changed, 6 insertions, 0 deletions
diff --git a/docs/html/sdk/eclipse-adt.jd b/docs/html/sdk/eclipse-adt.jd
index f5558ab831a6..1a42e7f9ea56 100644
--- a/docs/html/sdk/eclipse-adt.jd
+++ b/docs/html/sdk/eclipse-adt.jd
@@ -48,6 +48,9 @@ href="#installing">Installing the ADT Plugin</a>, below. </p>
how to update ADT to the latest version or how to uninstall it, if necessary.
</p>
+<p class="caution"><strong>Caution:</strong> There are known issues with the ADT plugin running with
+Eclipse 3.6. Please stay on 3.5 until further notice.</p>
+
<h2 id="notes">Revisions</h2>
<p>The sections below provide notes about successive releases of
diff --git a/docs/html/sdk/requirements.jd b/docs/html/sdk/requirements.jd
index cb9cdf3ff136..d710b8ec7ff0 100644
--- a/docs/html/sdk/requirements.jd
+++ b/docs/html/sdk/requirements.jd
@@ -23,6 +23,9 @@ installation notes</a>.</li>
<h4 style="margin-top:.25em"><em>Eclipse IDE</em></h4>
<ul>
<li>Eclipse 3.4 (Ganymede) or 3.5 (Galileo)
+ <p class="caution"><strong>Caution:</strong> There are known issues with the ADT plugin
+running with Eclipse 3.6. Please stay on 3.5 until further notice.</p>
+ </li>
<li>Eclipse <a href="http://www.eclipse.org/jdt">JDT</a> plugin (included
in most Eclipse IDE packages) </li>
<li>If you need to install or update Eclipse, you can download it from <a