commit 6302a72a8d9f3ce53d87c78b24048bc0787547cf
author Ricardo Cervera <rcervera@google.com> Tue Jan 06 22:36:16 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 06 22:36:16 2015 +0000
tree bc8ae7d4e8a9f2d22470ad72ab8558eae33b3fa8
parent 5e1b4a0c8301716bd20fa172db523013e7b698bd
parent 934c8ddc207133cc26eea9ce10d2079f2d6ff3ea

am 934c8ddc: am ebc28729: am e7d1db56: am d69238ef: am 4bb503cf: docs: Minor fixes in Android Studio pages.

* commit '934c8ddc207133cc26eea9ce10d2079f2d6ff3ea':
  docs: Minor fixes in Android Studio pages.

docs/html/sdk/index.jd

diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index 5d73d72..d9a47a2 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -449,7 +449,7 @@
 <ul>
 <li>Microsoft&reg;  Windows&reg;  8/7/Vista/2003 (32 or 64-bit)</li>
 <li>2 GB RAM minimum, 4 GB RAM recommended</li>
-<li>400 MB hard disk space + at least 1 G for Android SDK, emulator system images, and caches</li>
+<li>400 MB hard disk space + at least 1 GB for Android SDK, emulator system images, and caches</li>
 <li>1280 x 800  minimum screen resolution</li>
 <li>Java Development Kit (JDK) 7 </li>
 <li>Optional for accelerated emulator: Intel® processor with support for Intel® VT-x, Intel® EM64T

docs/html/sdk/installing/studio-tips.jd

diff --git a/docs/html/sdk/installing/studio-tips.jd b/docs/html/sdk/installing/studio-tips.jd
index 614615e..69c188c 100644
--- a/docs/html/sdk/installing/studio-tips.jd
+++ b/docs/html/sdk/installing/studio-tips.jd
@@ -91,11 +91,6 @@
 is based), refer to the
 <a href="http://www.jetbrains.com/idea/documentation/index.jsp">IntelliJ IDEA documentation</a>.</p>
 
-<h3>External annotations</h3>
-<p>Specify annotations within the code or from an external annotation file. The Android Studio
-IDE keeps track of the restrictions and validates compliance, for example setting the data type
-of a string as not null.</p>
-
 
 <h3><em>Alt + Enter</em> key binding</h3>
 <p>For quick fixes to coding errors, the IntelliJ powered IDE implements the <em>Alt + Enter</em>
@@ -169,12 +164,9 @@
 
 <p class="note"><strong>Note:</strong> This section lists Android Studio keyboard shortcuts
 for the default keymap. To change the default keymap on Windows and Linux, go to
-<strong>File</strong> &gt; <strong>Settings</strong> &gt; <strong>Keymap</strong>. To change
-the default keymap on Mac OS X, go to <strong>Android Studio</strong> &gt;
-<strong>Preferences</strong> &gt; <strong>Keymap</strong>.</p>
-
-<p class="note"><strong>Note:</strong> If you're using Mac OS X, update your keymap to use
-the Mac OS X 10.5+ version keymaps under <strong>Android Studio > Preferences > Keymap</strong>.</p>
+<strong>File</strong> &gt; <strong>Settings</strong> &gt; <strong>Keymap</strong>. If you're
+using Mac OS X, update your keymap to use the Mac OS X 10.5+ version keymaps under
+<strong>Android Studio > Preferences > Keymap</strong>.</p>
 
 
 <p class="table-caption"><strong>Table 1.</strong> Programming key commands</p>