From d10959a23c17fec6798bf428fc55db92b7686e49 Mon Sep 17 00:00:00 2001
From: Joe Fernandez <joefernandez@google.com>
Date: Tue, 29 Sep 2015 11:50:47 -0700
Subject: [PATCH] docs: Marshmallow release updates

- reorganize Marshmallow landing page sections (resources first)
- Re-titled M Samples page for better search result listing

Change-Id: Ied11b5d75f18e41eb080b2c01708ba83ede80299
---
 docs/html/about/about_toc.cs                  |  3 +-
 docs/html/about/versions/marshmallow/index.jd | 34 +++++++++----------
 .../about/versions/marshmallow/samples.jd     |  4 +--
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/docs/html/about/about_toc.cs b/docs/html/about/about_toc.cs
index a7b03f004f109..1b3edbbf95983 100644
--- a/docs/html/about/about_toc.cs
+++ b/docs/html/about/about_toc.cs
@@ -8,7 +8,8 @@
         Android 6.0 APIs</a></li>
         <li><a href="<?cs var:toroot ?>about/versions/marshmallow/android-6.0-changes.html">
         Android 6.0 Changes</a></li>
-        <li><a href="<?cs var:toroot ?>about/versions/marshmallow/samples.html">Samples</a></li>
+        <li><a href="<?cs var:toroot ?>about/versions/marshmallow/samples.html">
+        Android 6.0 Samples</a></li>
         <li><a href="<?cs var:toroot ?>about/versions/marshmallow/download.html">Downloads</a></li>
   </li>
       </ul>
diff --git a/docs/html/about/versions/marshmallow/index.jd b/docs/html/about/versions/marshmallow/index.jd
index 0c80007e51791..a7bca5656f644 100644
--- a/docs/html/about/versions/marshmallow/index.jd
+++ b/docs/html/about/versions/marshmallow/index.jd
@@ -46,14 +46,16 @@ footer.hide=1
   </a>
 </div>
 
-<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">
-  <h2 class="norule">Latest</h2>
+<section class="dac-section dac-gray" id="resources"><div class="wrap">
+  <h1 class="dac-section-title">Resources</h1>
+  <div class="dac-section-subtitle">
+    Essential information to help you get your apps ready for Android 6.0.
+  </div>
+
   <div class="resource-widget resource-flow-layout col-16"
-      data-query="type:blog+tag:marshmallow"
-      data-sortOrder="-timestamp"
-      data-cardSizes="6x6"
-      data-maxResults="12"
-      data-initial-results="3">
+       data-query="collection:marshmallow/landing/more"
+       data-cardSizes="6x6"
+       data-initial-results="3"></div>
   </div>
 </section>
 
@@ -70,15 +72,13 @@ footer.hide=1
   </div>
 </section>
 
-<section class="dac-section dac-gray" id="resources"><div class="wrap">
-  <h1 class="dac-section-title">Resources</h1>
-  <div class="dac-section-subtitle">
-    Essential information to help you get your apps ready for Android 6.0.
-  </div>
-
+<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">
+  <h2 class="norule">Latest</h2>
   <div class="resource-widget resource-flow-layout col-16"
-       data-query="collection:marshmallow/landing/more"
-       data-cardSizes="6x6"
-       data-initial-results="6"></div>
+      data-query="type:blog+tag:marshmallow"
+      data-sortOrder="-timestamp"
+      data-cardSizes="6x6"
+      data-maxResults="12"
+      data-initial-results="3">
   </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/html/about/versions/marshmallow/samples.jd b/docs/html/about/versions/marshmallow/samples.jd
index 865b5fc5db3e5..14221514c3c60 100644
--- a/docs/html/about/versions/marshmallow/samples.jd
+++ b/docs/html/about/versions/marshmallow/samples.jd
@@ -1,4 +1,4 @@
-page.title=Samples
+page.title=Android 6.0 Samples
 page.image=images/cards/card-build_16x9_2x.png
 page.tags=marshmallow, samples
 meta.tags=marshmallow,androidm,samples
@@ -9,7 +9,7 @@ page.metaDescription=Code to get your started with Android 6.0 APIs.
   Download or browse sample projects to get started with Android 6.0
   APIs (API level 23). You can download the samples
   directly from Android Studio &mdash; just select the <b>File > Import
-  Samples</b> menu option and pick the sample you want. 
+  Samples</b> menu option and pick the sample you want.
 </p>
 
 <p class="note">