diff options
| author | 2014-12-04 23:05:47 +0000 | |
|---|---|---|
| committer | 2014-12-04 23:05:47 +0000 | |
| commit | 4de95d71ec6eff0c9cbd303c083abf3431294a1c (patch) | |
| tree | 6b0bc926df5153160c3ac70a31dd5b9ec539ac17 | |
| parent | 8485098fa22a61f845cb2abbc5bc856b15835a9e (diff) | |
| parent | cc10c02b10ce6d0be223c4409cb6aab98c5b8858 (diff) | |
am cc10c02b: am 6c59abc9: am 9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs
* commit 'cc10c02b10ce6d0be223c4409cb6aab98c5b8858':
update L Preview message and disallow crawling /preview
| -rw-r--r-- | docs/html/preview/index.html | 10 | ||||
| -rw-r--r-- | docs/html/robots.txt | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/docs/html/preview/index.html b/docs/html/preview/index.html index 4f7722cd116b..7cd029f2ecb0 100644 --- a/docs/html/preview/index.html +++ b/docs/html/preview/index.html @@ -272,13 +272,11 @@ This is the Android SDK Preview License Agreement (the “License Agreement”). style="position:absolute;z-index:100;right:215px;top:375px">Android 5.0 API Overview</a> <div style="width:440px"> -<p>Android 5.0 (Lollipop) is almost here and users will begin receiving -device updates in November. To help you prepare, the Android 5.0 SDK is now available -with final APIs.</p> +<p>Android 5.0 (Lollipop) is now out of preview and available to users.</p> -<p>Since the L Developer Preview began, various APIs and behaviors have changed, -so if you've been using the Preview SDK -you should update now to test your apps and take advantage of new features.</p> +<p>If you previously developed apps with the L Developer Preview, be aware that various APIs and +behaviors have changed, so you should update your SDK now to test your apps and take advantage of +new features in Android 5.0.</p> <p>To get the latest Android 5.0 SDK:</p> diff --git a/docs/html/robots.txt b/docs/html/robots.txt index f5222208b094..ab379bb6e047 100644 --- a/docs/html/robots.txt +++ b/docs/html/robots.txt @@ -15,4 +15,5 @@ Disallow: /shareables/ Disallow: /guide/tutorials/ Disallow: /guide/samples/ Disallow: /community/ +Disallow: /preview/ Sitemap: http://developer.android.com/sitemap.txt |