summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-07-11 17:41:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-11 17:41:48 -0700
commit24810c6f5854e595b2c78f9c3e44b7d4045a7472 (patch)
tree9313324c2ee0da66ebc1881755f8fbe72a823312
parent116d46659889f588fa9ffa5e1bc4dda90067fce6 (diff)
parent3c13e5284e83390301bf3306e5d77f7014483ea0 (diff)
downloadbase-24810c6f5854e595b2c78f9c3e44b7d4045a7472.tar.gz
am 3c13e528: am 536fa1bb: am 84ad0894: fix markup error in download button and fix transition to install/update guide
* commit '3c13e5284e83390301bf3306e5d77f7014483ea0': fix markup error in download button and fix transition to install/update guide
-rw-r--r--docs/html/sdk/installing/studio.jd11
1 files changed, 5 insertions, 6 deletions
diff --git a/docs/html/sdk/installing/studio.jd b/docs/html/sdk/installing/studio.jd
index eeb889639aea..2e9c4b4f2e49 100644
--- a/docs/html/sdk/installing/studio.jd
+++ b/docs/html/sdk/installing/studio.jd
@@ -288,7 +288,7 @@ download (or continue to use) the
<h2 id="Updating">Updating to 0.2.x</h2>
-<p>To update your existing version of Android Studio to 0.2.x, simply
+<p>To update from Android Studio 0.1.x to 0.2.x,
follow the <a href="#Installing">installation instructions</a> below and replace your existing
installation.</p>
@@ -597,7 +597,7 @@ and install <strong>Android Studio Repository</strong>.</li>
/* set up primary ACE download button */
$('#download-ide-button').show();
$('#download-ide-button').append("Download Android Studio <span class='small'>v0.2.x</span>"
- + "<br/><span class='small'>for " + os + "</span>");
+ + "<br/> <span class='small'>for " + os + "</span>");
$('#download-ide-button').click(function() {return onDownload(this,true);}).attr('href', bundlename);
} else {
@@ -639,10 +639,9 @@ and install <strong>Android Studio Repository</strong>.</li>
function onDownloadForRealz(link) {
if ($("input#agree").is(':checked')) {
- $("div.sdk-terms,#sdk-terms-form,.sdk-terms-intro").hide();
- $("#main").show(function() {
- location.hash = "Installing";
- });
+ $("#tos").hide();
+ $("#main").show();
+ location.hash = "Updating";
return true;
} else {
$("label#agreeLabel,#bitpicker input").parent().stop().animate({color: "#258AAF"}, 200,