am 3f831568: am 6fb22b4e: Docs: Revisions to top DAC landing page and several Preview-page revisions.
* commit '3f83156867fba70db9f2a03f2f0192d8f3b4688e':
Docs: Revisions to top DAC landing page and several Preview-page revisions.
diff --git a/docs/html-intl/intl/es/index.jd b/docs/html-intl/intl/es/index.jd
index f69c442..e23c99f 100644
--- a/docs/html-intl/intl/es/index.jd
+++ b/docs/html-intl/intl/es/index.jd
@@ -26,9 +26,12 @@
<p class="dac-hero-description">Prepárese para la próxima versión de
Android. Pruebe sus aplicaciones en Nexus 5, 6, 9 y Player. </p>
- <a class="dac-hero-cta" href="{@docRoot}preview/overview.html">
+ <a class="dac-hero-cta" href="{@docRoot}preview/index.html">
<span class="dac-sprite dac-auto-chevron"></span>
- ¡Empiece hoy mismo!
+ ¡Empiece hoy mismo!</a><br>
+ <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Developer Preview 2</a>
</a>
</div>
</div>
diff --git a/docs/html-intl/intl/es/preview/index.jd b/docs/html-intl/intl/es/preview/index.jd
index 35b578d..aae8e4c 100644
--- a/docs/html-intl/intl/es/preview/index.jd
+++ b/docs/html-intl/intl/es/preview/index.jd
@@ -27,6 +27,11 @@
<span class="dac-sprite dac-auto-chevron"></span>
¡Empiece hoy mismo!</a>
<br>
+
+ <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Developer Preview 2</a>
+
</div>
</div>
<div class="dac-section dac-small">
@@ -43,7 +48,7 @@
<div class="dac-section-subtitle">
Información esencial para ayudarlo a preparar sus aplicaciones para Android M.
</div>
-
+
<div class="resource-widget resource-flow-layout col-16"
data-query="collection:preview/landing/more"
data-cardSizes="6x6"
@@ -55,7 +60,7 @@
<span class="dac-sprite dac-auto-chevron"></span>
Informe los problemas
</a>
- </li>
+ </li>
<li class="dac-section-link"><a href="http://g.co/dev/AndroidMDevPreview">
<span class="dac-sprite dac-auto-chevron"></span>
Únase a la comunidad en G+ </a>
diff --git a/docs/html-intl/intl/ja/index.jd b/docs/html-intl/intl/ja/index.jd
index 4b1fa0e..3084b24 100644
--- a/docs/html-intl/intl/ja/index.jd
+++ b/docs/html-intl/intl/ja/index.jd
@@ -26,10 +26,14 @@
<p class="dac-hero-description">次期バージョンの Android に向けて準備しましょう。
Nexus 5、6、9、Nexus Player でアプリをテストします。 </p>
- <a class="dac-hero-cta" href="{@docRoot}preview/overview.html">
+ <a class="dac-hero-cta" href="{@docRoot}preview/index.html">
<span class="dac-sprite dac-auto-chevron"></span>
スタートガイド
- </a>
+ </a><br>
+ <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Developer Preview 2</a>
+
</div>
</div>
</div>
diff --git a/docs/html-intl/intl/ja/preview/index.jd b/docs/html-intl/intl/ja/preview/index.jd
index 180f5ea..e44a42a 100644
--- a/docs/html-intl/intl/ja/preview/index.jd
+++ b/docs/html-intl/intl/ja/preview/index.jd
@@ -27,6 +27,10 @@
<span class="dac-sprite dac-auto-chevron"></span>
スタートガイド
</a><br>
+
+ <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Developer Preview 2</a>
</div>
</div>
<div class="dac-section dac-small">
@@ -43,7 +47,7 @@
<div class="dac-section-subtitle">
Android M 向けにアプリを用意する際に役立つ必須情報をご提供します。
</div>
-
+
<div class="resource-widget resource-flow-layout col-16"
data-query="collection:preview/landing/more"
data-cardSizes="6x6"
@@ -55,7 +59,7 @@
<span class="dac-sprite dac-auto-chevron"></span>
問題の報告
</a>
- </li>
+ </li>
<li class="dac-section-link"><a href="http://g.co/dev/AndroidMDevPreview">
<span class="dac-sprite dac-auto-chevron"></span>
Join G+ コミュニティ
diff --git a/docs/html-intl/intl/ko/index.jd b/docs/html-intl/intl/ko/index.jd
index dd756a4..34c14ec 100644
--- a/docs/html-intl/intl/ko/index.jd
+++ b/docs/html-intl/intl/ko/index.jd
@@ -23,13 +23,16 @@
<div class="dac-hero-tag"></div>
<h1 class="dac-hero-title">Android M Developer Preview</h1>
- <p class="dac-hero-description">Android의 다음 버전을 만나볼 준비가
+ <p class="dac-hero-description">Android의 다음 버전을 만나볼 준비가
되셨습니까? 여러분의 앱을 Nexus 5, 6, 9 및 Player에서 테스트해보십시오. </p>
- <a class="dac-hero-cta" href="{@docRoot}preview/overview.html">
+ <a class="dac-hero-cta" href="{@docRoot}preview/index.html">
<span class="dac-sprite dac-auto-chevron"></span>
지금 시작하세요!
- </a>
+ </a><br>
+ <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Developer Preview 2</a>
</div>
</div>
</div>
diff --git a/docs/html-intl/intl/ko/preview/index.jd b/docs/html-intl/intl/ko/preview/index.jd
index 15b14f9..9d0e040 100644
--- a/docs/html-intl/intl/ko/preview/index.jd
+++ b/docs/html-intl/intl/ko/preview/index.jd
@@ -27,6 +27,9 @@
<span class="dac-sprite dac-auto-chevron"></span>
지금 시작하세요!
</a><br>
+ <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Developer Preview 2</a>
</div>
</div>
<div class="dac-section dac-small">
@@ -43,7 +46,7 @@
<div class="dac-section-subtitle">
앱을 Android M에 대비시키는 데 유용한 중요 정보입니다.
</div>
-
+
<div class="resource-widget resource-flow-layout col-16"
data-query="collection:preview/landing/more"
data-cardSizes="6x6"
@@ -55,7 +58,7 @@
<span class="dac-sprite dac-auto-chevron"></span>
문제 보고
</a>
- </li>
+ </li>
<li class="dac-section-link"><a href="http://g.co/dev/AndroidMDevPreview">
<span class="dac-sprite dac-auto-chevron"></span>
G+ 커뮤니티 가입
diff --git a/docs/html-intl/intl/pt-br/index.jd b/docs/html-intl/intl/pt-br/index.jd
index dd48fe2..24dd2fe 100644
--- a/docs/html-intl/intl/pt-br/index.jd
+++ b/docs/html-intl/intl/pt-br/index.jd
@@ -26,10 +26,12 @@
<p class="dac-hero-description">Prepare-se para a próxima versão do
Android. Teste os aplicativos no Nexus 5, 6, 9 e Player. </p>
- <a class="dac-hero-cta" href="{@docRoot}preview/overview.html">
+ <a class="dac-hero-cta" href="{@docRoot}preview/index.html">
<span class="dac-sprite dac-auto-chevron"></span>
- Comece!
- </a>
+ Comece!</a><br>
+ <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Developer Preview 2</a>
</div>
</div>
</div>
diff --git a/docs/html-intl/intl/pt-br/preview/index.jd b/docs/html-intl/intl/pt-br/preview/index.jd
index 1e0252f..172b211 100644
--- a/docs/html-intl/intl/pt-br/preview/index.jd
+++ b/docs/html-intl/intl/pt-br/preview/index.jd
@@ -27,6 +27,9 @@
<span class="dac-sprite dac-auto-chevron"></span>
Comece!
</a><br>
+ <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Developer Preview 2</a>
</div>
</div>
<div class="dac-section dac-small">
@@ -43,7 +46,7 @@
<div class="dac-section-subtitle">
Informações essenciais para ajudar você a preparar os aplicativos para Android M.
</div>
-
+
<div class="resource-widget resource-flow-layout col-16"
data-query="collection:preview/landing/more"
data-cardSizes="6x6"
@@ -55,7 +58,7 @@
<span class="dac-sprite dac-auto-chevron"></span>
Relate problemas
</a>
- </li>
+ </li>
<li class="dac-section-link"><a href="http://g.co/dev/AndroidMDevPreview">
<span class="dac-sprite dac-auto-chevron"></span>
Junte-se à comunidade do G+
diff --git a/docs/html-intl/intl/ru/index.jd b/docs/html-intl/intl/ru/index.jd
index f59a136..3fe65ea 100644
--- a/docs/html-intl/intl/ru/index.jd
+++ b/docs/html-intl/intl/ru/index.jd
@@ -27,10 +27,13 @@
платформы Android. Протестируйте ваши приложения на устройствах Nexus
5, 6, 9 и Player. </p>
- <a class="dac-hero-cta" href="{@docRoot}preview/overview.html">
+ <a class="dac-hero-cta" href="{@docRoot}preview/index.html">
<span class="dac-sprite dac-auto-chevron"></span>
Итак, приступим!
- </a>
+ </a><br>
+ <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Developer Preview 2</a>
</div>
</div>
</div>
diff --git a/docs/html-intl/intl/ru/preview/index.jd b/docs/html-intl/intl/ru/preview/index.jd
index 27adbf9..138a5a6 100644
--- a/docs/html-intl/intl/ru/preview/index.jd
+++ b/docs/html-intl/intl/ru/preview/index.jd
@@ -27,6 +27,9 @@
<span class="dac-sprite dac-auto-chevron"></span>
Итак, приступим!
</a><br>
+ <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Developer Preview 2</a>
</div>
</div>
<div class="dac-section dac-small">
@@ -43,7 +46,7 @@
<div class="dac-section-subtitle">
Важная информация, которая поможет вам подготовить ваши приложения для работы в Android M.
</div>
-
+
<div class="resource-widget resource-flow-layout col-16"
data-query="collection:preview/landing/more"
data-cardSizes="6x6"
@@ -55,7 +58,7 @@
<span class="dac-sprite dac-auto-chevron"></span>
Сообщить о проблеме
</a>
- </li>
+ </li>
<li class="dac-section-link"><a href="http://g.co/dev/AndroidMDevPreview">
<span class="dac-sprite dac-auto-chevron"></span>
Присоединиться к сообществу в G+
diff --git a/docs/html-intl/intl/zh-cn/index.jd b/docs/html-intl/intl/zh-cn/index.jd
index 67035ea..bbd7fbe 100644
--- a/docs/html-intl/intl/zh-cn/index.jd
+++ b/docs/html-intl/intl/zh-cn/index.jd
@@ -26,9 +26,12 @@
<p class="dac-hero-description">准备迎接 Android 的下一版本。在 Nexus 5、
6、9 和 Player 中测试应用。 </p>
- <a class="dac-hero-cta" href="{@docRoot}preview/overview.html">
+ <a class="dac-hero-cta" href="{@docRoot}preview/index.html">
<span class="dac-sprite dac-auto-chevron"></span>
- 开始！
+ 开始！</a><br>
+ <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Developer Preview 2</a>
</a>
</div>
</div>
diff --git a/docs/html-intl/intl/zh-cn/preview/index.jd b/docs/html-intl/intl/zh-cn/preview/index.jd
index 19b4b78..36ad718 100644
--- a/docs/html-intl/intl/zh-cn/preview/index.jd
+++ b/docs/html-intl/intl/zh-cn/preview/index.jd
@@ -27,6 +27,9 @@
<span class="dac-sprite dac-auto-chevron"></span>
开始！
</a><br>
+ <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Developer Preview 2</a>
</div>
</div>
<div class="dac-section dac-small">
@@ -43,7 +46,7 @@
<div class="dac-section-subtitle">
帮助您的应用准备使用 Android M 的必备信息。
</div>
-
+
<div class="resource-widget resource-flow-layout col-16"
data-query="collection:preview/landing/more"
data-cardSizes="6x6"
@@ -55,7 +58,7 @@
<span class="dac-sprite dac-auto-chevron"></span>
报告问题
</a>
- </li>
+ </li>
<li class="dac-section-link"><a href="http://g.co/dev/AndroidMDevPreview">
<span class="dac-sprite dac-auto-chevron"></span>
加入 G+ 社区
diff --git a/docs/html-intl/intl/zh-tw/index.jd b/docs/html-intl/intl/zh-tw/index.jd
index e788062..53bbd8d 100644
--- a/docs/html-intl/intl/zh-tw/index.jd
+++ b/docs/html-intl/intl/zh-tw/index.jd
@@ -23,13 +23,16 @@
<div class="dac-hero-tag"></div>
<h1 class="dac-hero-title">Android M Developer Preview</h1>
- <p class="dac-hero-description">準備使用新版 Android。在 Nexus 5、6、9 和
+ <p class="dac-hero-description">準備使用新版 Android。在 Nexus 5、6、9 和
Player 上測試您的應用程式。 </p>
- <a class="dac-hero-cta" href="{@docRoot}preview/overview.html">
+ <a class="dac-hero-cta" href="{@docRoot}preview/index.html">
<span class="dac-sprite dac-auto-chevron"></span>
開始使用！
- </a>
+ </a><br>
+ <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Developer Preview 2</a>
</div>
</div>
</div>
diff --git a/docs/html-intl/intl/zh-tw/preview/index.jd b/docs/html-intl/intl/zh-tw/preview/index.jd
index f57728c..a9cf1ae 100644
--- a/docs/html-intl/intl/zh-tw/preview/index.jd
+++ b/docs/html-intl/intl/zh-tw/preview/index.jd
@@ -27,6 +27,9 @@
<span class="dac-sprite dac-auto-chevron"></span>
開始使用！
</a><br>
+ <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Developer Preview 2</a>
</div>
</div>
<div class="dac-section dac-small">
@@ -43,7 +46,7 @@
<div class="dac-section-subtitle">
以下重要資訊可幫助您的應用程式準備好使用 Android M。
</div>
-
+
<div class="resource-widget resource-flow-layout col-16"
data-query="collection:preview/landing/more"
data-cardSizes="6x6"
@@ -55,7 +58,7 @@
<span class="dac-sprite dac-auto-chevron"></span>
回報問題
</a>
- </li>
+ </li>
<li class="dac-section-link"><a href="http://g.co/dev/AndroidMDevPreview">
<span class="dac-sprite dac-auto-chevron"></span>
參加 G+ 社群
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 794494e..c6dbbd5 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -26,10 +26,16 @@
<p class="dac-hero-description">Get your apps ready for the next version
of Android. Test on Nexus 5, 6, 9, and Player. </p>
- <a class="dac-hero-cta" href="{@docRoot}preview/overview.html">
+ <a class="dac-hero-cta" href="{@docRoot}preview/index.html">
<span class="dac-sprite dac-auto-chevron"></span>
Get started
+ </a><br>
+
+ <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Update to Developer Preview 2
</a>
+
</div>
</div>
</div>
diff --git a/docs/html/preview/overview.jd b/docs/html/preview/overview.jd
index 36b177d..a19c926 100644
--- a/docs/html/preview/overview.jd
+++ b/docs/html/preview/overview.jd
@@ -5,6 +5,33 @@
@jd:body
+<div class="cols" style=
+"background-color:#ffebc3; padding: 5px 0;margin-bottom:1em; text-align:center;">
+<h3>
+ Developer Preview 2 is now available
+ </h3>
+
+ <ul class="dac-section-links">
+ <li class="dac-section-link">
+ <a href="#preview2-notes">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Read the Notes</a>
+ </li>
+
+ <li class="dac-section-link">
+ <a href="#preview2-get">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Get the Update</a>
+ </li>
+
+ <li class="dac-section-link">
+ <a href="https://code.google.com/p/android-developer-preview/">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Report Issues</a>
+ </li>
+ </ul>
+</div>
+
<p>
Welcome to the <strong>Android M Developer Preview</strong>, a program that gives you
everything you need to test and optimize your apps for the next version of
@@ -128,15 +155,15 @@
<ul>
<li>
- <strong>Preview 1</strong> (initial Preview release, late May),
+ <strong><a href="{@docRoot}preview/download_mp1.html">Preview 1</a></strong> (available).
</li>
<li>
- <strong>Preview 2</strong> (late June/early July), and
+ <strong><a href="{@docRoot}preview/download.html">Preview 2</a></strong> (available).
</li>
<li>
- <strong>Preview 3</strong> (near final, late July)
+ <strong>Preview 3</strong> (near final, late July).
</li>
</ul>
diff --git a/docs/html/preview/preview_toc.cs b/docs/html/preview/preview_toc.cs
index 5cc2159..83f69a4 100644
--- a/docs/html/preview/preview_toc.cs
+++ b/docs/html/preview/preview_toc.cs
@@ -126,7 +126,7 @@
<li class="nav-section">
<div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/support.html">
- Support</a></div>
+ Support & Release Notes</a></div>
</li>
<li class="nav-section">
diff --git a/docs/html/preview/support.jd b/docs/html/preview/support.jd
index 8a73481..8792f778 100644
--- a/docs/html/preview/support.jd
+++ b/docs/html/preview/support.jd
@@ -1,4 +1,4 @@
-page.title=Support
+page.title=Support and Release Notes
page.tags="preview", "developer preview"
page.image=images/cards/card-support_16-9_2x.png
@@ -14,7 +14,7 @@
<li class="dac-section-link">
<a href="#preview2-notes">
<span class="dac-sprite dac-auto-chevron"></span>
- Release notes</a>
+ Read the Notes</a>
</li>
<li class="dac-section-link">