diff --git a/docs/html/preview/index.jd b/docs/html/preview/index.jd
index 84a2d85a6d832..b84865b097d45 100644
--- a/docs/html/preview/index.jd
+++ b/docs/html/preview/index.jd
@@ -3,7 +3,8 @@ page.viewport_width=970
 fullpage=true
 no_footer_links=true
 page.type=about
-
+page.metaDescription=Test and build your apps against the next version of Android to ensure they're ready when the platform officially launches.
+page.image={@docRoot}preview/images/hero.jpg
 @jd:body
 
 <style>
@@ -22,19 +23,6 @@ page.type=about
 }
 </style>
 
-<div id="video-container">
-  <div id="video-frame">
-    <div class="video-close">
-      <span id="icon-video-close">&nbsp;</span>
-    </div>
-    <script src="//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js"></script>
-    <div id="ytapiplayer">
-      <a href="http://www.youtube.com/watch?v=0xQ3y902DEQ"><img width=940
-      src="https://i1.ytimg.com/vi/0xQ3y902DEQ/maxresdefault.jpg"></a><!--You need Flash player 8+ and JavaScript enabled to view this video. -->
-    </div>
-  </div>
-</div>
-
 <div class="landing-body-content">
   <div class="landing-hero-container">
     <div class="landing-section preview-hero">
@@ -93,7 +81,7 @@ page.type=about
                 <p>A New UI Design</p>
                 <p class="landing-small">
                   Create a consistent experience across mobile and the web with
-                   <b>Material</b>, the new Google design standard.
+                   material design, the new Google-wide standard.
                 </p>
                 <p class="landing-small">
                   <a href="/preview/quantum/index.html">Learn about</a>
@@ -174,13 +162,13 @@ page.type=about
                     <img class="landing-social-image" src="{@docRoot}preview/images/bugs.png" alt="">
                   </a>
                 <div class="landing-social-copy">
-                  <p>Submit Bugs</p>
+                  <p>Issue Tracker</p>
                   <p class="landing-small">
                   Let us know when you encounter problems, so we can fix them and make
                   the platform better for you and your users.
                     </p><p class="landing-small">
                       <a target="_blank" href="http://submit-bugs!">
-                      Submit Bugs</a>
+                      Report Issues</a>
                     </p>
                   <p></p>
                 </div>
@@ -190,13 +178,13 @@ page.type=about
                   <img class="landing-social-image" src="//www.google.com/images/icons/product/gplus-128.png" alt="">
                 </a>
                 <div class="landing-social-copy">
-                  <p>Discuss on Google+ </p>
+                  <p>Google+ </p>
                   <p class="landing-small">
                     Join the community of Android developers testing out the L Developer Preview and
                     share your thoughts and experiences.
                   </p><p class="landing-small">
                     <a target="_blank" href="http://plus.google.com">
-                    Socialize on Google+</a>
+                    Discuss on Google+</a>
                     </p>
                 </div>
               </div>
@@ -205,14 +193,14 @@ page.type=about
                   <img class="landing-social-image" src="{@docRoot}preview/images/updates.png" alt="">
                 </a>
                 <div class="landing-social-copy">
-                  <p>Get Updates</p>
+                  <p>Support and Updates</p>
                   <p class="landing-small">
                   Updates to the L Developer Preview are delivered
-                  in the Android SDK Manager. Check back here
+                  in the Android SDK Manager. Check back periodically
                   for news about the changes.
                   </p>
                   <p class="landing-small">
-                    <a target="_blank" href="{@docRoot}preview/release-notes.html">See Release Notes</a>
+                    <a target="_blank" href="{@docRoot}preview/support.html">Get Support</a>
                   </p>
                 </div>
               </div>
@@ -236,8 +224,6 @@ page.type=about
         License</a>.
       </div>
     </div>
-
-
   </div> <!-- end landing-body-content -->
 
   <script>
diff --git a/docs/html/preview/preview_toc.cs b/docs/html/preview/preview_toc.cs
index 8f6f8c198f0d7..72d62c3623aa1 100644
--- a/docs/html/preview/preview_toc.cs
+++ b/docs/html/preview/preview_toc.cs
@@ -75,7 +75,12 @@
   </li>
     <li class="nav-section">
     <div class="nav-section-header empty">
-      <a href="<?cs var:toroot ?>preview/feedback-support.html">Feedback and Support</a>
+      <a href="<?cs var:toroot ?>preview/support.html">Support</a>
+      </div>
+  </li>
+  <li class="nav-section">
+    <div class="nav-section-header empty">
+      <a href="<?cs var:toroot ?>preview/tos.html">Terms of Service</a>
       </div>
   </li>
 </ul>
\ No newline at end of file
diff --git a/docs/html/preview/samples.jd b/docs/html/preview/samples.jd
new file mode 100644
index 0000000000000..67404b6829473
--- /dev/null
+++ b/docs/html/preview/samples.jd
@@ -0,0 +1,16 @@
+page.title=Samples
+
+@jd:body
+
+<p>The code samples for the L Developer Preview are available in the Android SDK Manager under the
+L Preview section. Here is a summary of everything that is available:</p>
+
+<ul>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+ </ul>
diff --git a/docs/html/preview/setup-devices.jd b/docs/html/preview/setup-devices.jd
index 065468503411b..86e48458916e9 100644
--- a/docs/html/preview/setup-devices.jd
+++ b/docs/html/preview/setup-devices.jd
@@ -26,12 +26,6 @@ Android system image is not subject to the same testing as the factory OS and
 can cause your phone and installed services and applications to stop working.
 </p>
 
-<p><!-- Will this link change before we publish (to a clean version of the doc)?
-  Or will we scrub the doc's comments & revision history? -->
-<a href="https://docs.google.com/a/google.com/document/d/1OixnM1Q890ExOzDB3Z-FDD6Sb2kF4uZQiMxsYVII8F0/edit?usp=sharing">L
-Preview Terms of Service</a>
-</p>
-
 
 <ol>
   <li>Download and extract the Android Developer Preview package to a directory
diff --git a/docs/html/preview/support.jd b/docs/html/preview/support.jd
new file mode 100644
index 0000000000000..23ce6ff324737
--- /dev/null
+++ b/docs/html/preview/support.jd
@@ -0,0 +1,22 @@
+page.title=Support
+
+@jd:body
+
+<p>If you've encountered bugs or have feedback about the L Developer Preview, create
+an issue on our bug tracker</p>
+
+<p>Go to the Bug Tracker</p>
+
+<h2>Release Notes</h2>
+
+<p>June 25, 2014 - Initial Release of the L Developer Preview</p>
+
+<ul>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+  <li></li>
+ </ul>
diff --git a/docs/html/preview/tos.jd b/docs/html/preview/tos.jd
new file mode 100644
index 0000000000000..602439ff08046
--- /dev/null
+++ b/docs/html/preview/tos.jd
@@ -0,0 +1,9 @@
+page.title=License Agreement
+
+@jd:body
+
+<p><!-- Will this link change before we publish (to a clean version of the doc)?
+  Or will we scrub the doc's comments & revision history? -->
+<a href="https://docs.google.com/a/google.com/document/d/1OixnM1Q890ExOzDB3Z-FDD6Sb2kF4uZQiMxsYVII8F0/edit?usp=sharing">L
+Preview Terms of Service</a>
+</p>
\ No newline at end of file
diff --git a/docs/html/wear/index.jd b/docs/html/wear/index.jd
index 026698c953390..05fd25088a7b5 100644
--- a/docs/html/wear/index.jd
+++ b/docs/html/wear/index.jd
@@ -51,7 +51,7 @@ page.type=about
               </div>
 
               <div class="landing-body">
-                <a href="/training/wearables/index.html" class="landing-button landing-primary" style="margin-top: 40px;">
+                <a href="{@docRoot}training/building-wearables.html" class="landing-button landing-primary" style="margin-top: 40px;">
                   Get Started
                 </a>
               </div>
@@ -62,7 +62,7 @@ page.type=about
       </div> <!-- end .wrap -->
       <div class="landing-scroll-down-affordance">
         <a class="landing-down-arrow" href="#extending-android-to-wearables">
-          <img src="/wear/images/carrot.png" alt="Scroll down to read more">
+          <img src="{@docRoot}wear/images/carrot.png" alt="Scroll down to read more">
         </a>
       </div>
     </div> <!-- end .landing-section .landing-hero -->
@@ -85,8 +85,8 @@ page.type=about
               <div class="col-3-wide">
 
                 <div class="landing-inset-video-container">
-                  <img class="landing-bezel-only" src="/wear/images/screens/bezel.png" alt="">
-                  <img class="gif" src="/wear/images/screens/reservation_animated.gif">
+                  <img class="landing-bezel-only" src="{@docRoot}wear/images/screens/bezel.png" alt="">
+                  <img class="gif" src="{@docRoot}wear/images/screens/reservation_animated.gif">
                 </div>
 
                 <p class="landing-small">
@@ -94,7 +94,7 @@ page.type=about
                 </p>
               </div>
               <div class="col-3-wide">
-                <img src="/wear/images/screens/circle_message2.png" itemprop="image" alt="">
+                <img src="{@docRoot}wear/images/screens/circle_message2.png" itemprop="image" alt="">
                 <p class="landing-small">
                   Get glanceable, actionable information at just the right time with notifications
                   that are synced from your handheld device.
@@ -102,7 +102,7 @@ page.type=about
                 </p>
               </div>
               <div class="col-3-wide">
-                <img src="/wear/images/screens/fitness-24.png" alt="">
+                <img src="{@docRoot}wear/images/screens/fitness-24.png" alt="">
                 <p class="landing-small">
                   Design apps that can access a wide range of sensors and other hardware
                    directly on the wearable.
@@ -113,7 +113,7 @@ page.type=about
 
             <p>
               Before you start building, check out the
-              <a href="/design/devices/wear.html">Android Wear Design Principles</a>
+              <a href="{@docRoot}design/wear/index.html">Android Wear Design Principles</a>
               to understand how to create great experiences for this exciting, new form factor.</p>
 
           </div>
@@ -133,49 +133,49 @@ page.type=about
           <div class="landing-body">
             <div class="landing-breakout cols">
               <div class="col-4">
-                <img src="/wear/images/features/ts2.png" alt="">
+                <img src="{@docRoot}wear/images/features/ts2.png" alt="">
                 <p>Synced Notifications</p>
                 <p class="landing-small">
                   Notifications on handhelds can automatically sync to wearables, so design them
                   with both devices in mind.
                 </p>
                 <p class="landing-small">
-                  <a href="/training/wearables/notifications/index.html">Build notifications</a>
+                  <a href="{@docRoot}training/wearables/notifications/index.html">Build notifications</a>
                 </p>
               </div>
               <div class="col-4">
-                <img src="/wear/images/features/ts1.png" alt="">
+                <img src="{@docRoot}wear/images/features/ts1.png" alt="">
                 <p>Wearable Apps</p>
                 <p class="landing-small">
                   Create custom experiences with activities, services, sensors, and much
                   more with the Android SDK.
                 </p>
                 <p class="landing-small">
-                  <a href="/training/wearables/apps/index.html/">Create wearable apps</a>
+                  <a href="{@docRoot}training/wearables/apps/index.html">Create wearable apps</a>
 
                 </p>
               </div>
               <div class="col-4">
-                <img src="/wear/images/features/ts2.png" alt="">
+                <img src="{@docRoot}wear/images/features/ts2.png" alt="">
                 <p>Send Data</p>
                 <p class="landing-small">
                   Send data and actions between handhelds and wearables with
                   data replication APIs and RPCs.
                 </p>
                 <p class="landing-small">
-                  <a href="/training/wearables/apps/index.html/">Work with the Data Layer</a>
+                  <a href="{@docRoot}training/wearables/data-layer/index.html">Work with the Data Layer</a>
 
                 </p>
               </div>
               <div class="col-4">
-                <img src="/wear/images/features/ts4.png" alt="">
+                <img src="{@docRoot}wear/images/features/ts4.png" alt="">
                 <p>Voice Actions</p>
                 <p class="landing-small">
                   Register your app to handle voice actions, like "Ok Google, take a&nbsp;note,"
                   for a hands-free experience.
                 </p>
                 <p class="landing-small">
-                  <a href="/training/wearables/apps/index.html/">Integrate voice actions</a>
+                  <a href="{@docRoot}training/wearables/apps/voice-actions.html/">Integrate voice actions</a>
                 </p>
               </div>
             </div>
@@ -248,7 +248,7 @@ page.type=about
             </div>
           </div>
           <div class="landing-body">
-            <a href="/training/wearables/index.html" class="landing-button landing-secondary" style="margin-top: 20px;">
+            <a href="{@docRoot}training/building-wearables.html" class="landing-button landing-secondary" style="margin-top: 20px;">
               Get Started
             </a>
           </div>
@@ -277,7 +277,7 @@ page.type=about
               </div>
               <div class="col-3-wide">
                 <a target="_blank" href="http://android-developers.blogspot.com/2014/03/android-landing-developer-preview.html">
-                  <img class="landing-social-image" src="/wear/images/blogger.png" alt="">
+                  <img class="landing-social-image" src="{@docRoot}wear/images/blogger.png" alt="">
                 </a>
                 <div class="landing-social-copy">
                   <p>Blog Post</p>
@@ -313,8 +313,6 @@ page.type=about
         </div> <!-- end .wrap -->
       </div> <!-- end .landing-section -->
     </div> <!-- end .landing-rest-of-page -->
-
-
     <div class="content-footer wrap" itemscope="" itemtype="http://schema.org/SiteNavigationElement">
       <div class="layout-content-col col-16" style="padding-top:4px">
         <style>#___plusone_0 {float:right !important;}</style>
@@ -326,7 +324,7 @@ page.type=about
         Except as noted, this content is
         licensed under <a href="http://creativecommons.org/licenses/by/2.5/">
         Creative Commons Attribution 2.5</a>. For details and
-        restrictions, see the <a href="/license.html">Content
+        restrictions, see the <a href="{@docRoot}license.html">Content
         License</a>.
       </div>
     </div>