summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ricardo Cervera <rcervera@google.com> 2015-01-05 09:31:41 -0800
committer Ricardo Cervera <rcervera@google.com> 2015-01-05 09:31:41 -0800
commit4bb503cf1209d113face24267d4ed2f19828aa3d (patch)
treec0c5412c577ed5922f87077cf8c006183bcd7515
parentab5159310ad68f4a4325d772dc7369f7368b5a5b (diff)
docs: Minor fixes in Android Studio pages.
https://code.google.com/p/android/issues/detail?id=92839 https://code.google.com/p/android/issues/detail?id=92840 https://code.google.com/p/android/issues/detail?id=92661 Change-Id: I8a45112371da6ca144e0da28701a92254d98774b
-rw-r--r--docs/html/sdk/index.jd2
-rw-r--r--docs/html/sdk/installing/studio-tips.jd14
2 files changed, 4 insertions, 12 deletions
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index 5d73d72870e7..d9a47a231a56 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -449,7 +449,7 @@ Studio</a>.</p>
<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
diff --git a/docs/html/sdk/installing/studio-tips.jd b/docs/html/sdk/installing/studio-tips.jd
index 614615ece0c8..69c188c836f0 100644
--- a/docs/html/sdk/installing/studio-tips.jd
+++ b/docs/html/sdk/installing/studio-tips.jd
@@ -91,11 +91,6 @@ practices you should consider using when creating Android Studio apps. </p>
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 @@ various attributes.</p>
<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>