Merge "resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp" into honeycomb-plus-aosp
diff --git a/docs/html/guide/developing/building/building-cmdline.jd b/docs/html/guide/developing/building/building-cmdline.jd
index f40ad04..a5ab07d 100644
--- a/docs/html/guide/developing/building/building-cmdline.jd
+++ b/docs/html/guide/developing/building/building-cmdline.jd
@@ -1,4 +1,4 @@
-page.title=Building and Running Apps on the Command Line
+page.title=Building and Running from the Command Line
@jd:body
<div id="qv-wrapper">
@@ -46,10 +46,9 @@
<p class="note"><strong>Note:</strong> When installing JDK on Windows, the default is to install
in the "Program Files" directory. This location will cause <code>ant</code> to fail, because of
the space. To fix the problem, you can specify the JAVA_HOME variable like this:
- <pre>set JAVA_HOME=c:\Progra~1\Java\<jdkdir>
- </pre>
+ <pre>set JAVA_HOME=c:\Progra~1\Java\<jdkdir></pre>
- The easiest solution, however, is to install JDK in a non-space directory, for example:
+ <p>The easiest solution, however, is to install JDK in a non-space directory, for example:</p>
<pre>c:\java\jdk1.6.0_02</pre>
diff --git a/docs/html/guide/developing/building/building-eclipse.jd b/docs/html/guide/developing/building/building-eclipse.jd
index 2c610c1..85c82a9 100644
--- a/docs/html/guide/developing/building/building-eclipse.jd
+++ b/docs/html/guide/developing/building/building-eclipse.jd
@@ -1,4 +1,4 @@
-page.title=Building and Running Apps in Eclipse
+page.title=Building and Running from Eclipse with ADT
@jd:body
<div id="qv-wrapper">
@@ -88,7 +88,7 @@
<li>Ensure that your development computer can detect your device when connected via USB</li>
</ul>
- <p>Read <a href="{@docRoot}guide/developing/device.html">Connecting Hardware Devices</a>
+ <p>Read <a href="{@docRoot}guide/developing/device.html">Using Hardware Devices</a>
for more information.</p>
<p>Once set up and your device is connected via USB, install your application on the device by
diff --git a/docs/html/guide/developing/building/index.jd b/docs/html/guide/developing/building/index.jd
index 25a6e23..59c4645 100644
--- a/docs/html/guide/developing/building/index.jd
+++ b/docs/html/guide/developing/building/index.jd
@@ -1,4 +1,4 @@
-page.title=Building and Running Apps
+page.title=Building and Running
@jd:body
<div id="qv-wrapper">
@@ -49,7 +49,7 @@
tools and processes are masked from you. The following diagram depicts the different tools and
processes that are involved in a build:</p>
- <p><img src="{@docRoot}images/build.png" /></p>
+ <img src="{@docRoot}images/build.png" />
<p>The general process for a typical build is outlined below:</p>
diff --git a/docs/html/guide/developing/debugging/debugging-devtools.jd b/docs/html/guide/developing/debugging/debugging-devtools.jd
index 88e6005..67605ae 100644
--- a/docs/html/guide/developing/debugging/debugging-devtools.jd
+++ b/docs/html/guide/developing/debugging/debugging-devtools.jd
@@ -59,8 +59,9 @@
android.app.Activity#onSaveInstanceState} / {@link
android.app.Activity#onCreate(android.os.Bundle)} code path, which would otherwise be difficult
to force. Choosing this option will probably reveal a number of problems in your application
- due to not saving state. For more information about saving an application's state, see
- <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Handling Runtime Changes</a>.</dd>
+ due to not saving state. For more information about saving an activity's state, see the
+ <a href="{@docRoot}guide/topics/fundamentals/activities.html#SavingActivityState">Activities</a>
+document.</dd>
<dt><strong>Show CPU usage</strong></dt>
diff --git a/docs/html/guide/developing/debugging/debugging-log.jd b/docs/html/guide/developing/debugging/debugging-log.jd
index 6ee69c7..ff73c17 100644
--- a/docs/html/guide/developing/debugging/debugging-log.jd
+++ b/docs/html/guide/developing/debugging/debugging-log.jd
@@ -1,4 +1,4 @@
-page.title=Reading and Writing Log Messages
+page.title=Reading and Writing Logs
@jd:body
<div id="qv-wrapper">
diff --git a/docs/html/guide/developing/debugging/debugging-projects-cmdline.jd b/docs/html/guide/developing/debugging/debugging-projects-cmdline.jd
index 72bb16d..6800a5d 100644
--- a/docs/html/guide/developing/debugging/debugging-projects-cmdline.jd
+++ b/docs/html/guide/developing/debugging/debugging-projects-cmdline.jd
@@ -1,4 +1,4 @@
-page.title=Debugging in other IDEs
+page.title=Debugging from other IDEs
@jd:body
diff --git a/docs/html/guide/developing/debugging/debugging-projects.jd b/docs/html/guide/developing/debugging/debugging-projects.jd
index 0e14999..deb4341 100644
--- a/docs/html/guide/developing/debugging/debugging-projects.jd
+++ b/docs/html/guide/developing/debugging/debugging-projects.jd
@@ -1,4 +1,4 @@
-page.title=Debugging in Eclipse
+page.title=Debugging from Eclipse with ADT
@jd:body
<div id="qv-wrapper">
diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd
index 657f549..abfae5d 100644
--- a/docs/html/guide/developing/device.jd
+++ b/docs/html/guide/developing/device.jd
@@ -1,4 +1,4 @@
-page.title=Connecting Hardware Devices
+page.title=Using Hardware Devices
@jd:body
<div id="qv-wrapper">
@@ -15,10 +15,6 @@
<ol>
<li><a href="{@docRoot}sdk/win-usb.html">Google USB Driver</a></li>
<li><a href="{@docRoot}sdk/oem-usb.html">OEM USB Drivers</a></li>
- <li><a
-href="{@docRoot}guide/developing/eclipse-adt.html">Developing in Eclipse, with ADT</a></li>
- <li><a
-href="{@docRoot}guide/developing/other-ide.html">Developing in other IDEs</a></li>
</ol>
</div>
</div>
diff --git a/docs/html/guide/developing/devices/emulator.jd b/docs/html/guide/developing/devices/emulator.jd
index 53c1407..f61a437 100644
--- a/docs/html/guide/developing/devices/emulator.jd
+++ b/docs/html/guide/developing/devices/emulator.jd
@@ -121,7 +121,7 @@
<p>To create and manage AVDs you use the AVD Manager UI or the <code>android</code> tool
that is included in the SDK.
For complete information about how to set up AVDs, see <a
-href="{@docRoot}guide/developing/devices/index.html">Creating and Managing Virtual Devices</a>.</p>
+href="{@docRoot}guide/developing/devices/index.html">Managing Virtual Devices</a>.</p>
<a name="starting"></a>
@@ -352,7 +352,7 @@
<td><strong>Required</strong>. Specifies the AVD to load for this emulator
instance.</td>
<td>You must create an AVD configuration before launching the emulator. For
- information, see <a href="{@docRoot}guide/developing/devices/managing-avds.html">Creating and Managing
+ information, see <a href="{@docRoot}guide/developing/devices/managing-avds.html">Managing
Virtual Devices with AVD Manager</a>.</td>
<tr>
<td rowspan="7">Disk Images</td>
@@ -708,7 +708,7 @@
results, since the density with which to render the skin may not be defined.
AVDs let you associate each skin with a default density and override the default
as needed. For more information, see <a
-href="{@docRoot}guide/developing/devices/managing-avds.html">Creating and Managing Virtual Devices
+href="{@docRoot}guide/developing/devices/managing-avds.html">Managing Virtual Devices
with AVD Manager</a>.
</td>
</tr>
@@ -884,7 +884,8 @@
<p>You can also use the android tool to automatically create an SD Card image
for you, when creating an AVD. For more information, see <a
-href="{@docRoot}guide/developing/devices/managing-avds.html">Creating and Managing Virtual Devices with AVD Manager</a>.
+href="{@docRoot}guide/developing/devices/managing-avds.html">Managing Virtual Devices with AVD
+Manager</a>.
<a name="temporaryimages"></a>
<h3>Temporary Images</h3>
@@ -1635,7 +1636,7 @@
<h2>Using Emulator Skins</h2>
<p>The Android SDK includes several Emulator skins that you can use to control the resolution and density of the emulated device's screen. To select a specific skin for running the emulator, create an AVD that uses that skin. Please do not use deprecated emulator options such as <code>-skin</code> to control the skin used by an emulator instance. For more information about AVDs, see <a
-href="{@docRoot}guide/developing/devices/index.html">Creating and Managing Virtual Devices</a>.</p>
+href="{@docRoot}guide/developing/devices/index.html">Managing Virtual Devices</a>.</p>
<a name="multipleinstances"></a>
@@ -1699,7 +1700,8 @@
<p>You can also use the <code>-c</code> option to specify a path to an SD card
image to use in the new AVD. For more information, see <a
-href="{@docRoot}guide/developing/devices/managing-avds-cmdline.html">Creating and Managing Virtual Devices on the Command Line</a>.
+href="{@docRoot}guide/developing/devices/managing-avds-cmdline.html">Managing Virtual Devices
+from the Command Line</a>.
</p>
<h3 id="creatingm">Creating an SD card image using mksdcard</h3>
diff --git a/docs/html/guide/developing/devices/index.jd b/docs/html/guide/developing/devices/index.jd
index 3e73eb0..a7d00f3 100644
--- a/docs/html/guide/developing/devices/index.jd
+++ b/docs/html/guide/developing/devices/index.jd
@@ -1,4 +1,4 @@
-page.title=Creating and Managing Virtual Devices
+page.title=Managing Virtual Devices
@jd:body
@@ -13,8 +13,8 @@
<p>You can also create AVDs on the command line by passing the <code>android</code> tool options.
For more information on how to create AVDs in this manner, see <a href=
- "{@docRoot}guide/developing/devices/managing-avds-cmdline.html">Creating and Managing Virtual
- Devices on the Command Line</a>.</p>
+ "{@docRoot}guide/developing/devices/managing-avds-cmdline.html">Managing Virtual
+ Devices from the Command Line</a>.</p>
<p>An AVD consists of:</p>
@@ -66,10 +66,10 @@
</ul>
<p>To learn how to manage AVDs using a graphical tool, read <a href=
- "{@docRoot}guide/developing/devices/managing-avds.html">
- Creating and Managing AVDs with AVD Manager</a>. To learn how to manage AVDs on the command line, read
- <a href="{@docRoot}guide/developing/devices/managing-avds-cmdline.html">Creating and Managing AVDs
- on the Command Line</a>.</p>
+ "{@docRoot}guide/developing/devices/managing-avds.html">Managing AVDs with AVD Manager</a>. To
+learn how to manage AVDs on the command line, read
+ <a href="{@docRoot}guide/developing/devices/managing-avds-cmdline.html">Managing AVDs
+ from the Command Line</a>.</p>
diff --git a/docs/html/guide/developing/devices/managing-avds-cmdline.jd b/docs/html/guide/developing/devices/managing-avds-cmdline.jd
index 878ccc9..02fd750 100644
--- a/docs/html/guide/developing/devices/managing-avds-cmdline.jd
+++ b/docs/html/guide/developing/devices/managing-avds-cmdline.jd
@@ -1,4 +1,4 @@
-page.title=Creating and Managing AVDs on the Command Line
+page.title=Managing AVDs from the Command Line
@jd:body
<div id="qv-wrapper">
diff --git a/docs/html/guide/developing/devices/managing-avds.jd b/docs/html/guide/developing/devices/managing-avds.jd
index 27d2b55..2913ac9 100644
--- a/docs/html/guide/developing/devices/managing-avds.jd
+++ b/docs/html/guide/developing/devices/managing-avds.jd
@@ -1,4 +1,4 @@
-page.title=Creating and Managing AVDs with AVD Manager
+page.title=Managing AVDs with AVD Manager
@jd:body
<div id="qv-wrapper">
diff --git a/docs/html/guide/developing/index.jd b/docs/html/guide/developing/index.jd
index f19f97e..3a64dbc 100644
--- a/docs/html/guide/developing/index.jd
+++ b/docs/html/guide/developing/index.jd
@@ -1,4 +1,4 @@
-page.title=Overview
+page.title=Introduction
@jd:body
<p>Developing applications for Android devices is facilitated by a group of tools that are
@@ -28,8 +28,9 @@
<p>You need to create Android Virtual Devices (AVD) or connect hardware devices on which
you will install your applications.</p>
- <p>See <a href="{@docRoot}guide/developing/devices/index.html">Creating and Managing Virtual Devices</a>
- and <a href="{@docRoot}guide/developing/device.html">Connecting Hardware Devices</a> for more information.
+ <p>See <a href="{@docRoot}guide/developing/devices/index.html">Managing Virtual Devices</a>
+ and <a href="{@docRoot}guide/developing/device.html">Using Hardware Devices</a> for more
+information.
</li>
<li>
diff --git a/docs/html/guide/developing/projects/index.jd b/docs/html/guide/developing/projects/index.jd
index 609a71a..e27fcb4 100644
--- a/docs/html/guide/developing/projects/index.jd
+++ b/docs/html/guide/developing/projects/index.jd
@@ -1,4 +1,4 @@
-page.title=Creating and Managing Projects
+page.title=Managing Projects
@jd:body
<div id="qv-wrapper">
diff --git a/docs/html/guide/developing/projects/projects-cmdline.jd b/docs/html/guide/developing/projects/projects-cmdline.jd
index 8b889ab..b12864e 100644
--- a/docs/html/guide/developing/projects/projects-cmdline.jd
+++ b/docs/html/guide/developing/projects/projects-cmdline.jd
@@ -1,4 +1,4 @@
-page.title=Creating and Managing Projects on the Command Line
+page.title=Managing Projects from the Command Line
@jd:body
<div id="qv-wrapper">
@@ -21,7 +21,7 @@
<ol>
<li><a href=
"{@docRoot}guide/developing/testing/testing_otheride.html#CreateTestProjectCommand">Testing
- in Other IDEs</a></li>
+ from Other IDEs</a></li>
</ol>
</div>
</div>
@@ -41,7 +41,7 @@
<li>Test projects extend JUnit test functionality to include Android specific functionality. For
more information on creating a test project, see <a href=
- "{@docRoot}guide/developing/testing/testing_otheride.html">Testing in other IDEs</a>.</li>
+ "{@docRoot}guide/developing/testing/testing_otheride.html">Testing from other IDEs</a>.</li>
</ul>
@@ -279,7 +279,7 @@
<p>To build an application project that depends on one or more library projects, you can use the
standard Ant build commands and compile modes, as described in <a href=
- "{@docRoot}guide/developing/building/index.html">Building Your Application</a>, earlier in this
- document. The tools compile and merge all libraries referenced by the application as part of
+ "{@docRoot}guide/developing/building/index.html">Building and Running</a>. The tools
+compile and merge all libraries referenced by the application as part of
compiling the dependent application project. No additional commands or steps are necessary.</p>
diff --git a/docs/html/guide/developing/projects/projects-eclipse.jd b/docs/html/guide/developing/projects/projects-eclipse.jd
index 949e6f7..aa49663 100644
--- a/docs/html/guide/developing/projects/projects-eclipse.jd
+++ b/docs/html/guide/developing/projects/projects-eclipse.jd
@@ -1,4 +1,4 @@
-page.title=Creating and Managing Projects in Eclipse
+page.title=Managing Projects from Eclipse with ADT
@jd:body
<div id="qv-wrapper">
@@ -18,7 +18,7 @@
<ol>
<li><a href=
"{@docRoot}guide/developing/testing/testing_eclipse.html#CreateTestProjectEclipse">Testing
- in Eclipse, with ADT</a></li>
+ from Eclipse with ADT</a></li>
</ol>
</div>
</div>
@@ -37,7 +37,7 @@
<li>Test projects extend JUnit test functionality to include Android specific functionality. For
more information on creating a test project, see <a href=
- "{@docRoot}guide/developing/testing/testing_eclipse.html">Testing in Eclipse</a></li>
+ "{@docRoot}guide/developing/testing/testing_eclipse.html">Testing from Eclipse with ADT</a>.</li>
</ul>
<h2 id="CreatingAProject">Creating an Android Project</h2>
diff --git a/docs/html/guide/developing/testing/testing_eclipse.jd b/docs/html/guide/developing/testing/testing_eclipse.jd
index 1b9c6b1..2a5b771 100644
--- a/docs/html/guide/developing/testing/testing_eclipse.jd
+++ b/docs/html/guide/developing/testing/testing_eclipse.jd
@@ -1,4 +1,4 @@
-page.title=Testing In Eclipse, with ADT
+page.title=Testing from Eclipse with ADT
@jd:body
<div id="qv-wrapper">
<div id="qv">
@@ -14,8 +14,10 @@
This topic explains how create and run tests of Android applications in Eclipse with ADT.
Before you read this topic, you should read about how to create an Android application with the
basic processes for creating and running applications with ADT, as described in
- <a href="{@docRoot}guide/developing/projects/projects-eclipse.html">Creating and Managing Projects in Eclipse</a>
- and <a href="guide/developing/building/building-eclipse.html">Building and Running Apps in Eclipse</a>.
+ <a href="{@docRoot}guide/developing/projects/projects-eclipse.html">Managing Projects from
+Eclipse</a>
+ and <a href="guide/developing/building/building-eclipse.html">Building and Running from
+Eclipse</a>.
You may also want to read
<a href="{@docRoot}guide/topics/testing/testing_android.html">Testing Fundamentals</a>,
which provides an overview of the Android testing framework.
@@ -48,7 +50,7 @@
<p>
If you are not developing in Eclipse or you want to learn how to create and run tests from the
command line, see
- <a href="{@docRoot}guide/developing/testing/testing_otheride.html">Testing in Other IDEs</a>.
+ <a href="{@docRoot}guide/developing/testing/testing_otheride.html">Testing from Other IDEs</a>.
</p>
<h2 id="CreateTestProjectEclipse">Creating a Test Project</h2>
<p>
diff --git a/docs/html/guide/developing/testing/testing_otheride.jd b/docs/html/guide/developing/testing/testing_otheride.jd
index 48fa032..50cc4fa 100644
--- a/docs/html/guide/developing/testing/testing_otheride.jd
+++ b/docs/html/guide/developing/testing/testing_otheride.jd
@@ -1,4 +1,4 @@
-page.title=Testing In Other IDEs
+page.title=Testing from Other IDEs
@jd:body
<div id="qv-wrapper">
@@ -67,7 +67,7 @@
If you are developing in Eclipse with ADT, you can set up and run your tests
directly in Eclipse. For more information, please read
<a href="{@docRoot}guide/developing/testing/testing_eclipse.html">
- Testing in Eclipse, with ADT</a>.
+ Testing from Eclipse with ADT</a>.
</p>
<h2 id="CreateTestProjectCommand">Working with Test Projects</h2>
<p>
@@ -133,7 +133,7 @@
This creates a new test project with the appropriate directories and build files. The directory
structure and build file contents are identical to those in a regular Android application
project. They are described in detail in the topic
- <a href="{@docRoot}guide/developing/projects/index.html">Creating and Managing Projects</a>.
+ <a href="{@docRoot}guide/developing/projects/index.html">Managing Projects</a>.
</p>
<p>
The operation also creates an <code>AndroidManifest.xml</code> file with instrumentation
diff --git a/docs/html/guide/developing/tools/adb.jd b/docs/html/guide/developing/tools/adb.jd
index bcdc2e6..26839a1 100644
--- a/docs/html/guide/developing/tools/adb.jd
+++ b/docs/html/guide/developing/tools/adb.jd
@@ -171,7 +171,8 @@
<pre>adb install <path_to_apk></pre>
-<p>For more information about how to create an .apk file that you can install on an emulator/device instance, see <a href="{@docRoot}guide/developing/building/index.html">Building and Running Apps</a></p>
+<p>For more information about how to create an .apk file that you can install on an emulator/device
+instance, see <a href="{@docRoot}guide/developing/building/index.html">Building and Running</a></p>
<p>Note that, if you are using the Eclipse IDE and have the ADT plugin installed, you do not need to use adb (or aapt) directly to install your application on the emulator/device. Instead, the ADT plugin handles the packaging and installation of the application for you. </p>
diff --git a/docs/html/guide/developing/tools/android.jd b/docs/html/guide/developing/tools/android.jd
index ebf95ce..15cf8e0 100644
--- a/docs/html/guide/developing/tools/android.jd
+++ b/docs/html/guide/developing/tools/android.jd
@@ -5,11 +5,11 @@
<ul>
<li>Create, delete, and view Android Virtual Devices (AVDs). See <a href=
- "{@docRoot}guide/developing/devices/managing-avds-cmdline.html">
- Creating and Managing AVDs on the Command Line</a>.</li>
+ "{@docRoot}guide/developing/devices/managing-avds-cmdline.html">Managing AVDs from the Command
+Line</a>.</li>
<li>Create and update Android projects. See <a href=
- "{@docRoot}guide/developing/projects/projects-cmdline.html">Creating and Managing Projects on
+ "{@docRoot}guide/developing/projects/projects-cmdline.html">Managing Projects from
the Command Line</a>.</li>
<li>Update your Android SDK with new platforms, add-ons, and documentation. See <a href=
diff --git a/docs/html/guide/developing/tools/emulator.jd b/docs/html/guide/developing/tools/emulator.jd
index 9baf1a1..748a8b1 100644
--- a/docs/html/guide/developing/tools/emulator.jd
+++ b/docs/html/guide/developing/tools/emulator.jd
@@ -86,7 +86,7 @@
instance.</td>
<td>You must create an AVD configuration before launching the emulator. For
information, see <a href="{@docRoot}guide/developing/devices/managing-avds.html#createavd">
- Creating and Managing AVDs with AVD Manager</a>.</td>
+ Managing AVDs with AVD Manager</a>.</td>
<tr>
<td rowspan="7">Disk Images</td>
<td><code>-cache <filepath></code></td>
@@ -440,7 +440,7 @@
AVDs let you associate each skin with a default density and override the default
as needed. For more information, see <a
href="{@docRoot}guide/developing/devices/managing-avds.html#createavd">
-Creating and Managing Virtual Devices with AVD Manager</a>.
+Managing Virtual Devices with AVD Manager</a>.
</td>
</tr>
<tr>
diff --git a/docs/html/guide/developing/tools/layoutopt.jd b/docs/html/guide/developing/tools/layoutopt.jd
index fdbf777..e8f623d 100644
--- a/docs/html/guide/developing/tools/layoutopt.jd
+++ b/docs/html/guide/developing/tools/layoutopt.jd
@@ -5,8 +5,9 @@
layouts and layout hierarchies of your applications.<p>
<p>This document is a reference to the available command line options. For more information and sample
-output of the tool, see <a href="{@docRoot}guide/developing/debugging/debugging-ui.html#layoutopt.html">
-Optimizing layouts with layoutopt</a>.</p>
+output of the tool, see <a
+href="{@docRoot}guide/developing/debugging/debugging-ui.html#layoutopt">Optimizing layouts with
+layoutopt</a>.</p>
<h3>Usage</h3>
diff --git a/docs/html/guide/developing/tools/logcat.jd b/docs/html/guide/developing/tools/logcat.jd
index 1577604..9603b9f 100644
--- a/docs/html/guide/developing/tools/logcat.jd
+++ b/docs/html/guide/developing/tools/logcat.jd
@@ -8,7 +8,8 @@
<code>logcat</code> from an ADB shell to view the log messages.</p>
<p>This document is a reference to the available command line options. For more information on <code>logcat</code>, see
- <a href="{@docRoot}guide/developing/debugging/debugging-log.html">Reading and Writing Log Messages</a>. For more
+ <a href="{@docRoot}guide/developing/debugging/debugging-log.html">Reading and Writing Logs</a>.
+For more
information on accessing <code>logcat</code> from DDMS, instead of the command line, see the documentation for the
<a href="{@docRoot}guide/developing/debugging/ddms.html">Dalvik Debug Monitor Server</a>.
</p>
diff --git a/docs/html/guide/developing/tools/mksdcard.jd b/docs/html/guide/developing/tools/mksdcard.jd
index f70d6b7..0ec69d2 100644
--- a/docs/html/guide/developing/tools/mksdcard.jd
+++ b/docs/html/guide/developing/tools/mksdcard.jd
@@ -13,7 +13,7 @@
</pre>
<h3>Options</h3>
- The following table describes the command-line options of <code>mksdcard</code>
+ <p>The following table describes the command-line options of <code>mksdcard</code></p>
<table>
<tr>
<th>Option</th>
@@ -50,4 +50,4 @@
<pre>emulator -sdcard <file></pre>
<h3>Example</h3>
-mksdcard -l mySdCard 1024M mySdCardFile.img
\ No newline at end of file
+<pre>mksdcard -l mySdCard 1024M mySdCardFile.img</pre>
\ No newline at end of file
diff --git a/docs/html/guide/developing/tools/proguard.jd b/docs/html/guide/developing/tools/proguard.jd
index 6abbd36..e75a8cd 100644
--- a/docs/html/guide/developing/tools/proguard.jd
+++ b/docs/html/guide/developing/tools/proguard.jd
@@ -24,10 +24,10 @@
<ol>
<li><a href="http://proguard.sourceforge.net/manual/introduction.html">ProGuard
- Manual</a></li>
+ Manual »</a></li>
<li><a href="http://proguard.sourceforge.net/manual/retrace/introduction.html">ProGuard
- ReTrace Manual</a></li>
+ ReTrace Manual »</a></li>
</ol>
</div>
</div>
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index 441bdf5..a375b11 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -387,13 +387,13 @@
signing, upgrading, selecting a package name, select device profile, touch, trackball, dpad available, etc. -->
<li>
<a href="<?cs var:toroot ?>guide/developing/index.html">
- <span class="en">Overview</span></a>
+ <span class="en">Introduction</span></a>
</li>
<li class="toggle-list">
<div>
<a href="<?cs var:toroot ?>guide/developing/devices/index.html">
- <span class="en">Creating and Managing Virtual Devices</span>
+ <span class="en">Managing Virtual Devices</span>
</a>
</div>
<ul>
@@ -404,7 +404,7 @@
</li>
<li>
<a href="<?cs var:toroot ?>guide/developing/devices/managing-avds-cmdline.html">
- <span class="en">On the Command Line</span>
+ <span class="en">From the Command Line</span>
</a>
</li>
<li>
@@ -416,25 +416,25 @@
</li>
<li>
<a href="<?cs var:toroot ?>guide/developing/device.html">
- <span class="en">Connecting Hardware Devices</span>
+ <span class="en">Using Hardware Devices</span>
</a>
</li>
<li class="toggle-list">
<div>
<a href="<?cs var:toroot ?>guide/developing/projects/index.html">
- <span class="en">Creating and Managing Projects</span>
+ <span class="en">Managing Projects</span>
</a>
</div>
<ul>
<li>
<a href="<?cs var:toroot ?>guide/developing/projects/projects-eclipse.html">
- <span class="en">In Eclipse with ADT</span>
+ <span class="en">From Eclipse with ADT</span>
</a>
</li>
<li>
<a href="<?cs var:toroot ?>guide/developing/projects/projects-cmdline.html">
- <span class="en">On the Command Line</span>
+ <span class="en">From the Command Line</span>
</a>
</li>
</ul>
@@ -443,14 +443,15 @@
<li class="toggle-list">
<div>
<a href="<?cs var:toroot ?>guide/developing/building/index.html">
- <span class="en">Building and Running Apps</span>
+ <span class="en">Building and Running</span>
</a>
</div>
<ul>
<li><a href="<?cs var:toroot ?>guide/developing/building/building-eclipse.html">
- <span class="en">In Eclipse with ADT</span>
+ <span class="en">From Eclipse with ADT</span>
</a></li>
- <li><a href="<?cs var:toroot ?>guide/developing/building/building-cmdline.html"><span class="en">On the Command Line</span></a></li>
+ <li><a href="<?cs var:toroot ?>guide/developing/building/building-cmdline.html">
+ <span class="en">From the Command Line</span></a></li>
</ul>
</li>
@@ -463,12 +464,12 @@
<ul>
<li>
<a href="<?cs var:toroot ?>guide/developing/debugging/debugging-projects.html">
- <span class="en">In Eclipse with ADT</span>
+ <span class="en">From Eclipse with ADT</span>
</a>
</li>
<li>
<a href="<?cs var:toroot ?>guide/developing/debugging/debugging-projects-cmdline.html">
- <span class="en">In Other IDEs</span>
+ <span class="en">From Other IDEs</span>
</a>
</li>
<li>
@@ -478,7 +479,7 @@
</li>
<li>
<a href="<?cs var:toroot ?>guide/developing/debugging/debugging-log.html">
- <span class="en">Reading and Writing Log Messages</span>
+ <span class="en">Reading and Writing Logs</span>
</a>
</li>
<li>
@@ -508,13 +509,13 @@
<ul>
<li>
<a href="<?cs var:toroot ?>guide/developing/testing/testing_eclipse.html">
- <span class="en">In Eclipse with ADT</span>
+ <span class="en">From Eclipse with ADT</span>
</a>
</li>
<li>
<a href="<?cs var:toroot ?>guide/developing/testing/testing_otheride.html">
- <span class="en">In Other IDEs</span>
+ <span class="en">From Other IDEs</span>
</a>
</li>
</ul>