commit ee68a70fa4ca16109a74cee74ec385d9b57242a4
author David Friedman <dmail@google.com> Wed Nov 25 15:05:33 2015 -0800
committer David Friedman <dmail@google.com> Wed Nov 25 17:15:22 2015 -0800
tree 3c2bf117cbbaf3e2aaa8607e1b5de0bc3ef815f5
parent e68f6cdabd0ffd5c96935181cfc68b05de0db5ce

Docs: Removes obsoleted material.

Bug: N/A

This change reverts away from the temporary "Dev Summit" announcement
that dominated the Android top landing page--the summit is now over.
Also removing some M-Preview directories that had persisted in the
non-English areas of DAC.

Change-Id: I650345edc9be57875d4306cd4ab87603d6f69fa5

docs/html/index.jd

diff --git a/docs/html/index.jd b/docs/html/index.jd
index b27c30a..6c1b30a 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -10,8 +10,8 @@
 <section class="dac-hero-carousel">
 
 <!-- <article class="dac-expand dac-hero dac-invert active" style="background-color: rgb(38, 50, 56);"> -->
-<article class="dac-expand dac-hero dac-invert dac-darken mprev summit active" style="background-color: #75d1ff;">
-<a href="https://androiddevsummit.withgoogle.com/">
+<article class="dac-expand dac-hero dac-invert dac-darken mprev active" style="background-color: #75d1ff;">
+<a href="about/versions/marshmallow/index.html">
   <div class="wrap" style="max-width:1100px;margin-top:0">
     <div class="cols dac-hero-content">
       <div class="col-8of16 col-push-6of16 dac-hero-figure mprev">
@@ -19,21 +19,19 @@
       <div class="col-8of16 col-pull-7of16">
         <div class="dac-hero-tag"></div>
 
-        <h1 class="dac-hero-title" style="white-space:nowrap;">Android Developer Summit</h1>
+        <h1 class="dac-hero-title" style="white-space:nowrap;">Android 6.0 Marshmallow</h1>
         </div>
         <div class="col-6of16 col-push-1of16">
-        <p class="dac-hero-description" style="color:white;"><span style="white-space:nowrap;"><strong>November 23-24;
-          Mountain View, CA</strong></span><br />
-        Over 16 hours of deep Android technical content, streamed live. </p>
+        <p class="dac-hero-description" style="color:white"><strong>The
+        official Android 6.0 SDK is now available!</strong>
+        Explore&nbsp;what's&nbsp;new &mdash; runtime permissions,
+        Doze and App Standby power-saving features, new
+        assist technology, and more.</p>
 
-        <a class="dac-hero-cta" href="https://androiddevsummit.withgoogle.com/schedule">
+        <a class="dac-hero-cta" href="{@docRoot}about/versions/marshmallow/index.html">
           <span class="dac-sprite dac-auto-chevron"></span>
-          See the schedule
-        </a><br />
-        <a class="dac-hero-cta" href="https://androiddevsummit.withgoogle.com/stream">
-          <span class="dac-sprite dac-auto-chevron"></span>
-          Get updates to watch live
-        </a>
+          Learn more
+        </a><br>
       </div>
       </div>
     </div>
@@ -55,7 +53,7 @@
         <span class="dac-sprite dac-auto-chevron-large"></span>
         Browse Samples
       </a></div>
-      <div><a href="{@docRoot}/www.youtube.com/user/androiddevelopers">
+      <div><a href="https://www.youtube.com/user/androiddevelopers">
         <span class="dac-sprite dac-auto-chevron-large"></span>
         Watch Videos
       </a></div>