You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ad...@apache.org on 2016/11/14 23:59:10 UTC

[16/56] [partial] incubator-mynewt-site git commit: Deploying changes introduced in landingFormat branch

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/89c943e1/develop/os/modules/split/split/index.html
----------------------------------------------------------------------
diff --git a/develop/os/modules/split/split/index.html b/develop/os/modules/split/split/index.html
index 5b8afd1..a654296 100644
--- a/develop/os/modules/split/split/index.html
+++ b/develop/os/modules/split/split/index.html
@@ -10,15 +10,14 @@
         <link rel="canonical" href="http://mynewt.apache.org/os/modules/split/split/"> -->
         <link rel="shortcut icon" href="../../../../img/favicon.ico">
 
-	<title>toc - Apache Mynewt</title>
+	    <title>toc - Apache Mynewt</title>
 
         <link href="../../../../css/bootstrap-3.0.3.min.css" rel="stylesheet">
-        <link href="../../../../css/font-awesome-4.0.3.css" rel="stylesheet">
         <link rel="stylesheet" href="../../../../css/highlight.css">
         <link href="../../../../css/base.css" rel="stylesheet">
         <link href="../../../../css/custom.css" rel="stylesheet">
         <link href="../../../../css/v2.css" rel="stylesheet">
-        <link href='https://fonts.googleapis.com/css?family=Roboto:400,500,700,900,300,100' rel='stylesheet' type='text/css'>
+        <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
         <link href="../../../../extra.css" rel="stylesheet">
 
@@ -45,6 +44,16 @@
     <body class="toc">
 
 
+        <div class="container">
+    <div class="row v2-main-banner">
+        <div class="col-xs-12 v2-vcenter">
+            <a href="/"><img class="logo" src="/img/logo.png"></a>
+
+            <h4 class="tagline">An OS to build, deploy and securely manage billions of devices</h4>
+        </div>
+    </div>
+</div>
+
         
 
 
@@ -52,7 +61,7 @@
 
 
 
-<nav id="navbar" class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+<nav id="navbar" class="navbar navbar-inverse affix-top" data-spy="affix" data-offset-top="150" role="navigation">
     <div class="container">
         <!-- Collapsed navigation -->
         <div class="navbar-header">
@@ -73,7 +82,7 @@
                 <li 
   class=""
 >
-                    <a href="/">Home</a>
+                    <a href="/"><i class="fa fa-home" style="font-size: larger;"></i></a>
                 </li>
                 <li 
   class="important"
@@ -86,6 +95,11 @@
                     <a href="/about/">About</a>
                 </li>
                 <li 
+  class=""
+>
+                    <a href="/talks/">Talks</a>
+                </li>
+                <li 
   class="active"
 >
                     <a href="/latest/os/introduction">Documentation</a>
@@ -120,9 +134,8 @@
         <div class="container">
             
                 <div class="row">
-                    <div class="col-md-3 v2-sidebar"><div id="docSidebar" class="hidden-print" role="complementary">
+                    <div class="col-md-3 v2-sidebar sidebar-container"><div id="docSidebar" class="hidden-print" role="complementary">
     <div class="top">
-        <img class="hidden-xs hidden-sm logo-small" src="/img/logo.svg" alt="MyNewt" title="MyNewt">
         <div role="search">
             <form id="rtd-search-form" class="wy-form" action="../../../../search.html" method="get">
                 <div class="form-group">
@@ -139,14 +152,14 @@
       value="/develop/os/introduction"
       selected="selected"
     >
-      Version: develop
+      Version: develop (latest)
     </option>
     
     <option
       value="/v0_9_0/os/introduction"
       
     >
-      Version: 0.9.0 (latest)
+      Version: 0.9.0
     </option>
     
 </select>
@@ -165,6 +178,10 @@
         
       
         
+      
+        
+      
+        
           
   
   
@@ -463,14 +480,9 @@
     </ul>
 </div></div>
 
-                    <div class="show-sidebar-container">
-                        <button class="show-sidebar">Docs Menu</button>
-                    </div>
-
                     <div class="col-md-9" role="main">
-                        <div class="row doc-header">
-                            <div class="col-sm-12">
-                                <div role="navigation" aria-label="breadcrumbs navigation">
+                        <div class="doc-header">
+                            <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs pull-right">
     <li><a href="/develop/os/introduction">Docs</a></li>
     
@@ -488,20 +500,26 @@
     
   </ul>
 </div>
-                            </div>
                         </div>
                         
                             <h1 id="split-images">Split Images</h1>
 <h2 id="description">Description</h2>
-<p>Split images allow the user to build the application content separate from the library content by splitting an application into two pieces:</p>
+<p>Split images allow the user to build the application content separate from the library content by 
+splitting an application into two pieces:</p>
 <ul>
-<li>A "loader" which contains a separate application that can perform upgrades and manage split images. The "loader" resides in slot 1.</li>
-<li>A "split app" which contains the main application content and references the libraries in the loader by static linkage. The "split app" resides in slot 2.</li>
+<li>A "loader" which contains a separate application that can perform upgrades and manage split images. 
+The "loader" resides in slot 1.</li>
+<li>A "split app" which contains the main application content and references the libraries in the loader 
+by static linkage. The "split app" resides in slot 2.</li>
 </ul>
 <h2 id="goals">Goals</h2>
-<p>The goal of split images is to allow a larger application to run along with large components of mynewt such as <a href="../../../../network/ble/ble_intro/">nimble BLE stack</a> and <a href="../../fs/nffs/nffs/">neutron flash file system(nffs)</a>.</p>
+<p>The goal of split images is to allow a larger application to run along with large components of 
+mynewt such as <a href="../../../../network/ble/ble_intro/">nimble BLE stack</a> and <a href="../../fs/nffs/nffs/">neutron flash file system(nffs)</a>.</p>
 <h2 id="concept">Concept</h2>
-<p>In a typical mynewt application, an application is contained wholly within an image slot.  Typically there are at least two image slots since the image runs from one slot while uploading new code into the second slot.  Each image is capable of erasing and uploading another image.  Each image is completely stand-alone; that is, each image contains all of the libraries and components that it needs.</p>
+<p>In a typical mynewt application, an application is contained wholly within an image slot.  Typically 
+there are at least two image slots since the image runs from one slot while uploading new code into 
+the second slot.  Each image is capable of erasing and uploading another image.  Each image is completely 
+stand-alone; that is, each image contains all of the libraries and components that it needs.</p>
 <p>On a typical 256 kbyte flash, a flash layout might look like this:</p>
 <table>
 <thead>
@@ -572,12 +590,19 @@
 </tr>
 </tbody>
 </table>
-<p>which total 106k.  With an image slot size of 108k this leaves only a small amount of code space remaining for the application.</p>
-<p>However, we can see that these packages contain everything you need to upgrade and configure, so if we build a stand-alone loader with these components, we can build the app as a split image and get the entire second image slot to store application code and constant data.</p>
+<p>which total 106k.  With an image slot size of 108k this leaves only a small amount of code space 
+remaining for the application.</p>
+<p>However, we can see that these packages contain everything you need to upgrade and configure, so 
+if we build a stand-alone loader with these components, we can build the app as a split image and 
+get the entire second image slot to store application code and constant data.</p>
 <h2 id="when-do-i-use-split-images">When do I use split images</h2>
-<p>If your application fits into the available image slots, there is no advantage to using split images.  In general, split images are harder to debug and more complicated to upload. However for a larger application, there may not be enough flash space to have two copies of the entire application. This is when split image becomes necessary.</p>
+<p>If your application fits into the available image slots, there is no advantage to using split 
+images.  In general, split images are harder to debug and more complicated to upload. However 
+for a larger application, there may not be enough flash space to have two copies of the entire 
+application. This is when split image becomes necessary.</p>
 <h2 id="how-do-i-tell-newt-i-am-building-a-split-image">How do I tell Newt I am building a split image?</h2>
-<p>Newt looks for the variable <code>loader</code> in your target file. If it finds <code>loader</code> variable, it will build a split image.  For example,</p>
+<p>Newt looks for the variable <code>loader</code> in your target file. If it finds <code>loader</code> variable, it 
+will build a split image.  For example,</p>
 <div class="codehilite" style="background: #ffffff"><pre style="line-height: 125%">targets/app
     app=@apache-mynewt-core/apps/splitty
     loader=@apache-mynewt-core/apps/slinky
@@ -598,52 +623,77 @@
 <li>hw/bsp/nrf52dk</li>
 </ul>
 <h2 id="loaders">Loaders</h2>
-<p>The following applications have been enabled as loaders. You may choose to build your own loader application, and these can serve as samples.</p>
+<p>The following applications have been enabled as loaders. You may choose to build your own loader 
+application, and these can serve as samples.</p>
 <ul>
 <li>@apache-mynewt-core/apps/slinky</li>
 <li>@apache-mynewt-core/apps/bleprph</li>
 </ul>
 <h2 id="split-apps">Split Apps</h2>
-<p>The following applications have been enabled as split applications. If you choose to build your own split application these can serve as samples. Note that slinky can be either a loader image or a split app image.</p>
+<p>The following applications have been enabled as split applications. If you choose to build your own 
+split application these can serve as samples. Note that slinky can be either a loader image or a split app image.</p>
 <ul>
 <li>@apache-mynewt-core/apps/slinky</li>
 <li>@apache-mynewt-core/apps/splitty</li>
 </ul>
 <h2 id="theory-of-operation">Theory of Operation</h2>
 <p>A split image is built as follows:</p>
-<p>First newt builds the <code>app</code> and <code>loader</code> images separately to ensure they are consistent (no errors) and to generate elf files which can inform newt of the symbols used by each part.</p>
-<p>Then newt collects the symbols used by both <code>app</code> and <code>loader</code> in two ways.  It collects the set of symbols from the <code>.elf</code> files. It also collects all the possible symbols from the <code>.a</code> files for each application.</p>
-<p>Newt builds the set of packages that the two applications share.  It ensures that all the symbols used in those packages are matching.  NOTE: because of features and #ifdefs, its possible for the two package to have symbols that are not the same.  In this case newt generates an error and will not build a split image.</p>
+<p>First newt builds the <code>app</code> and <code>loader</code> images separately to ensure they are consistent (no errors) and 
+to generate elf files which can inform newt of the symbols used by each part.</p>
+<p>Then newt collects the symbols used by both <code>app</code> and <code>loader</code> in two ways.  It collects the set of 
+symbols from the <code>.elf</code> files. It also collects all the possible symbols from the <code>.a</code> files for 
+each application.</p>
+<p>Newt builds the set of packages that the two applications share.  It ensures that all the symbols 
+used in those packages are matching.  NOTE: because of features and #ifdefs, its possible for the 
+two package to have symbols that are not the same.  In this case newt generates an error and will 
+not build a split image.</p>
 <p>Then newt creates the list of symbols that the two applications share from those packages (using the .elf files).</p>
-<p>Newt re-links the loader to ensure all of these symbols are present in the loader application (by forcing the linker to include them in the <code>.elf</code>).</p>
-<p>Newt builds a special copy of the loader.elf with only these symbols (and the handful of symbols discussed in the linking section above).</p>
-<p>Finally, newt links the application, replacing the common .a libraries with the special loader.elf image during the link.</p>
+<p>Newt re-links the loader to ensure all of these symbols are present in the loader application (by 
+forcing the linker to include them in the <code>.elf</code>).</p>
+<p>Newt builds a special copy of the loader.elf with only these symbols (and the handful of symbols 
+discussed in the linking section above).</p>
+<p>Finally, newt links the application, replacing the common .a libraries with the special loader.elf 
+image during the link.</p>
 <h2 id="design">Design</h2>
 <h3 id="bootloader">Bootloader</h3>
-<p>The bootloader has been modified to support "non bootable" images like split app images.  A flag in the image header denotes the image as "non-bootable". When this flag is set, the bootloader will not boot the split app image, nor will it copy it to the slot 1 location. Loader images are bootable, split app images are not.</p>
+<p>The <a href="../../bootloader/bootloader/">bootloader</a> has been modified to support "non bootable" images like split app images.  A flag in 
+the image header denotes the image as "non-bootable". When this flag is set, the bootloader will 
+not boot the split app image, nor will it copy it to the slot 1 location. Loader images are bootable, 
+split app images are not.</p>
 <h3 id="newt">Newt</h3>
 <p>Newt builds a split image when the token <code>loader=@apache-mynewt-core/apps/slinky</code> is present in the target file.</p>
-<p>Newt has a <code>Builder</code> object that is responsible for building an image.  This features a <code>targetBuilder</code> object that contains two builders (one for the app and one for the loader).</p>
+<p>Newt has a <code>Builder</code> object that is responsible for building an image.  This features a <code>targetBuilder</code> 
+object that contains two builders (one for the app and one for the loader).</p>
 <p>The <code>Builder</code> object has been expanded to include options for building as part of a split image.
 <em> Ability to specify the linker file during the link
 </em> Ability to specify a set of keep_symbols during the link</p>
-<p>Newt commands like download, size, create-image have been expanded to perform operations twice (once for loader and once for app) if the loader target is present.</p>
-<p>During normal single-image builds, the <code>targetBuilder</code> initializes and builds the application <code>builder</code>. During the split image build, the <code>targetBuilder</code> performs the steps outlined in the section above using the two <code>builder</code>s for the loader and app.</p>
+<p>Newt commands like download, size, create-image have been expanded to perform operations twice 
+(once for loader and once for app) if the loader target is present.</p>
+<p>During normal single-image builds, the <code>targetBuilder</code> initializes and builds the application 
+<code>builder</code>. During the split image build, the <code>targetBuilder</code> performs the steps outlined in the 
+section above using the two <code>builder</code>s for the loader and app.</p>
 <p>Special symbol and link features are designed as follows:</p>
 <ul>
 <li>Newt uses objdump to parse the symbol maps in the <code>.a</code> and <code>.elf</code> files.</li>
-<li>Newt uses the <code>--undefined=</code> option of the linker to force the loader to keep symbols used by the app (but not used by the linker)</li>
+<li>Newt uses the <code>--undefined=</code> option of the linker to force the loader to keep symbols used by 
+the app (but not used by the linker)</li>
 <li>Newt uses objcopy with the <code>-K</code> (keep) option when building the special linker <code>.elf</code>.</li>
 <li>Newt uses the <code>--just-symbols</code> option of the linker to link against the loader <code>.elf</code> file.</li>
 </ul>
 <h4 id="newt-create-image">newt create-image</h4>
-<p><code>create-image</code> uses two different methods to compute the image hash for standard and split images.  For split images, the hash is computed starting with the 32-byte hash of the loader, then continuing with the hashing algorithm used by the standard application.  This ensures that the split app can be "validated" against a loader image specifically.</p>
+<p><code>create-image</code> uses two different methods to compute the image hash for standard and split images.<br />
+For split images, the hash is computed starting with the 32-byte hash of the loader, then continuing 
+with the hashing algorithm used by the standard application.  This ensures that the split app can be "validated" against a loader image specifically.</p>
 <h4 id="newt-errors">newt errors</h4>
 <p>Newt has several new build errors when building split images.</p>
 <ul>
-<li>Linker script undefined.  If the BSP for your application does not define a split image linker script the build will fail.</li>
+<li>Linker script undefined.  If the BSP for your application does not define a split image linker script 
+the build will fail.</li>
 </ul>
-<p>If newt finds that the same library (for example libs/os) has a different implementaiton in the loader and app, it will generate an error and fail to build.  These differences can arise when <code>#ifdef</code> or features are included in one app and not the other.  For example, it the loader includes <code>libs/console/stubs</code> and the app includes <code>libs/console/full</code> this may change implementations of certain functions within other packages.</p>
+<p>If newt finds that the same library (for example libs/os) has a different implementaiton in the loader 
+and app, it will generate an error and fail to build.  These differences can arise when <code>#ifdef</code> or features 
+are included in one app and not the other.  For example, it the loader includes <code>libs/console/stubs</code> and the 
+app includes <code>libs/console/full</code> this may change implementations of certain functions within other packages.</p>
 <h3 id="image-manifest">Image manifest</h3>
 <p>newt builds a single manifest for split images, adding extra tags to the manifest when the image is a split image.</p>
 <div class="codehilite" style="background: #ffffff"><pre style="line-height: 125%">  &quot;loader&quot;: &quot;slinky.img&quot;,
@@ -654,11 +704,14 @@
 </pre></div>
 
 
-<p>The manifest lists packages in both the loader and app.  The app package list only contains those packages that reside in the app image itself.</p>
+<p>The manifest lists packages in both the loader and app.  The app package list only contains those 
+packages that reside in the app image itself.</p>
 <h3 id="libsbootutil">libs/bootutil</h3>
-<p>Bootutil has been expanded to include a function that looks for a split app image in slot 2, verifies that it matches the loader image in slot 1 and then fetches the entry information for the split app.</p>
+<p>Bootutil has been expanded to include a function that looks for a split app image in slot 2, verifies 
+that it matches the loader image in slot 1 and then fetches the entry information for the split app.</p>
 <h3 id="libssplit">libs/split</h3>
-<p>A small split image library was created to provide newtmgr commands for split image and to hold the configuration for split image. See newtmgr below for details.</p>
+<p>A small split image library was created to provide newtmgr commands for split image and to hold the 
+configuration for split image. See newtmgr below for details.</p>
 <p>It also contains the function used by a loader to validate and boot a split image.</p>
 <h3 id="appsslinky">apps/slinky</h3>
 <p>A sample app that can be built as a split image with slinky.</p>
@@ -666,14 +719,20 @@
 <p><strong>To be added</strong></p>
 <h2 id="adding-bsp-support-for-split-images">Adding BSP support for split images</h2>
 <p>A BSP needs additional components to be "split image ready".</p>
-<p>The split image requires a special linker script. The split image needs to run from the second image partition (since it's using the loader library that is linked to be placed in the first partition).  It needs to reserve space for RAM used by the loader.  It also does not need to include the vector table (just a bit of it).</p>
-<p>The startup of the split image is different than a typical image.  It needs to copy <code>.data</code> from the loader image, and zero the loader image bss.  For this, it must reference symbols defined in the linker script of the loader. It has a special entry symbol that differentiates it from the entry symbol in the loader application.</p>
-<p>Several of the bsp scripts need to handle additional agruments to deal with the two images produced by newt when building split images - mainly download and debug.</p>
+<p>The split image requires a special linker script. The split image needs to run from the second image 
+partition (since it's using the loader library that is linked to be placed in the first partition).<br />
+It needs to reserve space for RAM used by the loader.  It also does not need to include the vector table (just a bit of it).</p>
+<p>The startup of the split image is different than a typical image.  It needs to copy <code>.data</code> from the 
+loader image, and zero the loader image bss.  For this, it must reference symbols defined in the linker 
+script of the loader. It has a special entry symbol that differentiates it from the entry symbol in the 
+loader application.</p>
+<p>Several of the bsp scripts need to handle additional agruments to deal with the two images produced 
+by newt when building split images - mainly download and debug.</p>
 <p>Add the following components to enable your BSP for split images:</p>
 <ol>
 <li>A split image linker file</li>
 <li>A startup file for the split image</li>
-<li>A property in the pkg.yml file to tell newt what linker script to use for partition 2 images.  The property is defined as <code>pkg.part2linkerscript: "split-nrf52dk.ld</code> for example.</li>
+<li>A property in the pkg.yml file to tell newt what linker script to use for partition 2 images. The property is defined as <code>pkg.part2linkerscript: "split-nrf52dk.ld</code> for example.</li>
 <li>Modified download script</li>
 <li>Modified sbrk functionality</li>
 </ol>
@@ -681,30 +740,37 @@
 <h3 id="split-image-linker-script">split image linker script</h3>
 <p>The split image linker script must have the following.</p>
 <p>The split linker must be linked to run from the second flash image slot. For example:</p>
-<div class="codehilite" style="background: #ffffff"><pre style="line-height: 125%">MEMORY
+<div class="codehilite" style="background: #ffffff"><pre style="line-height: 125%"><span style="color: #000000">MEMORY</span>
 {
-  FLASH (rx) : ORIGIN =  0x00042000, LENGTH = 0x3a000
-  RAM  (rwx) : ORIGIN =  0x20000000, LENGTH = 0x10000
+  <span style="color: #000000">FLASH</span> (<span style="color: #000000">rx</span>) <span style="color: #000000">:</span> <span style="color: #000000">ORIGIN</span> <span style="color: #000000">=</span>  <span style="color: #1C01CE">0x00042000</span>, <span style="color: #000000">LENGTH</span> <span style="color: #000000">=</span> <span style="color: #1C01CE">0x3a000</span>
+  <span style="color: #000000">RAM</span>  (<span style="color: #000000">rwx</span>) <span style="color: #000000">:</span> <span style="color: #000000">ORIGIN</span> <span style="color: #000000">=</span>  <span style="color: #1C01CE">0x20000000</span>, <span style="color: #000000">LENGTH</span> <span style="color: #000000">=</span> <span style="color: #1C01CE">0x10000</span>
 }
 </pre></div>
 
 
 <p>The split linker must define the entry symbol as Reset_Handler_split.   For example:</p>
-<div class="codehilite" style="background: #ffffff"><pre style="line-height: 125%">ENTRY(Reset_Handler_split)
+<div class="codehilite" style="background: #ffffff"><pre style="line-height: 125%"><span style="color: #000000">ENTRY</span>(<span style="color: #000000">Reset_Handler_split</span>)
 </pre></div>
 
 
-<p>The split linker must define the first two words in the vector table (initial SP and Reset Vector). The additional vector entries are part of the loader and are not needed in the split image. The bootloader accesses these entries at the beginning of the image slot (first 2 words). For example:</p>
+<p>The split linker must define the first two words in the vector table (initial SP and Reset Vector). The additional 
+vector entries are part of the loader and are not needed in the split image. The bootloader accesses these 
+entries at the beginning of the image slot (first 2 words). For example:</p>
 <div class="codehilite" style="background: #ffffff"><pre style="line-height: 125%">    .text :
     {
         __split_isr_vector_start = .;
         KEEP(*(.isr_vector_split))
         __split_isr_vector_end = .;
-        ...     
+        ... 
+    }   
 </pre></div>
 
 
-<p>The split linker must ensure that it doesn't overwrite the BSS and DATA sections of the loader (they are both using RAM).  Note, the two apps don't run at the same time, but the loader has global data that its libraries use.  This cannot be overwritten by the application. An example linker section that accomplishes this can be found in <code>/hw/bsp/nrf52dk/split-nrf52dk.ld</code>. When linking against the loader, the loader exports the following symbosl which can be used by the split app code:</p>
+<p>The split linker must ensure that it doesn't overwrite the BSS and DATA sections of the loader (they are 
+both using RAM).  Note, the two apps don't run at the same time, but the loader has global data that its 
+libraries use.  This cannot be overwritten by the application. An example linker section that accomplishes 
+this can be found in <code>/hw/bsp/nrf52dk/split-nrf52dk.ld</code>. When linking against the loader, the loader exports 
+the following symbosl which can be used by the split app code:</p>
 <ul>
 <li><code>__HeapBase_loader</code></li>
 <li><code>__bss_start___loader</code></li>
@@ -714,40 +780,48 @@
 <li><code>__data_end___loader</code></li>
 </ul>
 <p>The split app linker can use <code>__HeapBase_loader</code> to skip RAM used by the loader as follows.</p>
-<div class="codehilite" style="background: #ffffff"><pre style="line-height: 125%">    /* save RAM used by the split image. This assumes that
-     * the loader uses all the RAM up to its HeapBase  */
-    .loader_ram_contents :
+<div class="codehilite" style="background: #ffffff"><pre style="line-height: 125%">    <span style="color: #177500">/* save RAM used by the split image. This assumes that</span>
+<span style="color: #177500">     * the loader uses all the RAM up to its HeapBase  */</span>
+    .<span style="color: #000000">loader_ram_contents</span> :
     {
-        _loader_ram_start = .;
+        <span style="color: #000000">_loader_ram_start</span> <span style="color: #000000">=</span> .;
 
-    /* this symbol comes from the loader linker */
-    . = . + (ABSOLUTE(__HeapBase_loader) - _loader_ram_start);
-        _loader_ram_end = .;
-    } &gt; RAM
+    <span style="color: #177500">/* this symbol comes from the loader linker */</span>
+    . <span style="color: #000000">=</span> . <span style="color: #000000">+</span> (<span style="color: #000000">ABSOLUTE</span>(<span style="color: #000000">__HeapBase_loader</span>) <span style="color: #000000">-</span> <span style="color: #000000">_loader_ram_start</span>);
+        <span style="color: #000000">_loader_ram_end</span> <span style="color: #000000">=</span> .;
+    } <span style="color: #000000">&gt;</span> <span style="color: #000000">RAM</span>
 </pre></div>
 
 
 <h3 id="split-image-startup-code">split image startup code</h3>
-<p>The split application needs separate startup code to intialize the split image before running main.  THe split image is specially linked so that _start and main are included individually for the loader and split app.</p>
+<p>The split application needs separate startup code to intialize the split image before running main.  The 
+split image is specially linked so that <code>_start</code> and <code>main</code> are included individually for the loader and split app.</p>
 <p>The split app startup code must have the following.</p>
 <ol>
 <li>A definition of the split image vector table (first two words).</li>
 <li>The entry point function to start the code <code>Reset_Handler_split</code></li>
-<li>Code that copies the .data section for the loader from Flash to RAM</li>
-<li>Code that zeros the .bss section for the loader.</li>
-<li>Code that calls _sbrkInit to set the heap pointers for the application (see below)</li>
+<li>Code that copies the <code>.data</code> section for the loader from Flash to RAM</li>
+<li>Code that zeros the <code>.bss</code> section for the loader.</li>
+<li>Code that calls <code>_sbrkInit</code> to set the heap pointers for the application (see below)</li>
 <li>Code that calls the <code>bsp_slot_init_split_application</code> function (see below)</li>
 </ol>
 <p>An example can be found in the <code>/hw/bsp/nrf52dk/src/arch/cortex_m4/gcc_startup_nrf52_split.s</code></p>
 <h3 id="download-script">Download script</h3>
-<p>The download script needs to be modified to include support for passing the image slot number in the build.  Image slots are referenced as 0 and 1. Loading bootloaders ignore the image slot numbers.</p>
+<p>The download script needs to be modified to include support for passing the image slot number in the build.<br />
+Image slots are referenced as 0 and 1. Loading bootloaders ignore the image slot numbers.</p>
 <p>See and example in <code>/hw/bsp/bmd300eval/bmd300eval_download.sh</code>.</p>
 <h3 id="sbrk-functionality">Sbrk functionality</h3>
-<p>Split image (either a loader or app) references a single set of heap managment functions.  But the heap location and size is different depending which image is running.  Special functionality is needed to handle the dynamic setting of the heap base and limit.</p>
-<p>Instead of hard-coding the heap base and limit at link time (depending on the size of data and bss), sbrk needs to be dynamically initialized with these values from the startup code.</p>
-<p>See an example in <code>/hw/bsp/bmd300eval/src/sbrk.c</code> in the core repository.  The function <code>_sbrkInit</code> must be called from the startup code of the split image and normal image startup code with the appropriate values of heap base and limit.</p>
+<p>Split image (either a loader or app) references a single set of heap managment functions.  But the heap location and 
+size is different depending which image is running.  Special functionality is needed to handle the dynamic 
+setting of the heap base and limit.</p>
+<p>Instead of hard-coding the heap base and limit at link time (depending on the size of data and bss), sbrk 
+needs to be dynamically initialized with these values from the startup code.</p>
+<p>See an example in <code>/hw/bsp/bmd300eval/src/sbrk.c</code> in the core repository.  The function <code>_sbrkInit</code> must be 
+called from the startup code of the split image and normal image startup code with the appropriate 
+values of heap base and limit.</p>
 <h3 id="slot-init">Slot Init</h3>
-<p>A global variable tells mynewt whether the split image is runnning as just a stand-alone loader, or as the combined loader/app image.  Its the responsibility of the startup code to set this global variable.</p>
+<p>A global variable tells Mynewt whether the split image is runnning as just a stand-alone loader, or as 
+the combined loader/app image.  Its the responsibility of the startup code to set this global variable.</p>
 <p>See <code>hw/bsp/bmd300eval/src/os_bsp.c</code> for and implementation of the functionality.</p>
 <h2 id="newtmgr-and-split-images">newtmgr and split Images</h2>
 <p>newtmgr has support for split images.</p>
@@ -764,21 +838,26 @@
 </pre></div>
 
 
-<p>The bootloader is unable to boot split app images (of course it can boot the loader images), so do not use the <code>boot2</code> command to instruct mynewt to boot slot 2.</p>
-<p>Instead, use the new <code>split status</code> command to see the status of split images and to set their boot status.  The split status command with no arguments returns status of the split image.  The Split Value tells the loader how to boot the split app. Options are:</p>
+<p>The bootloader is unable to boot split app images (of course it can boot the loader images), so do not use the <code>boot2</code> 
+command to instruct mynewt to boot slot 2.</p>
+<p>Instead, use the new <code>split status</code> command to see the status of split images and to set their boot status.<br />
+The split status command with no arguments returns status of the split image.  The Split Value tells the loader 
+how to boot the split app. Options are:</p>
 <ul>
 <li><code>none</code> Don't boot the split application. Just remain running in the loader.</li>
 <li><code>test</code> Boot the split application, but revert back to the loader on the next reset.</li>
 <li><code>run</code> Boot the split application.</li>
 </ul>
-<p>The split status command also verified the hash of the split application (using the hash of the loader as shown above) and returns the status of the check (matching or non-matching).</p>
+<p>The split status command also verified the hash of the split application (using the hash of the loader 
+as shown above) and returns the status of the check (matching or non-matching).</p>
 <div class="codehilite" style="background: #ffffff"><pre style="line-height: 125%">newtmgr -c connection split status
   Split value is none
   Split status is matching
 </pre></div>
 
 
-<p>When the split image application is running, the active hash in the boot2 command will match the hash of the split application (in slot 2). For example:</p>
+<p>When the split image application is running, the active hash in the <code>boot2</code> command will match the 
+hash of the split application (in slot 2). For example:</p>
 <div class="codehilite" style="background: #ffffff"><pre style="line-height: 125%">prompt$ newtmgr -c foo1 image boot
    Test image: 55e254f133bedf640fc7be7b5bfe3e5fb387cf5e29ecd0d4ea02b5ba617e27e0
    Main image: 55e254f133bedf640fc7be7b5bfe3e5fb387cf5e29ecd0d4ea02b5ba617e27e0
@@ -788,7 +867,8 @@
 
 <h2 id="upgrading-a-split-image-with-newtmgr">Upgrading a split image with newtmgr</h2>
 <p>When running via newt, the <code>newt load</code> command will load both parts of a split image, the loader and application.</p>
-<p>When running via newtmgr a sequence of commands is required to upgrade.  Assuming you are running the split app in <code>run</code> mode the following sequence will upgrade</p>
+<p>When running via newtmgr a sequence of commands is required to upgrade.  Assuming you are running the 
+split app in <code>run</code> mode the following sequence will upgrade</p>
 <ol>
 <li>newtmgr split status none</li>
 <li>newtmgr reboot</li>
@@ -827,34 +907,22 @@
     </li>
 </ul>
                         </div>
-                        <div class="row">
-                            <footer>
-    <div class="row">
-        <div class="col-md-12">
-            
-                <p class="copyright">Copyright &copy; 2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 Apache and the Apache feather logo are trademarks of The Apache Software Foundation.<br>The Apache Software Foundation Apache Incubator</p>
-            
-        </div>
-    </div>
-    <div class="copyright-logos">
-        <div class="row">
-            <div class="col-xs-6 text-left">
-                <img src="/img/asf_logo_wide_small.png" alt="Apache" title="Apache">
-            </div>
-            <div class="col-xs-6 text-right">
-                <img src="/img/egg-logo2.png" alt="Apache Incubator" title="Apache Incubator">
-            </div>
-        </div>
+                        <footer class="row">
+    <div class="col-xs-12">
+        
+            <p class="copyright">Copyright &copy; 2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+        
     </div>
-    <div class="row">
-        <div class="col-md-12">
+    <div class="col-xs-12">
+        <div class="logos">
+            <img src="/img/asf_logo_wide_small.png" alt="Apache" title="Apache">
             <small class="footnote">
                 MyNewt is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
             </small>
+            <img src="/img/egg-logo2.png" alt="Apache Incubator" title="Apache Incubator">
         </div>
     </div>
 </footer>
-                        </div>
                     </div>
                 </div>
             

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/89c943e1/develop/os/modules/stats/stats/index.html
----------------------------------------------------------------------
diff --git a/develop/os/modules/stats/stats/index.html b/develop/os/modules/stats/stats/index.html
index b4be684..748e73a 100644
--- a/develop/os/modules/stats/stats/index.html
+++ b/develop/os/modules/stats/stats/index.html
@@ -10,15 +10,14 @@
         <link rel="canonical" href="http://mynewt.apache.org/os/modules/stats/stats/"> -->
         <link rel="shortcut icon" href="../../../../img/favicon.ico">
 
-	<title>toc - Apache Mynewt</title>
+	    <title>toc - Apache Mynewt</title>
 
         <link href="../../../../css/bootstrap-3.0.3.min.css" rel="stylesheet">
-        <link href="../../../../css/font-awesome-4.0.3.css" rel="stylesheet">
         <link rel="stylesheet" href="../../../../css/highlight.css">
         <link href="../../../../css/base.css" rel="stylesheet">
         <link href="../../../../css/custom.css" rel="stylesheet">
         <link href="../../../../css/v2.css" rel="stylesheet">
-        <link href='https://fonts.googleapis.com/css?family=Roboto:400,500,700,900,300,100' rel='stylesheet' type='text/css'>
+        <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
         <link href="../../../../extra.css" rel="stylesheet">
 
@@ -45,6 +44,16 @@
     <body class="toc">
 
 
+        <div class="container">
+    <div class="row v2-main-banner">
+        <div class="col-xs-12 v2-vcenter">
+            <a href="/"><img class="logo" src="/img/logo.png"></a>
+
+            <h4 class="tagline">An OS to build, deploy and securely manage billions of devices</h4>
+        </div>
+    </div>
+</div>
+
         
 
 
@@ -52,7 +61,7 @@
 
 
 
-<nav id="navbar" class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+<nav id="navbar" class="navbar navbar-inverse affix-top" data-spy="affix" data-offset-top="150" role="navigation">
     <div class="container">
         <!-- Collapsed navigation -->
         <div class="navbar-header">
@@ -73,7 +82,7 @@
                 <li 
   class=""
 >
-                    <a href="/">Home</a>
+                    <a href="/"><i class="fa fa-home" style="font-size: larger;"></i></a>
                 </li>
                 <li 
   class="important"
@@ -86,6 +95,11 @@
                     <a href="/about/">About</a>
                 </li>
                 <li 
+  class=""
+>
+                    <a href="/talks/">Talks</a>
+                </li>
+                <li 
   class="active"
 >
                     <a href="/latest/os/introduction">Documentation</a>
@@ -120,9 +134,8 @@
         <div class="container">
             
                 <div class="row">
-                    <div class="col-md-3 v2-sidebar"><div id="docSidebar" class="hidden-print" role="complementary">
+                    <div class="col-md-3 v2-sidebar sidebar-container"><div id="docSidebar" class="hidden-print" role="complementary">
     <div class="top">
-        <img class="hidden-xs hidden-sm logo-small" src="/img/logo.svg" alt="MyNewt" title="MyNewt">
         <div role="search">
             <form id="rtd-search-form" class="wy-form" action="../../../../search.html" method="get">
                 <div class="form-group">
@@ -139,14 +152,14 @@
       value="/develop/os/introduction"
       selected="selected"
     >
-      Version: develop
+      Version: develop (latest)
     </option>
     
     <option
       value="/v0_9_0/os/introduction"
       
     >
-      Version: 0.9.0 (latest)
+      Version: 0.9.0
     </option>
     
 </select>
@@ -165,6 +178,10 @@
         
       
         
+      
+        
+      
+        
           
   
   
@@ -463,14 +480,9 @@
     </ul>
 </div></div>
 
-                    <div class="show-sidebar-container">
-                        <button class="show-sidebar">Docs Menu</button>
-                    </div>
-
                     <div class="col-md-9" role="main">
-                        <div class="row doc-header">
-                            <div class="col-sm-12">
-                                <div role="navigation" aria-label="breadcrumbs navigation">
+                        <div class="doc-header">
+                            <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs pull-right">
     <li><a href="/develop/os/introduction">Docs</a></li>
     
@@ -488,7 +500,6 @@
     
   </ul>
 </div>
-                            </div>
                         </div>
                         
                             <h1 id="statistics-module">Statistics Module</h1>
@@ -741,34 +752,22 @@ not let two sections be entered with the same name.</p>
     </li>
 </ul>
                         </div>
-                        <div class="row">
-                            <footer>
-    <div class="row">
-        <div class="col-md-12">
-            
-                <p class="copyright">Copyright &copy; 2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 Apache and the Apache feather logo are trademarks of The Apache Software Foundation.<br>The Apache Software Foundation Apache Incubator</p>
-            
-        </div>
-    </div>
-    <div class="copyright-logos">
-        <div class="row">
-            <div class="col-xs-6 text-left">
-                <img src="/img/asf_logo_wide_small.png" alt="Apache" title="Apache">
-            </div>
-            <div class="col-xs-6 text-right">
-                <img src="/img/egg-logo2.png" alt="Apache Incubator" title="Apache Incubator">
-            </div>
-        </div>
+                        <footer class="row">
+    <div class="col-xs-12">
+        
+            <p class="copyright">Copyright &copy; 2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+        
     </div>
-    <div class="row">
-        <div class="col-md-12">
+    <div class="col-xs-12">
+        <div class="logos">
+            <img src="/img/asf_logo_wide_small.png" alt="Apache" title="Apache">
             <small class="footnote">
                 MyNewt is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
             </small>
+            <img src="/img/egg-logo2.png" alt="Apache Incubator" title="Apache Incubator">
         </div>
     </div>
 </footer>
-                        </div>
                     </div>
                 </div>
             

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/89c943e1/develop/os/modules/testutil/test_assert/index.html
----------------------------------------------------------------------
diff --git a/develop/os/modules/testutil/test_assert/index.html b/develop/os/modules/testutil/test_assert/index.html
index 1271331..ce422ee 100644
--- a/develop/os/modules/testutil/test_assert/index.html
+++ b/develop/os/modules/testutil/test_assert/index.html
@@ -10,15 +10,14 @@
         <link rel="canonical" href="http://mynewt.apache.org/os/modules/testutil/test_assert/"> -->
         <link rel="shortcut icon" href="../../../../img/favicon.ico">
 
-	<title>TEST_ASSERT - Apache Mynewt</title>
+	    <title>TEST_ASSERT - Apache Mynewt</title>
 
         <link href="../../../../css/bootstrap-3.0.3.min.css" rel="stylesheet">
-        <link href="../../../../css/font-awesome-4.0.3.css" rel="stylesheet">
         <link rel="stylesheet" href="../../../../css/highlight.css">
         <link href="../../../../css/base.css" rel="stylesheet">
         <link href="../../../../css/custom.css" rel="stylesheet">
         <link href="../../../../css/v2.css" rel="stylesheet">
-        <link href='https://fonts.googleapis.com/css?family=Roboto:400,500,700,900,300,100' rel='stylesheet' type='text/css'>
+        <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
         <link href="../../../../extra.css" rel="stylesheet">
 
@@ -45,6 +44,16 @@
     <body class="TEST_ASSERT">
 
 
+        <div class="container">
+    <div class="row v2-main-banner">
+        <div class="col-xs-12 v2-vcenter">
+            <a href="/"><img class="logo" src="/img/logo.png"></a>
+
+            <h4 class="tagline">An OS to build, deploy and securely manage billions of devices</h4>
+        </div>
+    </div>
+</div>
+
         
 
 
@@ -52,7 +61,7 @@
 
 
 
-<nav id="navbar" class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+<nav id="navbar" class="navbar navbar-inverse affix-top" data-spy="affix" data-offset-top="150" role="navigation">
     <div class="container">
         <!-- Collapsed navigation -->
         <div class="navbar-header">
@@ -73,7 +82,7 @@
                 <li 
   class=""
 >
-                    <a href="/">Home</a>
+                    <a href="/"><i class="fa fa-home" style="font-size: larger;"></i></a>
                 </li>
                 <li 
   class="important"
@@ -86,6 +95,11 @@
                     <a href="/about/">About</a>
                 </li>
                 <li 
+  class=""
+>
+                    <a href="/talks/">Talks</a>
+                </li>
+                <li 
   class="active"
 >
                     <a href="/latest/os/introduction">Documentation</a>
@@ -120,9 +134,8 @@
         <div class="container">
             
                 <div class="row">
-                    <div class="col-md-3 v2-sidebar"><div id="docSidebar" class="hidden-print" role="complementary">
+                    <div class="col-md-3 v2-sidebar sidebar-container"><div id="docSidebar" class="hidden-print" role="complementary">
     <div class="top">
-        <img class="hidden-xs hidden-sm logo-small" src="/img/logo.svg" alt="MyNewt" title="MyNewt">
         <div role="search">
             <form id="rtd-search-form" class="wy-form" action="../../../../search.html" method="get">
                 <div class="form-group">
@@ -139,14 +152,14 @@
       value="/develop/os/introduction"
       selected="selected"
     >
-      Version: develop
+      Version: develop (latest)
     </option>
     
     <option
       value="/v0_9_0/os/introduction"
       
     >
-      Version: 0.9.0 (latest)
+      Version: 0.9.0
     </option>
     
 </select>
@@ -165,6 +178,10 @@
         
       
         
+      
+        
+      
+        
           
   
   
@@ -536,14 +553,9 @@
     </ul>
 </div></div>
 
-                    <div class="show-sidebar-container">
-                        <button class="show-sidebar">Docs Menu</button>
-                    </div>
-
                     <div class="col-md-9" role="main">
-                        <div class="row doc-header">
-                            <div class="col-sm-12">
-                                <div role="navigation" aria-label="breadcrumbs navigation">
+                        <div class="doc-header">
+                            <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs pull-right">
     <li><a href="/develop/os/introduction">Docs</a></li>
     
@@ -563,7 +575,6 @@
     
   </ul>
 </div>
-                            </div>
                         </div>
                         
                             <h2 id="test_assert"><font color="F2853F" style="font-size:24pt"> TEST_ASSERT</font></h2>
@@ -671,34 +682,22 @@ cbmem_test_case_1_walk(struct cbmem *cbmem, struct cbmem_entry_hdr *hdr,
     </li>
 </ul>
                         </div>
-                        <div class="row">
-                            <footer>
-    <div class="row">
-        <div class="col-md-12">
-            
-                <p class="copyright">Copyright &copy; 2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 Apache and the Apache feather logo are trademarks of The Apache Software Foundation.<br>The Apache Software Foundation Apache Incubator</p>
-            
-        </div>
-    </div>
-    <div class="copyright-logos">
-        <div class="row">
-            <div class="col-xs-6 text-left">
-                <img src="/img/asf_logo_wide_small.png" alt="Apache" title="Apache">
-            </div>
-            <div class="col-xs-6 text-right">
-                <img src="/img/egg-logo2.png" alt="Apache Incubator" title="Apache Incubator">
-            </div>
-        </div>
+                        <footer class="row">
+    <div class="col-xs-12">
+        
+            <p class="copyright">Copyright &copy; 2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+        
     </div>
-    <div class="row">
-        <div class="col-md-12">
+    <div class="col-xs-12">
+        <div class="logos">
+            <img src="/img/asf_logo_wide_small.png" alt="Apache" title="Apache">
             <small class="footnote">
                 MyNewt is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
             </small>
+            <img src="/img/egg-logo2.png" alt="Apache Incubator" title="Apache Incubator">
         </div>
     </div>
 </footer>
-                        </div>
                     </div>
                 </div>
             

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/89c943e1/develop/os/modules/testutil/test_case/index.html
----------------------------------------------------------------------
diff --git a/develop/os/modules/testutil/test_case/index.html b/develop/os/modules/testutil/test_case/index.html
index c619e9e..6200665 100644
--- a/develop/os/modules/testutil/test_case/index.html
+++ b/develop/os/modules/testutil/test_case/index.html
@@ -10,15 +10,14 @@
         <link rel="canonical" href="http://mynewt.apache.org/os/modules/testutil/test_case/"> -->
         <link rel="shortcut icon" href="../../../../img/favicon.ico">
 
-	<title>TEST_CASE - Apache Mynewt</title>
+	    <title>TEST_CASE - Apache Mynewt</title>
 
         <link href="../../../../css/bootstrap-3.0.3.min.css" rel="stylesheet">
-        <link href="../../../../css/font-awesome-4.0.3.css" rel="stylesheet">
         <link rel="stylesheet" href="../../../../css/highlight.css">
         <link href="../../../../css/base.css" rel="stylesheet">
         <link href="../../../../css/custom.css" rel="stylesheet">
         <link href="../../../../css/v2.css" rel="stylesheet">
-        <link href='https://fonts.googleapis.com/css?family=Roboto:400,500,700,900,300,100' rel='stylesheet' type='text/css'>
+        <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
         <link href="../../../../extra.css" rel="stylesheet">
 
@@ -45,6 +44,16 @@
     <body class="TEST_CASE">
 
 
+        <div class="container">
+    <div class="row v2-main-banner">
+        <div class="col-xs-12 v2-vcenter">
+            <a href="/"><img class="logo" src="/img/logo.png"></a>
+
+            <h4 class="tagline">An OS to build, deploy and securely manage billions of devices</h4>
+        </div>
+    </div>
+</div>
+
         
 
 
@@ -52,7 +61,7 @@
 
 
 
-<nav id="navbar" class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+<nav id="navbar" class="navbar navbar-inverse affix-top" data-spy="affix" data-offset-top="150" role="navigation">
     <div class="container">
         <!-- Collapsed navigation -->
         <div class="navbar-header">
@@ -73,7 +82,7 @@
                 <li 
   class=""
 >
-                    <a href="/">Home</a>
+                    <a href="/"><i class="fa fa-home" style="font-size: larger;"></i></a>
                 </li>
                 <li 
   class="important"
@@ -86,6 +95,11 @@
                     <a href="/about/">About</a>
                 </li>
                 <li 
+  class=""
+>
+                    <a href="/talks/">Talks</a>
+                </li>
+                <li 
   class="active"
 >
                     <a href="/latest/os/introduction">Documentation</a>
@@ -120,9 +134,8 @@
         <div class="container">
             
                 <div class="row">
-                    <div class="col-md-3 v2-sidebar"><div id="docSidebar" class="hidden-print" role="complementary">
+                    <div class="col-md-3 v2-sidebar sidebar-container"><div id="docSidebar" class="hidden-print" role="complementary">
     <div class="top">
-        <img class="hidden-xs hidden-sm logo-small" src="/img/logo.svg" alt="MyNewt" title="MyNewt">
         <div role="search">
             <form id="rtd-search-form" class="wy-form" action="../../../../search.html" method="get">
                 <div class="form-group">
@@ -139,14 +152,14 @@
       value="/develop/os/introduction"
       selected="selected"
     >
-      Version: develop
+      Version: develop (latest)
     </option>
     
     <option
       value="/v0_9_0/os/introduction"
       
     >
-      Version: 0.9.0 (latest)
+      Version: 0.9.0
     </option>
     
 </select>
@@ -165,6 +178,10 @@
         
       
         
+      
+        
+      
+        
           
   
   
@@ -536,14 +553,9 @@
     </ul>
 </div></div>
 
-                    <div class="show-sidebar-container">
-                        <button class="show-sidebar">Docs Menu</button>
-                    </div>
-
                     <div class="col-md-9" role="main">
-                        <div class="row doc-header">
-                            <div class="col-sm-12">
-                                <div role="navigation" aria-label="breadcrumbs navigation">
+                        <div class="doc-header">
+                            <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs pull-right">
     <li><a href="/develop/os/introduction">Docs</a></li>
     
@@ -563,7 +575,6 @@
     
   </ul>
 </div>
-                            </div>
                         </div>
                         
                             <h2 id="test_case"><font color="F2853F" style="font-size:24pt"> TEST_CASE </font></h2>
@@ -620,34 +631,22 @@
     </li>
 </ul>
                         </div>
-                        <div class="row">
-                            <footer>
-    <div class="row">
-        <div class="col-md-12">
-            
-                <p class="copyright">Copyright &copy; 2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 Apache and the Apache feather logo are trademarks of The Apache Software Foundation.<br>The Apache Software Foundation Apache Incubator</p>
-            
-        </div>
-    </div>
-    <div class="copyright-logos">
-        <div class="row">
-            <div class="col-xs-6 text-left">
-                <img src="/img/asf_logo_wide_small.png" alt="Apache" title="Apache">
-            </div>
-            <div class="col-xs-6 text-right">
-                <img src="/img/egg-logo2.png" alt="Apache Incubator" title="Apache Incubator">
-            </div>
-        </div>
+                        <footer class="row">
+    <div class="col-xs-12">
+        
+            <p class="copyright">Copyright &copy; 2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+        
     </div>
-    <div class="row">
-        <div class="col-md-12">
+    <div class="col-xs-12">
+        <div class="logos">
+            <img src="/img/asf_logo_wide_small.png" alt="Apache" title="Apache">
             <small class="footnote">
                 MyNewt is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
             </small>
+            <img src="/img/egg-logo2.png" alt="Apache Incubator" title="Apache Incubator">
         </div>
     </div>
 </footer>
-                        </div>
                     </div>
                 </div>
             

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/89c943e1/develop/os/modules/testutil/test_decl/index.html
----------------------------------------------------------------------
diff --git a/develop/os/modules/testutil/test_decl/index.html b/develop/os/modules/testutil/test_decl/index.html
index dde3295..f8c9dad 100644
--- a/develop/os/modules/testutil/test_decl/index.html
+++ b/develop/os/modules/testutil/test_decl/index.html
@@ -10,15 +10,14 @@
         <link rel="canonical" href="http://mynewt.apache.org/os/modules/testutil/test_decl/"> -->
         <link rel="shortcut icon" href="../../../../img/favicon.ico">
 
-	<title>TEST_CASE_DECL - Apache Mynewt</title>
+	    <title>TEST_CASE_DECL - Apache Mynewt</title>
 
         <link href="../../../../css/bootstrap-3.0.3.min.css" rel="stylesheet">
-        <link href="../../../../css/font-awesome-4.0.3.css" rel="stylesheet">
         <link rel="stylesheet" href="../../../../css/highlight.css">
         <link href="../../../../css/base.css" rel="stylesheet">
         <link href="../../../../css/custom.css" rel="stylesheet">
         <link href="../../../../css/v2.css" rel="stylesheet">
-        <link href='https://fonts.googleapis.com/css?family=Roboto:400,500,700,900,300,100' rel='stylesheet' type='text/css'>
+        <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
         <link href="../../../../extra.css" rel="stylesheet">
 
@@ -45,6 +44,16 @@
     <body class="TEST_CASE_DECL">
 
 
+        <div class="container">
+    <div class="row v2-main-banner">
+        <div class="col-xs-12 v2-vcenter">
+            <a href="/"><img class="logo" src="/img/logo.png"></a>
+
+            <h4 class="tagline">An OS to build, deploy and securely manage billions of devices</h4>
+        </div>
+    </div>
+</div>
+
         
 
 
@@ -52,7 +61,7 @@
 
 
 
-<nav id="navbar" class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+<nav id="navbar" class="navbar navbar-inverse affix-top" data-spy="affix" data-offset-top="150" role="navigation">
     <div class="container">
         <!-- Collapsed navigation -->
         <div class="navbar-header">
@@ -73,7 +82,7 @@
                 <li 
   class=""
 >
-                    <a href="/">Home</a>
+                    <a href="/"><i class="fa fa-home" style="font-size: larger;"></i></a>
                 </li>
                 <li 
   class="important"
@@ -86,6 +95,11 @@
                     <a href="/about/">About</a>
                 </li>
                 <li 
+  class=""
+>
+                    <a href="/talks/">Talks</a>
+                </li>
+                <li 
   class="active"
 >
                     <a href="/latest/os/introduction">Documentation</a>
@@ -120,9 +134,8 @@
         <div class="container">
             
                 <div class="row">
-                    <div class="col-md-3 v2-sidebar"><div id="docSidebar" class="hidden-print" role="complementary">
+                    <div class="col-md-3 v2-sidebar sidebar-container"><div id="docSidebar" class="hidden-print" role="complementary">
     <div class="top">
-        <img class="hidden-xs hidden-sm logo-small" src="/img/logo.svg" alt="MyNewt" title="MyNewt">
         <div role="search">
             <form id="rtd-search-form" class="wy-form" action="../../../../search.html" method="get">
                 <div class="form-group">
@@ -139,14 +152,14 @@
       value="/develop/os/introduction"
       selected="selected"
     >
-      Version: develop
+      Version: develop (latest)
     </option>
     
     <option
       value="/v0_9_0/os/introduction"
       
     >
-      Version: 0.9.0 (latest)
+      Version: 0.9.0
     </option>
     
 </select>
@@ -165,6 +178,10 @@
         
       
         
+      
+        
+      
+        
           
   
   
@@ -536,14 +553,9 @@
     </ul>
 </div></div>
 
-                    <div class="show-sidebar-container">
-                        <button class="show-sidebar">Docs Menu</button>
-                    </div>
-
                     <div class="col-md-9" role="main">
-                        <div class="row doc-header">
-                            <div class="col-sm-12">
-                                <div role="navigation" aria-label="breadcrumbs navigation">
+                        <div class="doc-header">
+                            <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs pull-right">
     <li><a href="/develop/os/introduction">Docs</a></li>
     
@@ -563,7 +575,6 @@
     
   </ul>
 </div>
-                            </div>
                         </div>
                         
                             <h2 id="test_case_decl"><font color="F2853F" style="font-size:24pt"> TEST_CASE_DECL </font></h2>
@@ -621,34 +632,22 @@ TEST_CASE_DECL(test_case_3)
     </li>
 </ul>
                         </div>
-                        <div class="row">
-                            <footer>
-    <div class="row">
-        <div class="col-md-12">
-            
-                <p class="copyright">Copyright &copy; 2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 Apache and the Apache feather logo are trademarks of The Apache Software Foundation.<br>The Apache Software Foundation Apache Incubator</p>
-            
-        </div>
-    </div>
-    <div class="copyright-logos">
-        <div class="row">
-            <div class="col-xs-6 text-left">
-                <img src="/img/asf_logo_wide_small.png" alt="Apache" title="Apache">
-            </div>
-            <div class="col-xs-6 text-right">
-                <img src="/img/egg-logo2.png" alt="Apache Incubator" title="Apache Incubator">
-            </div>
-        </div>
+                        <footer class="row">
+    <div class="col-xs-12">
+        
+            <p class="copyright">Copyright &copy; 2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+        
     </div>
-    <div class="row">
-        <div class="col-md-12">
+    <div class="col-xs-12">
+        <div class="logos">
+            <img src="/img/asf_logo_wide_small.png" alt="Apache" title="Apache">
             <small class="footnote">
                 MyNewt is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
             </small>
+            <img src="/img/egg-logo2.png" alt="Apache Incubator" title="Apache Incubator">
         </div>
     </div>
 </footer>
-                        </div>
                     </div>
                 </div>
             

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/89c943e1/develop/os/modules/testutil/test_pass/index.html
----------------------------------------------------------------------
diff --git a/develop/os/modules/testutil/test_pass/index.html b/develop/os/modules/testutil/test_pass/index.html
index 9cc4bdb..16648e2 100644
--- a/develop/os/modules/testutil/test_pass/index.html
+++ b/develop/os/modules/testutil/test_pass/index.html
@@ -10,15 +10,14 @@
         <link rel="canonical" href="http://mynewt.apache.org/os/modules/testutil/test_pass/"> -->
         <link rel="shortcut icon" href="../../../../img/favicon.ico">
 
-	<title>TEST_PASS - Apache Mynewt</title>
+	    <title>TEST_PASS - Apache Mynewt</title>
 
         <link href="../../../../css/bootstrap-3.0.3.min.css" rel="stylesheet">
-        <link href="../../../../css/font-awesome-4.0.3.css" rel="stylesheet">
         <link rel="stylesheet" href="../../../../css/highlight.css">
         <link href="../../../../css/base.css" rel="stylesheet">
         <link href="../../../../css/custom.css" rel="stylesheet">
         <link href="../../../../css/v2.css" rel="stylesheet">
-        <link href='https://fonts.googleapis.com/css?family=Roboto:400,500,700,900,300,100' rel='stylesheet' type='text/css'>
+        <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
         <link href="../../../../extra.css" rel="stylesheet">
 
@@ -45,6 +44,16 @@
     <body class="TEST_PASS">
 
 
+        <div class="container">
+    <div class="row v2-main-banner">
+        <div class="col-xs-12 v2-vcenter">
+            <a href="/"><img class="logo" src="/img/logo.png"></a>
+
+            <h4 class="tagline">An OS to build, deploy and securely manage billions of devices</h4>
+        </div>
+    </div>
+</div>
+
         
 
 
@@ -52,7 +61,7 @@
 
 
 
-<nav id="navbar" class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+<nav id="navbar" class="navbar navbar-inverse affix-top" data-spy="affix" data-offset-top="150" role="navigation">
     <div class="container">
         <!-- Collapsed navigation -->
         <div class="navbar-header">
@@ -73,7 +82,7 @@
                 <li 
   class=""
 >
-                    <a href="/">Home</a>
+                    <a href="/"><i class="fa fa-home" style="font-size: larger;"></i></a>
                 </li>
                 <li 
   class="important"
@@ -86,6 +95,11 @@
                     <a href="/about/">About</a>
                 </li>
                 <li 
+  class=""
+>
+                    <a href="/talks/">Talks</a>
+                </li>
+                <li 
   class="active"
 >
                     <a href="/latest/os/introduction">Documentation</a>
@@ -120,9 +134,8 @@
         <div class="container">
             
                 <div class="row">
-                    <div class="col-md-3 v2-sidebar"><div id="docSidebar" class="hidden-print" role="complementary">
+                    <div class="col-md-3 v2-sidebar sidebar-container"><div id="docSidebar" class="hidden-print" role="complementary">
     <div class="top">
-        <img class="hidden-xs hidden-sm logo-small" src="/img/logo.svg" alt="MyNewt" title="MyNewt">
         <div role="search">
             <form id="rtd-search-form" class="wy-form" action="../../../../search.html" method="get">
                 <div class="form-group">
@@ -139,14 +152,14 @@
       value="/develop/os/introduction"
       selected="selected"
     >
-      Version: develop
+      Version: develop (latest)
     </option>
     
     <option
       value="/v0_9_0/os/introduction"
       
     >
-      Version: 0.9.0 (latest)
+      Version: 0.9.0
     </option>
     
 </select>
@@ -165,6 +178,10 @@
         
       
         
+      
+        
+      
+        
           
   
   
@@ -536,14 +553,9 @@
     </ul>
 </div></div>
 
-                    <div class="show-sidebar-container">
-                        <button class="show-sidebar">Docs Menu</button>
-                    </div>
-
                     <div class="col-md-9" role="main">
-                        <div class="row doc-header">
-                            <div class="col-sm-12">
-                                <div role="navigation" aria-label="breadcrumbs navigation">
+                        <div class="doc-header">
+                            <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs pull-right">
     <li><a href="/develop/os/introduction">Docs</a></li>
     
@@ -563,7 +575,6 @@
     
   </ul>
 </div>
-                            </div>
                         </div>
                         
                             <h2 id="test_pass"><font color="F2853F" style="font-size:24pt"> TEST_PASS </font></h2>
@@ -627,34 +638,22 @@
     </li>
 </ul>
                         </div>
-                        <div class="row">
-                            <footer>
-    <div class="row">
-        <div class="col-md-12">
-            
-                <p class="copyright">Copyright &copy; 2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 Apache and the Apache feather logo are trademarks of The Apache Software Foundation.<br>The Apache Software Foundation Apache Incubator</p>
-            
-        </div>
-    </div>
-    <div class="copyright-logos">
-        <div class="row">
-            <div class="col-xs-6 text-left">
-                <img src="/img/asf_logo_wide_small.png" alt="Apache" title="Apache">
-            </div>
-            <div class="col-xs-6 text-right">
-                <img src="/img/egg-logo2.png" alt="Apache Incubator" title="Apache Incubator">
-            </div>
-        </div>
+                        <footer class="row">
+    <div class="col-xs-12">
+        
+            <p class="copyright">Copyright &copy; 2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+        
     </div>
-    <div class="row">
-        <div class="col-md-12">
+    <div class="col-xs-12">
+        <div class="logos">
+            <img src="/img/asf_logo_wide_small.png" alt="Apache" title="Apache">
             <small class="footnote">
                 MyNewt is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
             </small>
+            <img src="/img/egg-logo2.png" alt="Apache Incubator" title="Apache Incubator">
         </div>
     </div>
 </footer>
-                        </div>
                     </div>
                 </div>
             

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/89c943e1/develop/os/modules/testutil/test_suite/index.html
----------------------------------------------------------------------
diff --git a/develop/os/modules/testutil/test_suite/index.html b/develop/os/modules/testutil/test_suite/index.html
index d40b2c0..5c63fea 100644
--- a/develop/os/modules/testutil/test_suite/index.html
+++ b/develop/os/modules/testutil/test_suite/index.html
@@ -10,15 +10,14 @@
         <link rel="canonical" href="http://mynewt.apache.org/os/modules/testutil/test_suite/"> -->
         <link rel="shortcut icon" href="../../../../img/favicon.ico">
 
-	<title>TEST_SUITE - Apache Mynewt</title>
+	    <title>TEST_SUITE - Apache Mynewt</title>
 
         <link href="../../../../css/bootstrap-3.0.3.min.css" rel="stylesheet">
-        <link href="../../../../css/font-awesome-4.0.3.css" rel="stylesheet">
         <link rel="stylesheet" href="../../../../css/highlight.css">
         <link href="../../../../css/base.css" rel="stylesheet">
         <link href="../../../../css/custom.css" rel="stylesheet">
         <link href="../../../../css/v2.css" rel="stylesheet">
-        <link href='https://fonts.googleapis.com/css?family=Roboto:400,500,700,900,300,100' rel='stylesheet' type='text/css'>
+        <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
         <link href="../../../../extra.css" rel="stylesheet">
 
@@ -45,6 +44,16 @@
     <body class="TEST_SUITE">
 
 
+        <div class="container">
+    <div class="row v2-main-banner">
+        <div class="col-xs-12 v2-vcenter">
+            <a href="/"><img class="logo" src="/img/logo.png"></a>
+
+            <h4 class="tagline">An OS to build, deploy and securely manage billions of devices</h4>
+        </div>
+    </div>
+</div>
+
         
 
 
@@ -52,7 +61,7 @@
 
 
 
-<nav id="navbar" class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+<nav id="navbar" class="navbar navbar-inverse affix-top" data-spy="affix" data-offset-top="150" role="navigation">
     <div class="container">
         <!-- Collapsed navigation -->
         <div class="navbar-header">
@@ -73,7 +82,7 @@
                 <li 
   class=""
 >
-                    <a href="/">Home</a>
+                    <a href="/"><i class="fa fa-home" style="font-size: larger;"></i></a>
                 </li>
                 <li 
   class="important"
@@ -86,6 +95,11 @@
                     <a href="/about/">About</a>
                 </li>
                 <li 
+  class=""
+>
+                    <a href="/talks/">Talks</a>
+                </li>
+                <li 
   class="active"
 >
                     <a href="/latest/os/introduction">Documentation</a>
@@ -120,9 +134,8 @@
         <div class="container">
             
                 <div class="row">
-                    <div class="col-md-3 v2-sidebar"><div id="docSidebar" class="hidden-print" role="complementary">
+                    <div class="col-md-3 v2-sidebar sidebar-container"><div id="docSidebar" class="hidden-print" role="complementary">
     <div class="top">
-        <img class="hidden-xs hidden-sm logo-small" src="/img/logo.svg" alt="MyNewt" title="MyNewt">
         <div role="search">
             <form id="rtd-search-form" class="wy-form" action="../../../../search.html" method="get">
                 <div class="form-group">
@@ -139,14 +152,14 @@
       value="/develop/os/introduction"
       selected="selected"
     >
-      Version: develop
+      Version: develop (latest)
     </option>
     
     <option
       value="/v0_9_0/os/introduction"
       
     >
-      Version: 0.9.0 (latest)
+      Version: 0.9.0
     </option>
     
 </select>
@@ -165,6 +178,10 @@
         
       
         
+      
+        
+      
+        
           
   
   
@@ -536,14 +553,9 @@
     </ul>
 </div></div>
 
-                    <div class="show-sidebar-container">
-                        <button class="show-sidebar">Docs Menu</button>
-                    </div>
-
                     <div class="col-md-9" role="main">
-                        <div class="row doc-header">
-                            <div class="col-sm-12">
-                                <div role="navigation" aria-label="breadcrumbs navigation">
+                        <div class="doc-header">
+                            <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs pull-right">
     <li><a href="/develop/os/introduction">Docs</a></li>
     
@@ -563,7 +575,6 @@
     
   </ul>
 </div>
-                            </div>
                         </div>
                         
                             <h2 id="test_suite"><font color="F2853F" style="font-size:24pt"> TEST_SUITE </font></h2>
@@ -624,34 +635,22 @@
     </li>
 </ul>
                         </div>
-                        <div class="row">
-                            <footer>
-    <div class="row">
-        <div class="col-md-12">
-            
-                <p class="copyright">Copyright &copy; 2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 Apache and the Apache feather logo are trademarks of The Apache Software Foundation.<br>The Apache Software Foundation Apache Incubator</p>
-            
-        </div>
-    </div>
-    <div class="copyright-logos">
-        <div class="row">
-            <div class="col-xs-6 text-left">
-                <img src="/img/asf_logo_wide_small.png" alt="Apache" title="Apache">
-            </div>
-            <div class="col-xs-6 text-right">
-                <img src="/img/egg-logo2.png" alt="Apache Incubator" title="Apache Incubator">
-            </div>
-        </div>
+                        <footer class="row">
+    <div class="col-xs-12">
+        
+            <p class="copyright">Copyright &copy; 2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+        
     </div>
-    <div class="row">
-        <div class="col-md-12">
+    <div class="col-xs-12">
+        <div class="logos">
+            <img src="/img/asf_logo_wide_small.png" alt="Apache" title="Apache">
             <small class="footnote">
                 MyNewt is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
             </small>
+            <img src="/img/egg-logo2.png" alt="Apache Incubator" title="Apache Incubator">
         </div>
     </div>
 </footer>
-                        </div>
                     </div>
                 </div>
             

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/89c943e1/develop/os/modules/testutil/testutil/index.html
----------------------------------------------------------------------
diff --git a/develop/os/modules/testutil/testutil/index.html b/develop/os/modules/testutil/testutil/index.html
index 1236da6..39c15d9 100644
--- a/develop/os/modules/testutil/testutil/index.html
+++ b/develop/os/modules/testutil/testutil/index.html
@@ -10,15 +10,14 @@
         <link rel="canonical" href="http://mynewt.apache.org/os/modules/testutil/testutil/"> -->
         <link rel="shortcut icon" href="../../../../img/favicon.ico">
 
-	<title>toc - Apache Mynewt</title>
+	    <title>toc - Apache Mynewt</title>
 
         <link href="../../../../css/bootstrap-3.0.3.min.css" rel="stylesheet">
-        <link href="../../../../css/font-awesome-4.0.3.css" rel="stylesheet">
         <link rel="stylesheet" href="../../../../css/highlight.css">
         <link href="../../../../css/base.css" rel="stylesheet">
         <link href="../../../../css/custom.css" rel="stylesheet">
         <link href="../../../../css/v2.css" rel="stylesheet">
-        <link href='https://fonts.googleapis.com/css?family=Roboto:400,500,700,900,300,100' rel='stylesheet' type='text/css'>
+        <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
         <link href="../../../../extra.css" rel="stylesheet">
 
@@ -45,6 +44,16 @@
     <body class="toc">
 
 
+        <div class="container">
+    <div class="row v2-main-banner">
+        <div class="col-xs-12 v2-vcenter">
+            <a href="/"><img class="logo" src="/img/logo.png"></a>
+
+            <h4 class="tagline">An OS to build, deploy and securely manage billions of devices</h4>
+        </div>
+    </div>
+</div>
+
         
 
 
@@ -52,7 +61,7 @@
 
 
 
-<nav id="navbar" class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+<nav id="navbar" class="navbar navbar-inverse affix-top" data-spy="affix" data-offset-top="150" role="navigation">
     <div class="container">
         <!-- Collapsed navigation -->
         <div class="navbar-header">
@@ -73,7 +82,7 @@
                 <li 
   class=""
 >
-                    <a href="/">Home</a>
+                    <a href="/"><i class="fa fa-home" style="font-size: larger;"></i></a>
                 </li>
                 <li 
   class="important"
@@ -86,6 +95,11 @@
                     <a href="/about/">About</a>
                 </li>
                 <li 
+  class=""
+>
+                    <a href="/talks/">Talks</a>
+                </li>
+                <li 
   class="active"
 >
                     <a href="/latest/os/introduction">Documentation</a>
@@ -120,9 +134,8 @@
         <div class="container">
             
                 <div class="row">
-                    <div class="col-md-3 v2-sidebar"><div id="docSidebar" class="hidden-print" role="complementary">
+                    <div class="col-md-3 v2-sidebar sidebar-container"><div id="docSidebar" class="hidden-print" role="complementary">
     <div class="top">
-        <img class="hidden-xs hidden-sm logo-small" src="/img/logo.svg" alt="MyNewt" title="MyNewt">
         <div role="search">
             <form id="rtd-search-form" class="wy-form" action="../../../../search.html" method="get">
                 <div class="form-group">
@@ -139,14 +152,14 @@
       value="/develop/os/introduction"
       selected="selected"
     >
-      Version: develop
+      Version: develop (latest)
     </option>
     
     <option
       value="/v0_9_0/os/introduction"
       
     >
-      Version: 0.9.0 (latest)
+      Version: 0.9.0
     </option>
     
 </select>
@@ -165,6 +178,10 @@
         
       
         
+      
+        
+      
+        
           
   
   
@@ -476,14 +493,9 @@
     </ul>
 </div></div>
 
-                    <div class="show-sidebar-container">
-                        <button class="show-sidebar">Docs Menu</button>
-                    </div>
-
                     <div class="col-md-9" role="main">
-                        <div class="row doc-header">
-                            <div class="col-sm-12">
-                                <div role="navigation" aria-label="breadcrumbs navigation">
+                        <div class="doc-header">
+                            <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs pull-right">
     <li><a href="/develop/os/introduction">Docs</a></li>
     
@@ -501,7 +513,6 @@
     
   </ul>
 </div>
-                            </div>
                         </div>
                         
                             <h1 id="testutil">testutil</h1>
@@ -635,34 +646,22 @@ This should be populated before <code>tu_init()</code> is called.</p>
     </li>
 </ul>
                         </div>
-                        <div class="row">
-                            <footer>
-    <div class="row">
-        <div class="col-md-12">
-            
-                <p class="copyright">Copyright &copy; 2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 Apache and the Apache feather logo are trademarks of The Apache Software Foundation.<br>The Apache Software Foundation Apache Incubator</p>
-            
-        </div>
-    </div>
-    <div class="copyright-logos">
-        <div class="row">
-            <div class="col-xs-6 text-left">
-                <img src="/img/asf_logo_wide_small.png" alt="Apache" title="Apache">
-            </div>
-            <div class="col-xs-6 text-right">
-                <img src="/img/egg-logo2.png" alt="Apache Incubator" title="Apache Incubator">
-            </div>
-        </div>
+                        <footer class="row">
+    <div class="col-xs-12">
+        
+            <p class="copyright">Copyright &copy; 2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+        
     </div>
-    <div class="row">
-        <div class="col-md-12">
+    <div class="col-xs-12">
+        <div class="logos">
+            <img src="/img/asf_logo_wide_small.png" alt="Apache" title="Apache">
             <small class="footnote">
                 MyNewt is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
             </small>
+            <img src="/img/egg-logo2.png" alt="Apache Incubator" title="Apache Incubator">
         </div>
     </div>
 </footer>
-                        </div>
                     </div>
                 </div>