summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/developing/tools
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2009-12-10 16:25:06 -0800
committerDirk Dougherty <ddougherty@google.com>2009-12-14 11:40:02 -0800
commit22558d0be8210aee1a2ab64b374bb357d4123acd (patch)
tree68e6a9df29fa6c86447366cdcd4e537dc0ba1389 /docs/html/guide/developing/tools
parent54bb575e85d1e40efbfbb868f37553cdd8ed318f (diff)
downloadframeworks_base-22558d0be8210aee1a2ab64b374bb357d4123acd.zip
frameworks_base-22558d0be8210aee1a2ab64b374bb357d4123acd.tar.gz
frameworks_base-22558d0be8210aee1a2ab64b374bb357d4123acd.tar.bz2
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.
Bug: 2160782 Change-Id: Ib1eb2e9e3fe3a7b2ad16387dbf888646a1195221
Diffstat (limited to 'docs/html/guide/developing/tools')
-rw-r--r--docs/html/guide/developing/tools/adt.jd2
-rw-r--r--docs/html/guide/developing/tools/emulator.jd2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/guide/developing/tools/adt.jd b/docs/html/guide/developing/tools/adt.jd
index f28b24c..6eee91d 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 installion 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 a9b6914..03a4d1e 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 &quot;Warning: No DNS servers found&quot; 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>