am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs
* commit '717b4d130f67606c44122c2219ed35996afc360c':
docs: note to install linux packages
diff --git a/docs/html/sdk/installing/adding-packages.jd b/docs/html/sdk/installing/adding-packages.jd
index 3126c1b..88619bd 100644
--- a/docs/html/sdk/installing/adding-packages.jd
+++ b/docs/html/sdk/installing/adding-packages.jd
@@ -72,7 +72,7 @@
<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 9a02382..40f5e4a 100644
--- a/docs/html/sdk/installing/index.jd
+++ b/docs/html/sdk/installing/index.jd
@@ -119,7 +119,12 @@
<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 b084237..0c77395 100644
--- a/docs/html/tools/help/sdk-manager.jd
+++ b/docs/html/tools/help/sdk-manager.jd
@@ -16,7 +16,7 @@
<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