diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2009-12-15 15:04:00 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-15 15:04:00 -0800 |
| commit | 692bf86e67ef3bef98a64c1ad1c6f54b9f2020ae (patch) | |
| tree | 31c7dc2763581b69384912daec24c7e7c6a15f44 /docs/html/guide/developing | |
| parent | 01dde47ea9dda6f869557931db5f64573b9ce73d (diff) | |
| parent | 479a49f74f77855825ba69b105c065422c24246a (diff) | |
| download | frameworks_base-692bf86e67ef3bef98a64c1ad1c6f54b9f2020ae.zip frameworks_base-692bf86e67ef3bef98a64c1ad1c6f54b9f2020ae.tar.gz frameworks_base-692bf86e67ef3bef98a64c1ad1c6f54b9f2020ae.tar.bz2 | |
am 479a49f7: am 7585586c: Merge change Ib1eb2e9e into eclair
Merge commit '479a49f74f77855825ba69b105c065422c24246a'
* commit '479a49f74f77855825ba69b105c065422c24246a':
sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
Diffstat (limited to 'docs/html/guide/developing')
| -rw-r--r-- | docs/html/guide/developing/debug-tasks.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/developing/tools/adt.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/developing/tools/emulator.jd | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/guide/developing/debug-tasks.jd b/docs/html/guide/developing/debug-tasks.jd index 6b7c27a..3279741 100644 --- a/docs/html/guide/developing/debug-tasks.jd +++ b/docs/html/guide/developing/debug-tasks.jd @@ -60,7 +60,7 @@ D/ActivityManager( 763): Stopping: HistoryRecord{409dbb20 com.android.home.AllAp that expose useful information such as CPU usage and frame rate. See <a href="#additionaldebugging">Debug and Test Settings on the Emulator</a> below. </li> </ul> -<p>Also, see the <a href="{@docRoot}guide/appendix/faq/troubleshooting.html">Troubleshooting</a> section +<p>Also, see the <a href="{@docRoot}resources/faq/troubleshooting.html">Troubleshooting</a> section of the doc to figure out why your application isn't appearing on the emulator, or why it's not starting. </p> diff --git a/docs/html/guide/developing/tools/adt.jd b/docs/html/guide/developing/tools/adt.jd index 219be67..eb7ad4f 100644 --- a/docs/html/guide/developing/tools/adt.jd +++ b/docs/html/guide/developing/tools/adt.jd @@ -105,7 +105,7 @@ Eclipse components (for example, WST). If you encounter an error when installing ADT, your Eclipse installation might not include those components. For information about how to quickly add the necessary components to your Eclipse installation, see the troubleshooting topic -<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#installeclipsecomponents">ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p> +<a href="{@docRoot}resources/faq/troubleshooting.html#installeclipsecomponents">ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p> <h4>For Linux users</h4> <p>If you encounter this error when installing the ADT Plugin for Eclipse: diff --git a/docs/html/guide/developing/tools/emulator.jd b/docs/html/guide/developing/tools/emulator.jd index 43f9271..507353e 100644 --- a/docs/html/guide/developing/tools/emulator.jd +++ b/docs/html/guide/developing/tools/emulator.jd @@ -1754,7 +1754,7 @@ to the current working directory): </p> <p>For emulators running on Mac OS X, if you see an error "Warning: No DNS servers found" when starting the emulator, check to see whether you have an <code>/etc/resolv.conf</code> file. If not, please run the following line in a command window:</p> <pre>ln -s /private/var/run/resolv.conf /etc/resolv.conf</pre> -<p>See <a href="{@docRoot}guide/appendix/faq/index.html">Frequently Asked Questions</a> for more troubleshooting information. </p> +<p>See <a href="{@docRoot}resources/faq/index.html">Frequently Asked Questions</a> for more troubleshooting information. </p> <a name="limitations"></a> <h2>Emulator Limitations</h2> |