From be8e62388cbb428432049938af4122a6314d735c Mon Sep 17 00:00:00 2001
From: Rich Slogar <rslogar@google.com>
Date: Wed, 21 Jan 2015 10:38:38 -0800
Subject: [PATCH] docs: note to install linux packages

b/2845850
b.android 98328

Change-Id: I23224f24cb0b42ec4ffb3829e2246628da140f8c
---
 docs/html/sdk/installing/adding-packages.jd | 2 +-
 docs/html/sdk/installing/index.jd           | 7 ++++++-
 docs/html/tools/help/sdk-manager.jd         | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/html/sdk/installing/adding-packages.jd b/docs/html/sdk/installing/adding-packages.jd
index 3126c1b02839e..88619bd4084c6 100644
--- a/docs/html/sdk/installing/adding-packages.jd
+++ b/docs/html/sdk/installing/adding-packages.jd
@@ -72,7 +72,7 @@ style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li>
       <li>Windows: Double-click the <code>SDK Manager.exe</code> file at the root of the Android
   SDK directory.</li>
       <li>Mac/Linux: Open a terminal and navigate to the <code>tools/</code> directory in the
-  Android SDK, then execute <code>android sdk</code>.</li>
+      location where the Android SDK was installed, then execute <code>android sdk</code>.</li>
     </ul>
   </li>
 </ul>
diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd
index 9a02382e766c6..40f5e4a1ec058 100644
--- a/docs/html/sdk/installing/index.jd
+++ b/docs/html/sdk/installing/index.jd
@@ -119,7 +119,12 @@ you can access them at:</p>
       <p>You may want to add {@code android-studio/bin/} to your PATH environmental
       variable so that you can start Android Studio from any directory.</p>
     </li>
-    <li>Follow the setup wizard to install any necessary SDK tools.</li>
+    <li>If the SDK is not already installed, follow the setup wizard to install the SDK and any
+    necessary SDK tools.
+    <p class="note"><strong>Note:</strong> You may also need to install the ia32-libs,
+    lib32ncurses5-dev, and lib32stc++6 packages. These packages are required to support 32-bit apps
+    on a 64-bit machine. </p>
+    </li>
   </ol>
 
 </div><!-- end linux -->
diff --git a/docs/html/tools/help/sdk-manager.jd b/docs/html/tools/help/sdk-manager.jd
index b084237855273..0c7739545b0e0 100644
--- a/docs/html/tools/help/sdk-manager.jd
+++ b/docs/html/tools/help/sdk-manager.jd
@@ -16,7 +16,7 @@ your environment.</p>
   <li>On Windows, double-click the <code>SDK Manager.exe</code> file at the root of the Android
 SDK directory.</li>
   <li>On Mac or Linux, open a terminal and navigate to the <code>tools/</code> directory in the
-Android SDK, then execute <code>android sdk</code>.</li>
+location where the Android SDK is installed, then execute <code>android sdk</code>.</li>
 </ul>
 
 <p>You can select which packages you want to download by toggling the checkboxes on the left, then