Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6215e24e authored by Joe Fernandez's avatar Joe Fernandez Committed by Android (Google) Code Review
Browse files

Merge "docs: Marshmallow release updates" into mnc-mr-docs

parents 43e7468c d10959a2

docs/html/about/about_toc.cs

+2 −1
Original line number Diff line number Diff line
@@ -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>

docs/html/about/versions/marshmallow/index.jd

+17 −17
Original line number Diff line number Diff line
@@ -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-query="collection:marshmallow/landing/more"

       data-cardSizes="6x6"

      data-maxResults="12"

      data-initial-results="3">

       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-query="type:blog+tag:marshmallow"

      data-sortOrder="-timestamp"

      data-cardSizes="6x6"

       data-initial-results="6"></div>

      data-maxResults="12"

      data-initial-results="3">

  </div>

</section>

docs/html/about/versions/marshmallow/samples.jd

+2 −2
Original line number Diff line number Diff line 
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