Merge "update sidenav, fix typos" into honeycomb

docs/html/guide/topics/fundamentals/fragments.jd

@@ -9,7 +9,7 @@ page.title=Fragments
     <li>Fragments decompose application functionality and UI into reusable modules</li>
     <li>Add multiple fragments to a screen to avoid switching activities</li>
     <li>Fragments have their own lifecycle, state, and back stack</li>
-    <li>Fragments require API Level HONEYCOMB or greater</li>
+    <li>Fragments require API Level "Honeycomb" or greater</li>
   </ul>
 
   <h2>In this document</h2>
@@ -59,12 +59,12 @@ modular section of an activity, which has its own lifecycle, receives its own in
 which you can add or remove while the activity is running.</p>
 
 <p>A fragment must always be embedded in an activity and the fragment's lifecycle is directly
-affected by the activity's lifecycle. For example, when the activity is paused, so are all
+affected by the host activity's lifecycle. For example, when the activity is paused, so are all
 fragments in it, and when the activity is destroyed, so are all fragments. However, while an
 activity is running (it is in the <em>resumed</em> <a
 href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">lifecycle state</a>), you can
 manipulate each fragment independently, such as add or remove them. When you perform such a
-fragment transaction, you can it to a back stack managed by the
+fragment transaction, you can also add it to a back stack that's managed by the
 activity&mdash;each back stack entry in the activity is a record of the fragment transaction that
 occurred. The back stack allows the user to reverse a fragment transaction (navigate backwards),
 by pressing the BACK key.</p>

docs/html/sdk/preview/start.jd

@@ -3,10 +3,9 @@ page.title=Getting Started with the Android 3.0 Preview
 
 <p>Welcome to Android 3.0!</p>
 
-<p>Android 3.0 is the next major release of the Android platform and is optimized for tablet
-devices. We're offering a preview SDK so you can get a head-start developing
-applications for it or simply optimize your existing application for upcoming
-tablets.</p>
+<p>Android 3.0 is the next major release of the Android platform and is optimized for larger screen
+devices, particularly tablets. We're offering a preview SDK so you can get a head-start developing
+applications for it or simply test and optimize your existing application for upcoming devices.</p>
 
 <p><strong>Be aware that:</strong></p>
 <ul>
@@ -29,13 +28,13 @@ the AVD and SDK Manager.</li>
   <li><a href="#Setup">Set up the preview SDK</a></li>
   <li>Then choose your app adventure:
     <ol type="a">
-      <li><a href="#Optimize">Optimize Your App for Tablets</a>
+      <li><a href="#Optimize">Optimize Your App for Tablets and Similar Devices</a>
         <p>When you have an existing application and you want to maintain compatibility with
 older versions of Android.</p>
       </li>
-      <li><a href="#Upgrade">Upgrade or Develop a New App for Tablets</a>
+      <li><a href="#Upgrade">Upgrade or Develop a New App for Tablets and Similar Devices</a>
         <p>When you want to upgrade your application to use APIs introduced in Android 3.0 or
-    create an all new application targeted to tablet devices.</p></li>
+    create a new application targeted to tablets and similar devices.</p></li>
     </ol>
   </li>
 </ol>
@@ -64,16 +63,16 @@ the target to "Android 3.0 (Preview)" and the skin to "WXGA".</li>
 </ol>
 
 
-<h3>About Emulator Performance</h3>
+<h3>About emulator performance</h3>
 
 <p>Because the Android emulator must simulate the ARM instruction set architecture on your
 computer and the WXGA screen is significantly larger than what the emulator
 normally handles, emulator performance is much slower than usual.</p>
 
 <p>We're working hard to resolve the performance issues and it will improve in future releases.
-Unfortunately, the emulator will perform slowly during your trial with the preview SDK. Please
-continue to use the emulator to evaluate your application's appearance and functionality on Android
-3.0.</p>
+Unfortunately, the emulator will perform slowly during your trial with the preview SDK. For the time
+being, the emulator is still best way to evaluate your application's appearance and functionality on
+Android 3.0.</p>
 
 <p class="note"><strong>Tip:</strong> To improve the startup time for the emulator, enable
 snapshots for the AVD when you create it with the SDK and AVD Manager (there's a checkbox in
@@ -83,7 +82,8 @@ used to quickly relaunch the AVD next time. However, when you choose to save a s
 emulator will be slow to close, so you might want to enable <b>Save to
 snapshot</b> only for the first time you launch the AVD.</p>
 
-<h4>Other emulator issues</h4> 
+
+<h3>Known issues</h3> 
 
 <p>The following known issues occur for Android 3.0 AVDs that are loaded in the emulator:</p> 
   <ul> 
@@ -98,23 +98,23 @@ mode. To view the screen correctly, rotate the emulator to portrait mode by pres
 turn off the auto-rotate setting in <strong>Settings > Screen > Auto-rotate screen</strong>.</li> 
     <li>The Dev Tools application sometimes crashes when trying to use the Package Browser
 feature.</li> 
-    <li>On Ubuntu 10.04 64-bit machines, you cannot create an AVD that have an SD card.</li> 
+    <li>On Ubuntu 10.04 64-bit machines, you cannot create an AVD that has an SD card.</li> 
   </ul> 
 
 
 
-<h2 id="Optimize">Optimize Your Application for Tablets</h2>
+<h2 id="Optimize">Optimize Your Application for Tablets and Similar Devices</h2>
 
 <p>If you've already developed an application for Android, there are a few things you can do
-to optimize it for a tablet experience, without changing the minimum platform version required (you
-don't need to change the manifest {@code minSdkVersion}).</p>
+to optimize it for a tablet-style experience, without changing the minimum platform version required
+(you don't need to change the manifest {@code minSdkVersion}).</p>
 
 <p class="note"><strong>Note:</strong> All Android applications are forward-compatible, so
 there's nothing you <em>have to</em> do&mdash;if your application is a good citizen of the Android
 APIs, your app should work fine on devices running Android 3.0. However, in order to provide users
-a better experience when running your app on an Android 3.0 tablet, we recommend that you update
-your application to adapt to the new system theme and optimize your application for larger
-screens.</p>
+a better experience when running your app on an Android 3.0 tablet or similar-size device, we
+recommend that you update your application to adapt to the new system theme and optimize your
+application for larger screens.</p>
 
 <p>Here's what you can do to optimize your application for tablets running Android
 3.0:</p>
@@ -189,10 +189,10 @@ for Screen Independence</a>.</p>
 
 
 
-<h2 id="Upgrade">Upgrade or Develop a New App for Tablets</h2>
+<h2 id="Upgrade">Upgrade or Develop a New App for Tablets and Similar Devices</h2>
 
-<p>If you want to develop something truly for tablets running Android 3.0, then you need to use new
-APIs available in Android 3.0. This section introduces some of the new features that you
+<p>If you want to develop something truly for tablet-type devices running Android 3.0, then you need
+to use new APIs available in Android 3.0. This section introduces some of the new features that you
 should use.</p>
 
 <p>The first thing to do when you create a project with the Android 3.0 preview is set the <a
@@ -227,7 +227,7 @@ activities.</p>
 
 
 
-<h3>Publishing your app for tablets only</h3>
+<h3>Publishing your app for tablet-type devices only</h3>
 
 <p>Additionally, you should decide whether your application is for <em>only</em> tablet devices
 (specifically, <em>xlarge</em> devices) or for devices of all sizes that may run Android 3.0.</p>

docs/html/sdk/sdk_toc.cs

@@ -78,7 +78,7 @@
     <ul>
       <li class="toggle-list">
       <div><a href="<?cs var:toroot ?>sdk/android-2.3.html">
-      <span class="en">Android 2.3 Platform</span></a> <span class="new">new!</span></div>
+      <span class="en">Android 2.3 Platform</span></a></div>
         <ul>
           <li><a href="<?cs var:toroot ?>sdk/android-2.3-highlights.html">Platform Highlights</a></li> 
           <li><a href="<?cs var:toroot ?>sdk/api_diff/9/changes.html">API Differences Report &raquo;</a></li> 
@@ -98,9 +98,8 @@
       </li>
     </ul>
     <ul>
-      <li><a href="<?cs var:toroot ?>sdk/tools-notes.html">SDK Tools, r8</a> <span class="new">new!</span></li>
-      <li><a href="<?cs var:toroot ?>sdk/win-usb.html">Google USB Driver, r4</a> <span class="new">new!</span>
-      </li>
+      <li><a href="<?cs var:toroot ?>sdk/tools-notes.html">SDK Tools, r9</a> <span class="new">new!</span></li>
+      <li><a href="<?cs var:toroot ?>sdk/win-usb.html">Google USB Driver, r4</a></li>
     </ul>
   </li>
   <li>
@@ -115,7 +114,7 @@
       <span style="display:none" class="zh-TW"></span>
       </h2>
     <ul>
-      <li><a href="<?cs var:toroot ?>sdk/eclipse-adt.html">ADT 8.0.1
+      <li><a href="<?cs var:toroot ?>sdk/eclipse-adt.html">ADT 9.0.0
       <span style="display:none" class="de"></span>
       <span style="display:none" class="es"></span>
       <span style="display:none" class="fr"></span>
@@ -137,7 +136,7 @@
       <span style="display:none" class="zh-TW"></span>
     </h2>
     <ul>
-      <li><a href="<?cs var:toroot ?>sdk/ndk/index.html">Android NDK, r5</a>
+      <li><a href="<?cs var:toroot ?>sdk/ndk/index.html">Android NDK, r5b</a>
         <span class="new">new!</span></li>
       <li><a href="<?cs var:toroot ?>sdk/ndk/overview.html">What is the NDK?</a></li>
     </ul>