Doc navigation work.

This affects the sidenav, so if we go ahead with this I'll
regenerate all the files and add them to this CL.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/338007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29998 0039d316-1c4b-4281-b951-d872f2087c98

34 files changed, 460 insertions, 177 deletions

diff --git a/chrome/common/extensions/docs/api_index.html b/chrome/common/extensions/docs/api_index.html
index 5b17488..b5479e7 100644
--- a/chrome/common/extensions/docs/api_index.html
+++ b/chrome/common/extensions/docs/api_index.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/api_other.html b/chrome/common/extensions/docs/api_other.html
index b9acaec..087b964 100644
--- a/chrome/common/extensions/docs/api_other.html
+++ b/chrome/common/extensions/docs/api_other.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/autoupdate.html b/chrome/common/extensions/docs/autoupdate.html
index 71a37cd..61ac6c7 100644
--- a/chrome/common/extensions/docs/autoupdate.html
+++ b/chrome/common/extensions/docs/autoupdate.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/background_pages.html b/chrome/common/extensions/docs/background_pages.html
index a42ea95..e2c5355 100644
--- a/chrome/common/extensions/docs/background_pages.html
+++ b/chrome/common/extensions/docs/background_pages.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/bookmarks.html b/chrome/common/extensions/docs/bookmarks.html
index f1da8bf..cb7de4f 100644
--- a/chrome/common/extensions/docs/bookmarks.html
+++ b/chrome/common/extensions/docs/bookmarks.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li class="leftNavSelected">Bookmarks</li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/browserAction.html b/chrome/common/extensions/docs/browserAction.html
index 983b118..8c5300a 100644
--- a/chrome/common/extensions/docs/browserAction.html
+++ b/chrome/common/extensions/docs/browserAction.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li class="leftNavSelected">Browser Actions</li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
@@ -485,7 +485,7 @@ using the <b>popup</b> field of <b>browser_action</b>.
           <!-- OBJECT PROPERTIES -->
           <dd>
             <dl>
-              <div jsinstance="*0">
+              <div jsinstance="0">
                 <div>
           <dt>
             <var>color</var>
@@ -536,6 +536,47 @@ using the <b>popup</b> field of <b>browser_action</b>.
             </dl>
           </dd>
         </div>
+              </div><div jsinstance="*1">
+                <div>
+          <dt>
+            <var>tabId</var>
+              <em>
+
+                <!-- TYPE -->
+                <div style="display:inline">
+                  (
+                    <span class="optional">optional</span>
+                    <span id="typeTemplate">
+                      <span style="display: none; ">
+                        <a> Type</a>
+                      </span>
+                      <span>
+                        <span style="display: none; ">
+                          array of <span><span></span></span>
+                        </span>
+                        <span>integer</span>
+                      </span>
+                    </span>
+                  )
+                </div>
+
+              </em>
+          </dt>
+          <dd class="todo" style="display: none; ">
+            Undocumented.
+          </dd>
+          <dd>Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.</dd>
+
+          <!-- OBJECT PROPERTIES -->
+          <dd style="display: none; ">
+            <dl>
+              <div>
+                <div>
+                </div>
+              </div>
+            </dl>
+          </dd>
+        </div>
               </div>
             </dl>
           </dd>
@@ -626,7 +667,7 @@ using the <b>popup</b> field of <b>browser_action</b>.
           <!-- OBJECT PROPERTIES -->
           <dd>
             <dl>
-              <div jsinstance="*0">
+              <div jsinstance="0">
                 <div>
           <dt>
             <var>text</var>
@@ -667,6 +708,47 @@ using the <b>popup</b> field of <b>browser_action</b>.
             </dl>
           </dd>
         </div>
+              </div><div jsinstance="*1">
+                <div>
+          <dt>
+            <var>tabId</var>
+              <em>
+
+                <!-- TYPE -->
+                <div style="display:inline">
+                  (
+                    <span class="optional">optional</span>
+                    <span id="typeTemplate">
+                      <span style="display: none; ">
+                        <a> Type</a>
+                      </span>
+                      <span>
+                        <span style="display: none; ">
+                          array of <span><span></span></span>
+                        </span>
+                        <span>integer</span>
+                      </span>
+                    </span>
+                  )
+                </div>
+
+              </em>
+          </dt>
+          <dd class="todo" style="display: none; ">
+            Undocumented.
+          </dd>
+          <dd>Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.</dd>
+
+          <!-- OBJECT PROPERTIES -->
+          <dd style="display: none; ">
+            <dl>
+              <div>
+                <div>
+                </div>
+              </div>
+            </dl>
+          </dd>
+        </div>
               </div>
             </dl>
           </dd>
@@ -801,7 +883,7 @@ using the <b>popup</b> field of <b>browser_action</b>.
               </div><div jsinstance="1">
                 <div>
           <dt>
-            <var>iconIndex</var>
+            <var>path</var>
               <em>
 
                 <!-- TYPE -->
@@ -816,7 +898,7 @@ using the <b>popup</b> field of <b>browser_action</b>.
                         <span style="display: none; ">
                           array of <span><span></span></span>
                         </span>
-                        <span>integer</span>
+                        <span>string</span>
                       </span>
                     </span>
                   )
@@ -827,7 +909,7 @@ using the <b>popup</b> field of <b>browser_action</b>.
           <dd class="todo" style="display: none; ">
             Undocumented.
           </dd>
-          <dd><b>Deprecated.</b> The zero-based index into the <b>icons</b> vector specified in the manifest.</dd>
+          <dd>Relative path to an image in the extension to show in the browser action.</dd>
 
           <!-- OBJECT PROPERTIES -->
           <dd style="display: none; ">
@@ -842,7 +924,7 @@ using the <b>popup</b> field of <b>browser_action</b>.
               </div><div jsinstance="*2">
                 <div>
           <dt>
-            <var>path</var>
+            <var>tabId</var>
               <em>
 
                 <!-- TYPE -->
@@ -857,7 +939,7 @@ using the <b>popup</b> field of <b>browser_action</b>.
                         <span style="display: none; ">
                           array of <span><span></span></span>
                         </span>
-                        <span>string</span>
+                        <span>integer</span>
                       </span>
                     </span>
                   )
@@ -868,7 +950,7 @@ using the <b>popup</b> field of <b>browser_action</b>.
           <dd class="todo" style="display: none; ">
             Undocumented.
           </dd>
-          <dd>Relative path to an image in the extension to show in the browser action.</dd>
+          <dd>Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.</dd>
 
           <!-- OBJECT PROPERTIES -->
           <dd style="display: none; ">
@@ -970,7 +1052,7 @@ using the <b>popup</b> field of <b>browser_action</b>.
           <!-- OBJECT PROPERTIES -->
           <dd>
             <dl>
-              <div jsinstance="*0">
+              <div jsinstance="0">
                 <div>
           <dt>
             <var>title</var>
@@ -1011,6 +1093,47 @@ using the <b>popup</b> field of <b>browser_action</b>.
             </dl>
           </dd>
         </div>
+              </div><div jsinstance="*1">
+                <div>
+          <dt>
+            <var>tabId</var>
+              <em>
+
+                <!-- TYPE -->
+                <div style="display:inline">
+                  (
+                    <span class="optional">optional</span>
+                    <span id="typeTemplate">
+                      <span style="display: none; ">
+                        <a> Type</a>
+                      </span>
+                      <span>
+                        <span style="display: none; ">
+                          array of <span><span></span></span>
+                        </span>
+                        <span>integer</span>
+                      </span>
+                    </span>
+                  )
+                </div>
+
+              </em>
+          </dt>
+          <dd class="todo" style="display: none; ">
+            Undocumented.
+          </dd>
+          <dd>Limits the change to when a particular tab is selected. Automatically resets when the tab is closed.</dd>
+
+          <!-- OBJECT PROPERTIES -->
+          <dd style="display: none; ">
+            <dl>
+              <div>
+                <div>
+                </div>
+              </div>
+            </dl>
+          </dd>
+        </div>
               </div>
             </dl>
           </dd>
diff --git a/chrome/common/extensions/docs/content_scripts.html b/chrome/common/extensions/docs/content_scripts.html
index c620afb..51beb4d 100644
--- a/chrome/common/extensions/docs/content_scripts.html
+++ b/chrome/common/extensions/docs/content_scripts.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/css/ApiRefStyles.css b/chrome/common/extensions/docs/css/ApiRefStyles.css
index ab7c52e..7726805 100755
--- a/chrome/common/extensions/docs/css/ApiRefStyles.css
+++ b/chrome/common/extensions/docs/css/ApiRefStyles.css
@@ -227,3 +227,16 @@ div.leftNavSelected {
 #mainColumn table.imagelayout tr.images td {
   vertical-align:bottom;
 }
+
+#mainColumn .columns {
+        border: none;
+        margin-top:0;
+        margin-bottom:0;
+        margin-left:0;
+        /* margin-right omitted to avoid IE6 bug */
+        }
+
+#mainColumn .columns td{
+        border: none;
+        padding:0 10px 0 0px;
+        }
diff --git a/chrome/common/extensions/docs/devguide.html b/chrome/common/extensions/docs/devguide.html
index 9e15895..2dc6abb 100644
--- a/chrome/common/extensions/docs/devguide.html
+++ b/chrome/common/extensions/docs/devguide.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li><div class="leftNavSelected">Developer's Guide</div> 
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
@@ -216,44 +216,97 @@
 
 <p>
 We're still building this guide,
-but here's what we have, so far:
+but here's what we have, so far.
+The following pages assume you've completed
+the <a href="getstarted.html">Getting Started</a> tutorial
+and <a href="overview.html">Overview</a>.
 </p>
 
-<ul>
-  <li> Changing the Google Chrome chrome
-    <ul>
-      <li><a href="browserAction.html">Browser Actions</a></li>
-      <li><a href="pageAction.html">Page Actions</a></li>
-      <li><a href="themes.html">Themes</a></li>
-      <li><a href="toolstrip.html">Toolstrips</a></li>
-    </ul>
-  </li>
-  <li> Interacting with Google Chrome in other ways
-    <ul>
-      <li><a href="bookmarks.html">Bookmarks</a></li>
-      <li><a href="events.html">Events</a></li>
-      <li><a href="i18n.html">I18n</a></li>
-      <li><a href="tabs.html">Tabs</a></li>
-      <li><a href="windows.html">Windows</a></li>
-    </ul>
-  </li>
-  <li> Implementing the innards of your extension
-    <ul>
-      <li><a href="background_pages.html">Background Pages</a></li>
-      <li><a href="content_scripts.html">Content Scripts</a></li>
-      <li><a href="xhr.html">Cross-Origin XMLHttpRequest</a></li>
-      <li><a href="npapi.html">NPAPI Plugins</a></li>
-    </ul>
-  </li>
-  <li> Finishing and distributing your extension
-    <ul>
-      <li><a href="packaging.html">Packaging</a></li>
-      <li><a href="autoupdate.html">Autoupdating</a></li>
-      <li><a href="hosting.html">Hosting</a></li>
-    </ul>
-  </li>
-</ul>
-
+<table class="columns">
+  <tbody><tr>
+    <td colspan="2"><h4>Changing the Google Chrome chrome</h4></td>
+  </tr>
+  <tr>
+    <td> <a href="browserAction.html">Browser&nbsp;Actions</a> </td>
+    <td> Add icons to the toolbar </td>
+  </tr>
+  <tr>
+    <td> <a href="ntp.html">New&nbsp;Tab&nbsp;Pages</a> </td>
+    <td> Change what users see when creating new tabs or windows </td>
+  </tr>
+  <tr>
+    <td> <a href="options.html">Options&nbsp;Pages</a> </td>
+    <td> Let users customize your extension </td>
+  </tr>
+  <tr>
+    <td> <a href="pageAction.html">Page&nbsp;Actions</a> </td>
+    <td> Add temporary icons inside the address bar </td>
+  </tr>
+  <tr>
+    <td> <a href="themes.html">Themes</a> </td>
+    <td> Change the overall appearance of the browser </td>
+  </tr>
+
+  <tr>
+    <td colspan="2"><h4>Interacting with Google Chrome in other ways</h4></td>
+  </tr>
+  <tr>
+    <td> <a href="bookmarks.html">Bookmarks</a> </td>
+    <td> Create, organize, and otherwise manipulate the user's bookmarks </td>
+  </tr>
+  <tr>
+    <td> <a href="events.html">Events</a> </td>
+    <td> Detect when something interesting happens </td>
+  </tr>
+  <tr>
+    <td> <a href="i18n.html">I18n</a> </td>
+    <td> Deal with language and locale </td>
+  </tr>
+  <tr>
+    <td> <a href="tabs.html">Tabs</a> </td>
+    <td> Create, modify, and rearrange tabs in the browser </td>
+  </tr>
+  <tr>
+    <td> <a href="windows.html">Windows</a> </td>
+    <td> Create, modify, and rearrange windows in the browser </td>
+  </tr>
+
+  <tr>
+    <td colspan="2"><h4>Implementing the innards of your extension</h4></td>
+  </tr>
+  <tr>
+    <td> <a href="background_pages.html">Background&nbsp;Pages</a> </td>
+    <td> Put all the common code for your extension in a single place </td>
+  </tr>
+  <tr>
+    <td> <a href="content_scripts.html">Content&nbsp;Scripts</a> </td>
+    <td> Run JavaScript code in the context of web pages </td>
+  </tr>
+  <tr>
+    <td> <a href="xhr.html">Cross-Origin&nbsp;XHR</a> </td>
+    <td> Use XMLHttpRequest to send and receive data from remote servers </td>
+  </tr>
+  <tr>
+    <td> <a href="npapi.html">NPAPI&nbsp;Plugins</a> </td>
+    <td> Load native binary code </td>
+  </tr>
+
+  <tr>
+    <td colspan="2"><h4>Finishing and distributing your extension</h4></td>
+  </tr>
+  <tr>
+    <td> <a href="autoupdate.html">Autoupdating</a> </td>
+    <td> Update extensions automatically </td>
+  </tr>
+  <tr>
+    <td> <a href="hosting.html">Hosting</a> </td>
+    <td> Host extensions on your own servers </td>
+  </tr>
+  <tr>
+    <td> <a href="packaging.html">Packaging</a> </td>
+    <td> Create a .crx file so you can distribute your extension </td>
+  </tr>
+</tbody></table>
 
 </div>
 
diff --git a/chrome/common/extensions/docs/devtools.html b/chrome/common/extensions/docs/devtools.html
index b98155e..9775321 100644
--- a/chrome/common/extensions/docs/devtools.html
+++ b/chrome/common/extensions/docs/devtools.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/events.html b/chrome/common/extensions/docs/events.html
index 11a0f9e..621bbdf 100644
--- a/chrome/common/extensions/docs/events.html
+++ b/chrome/common/extensions/docs/events.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li class="leftNavSelected">Events</li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/extension.html b/chrome/common/extensions/docs/extension.html
index af22583..c74cfe6 100644
--- a/chrome/common/extensions/docs/extension.html
+++ b/chrome/common/extensions/docs/extension.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/getstarted.html b/chrome/common/extensions/docs/getstarted.html
index bd234a5..8d5cc89 100644
--- a/chrome/common/extensions/docs/getstarted.html
+++ b/chrome/common/extensions/docs/getstarted.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/hosting.html b/chrome/common/extensions/docs/hosting.html
index 4af3190..e4edd1d 100644
--- a/chrome/common/extensions/docs/hosting.html
+++ b/chrome/common/extensions/docs/hosting.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/i18n.html b/chrome/common/extensions/docs/i18n.html
index 3a86e17..25803a5 100644
--- a/chrome/common/extensions/docs/i18n.html
+++ b/chrome/common/extensions/docs/i18n.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/index.html b/chrome/common/extensions/docs/index.html
index 8b18dc5..2333eaa 100644
--- a/chrome/common/extensions/docs/index.html
+++ b/chrome/common/extensions/docs/index.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/manifest.html b/chrome/common/extensions/docs/manifest.html
index 3f980d1..75057c2 100644
--- a/chrome/common/extensions/docs/manifest.html
+++ b/chrome/common/extensions/docs/manifest.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/match_patterns.html b/chrome/common/extensions/docs/match_patterns.html
index a82b86d..9fb0068 100644
--- a/chrome/common/extensions/docs/match_patterns.html
+++ b/chrome/common/extensions/docs/match_patterns.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/npapi.html b/chrome/common/extensions/docs/npapi.html
index 86acf93..8e421fd 100644
--- a/chrome/common/extensions/docs/npapi.html
+++ b/chrome/common/extensions/docs/npapi.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/ntp.html b/chrome/common/extensions/docs/ntp.html
index 0789dd7..69c594b 100644
--- a/chrome/common/extensions/docs/ntp.html
+++ b/chrome/common/extensions/docs/ntp.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li class="leftNavSelected">New Tab Pages</li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/options.html b/chrome/common/extensions/docs/options.html
index 2caeed6..d2f3c08 100644
--- a/chrome/common/extensions/docs/options.html
+++ b/chrome/common/extensions/docs/options.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li class="leftNavSelected">Options Pages</li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li class="leftNavSelected">Options Page</li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/overview.html b/chrome/common/extensions/docs/overview.html
index 506c6f9..7f9c53c 100644
--- a/chrome/common/extensions/docs/overview.html
+++ b/chrome/common/extensions/docs/overview.html
@@ -100,19 +100,19 @@
           <li class="leftNavSelected">Overview </li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/packaging.html b/chrome/common/extensions/docs/packaging.html
index 777d6fb..c9b5f16 100644
--- a/chrome/common/extensions/docs/packaging.html
+++ b/chrome/common/extensions/docs/packaging.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/pageAction.html b/chrome/common/extensions/docs/pageAction.html
index 1655ff2..3801031 100644
--- a/chrome/common/extensions/docs/pageAction.html
+++ b/chrome/common/extensions/docs/pageAction.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li class="leftNavSelected">Page Actions</li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
@@ -599,7 +599,48 @@ follow these guidelines:</p>
             </dl>
           </dd>
         </div>
-              </div><div jsinstance="*2">
+              </div><div jsinstance="2">
+                <div>
+          <dt>
+            <var>path</var>
+              <em>
+
+                <!-- TYPE -->
+                <div style="display:inline">
+                  (
+                    <span class="optional">optional</span>
+                    <span id="typeTemplate">
+                      <span style="display: none; ">
+                        <a> Type</a>
+                      </span>
+                      <span>
+                        <span style="display: none; ">
+                          array of <span><span></span></span>
+                        </span>
+                        <span>string</span>
+                      </span>
+                    </span>
+                  )
+                </div>
+
+              </em>
+          </dt>
+          <dd class="todo" style="display: none; ">
+            Undocumented.
+          </dd>
+          <dd>Relative path to an image in the extension to show in the browser action.</dd>
+
+          <!-- OBJECT PROPERTIES -->
+          <dd style="display: none; ">
+            <dl>
+              <div>
+                <div>
+                </div>
+              </div>
+            </dl>
+          </dd>
+        </div>
+              </div><div jsinstance="*3">
                 <div>
           <dt>
             <var>iconIndex</var>
diff --git a/chrome/common/extensions/docs/static/devguide.html b/chrome/common/extensions/docs/static/devguide.html
index 9133c36..2eea7a7 100644
--- a/chrome/common/extensions/docs/static/devguide.html
+++ b/chrome/common/extensions/docs/static/devguide.html
@@ -2,42 +2,95 @@
 
 <p>
 We're still building this guide,
-but here's what we have, so far:
+but here's what we have, so far.
+The following pages assume you've completed
+the <a href="getstarted.html">Getting Started</a> tutorial
+and <a href="overview.html">Overview</a>.
 </p>
 
-<ul>
-  <li> Changing the Google Chrome chrome
-    <ul>
-      <li><a href="browserAction.html">Browser Actions</a></li>
-      <li><a href="pageAction.html">Page Actions</a></li>
-      <li><a href="themes.html">Themes</a></li>
-      <li><a href="toolstrip.html">Toolstrips</a></li>
-    </ul>
-  </li>
-  <li> Interacting with Google Chrome in other ways
-    <ul>
-      <li><a href="bookmarks.html">Bookmarks</a></li>
-      <li><a href="events.html">Events</a></li>
-      <li><a href="i18n.html">I18n</a></li>
-      <li><a href="tabs.html">Tabs</a></li>
-      <li><a href="windows.html">Windows</a></li>
-    </ul>
-  </li>
-  <li> Implementing the innards of your extension
-    <ul>
-      <li><a href="background_pages.html">Background Pages</a></li>
-      <li><a href="content_scripts.html">Content Scripts</a></li>
-      <li><a href="xhr.html">Cross-Origin XMLHttpRequest</a></li>
-      <li><a href="npapi.html">NPAPI Plugins</a></li>
-    </ul>
-  </li>
-  <li> Finishing and distributing your extension
-    <ul>
-      <li><a href="packaging.html">Packaging</a></li>
-      <li><a href="autoupdate.html">Autoupdating</a></li>
-      <li><a href="hosting.html">Hosting</a></li>
-    </ul>
-  </li>
-</ul>
+<table class="columns">
+  <tr>
+    <td colspan="2"><h4>Changing the Google Chrome chrome</h4></td>
+  </tr>
+  <tr>
+    <td> <a href="browserAction.html">Browser&nbsp;Actions</a> </td>
+    <td> Add icons to the toolbar </td>
+  </tr>
+  <tr>
+    <td> <a href="ntp.html">New&nbsp;Tab&nbsp;Pages</a> </td>
+    <td> Change what users see when creating new tabs or windows </td>
+  </tr>
+  <tr>
+    <td> <a href="options.html">Options&nbsp;Pages</a> </td>
+    <td> Let users customize your extension </td>
+  </tr>
+  <tr>
+    <td> <a href="pageAction.html">Page&nbsp;Actions</a> </td>
+    <td> Add temporary icons inside the address bar </td>
+  </tr>
+  <tr>
+    <td> <a href="themes.html">Themes</a> </td>
+    <td> Change the overall appearance of the browser </td>
+  </tr>
 
+  <tr>
+    <td colspan="2"><h4>Interacting with Google Chrome in other ways</h4></td>
+  </tr>
+  <tr>
+    <td> <a href="bookmarks.html">Bookmarks</a> </td>
+    <td> Create, organize, and otherwise manipulate the user's bookmarks </td>
+  </tr>
+  <tr>
+    <td> <a href="events.html">Events</a> </td>
+    <td> Detect when something interesting happens </td>
+  </tr>
+  <tr>
+    <td> <a href="i18n.html">I18n</a> </td>
+    <td> Deal with language and locale </td>
+  </tr>
+  <tr>
+    <td> <a href="tabs.html">Tabs</a> </td>
+    <td> Create, modify, and rearrange tabs in the browser </td>
+  </tr>
+  <tr>
+    <td> <a href="windows.html">Windows</a> </td>
+    <td> Create, modify, and rearrange windows in the browser </td>
+  </tr>
+
+  <tr>
+    <td colspan="2"><h4>Implementing the innards of your extension</h4></td>
+  </tr>
+  <tr>
+    <td> <a href="background_pages.html">Background&nbsp;Pages</a> </td>
+    <td> Put all the common code for your extension in a single place </td>
+  </tr>
+  <tr>
+    <td> <a href="content_scripts.html">Content&nbsp;Scripts</a> </td>
+    <td> Run JavaScript code in the context of web pages </td>
+  </tr>
+  <tr>
+    <td> <a href="xhr.html">Cross-Origin&nbsp;XHR</a> </td>
+    <td> Use XMLHttpRequest to send and receive data from remote servers </td>
+  </tr>
+  <tr>
+    <td> <a href="npapi.html">NPAPI&nbsp;Plugins</a> </td>
+    <td> Load native binary code </td>
+  </tr>
+
+  <tr>
+    <td colspan="2"><h4>Finishing and distributing your extension</h4></td>
+  </tr>
+  <tr>
+    <td> <a href="autoupdate.html">Autoupdating</a> </td>
+    <td> Update extensions automatically </td>
+  </tr>
+  <tr>
+    <td> <a href="hosting.html">Hosting</a> </td>
+    <td> Host extensions on your own servers </td>
+  </tr>
+  <tr>
+    <td> <a href="packaging.html">Packaging</a> </td>
+    <td> Create a .crx file so you can distribute your extension </td>
+  </tr>
+</table>
 
diff --git a/chrome/common/extensions/docs/tabs.html b/chrome/common/extensions/docs/tabs.html
index 12dbdb9..5b97416 100644
--- a/chrome/common/extensions/docs/tabs.html
+++ b/chrome/common/extensions/docs/tabs.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li class="leftNavSelected">Tabs</li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/template/api_template.html b/chrome/common/extensions/docs/template/api_template.html
index c86c577..e456c7e 100644
--- a/chrome/common/extensions/docs/template/api_template.html
+++ b/chrome/common/extensions/docs/template/api_template.html
@@ -84,19 +84,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/test.html b/chrome/common/extensions/docs/test.html
index 06321c7..5414cad 100644
--- a/chrome/common/extensions/docs/test.html
+++ b/chrome/common/extensions/docs/test.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/themes.html b/chrome/common/extensions/docs/themes.html
index 8a5bb9d..50d9111 100644
--- a/chrome/common/extensions/docs/themes.html
+++ b/chrome/common/extensions/docs/themes.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li class="leftNavSelected">Themes</li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/toolstrip.html b/chrome/common/extensions/docs/toolstrip.html
index bafa12f..f3accce 100644
--- a/chrome/common/extensions/docs/toolstrip.html
+++ b/chrome/common/extensions/docs/toolstrip.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/tut_debugging.html b/chrome/common/extensions/docs/tut_debugging.html
index c63e829..624ca25 100644
--- a/chrome/common/extensions/docs/tut_debugging.html
+++ b/chrome/common/extensions/docs/tut_debugging.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/tutorials.html b/chrome/common/extensions/docs/tutorials.html
index 779a46b..cea2016 100644
--- a/chrome/common/extensions/docs/tutorials.html
+++ b/chrome/common/extensions/docs/tutorials.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>
diff --git a/chrome/common/extensions/docs/windows.html b/chrome/common/extensions/docs/windows.html
index a6f4793..46b45ff 100644
--- a/chrome/common/extensions/docs/windows.html
+++ b/chrome/common/extensions/docs/windows.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li class="leftNavSelected">Windows</li>
                 </ul>
diff --git a/chrome/common/extensions/docs/xhr.html b/chrome/common/extensions/docs/xhr.html
index 0dda814..331111b 100644
--- a/chrome/common/extensions/docs/xhr.html
+++ b/chrome/common/extensions/docs/xhr.html
@@ -100,19 +100,19 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li> UI Surfaces
+              <li> Browser UI
                 <ul>
                   <li><a href="browserAction.html">Browser Actions</a></li>
                   <li><a href="ntp.html">New Tab Pages</a></li>
+                  <li><a href="options.html">Options Pages</a></li>
                   <li><a href="pageAction.html">Page Actions</a></li>
                   <li><a href="themes.html">Themes</a></li>
                 </ul>
               </li>
-              <li> More Interaction
+              <li> Browser Interaction
                 <ul>
                   <li><a href="bookmarks.html">Bookmarks</a></li>
                   <li><a href="events.html">Events</a></li>
-                  <li><a href="options.html">Options Page</a></li>
                   <li><a href="tabs.html">Tabs</a></li>
                   <li><a href="windows.html">Windows</a></li>
                 </ul>