From f45303bfcad3a1825789c8f36852528e3641b3e8 Mon Sep 17 00:00:00 2001
From: Cheryl Potter <cherylpotter@google.com>
Date: Fri, 29 Jan 2016 18:22:05 -0800
Subject: [PATCH] b/25963771 docs: 64-bit Linux now required b/26288626

Change-Id: I0291b1dab9603ba2f4230ac9d1477c484c90f0cd
---
 docs/html/sdk/index.jd             |  3 ++-
 docs/html/sdk/installing/index.jd  |  2 +-
 docs/html/tools/sdk/tools-notes.jd | 24 ++++++++++++++++++++++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index 5db013c860d52..4c09f8fcc2561 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -437,7 +437,7 @@ Studio</a>.</p>
 <h3>Windows</h3>
 
 <ul>
-<li>Microsoft&reg;  Windows&reg;  8/7/Vista (32 or 64-bit)</li>
+<li>Microsoft&reg;  Windows&reg;  8/7/Vista (32- or 64-bit)</li>
 <li>2 GB RAM minimum, 4 GB RAM recommended</li>
 <li>400 MB hard disk space</li>
 <li>At least 1 GB for Android SDK, emulator system images, and caches</li>
@@ -477,6 +477,7 @@ rendering. You can then configure your project to use Java Development Kit (JDK)
 <li>At least 1 GB for Android SDK, emulator system images, and caches</li>
 <li>1280 x 800 minimum screen resolution</li>
 <li>Oracle&reg;  Java Development Kit (JDK) 7 </li>
+<li>64-bit distribution capable of running 32-bit applications</li>
 </ul>
 <p>Tested on Ubuntu&reg;  14.04, Trusty Tahr (64-bit distribution capable of running
 32-bit applications).</p>
diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd
index 1e732da7d8859..4d53ea4088abf 100644
--- a/docs/html/sdk/installing/index.jd
+++ b/docs/html/sdk/installing/index.jd
@@ -93,7 +93,7 @@ where they are installed. For example:</p>
     </li>
   </ol>
 
-<p>If you need use the Android SDK tools from a command line,
+<p>If you need to use the Android SDK tools from a command line,
 you can access them at:</p>
 <p><code>/Users/&lt;user>/Library/Android/sdk/</code></p>
 
diff --git a/docs/html/tools/sdk/tools-notes.jd b/docs/html/tools/sdk/tools-notes.jd
index 3859ecfa737f0..64e4f59347a13 100644
--- a/docs/html/tools/sdk/tools-notes.jd
+++ b/docs/html/tools/sdk/tools-notes.jd
@@ -21,11 +21,31 @@ Tools you are using, refer to the "Installed Packages" listing in the Android SD
 <p>For a summary of all known issues in SDK Tools, see <a
 href="http://tools.android.com/knownissues">http://tools.android.com/knownissues</a>.</p>
 
-
-
 <div class="toggle-content opened">
   <p><a href="#" onclick="return toggleContent(this)">
     <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
+      alt=""/>SDK Platform-tools, Revision 23.1.0</a> <em>(December 2015)</em>
+  </p>
+
+  <div class="toggle-content-toggleme">
+
+    <dl>
+        <dt>General Notes:</dt>
+    <dd>
+      <ul>
+        <li>Changed Linux requirements for Android SDK Platform-tools revision 23.1.0 and later:
+          it now requires 64-bit Linux.</li>
+      </ul>
+    </dd>
+
+
+
+  </div>
+</div>
+
+<div class="toggle-content closed">
+  <p><a href="#" onclick="return toggleContent(this)">
+    <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img"
       alt=""/>SDK Tools, Revision 24.4.1</a> <em>(October 2015)</em>
   </p>