am 6051cd3e: am 1809f534: Docs: Changes to the "Support" preview page.

* commit '6051cd3e1b38b9c5b18392ce8c440aaf16412f66':
  Docs: Changes to the "Support" preview page.

9 files changed, 13 insertions, 487 deletions

diff --git a/docs/html-intl/intl/es/preview/support.jd b/docs/html-intl/intl/es/preview/support.jd
deleted file mode 100644
index 85f0f38..0000000
--- a/docs/html-intl/intl/es/preview/support.jd
+++ /dev/null
@@ -1,67 +0,0 @@
-page.title=Soporte
-page.image=images/cards/card-support_16-9_2x.png
-
-@jd:body
-
-<p>
-  Si ha encontrado errores o tiene comentarios sobre M Developer Preview, <a href="https://code.google.com/p/android-developer-preview/">inicie un problema</a> en nuestro seguimiento de problemas.
-
-
-</p>
-
-<p>
-  Para obtener soporte adicional, únase a la <a href="http://g.co/dev/AndroidMDevPreview">comunidad M Developer Preview en Google+</a> para analizar sus experiencias de desarrollo.
-
-
-</p>
-
-<h2 id="release-notes">Notas de la versión</h2>
-
-<!--
-<div class="toggle-content opened">
-  <p><a href="#" onclick="return toggleContent(this)">
-    <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
-      alt=""/>M Developer Preview, Revision 2</a> <em>(Month 2015)</em>
-  </p>
-
-  <div class="toggle-content-toggleme">
-
-    <dl>
-
-    <dt>Fix Category 1</dt>
-    <dd>
-      <ul>
-        <li>Fixed issue X.</li>
-        <li>Fixed issue Y.</li>
-        <li>Fixed issue Z.</li>
-      </ul>
-    </dd>
-
-    <dt>Fix Category 2</dt>
-    <dd>
-      <ul>
-        <li>Fixed issue X.</li>
-        <li>Fixed issue Y.</li>
-        <li>Fixed issue Z.</li>
-      </ul>
-    </dd>
-
-    </dl>
-  </div>
-</div>
--->
-
-<div class="toggle-content opened">
-  <p><a href="#" onclick="return toggleContent(this)">
-    <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img" alt="" />M Developer Preview, Revisión 1</a> <em>(Mayo de 2015)</em>
-  </p>
-
-  <div class="toggle-content-toggleme">
-
-    <dl>
-    <dt>Versión inicial.</dt>
-    </dl>
-  </div>
-</div>
-
-
diff --git a/docs/html-intl/intl/ja/preview/support.jd b/docs/html-intl/intl/ja/preview/support.jd
deleted file mode 100644
index 2f00a47..0000000
--- a/docs/html-intl/intl/ja/preview/support.jd
+++ /dev/null
@@ -1,67 +0,0 @@
-page.title=サポート
-page.image=images/cards/card-support_16-9_2x.png
-
-@jd:body
-
-<p>
-  M Developer Preview についてのバグの報告やフィードバックがありましたら Issue Tracker で<a href="https://code.google.com/p/android-developer-preview/">Issue を作成</a>してください。
-
-
-</p>
-
-<p>
-  また、<a href="http://g.co/dev/AndroidMDevPreview">M Developer Preview Google+ コミュニティ</a>にご参加いただくと、開発上の問題についての相談やディスカッションを行うことができます。
-
-
-</p>
-
-<h2 id="release-notes">リリースノート</h2>
-
-<!--
-<div class="toggle-content opened">
-  <p><a href="#" onclick="return toggleContent(this)">
-    <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
-      alt=""/>M Developer Preview, Revision 2</a> <em>(Month 2015)</em>
-  </p>
-
-  <div class="toggle-content-toggleme">
-
-    <dl>
-
-    <dt>Fix Category 1</dt>
-    <dd>
-      <ul>
-        <li>Fixed issue X.</li>
-        <li>Fixed issue Y.</li>
-        <li>Fixed issue Z.</li>
-      </ul>
-    </dd>
-
-    <dt>Fix Category 2</dt>
-    <dd>
-      <ul>
-        <li>Fixed issue X.</li>
-        <li>Fixed issue Y.</li>
-        <li>Fixed issue Z.</li>
-      </ul>
-    </dd>
-
-    </dl>
-  </div>
-</div>
--->
-
-<div class="toggle-content opened">
-  <p><a href="#" onclick="return toggleContent(this)"><img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img" alt="" />M Developer Preview, Revision 1</a> <em>（2015 年 5 月）</em>
-
-  </p>
-
-  <div class="toggle-content-toggleme">
-
-    <dl>
-    <dt>イニシャル リリース。</dt>
-    </dl>
-  </div>
-</div>
-
-
diff --git a/docs/html-intl/intl/ko/preview/support.jd b/docs/html-intl/intl/ko/preview/support.jd
deleted file mode 100644
index 36d083da..0000000
--- a/docs/html-intl/intl/ko/preview/support.jd
+++ /dev/null
@@ -1,67 +0,0 @@
-page.title=지원
-page.image=images/cards/card-support_16-9_2x.png
-
-@jd:body
-
-<p>
-  M 개발자 미리 보기에서 버그가 발생했거나 이에 대한 피드백을 보내려면 문제 추적기에서 <a href="https://code.google.com/p/android-developer-preview/">문제를 생성</a>해 주십시오.
-
-
-</p>
-
-<p>
-  더 많은 지원이 필요하시면 <a href="http://g.co/dev/AndroidMDevPreview">M 개발자 미리 보기 Google+ 커뮤니티</a>에 가입하여 여러분의 개발 경험에 대해 논의해보시면 좋습니다.
-
-
-</p>
-
-<h2 id="release-notes">릴리스 노트</h2>
-
-<!--
-<div class="toggle-content opened">
-  <p><a href="#" onclick="return toggleContent(this)">
-    <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
-      alt=""/>M Developer Preview, Revision 2</a> <em>(Month 2015)</em>
-  </p>
-
-  <div class="toggle-content-toggleme">
-
-    <dl>
-
-    <dt>Fix Category 1</dt>
-    <dd>
-      <ul>
-        <li>Fixed issue X.</li>
-        <li>Fixed issue Y.</li>
-        <li>Fixed issue Z.</li>
-      </ul>
-    </dd>
-
-    <dt>Fix Category 2</dt>
-    <dd>
-      <ul>
-        <li>Fixed issue X.</li>
-        <li>Fixed issue Y.</li>
-        <li>Fixed issue Z.</li>
-      </ul>
-    </dd>
-
-    </dl>
-  </div>
-</div>
--->
-
-<div class="toggle-content opened">
-  <p><a href="#" onclick="return toggleContent(this)"><img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img" alt="" />M 개발자 미리 보기, 수정 버전 1</a> <em>(2015년 5월)</em>
-
-  </p>
-
-  <div class="toggle-content-toggleme">
-
-    <dl>
-    <dt>최초 릴리스입니다.</dt>
-    </dl>
-  </div>
-</div>
-
-
diff --git a/docs/html-intl/intl/pt-br/preview/support.jd b/docs/html-intl/intl/pt-br/preview/support.jd
deleted file mode 100644
index 63b88a7..0000000
--- a/docs/html-intl/intl/pt-br/preview/support.jd
+++ /dev/null
@@ -1,67 +0,0 @@
-page.title=Suporte
-page.image=images/cards/card-support_16-9_2x.png
-
-@jd:body
-
-<p>
-  Caso tenha encontrado erros ou tenha feedback sobre o M Developer Preview,
- <a href="https://code.google.com/p/android-developer-preview/">crie um problema</a>
- em nosso issue tracker.
-</p>
-
-<p>
-  Para obter mais auxílio, junte-se à comunidade
- <a href="http://g.co/dev/AndroidMDevPreview">M Developer
- Preview do Google+</a> para discutir suas experiências de desenvolvimento.
-</p>
-
-<h2 id="release-notes">Notas da versão</h2>
-
-<!--
-<div class="toggle-content opened">
-  <p><a href="#" onclick="return toggleContent(this)">
-    <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
-      alt=""/>M Developer Preview, Revision 2</a> <em>(Month 2015)</em>
-  </p>
-
-  <div class="toggle-content-toggleme">
-
-    <dl>
-
-    <dt>Fix Category 1</dt>
-    <dd>
-      <ul>
-        <li>Fixed issue X.</li>
-        <li>Fixed issue Y.</li>
-        <li>Fixed issue Z.</li>
-      </ul>
-    </dd>
-
-    <dt>Fix Category 2</dt>
-    <dd>
-      <ul>
-        <li>Fixed issue X.</li>
-        <li>Fixed issue Y.</li>
-        <li>Fixed issue Z.</li>
-      </ul>
-    </dd>
-
-    </dl>
-  </div>
-</div>
--->
-
-<div class="toggle-content opened">
-  <p><a href="#" onclick="return toggleContent(this)">
-<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img" alt="" />M Developer Preview, revisão 1</a> <em>(maio de 2015)</em>
-  </p>
-
-  <div class="toggle-content-toggleme">
-
-    <dl>
-    <dt>Versão inicial.</dt>
-    </dl>
-  </div>
-</div>
-
-
diff --git a/docs/html-intl/intl/ru/preview/support.jd b/docs/html-intl/intl/ru/preview/support.jd
deleted file mode 100644
index 816dc7f..0000000
--- a/docs/html-intl/intl/ru/preview/support.jd
+++ /dev/null
@@ -1,67 +0,0 @@
-page.title=Поддержка
-page.image=images/cards/card-support_16-9_2x.png
-
-@jd:body
-
-<p>
-  Если вы обнаружили ошибки или желаете поделиться своим отзывом о платформе M Developer Preview,
-<a href="https://code.google.com/p/android-developer-preview/">создайте заявку</a>
-в нашей системе отслеживания проблем.
-</p>
-
-<p>
-  Для получения дополнительной поддержки присоединяйтесь к
-<a href="http://g.co/dev/AndroidMDevPreview">сообществу M Developer
-Preview в Google+</a> и делитесь своим опытом разработки с единомышленниками.
-</p>
-
-<h2 id="release-notes">Примечания к выпуску</h2>
-
-<!--
-<div class="toggle-content opened">
-  <p><a href="#" onclick="return toggleContent(this)">
-    <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
-      alt=""/>M Developer Preview, Revision 2</a> <em>(Month 2015)</em>
-  </p>
-
-  <div class="toggle-content-toggleme">
-
-    <dl>
-
-    <dt>Fix Category 1</dt>
-    <dd>
-      <ul>
-        <li>Fixed issue X.</li>
-        <li>Fixed issue Y.</li>
-        <li>Fixed issue Z.</li>
-      </ul>
-    </dd>
-
-    <dt>Fix Category 2</dt>
-    <dd>
-      <ul>
-        <li>Fixed issue X.</li>
-        <li>Fixed issue Y.</li>
-        <li>Fixed issue Z.</li>
-      </ul>
-    </dd>
-
-    </dl>
-  </div>
-</div>
--->
-
-<div class="toggle-content opened">
-  <p><a href="#" onclick="return toggleContent(this)">
-<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img" alt="" />M Developer Preview, версия 1</a> <em>(май 2015 г.)</em>
-  </p>
-
-  <div class="toggle-content-toggleme">
-
-    <dl>
-    <dt>Первоначальный выпуск.</dt>
-    </dl>
-  </div>
-</div>
-
-
diff --git a/docs/html-intl/intl/zh-cn/preview/support.jd b/docs/html-intl/intl/zh-cn/preview/support.jd
deleted file mode 100644
index a62417b..0000000
--- a/docs/html-intl/intl/zh-cn/preview/support.jd
+++ /dev/null
@@ -1,67 +0,0 @@
-page.title=支持
-page.image=images/cards/card-support_16-9_2x.png
-
-@jd:body
-
-<p>
-  如果您遇到错误或要提供有关 M 开发者预览版的反馈，请在我们的问题跟踪器上<a href="https://code.google.com/p/android-developer-preview/">创建问题</a>。
-
-
-</p>
-
-<p>
-  有关更多支持，请加入 <a href="http://g.co/dev/AndroidMDevPreview">M 开发者预览版 Google+ 社区</a>，讨论您的开发体验。
-
-
-</p>
-
-<h2 id="release-notes">版本说明</h2>
-
-<!--
-<div class="toggle-content opened">
-  <p><a href="#" onclick="return toggleContent(this)">
-    <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
-      alt=""/>M Developer Preview, Revision 2</a> <em>(Month 2015)</em>
-  </p>
-
-  <div class="toggle-content-toggleme">
-
-    <dl>
-
-    <dt>Fix Category 1</dt>
-    <dd>
-      <ul>
-        <li>Fixed issue X.</li>
-        <li>Fixed issue Y.</li>
-        <li>Fixed issue Z.</li>
-      </ul>
-    </dd>
-
-    <dt>Fix Category 2</dt>
-    <dd>
-      <ul>
-        <li>Fixed issue X.</li>
-        <li>Fixed issue Y.</li>
-        <li>Fixed issue Z.</li>
-      </ul>
-    </dd>
-
-    </dl>
-  </div>
-</div>
--->
-
-<div class="toggle-content opened">
-  <p><a href="#" onclick="return toggleContent(this)"> 
-<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img" alt="" />M 开发者预览版，版本 1</a>（2015 年 5 月）<em></em>
-  </p>
-
-  <div class="toggle-content-toggleme">
-
-    <dl>
-    <dt>初始版本。</dt>
-    </dl>
-  </div>
-</div>
-
-
diff --git a/docs/html-intl/intl/zh-tw/preview/support.jd b/docs/html-intl/intl/zh-tw/preview/support.jd
deleted file mode 100644
index 2c2d66a..0000000
--- a/docs/html-intl/intl/zh-tw/preview/support.jd
+++ /dev/null
@@ -1,67 +0,0 @@
-page.title=支援
-page.image=images/cards/card-support_16-9_2x.png
-
-@jd:body
-
-<p>
-  如果您遇到錯誤或有關於 M 開發人員預覽版的意見反應，請在我們的問題追蹤器上<a href="https://code.google.com/p/android-developer-preview/">建立問題</a>。
-
-
-</p>
-
-<p>
-  如需更多支援，請加入 <a href="http://g.co/dev/AndroidMDevPreview">M 開發人員預覽版 Google+ 社群</a>來討論您的開發體驗。
-
-
-</p>
-
-<h2 id="release-notes">版本資訊</h2>
-
-<!--
-<div class="toggle-content opened">
-  <p><a href="#" onclick="return toggleContent(this)">
-    <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
-      alt=""/>M Developer Preview, Revision 2</a> <em>(Month 2015)</em>
-  </p>
-
-  <div class="toggle-content-toggleme">
-
-    <dl>
-
-    <dt>Fix Category 1</dt>
-    <dd>
-      <ul>
-        <li>Fixed issue X.</li>
-        <li>Fixed issue Y.</li>
-        <li>Fixed issue Z.</li>
-      </ul>
-    </dd>
-
-    <dt>Fix Category 2</dt>
-    <dd>
-      <ul>
-        <li>Fixed issue X.</li>
-        <li>Fixed issue Y.</li>
-        <li>Fixed issue Z.</li>
-      </ul>
-    </dd>
-
-    </dl>
-  </div>
-</div>
--->
-
-<div class="toggle-content opened">
-  <p><a href="#" onclick="return toggleContent(this)">
-<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img" alt="" />M 開發人員預覽版，修訂版 1</a> (2015 年 5 月)<em></em>
-  </p>
-
-  <div class="toggle-content-toggleme">
-
-    <dl>
-    <dt>初始版本。</dt>
-    </dl>
-  </div>
-</div>
-
-
diff --git a/docs/html/preview/preview_toc.cs b/docs/html/preview/preview_toc.cs
index 6cd4157..5cc2159 100644
--- a/docs/html/preview/preview_toc.cs
+++ b/docs/html/preview/preview_toc.cs
@@ -125,14 +125,7 @@
   </li>
 
   <li class="nav-section">
-    <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/support.html"
-      es-lang="Soporte"
-      ja-lang="サポート"
-      ko-lang="지원"
-      pt-br-lang="Suporte"
-      ru-lang="Поддержка"
-      zh-cn-lang="支持"
-      zh-tw-lang="支援">
+    <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/support.html">
       Support</a></div>
   </li>
 
diff --git a/docs/html/preview/support.jd b/docs/html/preview/support.jd
index 954ca65..9922eda 100644
--- a/docs/html/preview/support.jd
+++ b/docs/html/preview/support.jd
@@ -52,11 +52,11 @@ page.image=images/cards/card-support_16-9_2x.png
 
 <div class="wrap">
   <div class="cols">
-    <div class="col-5of12">
+    <div class="col-9of16">
       <p>
         <em>Date: July 2015<br>
-        Build: MPZ79M<br>
-        Hardware support: Nexus 5,6,9, Player<br>
+        Builds: MPZ79M (Nexus 5, 6, 9), MPZ79N (Nexus Player)<br>
+        Hardware support: Nexus 5, 6, 9, Player<br>
         Emulator support: x86 &amp; ARM 32/64-bit<br>
         Google Play services: 7.6</em>
       </p>
@@ -293,10 +293,12 @@ page.image=images/cards/card-support_16-9_2x.png
 </p>
 
 <p>
-  If you are just getting started with Android M Developer Preview you want to
-  receive Developer Preview 2 by OTA, first download Developer Preview 1 and
-  flash it to your device. Leave the device powered on for several hours until
-  the device is registered and receives the update.
+  If you are just getting started with Android M Developer Preview, and want
+  to receive Developer Preview 2 via OTA, download the appropriate
+  Developer Preview 1 <a href="{@docRoot}preview/download_mp1.html#images">
+  system image</a>, and flash it to your device. Then,
+  leave the device powered on for several hours. It registers with the
+  OTA service, and receives Developer Preview 2 by OTA.
 </p>
 
 <p>
@@ -307,7 +309,7 @@ page.image=images/cards/card-support_16-9_2x.png
 
 <p>
   For instructions on how to start developing and testing with Android M, read
-  <a href="/preview/setup-sdk.html">Setting up the SDK</a>
+  <a href="/preview/setup-sdk.html">Setting up the SDK</a>.
 </p>
 
 <h2 id="preview1-notes">
@@ -316,11 +318,11 @@ page.image=images/cards/card-support_16-9_2x.png
 
 <div class="wrap">
   <div class="cols">
-    <div class="col-5of12">
+    <div class="col-6of12">
       <p>
         <em>Date: May 2015<br>
         Build: MPZ44Q<br>
-        Hardware support: Nexus 5,6,9, Player<br>
+        Hardware support: Nexus 5, 6, 9, Player<br>
         Emulator support: x86 &amp; ARM (32/64-bit)<br>
         Google Play services: 7.5</em>
       </p>