summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-07-07 18:37:48 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-07-07 18:37:48 -0700
commit5183ae3b0f27dfff5ecdceabaa4950eef38b31e8 (patch)
treedbb9bac7bd72a55d402bd834a2c2ea8a881905f2 /docs
parent2651504c020f07847bafa3d539c36f1396629669 (diff)
parent1c9bada4b4a8bdec66c13f626d5821b10079c123 (diff)
downloadframeworks_base-5183ae3b0f27dfff5ecdceabaa4950eef38b31e8.zip
frameworks_base-5183ae3b0f27dfff5ecdceabaa4950eef38b31e8.tar.gz
frameworks_base-5183ae3b0f27dfff5ecdceabaa4950eef38b31e8.tar.bz2
Merge "docs: add caution about adt in eclipse 3.6" into froyo
Diffstat (limited to 'docs')
-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 f5558ab..1a42e7f 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 cb9cdf3..d710b8e 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