add notice about compatiblity with N Preview (bug:27830549) improve linux 32-bit library information (bug:27962189), add a note about JDK 8 compatibility on Mac, and a few other edits to installation guide and system reqs. am: d69b727

am: 1b30208

* commit '1b302089bc287784a80451a14687c09959580298':
  add notice about compatiblity with N Preview (bug:27830549) improve linux 32-bit library information (bug:27962189), add a note about JDK 8 compatibility on Mac, and a few other edits to installation guide and system reqs.

Change-Id: I15abf5e209c4e005856b0009932cc7ac04177d96

docs/html/sdk/index.jd

@@ -486,8 +486,9 @@ Android Auto.</p>
 <ul>
 <li>Microsoft&reg;  Windows&reg;  7/8/10 (32 or 64-bit)</li>
 <li>2 GB RAM minimum, 8 GB RAM recommended</li>
-<li>2 GB of available disk space minimum (500 MB for IDE + 1.5 GB for
+<li>2 GB of available disk space minimum,<br>4 GB Recommended
-Android SDK and emulator system image). 4 GB Recommended.</li>
+(500 MB for IDE + 1.5 GB for
+Android SDK and emulator system image)</li>
 <li>1280 x 800  minimum screen resolution</li>
 <li>Java Development Kit (JDK) 8</li>
 <li>Optional for accelerated emulator: Intel® processor with support for Intel®
@@ -500,8 +501,9 @@ VT-x, Intel® EM64T (Intel® 64), and Execute Disable (XD) Bit functionality</li
 <ul>
 <li>Mac&reg;  OS X&reg;  10.8.5 or higher, up to 10.11.4 (El Capitan)</li>
 <li>2 GB RAM minimum, 8 GB RAM recommended</li>
-<li>2 GB of available disk space minimum (500 MB for IDE + 1.5 GB for
+<li>2 GB of available disk space minimum,<br>4 GB Recommended
-Android SDK and emulator system image). 4 GB Recommended.</li>
+(500 MB for IDE + 1.5 GB for
+Android SDK and emulator system image)</li>
 <li>1280 x 800 minimum screen resolution</li>
 <li>Java Development Kit (JDK) 6</li>
 </ul>
@@ -515,8 +517,9 @@ Android SDK and emulator system image). 4 GB Recommended.</li>
 capable of running 32-bit applications)</i></li>
 <li>GNU C Library (glibc) 2.11 or later</li>
 <li>2 GB RAM minimum, 8 GB RAM recommended</li>
-<li>2 GB of available disk space minimum (500 MB for IDE + 1.5 GB for
+<li>2 GB of available disk space minimum,<br>4 GB Recommended
-Android SDK and emulator system image). 4 GB Recommended.</li>
+(500 MB for IDE + 1.5 GB for
+Android SDK and emulator system image)</li>
 <li>1280 x 800 minimum screen resolution</li>
 <li>Java Development Kit (JDK) 8</li>
 </ul>

docs/html/sdk/installing/index.jd

@@ -5,21 +5,29 @@ page.tags=sdk tools
 
 @jd:body
 
+<style>
+.instruction-select {
+  float:right;
+  background: #f7f7f7;
+  padding: 15px;
+  margin: -15px 0 20px 40px;
+}
+</style>
 
-<div style="float:right;margin:0 0 20px 20px;border:1px solid #ccc;padding:10px">
+<div class="instruction-select">
 <p><strong>Instructions for</strong></p>
 <select id="instructions-option" onchange="showInstructions(this.value)" style="padding:4px">
   <option value="windows">Windows</option>
   <option value="mac">Mac</option>
   <option value="linux">Linux</option>
-</select> 
+</select>
 </div>
 
 <p>Setting up Android Studio takes just a few clicks.</p>
 
 <p>While the <a href="{@docRoot}sdk/index.html">Android Studio download</a>
-completes, make sure you have JDK 8 or higher installed. To check which version
+completes, verify which version of the JDK you have:
-you have, open a command line and type <code>javac -version</code>. If the JDK
+open a command line and type <code>javac -version</code>. If the JDK
 is not available or the version is lower than 1.8, download the <a href=
 "http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
 class="external-link">Java SE Development Kit 8</a>.</p>
@@ -38,7 +46,7 @@ class="external-link">Java SE Development Kit 8</a>.</p>
     <p>Select <strong>Start menu > Computer > System Properties >
     Advanced System Properties</strong>. Then open <strong>Advanced tab > Environment
     Variables</strong> and add a new system variable <code>JAVA_HOME</code> that points to
-    your JDK folder, for example <code>C:\Program Files\Java\jdk1.7.0_21</code>.</p>
+    your JDK folder, for example <code>C:\Program Files\Java\jdk1.8.0_77</code>.</p>
   </p>
   </li>
 </ol>
@@ -50,8 +58,8 @@ The following video shows each step of the recommended setup procedure.</p>
   <source src="https://storage.googleapis.com/androiddevelopers/videos/studio-install-windows.mp4" type="video/mp4">
 </video>
 
-<p>As new tools and other APIs become available, Android Studio will tell you
+<p>As new tools and other APIs become available, Android Studio tells you
-with a pop-up, or you can check yourself by clicking <strong>Help &gt;
+with a pop-up, or you can check for updates by clicking <strong>Help &gt;
 Check for Update</strong>.</p>
 
 
@@ -64,6 +72,10 @@ Check for Update</strong>.</p>
 
 <div id="system-mac" style="display:none">
 
+<p>There are, however, known stability issues in Android Studio on Mac
+when using JDK 1.8. Until these issues are resolved, you can improve stability
+by downgrading your JDK to an older version (but no lower than JDK 1.6).</p>
+
 <p>To install Android Studio on your Mac, proceed as follows:</p>
 
 <ol>
@@ -72,9 +84,8 @@ Check for Update</strong>.</p>
     Android Studio.</li>
   <li>Select whether you want to import previous Android Studio settings,
     then click <strong>OK</strong>.</li>
-  <li>The Android Studio Setup Wizard will guide you though the rest of the
+  <li>The Android Studio Setup Wizard guides you though the rest of the
-    setup procedures in just a few clicks,
+    setup, which includes downloading Android SDK components
-    which includes downloading various Android SDK components
     that are required for development.</li>
 </ol>
 
@@ -86,9 +97,9 @@ The following video shows each step of the recommended setup procedure.</p>
 </video>
 
 <p>
-As new tools and other APIs become available, Android Studio will tell you
+As new tools and other APIs become available, Android Studio tells you
-with a pop-up, or you can check yourself by clicking <strong>Android Studio &gt;
+with a pop-up, or you can check for updates by clicking <strong>Android Studio
-Check for Updates</strong>.</p>
+&gt; Check for Updates</strong>.</p>
 
 </div>
 <!-- end mac -->
@@ -116,13 +127,21 @@ Check for Updates</strong>.</p>
   </li>
   <li>Select whether you want to import previous Android Studio settings
     or not, then click <strong>OK</strong>.</li>
-  <li>The Android Studio Setup Wizard will guide you though the rest of the
+  <li>The Android Studio Setup Wizard guides you though the rest of the
-    setup procedures in just a few clicks,
+    setup, which includes downloading Android SDK components
-    which includes downloading various Android SDK components
     that are required for development.</li>
   </li>
 </ol>
 
+<div class="note">
+<p><strong>Note:</strong>
+If you are running a 64-bit version of Ubuntu, you need to install some 32-bit
+libraries with the following command:</p>
+<pre>sudo apt-get install lib32z1 lib32ncurses5 lib32bz2-1.0 lib32stdc++6</pre>
+<p>If you are running 64-bit Fedora, the command is:</p>
+<pre>sudo yum install zlib.i686 ncurses-libs.i686 bzip2-libs.i686</pre>
+</div>
+
 <p>That's it!
 The following video shows each step of the recommended setup procedure.</p>
 
@@ -130,16 +149,16 @@ The following video shows each step of the recommended setup procedure.</p>
   <source src="https://storage.googleapis.com/androiddevelopers/videos/studio-install-linux.mp4" type="video/mp4">
 </video>
 
-<p>As new tools and other APIs become available, Android Studio will tell you
+<p>As new tools and other APIs become available, Android Studio tells you
-with a pop-up, or you can check yourself by clicking <strong>Help &gt;
+with a pop-up, or you can check for updates by clicking <strong>Help &gt;
 Check for Update</strong>.</p>
 
-  <p class="note"><strong>Note:</strong> To support 32-bit apps
-  on a 64-bit machine, you will need to install the ia32-libs,
-  lib32ncurses5-dev, and lib32stdc++6 packages.</p>
-
 </div><!-- end linux -->
 
+<p class="note"><strong>Note:</strong>
+If you want to develop apps with the N Preview SDK, you must use
+the preview version of Android Studio 2.1. For more information, see the
+<a href="{@docRoot}preview/setup-sdk.html">N Preview setup guide</a>.</p>