diff options
| author | Scott Main <smain@google.com> | 2012-06-27 02:12:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-27 02:12:35 -0700 |
| commit | b6d148d02a9764abd40af50b096599bb148571b3 (patch) | |
| tree | 87efc23e87804f6fe830962f83fd4928ba592e32 /docs/html/sdk | |
| parent | 84ea453cc7a9f193cfef1b3e2af41935dbe15d02 (diff) | |
| parent | ce6c850206bce4860ee9eac036682ec101234263 (diff) | |
| download | frameworks_base-b6d148d02a9764abd40af50b096599bb148571b3.zip frameworks_base-b6d148d02a9764abd40af50b096599bb148571b3.tar.gz frameworks_base-b6d148d02a9764abd40af50b096599bb148571b3.tar.bz2 | |
Merge "docs: remove empty page and expand system requirements based on URL hash" into jb-dev
Diffstat (limited to 'docs/html/sdk')
| -rw-r--r-- | docs/html/sdk/index.jd | 5 | ||||
| -rw-r--r-- | docs/html/sdk/installing/index.jd | 2 | ||||
| -rw-r--r-- | docs/html/sdk/installing/installing-adt.jd | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index a20d0b1..02f8d6e 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -136,3 +136,8 @@ for Java, both of which are <em>not</em> supported for Android development. </p> </div> +<script> + if (location.hash == "#Requirements") { + $('.reqs').show(); + } +</script> diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd index 2ae6bed..f049191 100644 --- a/docs/html/sdk/installing/index.jd +++ b/docs/html/sdk/installing/index.jd @@ -85,7 +85,7 @@ the SDK tools from the command line.</p> <pre>apt-get install ia32-libs</pre> </li> <li>Next, install Java: <pre>apt-get install sun-java6-jdk</pre></li> - <li>The Ubuntu package manager does not currently offer an Eclipse 3.3 + <li>The Ubuntu package manager does not currently offer an Eclipse 3.6 version for download, so we recommend that you download Eclipse from eclipse.org (<a href="http://www.eclipse.org/downloads/">http://www.eclipse.org/ diff --git a/docs/html/sdk/installing/installing-adt.jd b/docs/html/sdk/installing/installing-adt.jd index 0e53e75..b276da4 100644 --- a/docs/html/sdk/installing/installing-adt.jd +++ b/docs/html/sdk/installing/installing-adt.jd @@ -19,7 +19,7 @@ UI, debug your app, and export signed (or unsigned) app packages (APKs) for dist <p>If you will be developing in Eclipse with the ADT Plugin, first make sure that you have a suitable version of Eclipse installed on your computer as described by the -<a href="{@docRoot}tools/sdk/index.html#Requirements">system requirements</a>.</p> +<a href="{@docRoot}sdk/index.html#Requirements">system requirements</a>.</p> <p>If you need to install Eclipse, you can download it from <a href= "http://www.eclipse.org/downloads/">http://www.eclipse.org/downloads/</a>. |