Changes related to improvements to the navigation.

This change should go in before Raf makes a couple
of fixes/improvements to the sidenav.

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

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

5 files changed, 86 insertions, 54 deletions

diff --git a/chrome/common/extensions/docs/README.txt b/chrome/common/extensions/docs/README.txt
index 13681ff..03d1f15 100755
--- a/chrome/common/extensions/docs/README.txt
+++ b/chrome/common/extensions/docs/README.txt
@@ -11,9 +11,9 @@ To build the extension docs, run the build.py script in the ./build directory.
 This will regenerate the docs and report which, if any, files have changed
 and need to be included in the changelist that changed the dependent files.
 
-Note that the build.py script depends on test_shell to run, so in you must be
+Note that the build.py script depends on test_shell to run, so you must be
 able to build test_shell to build extension_docs. The build.py script will
-look in typically locations for the test_shell executable, but you may set
+look in typical locations for the test_shell executable, but you may set
 the path to test_shell explicitly with --test-shell-path.
 
 --------------------------------------------------------------------------------
@@ -41,9 +41,9 @@ For each given <page>:
 1) A copy of ./page_shell.html is copied to ./<page>.html.
 2) This page loads bootstrap.js which inspects the <page> name
 3) ./template/api_template.html is loaded and inserted into the body of the page
-4) If a ./static/<page>.html exists, it's content is inserted into the main
+4) If a ./static/<page>.html exists, its content is inserted into the main
 content column of the api_template.html
 5) If the <page> matches an api "module" in extension_api.json, the api is then
 fed through the api template within api_template.html
-6) The result is writen ontop of the existing /<page>.html. If the new file
+6) The result is written on top of the existing /<page>.html. If the new file
 differs in content, it is reported as changed by the build.py script.
diff --git a/chrome/common/extensions/docs/static/devguide.html b/chrome/common/extensions/docs/static/devguide.html
index f9923b8..268c13c 100755
--- a/chrome/common/extensions/docs/static/devguide.html
+++ b/chrome/common/extensions/docs/static/devguide.html
@@ -1,36 +1,11 @@
-<div id="pageData-title" class="pageData">Developer Guide</div>
+<div id="pageData-title" class="pageData">Developer's Guide</div>
 
-<p>
-[PENDING: intro to the guide goes here. say where to go. lots o' links.]
+<p class="comment">
+[PENDING: This page needs to be written.
+At the very least,
+it should link to each important page
+that's in the Developer's Guide.]
 </p>
 
-<p>
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce sed
-elit felis. Vestibulum porta mauris eget mi placerat a condimentum leo
-semper. Ut scelerisque, ipsum in cursus semper, lectus enim molestie
-ante, a porttitor dolor neque sit amet lorem. Integer dignissim gravida
-eros ac rhoncus. Curabitur porttitor hendrerit dolor nec aliquam. Ut
-vulputate ultrices eros eu ultrices. Pellentesque tempor mattis
-odio in blandit. Proin nulla metus, tristique eget iaculis gravida,
-varius at leo. Ut dolor mi, auctor et scelerisque vitae, volutpat
-eleifend magna. Pellentesque habitant morbi tristique senectus et
-netus et malesuada fames ac turpis egestas. Morbi ut risus nec massa
-consectetur accumsan sed non est. Fusce ornare eros et felis dignissim
-convallis. Maecenas condimentum purus eget nisl condimentum vitae ornare
-diam sollicitudin. Nulla et dictum ante. In lacus odio, dapibus vel
-faucibus at, posuere id enim. Nulla tincidunt felis id lectus convallis
-vulputate. Phasellus libero dui, posuere sollicitudin egestas eget,
-blandit in urna. Sed cursus tellus sed diam hendrerit pulvinar.
-</p>
 
-<p>
-Nam tincidunt mollis aliquam. Suspendisse bibendum dignissim dui,
-ac mollis ligula fringilla sit amet. Pellentesque dapibus lobortis
-dignissim. Cras eu lorem a ligula imperdiet ultricies. Phasellus ipsum
-mi, accumsan quis dignissim eu, commodo ut mi. Nulla sagittis aliquet
-malesuada. Ut lobortis tellus vitae dolor venenatis eu ullamcorper
-lorem gravida. Quisque non pharetra velit. Maecenas elit risus,
-ultricies in sagittis eget, facilisis sed neque. Quisque feugiat porta
-pharetra. Vestibulum lorem magna, pellentesque et mattis sit amet,
-euismod et dui.
-</p>
\ No newline at end of file
+
diff --git a/chrome/common/extensions/docs/static/index.html b/chrome/common/extensions/docs/static/index.html
index 0aba4d6..e843996 100755
--- a/chrome/common/extensions/docs/static/index.html
+++ b/chrome/common/extensions/docs/static/index.html
@@ -22,13 +22,24 @@
 
 <h3>Hello There!</h3>
 
-<p><em>Extensions</em> are small software programs that can modify and enhance the functionality of Google Chrome.
+<p>
+<em>Extensions</em> are small software programs
+that can modify and enhance the functionality of Google Chrome.
+</p>
 
-<p>They are written using web technologies like HTML, JavaScript, and CSS. So if you know how to write web pages, you already know most of what you need to know to write extensions.
+<p>
+You write them using web technologies like
+HTML, JavaScript, and CSS.
+So if you know how to write web pages,
+you already know most of what
+you need to know to write extensions.
+</p>
 
-<p>Some examples of things you can build with an extension include:
+<p>
+Here are some examples of what you can build with extensions:
+</p>
 
-<table width="100%" id="pics">
+<table id="pics">
   <tr>
     <td valign="top">
       <b>Toolstrips</b><br>
@@ -48,10 +59,28 @@
   </tr>
 </table>
 
-<p>This website contains all the information you need to start building extensions. To begin, choose one of:
+<p>
+This website contains all the information
+you need to build extensions.
+Start with one of these sections:
+</p>
 
 <ul>
-  <li><a href="getstarted.html">Get Started</a>: Build a simple "Hello, World" extension in about 5 minutes.
-  <li><a href="overview.html">Overview</a>: Dig deeper into the fundamental design points of Google Chrome's extension system.
-  <li><a href="#">Reference</a>: The complete listing of all the features and APIs.
+  <li>
+    <a href="getstarted.html">Getting Started</a>:
+    Build a simple "Hello, World" extension in about 5 minutes.
+    </li>
+  <li>
+    <a href="overview.html">Overview</a>:
+    Learn about the fundamental design points of
+    Google Chrome's extension system.
+    </li>
+  <li>
+    <a href="#">Developer's Guide</a>:
+    Get detailed information on using each feature and API.
+    </li>
 </ul>
+
+<p>
+Also check out the discussion group:
+<a href="http://groups.google.com/group/chromium-extensions">chromium-extensions</a>.
diff --git a/chrome/common/extensions/docs/static/manifest.html b/chrome/common/extensions/docs/static/manifest.html
index 8fedf97..405e025 100755
--- a/chrome/common/extensions/docs/static/manifest.html
+++ b/chrome/common/extensions/docs/static/manifest.html
@@ -1,5 +1,6 @@
-<div id="pageData-title" class="pageData">Manifest File Format</div>
+<div id="pageData-title" class="pageData">Formats: Manifest Files</div>
 
 <p class="comment">
-[PENDING: This page should go into detail about all the parts of the manifest. In cases where there's not too much to say about something (icons, cross-origin XHR), we can just document it inline. Otherwise (content scripts), we can link off to a separate page.]
+[PENDING: This page should go into detail about all the parts of manifest.json files. In cases where there's not too much to say about something (icons, cross-origin XHR), we can just document it inline. Otherwise (content scripts), we can link off to a separate page.]
 </p>
+
diff --git a/chrome/common/extensions/docs/template/api_template.html b/chrome/common/extensions/docs/template/api_template.html
index a629aeb..26948944 100755
--- a/chrome/common/extensions/docs/template/api_template.html
+++ b/chrome/common/extensions/docs/template/api_template.html
@@ -27,26 +27,53 @@
       <div id="leftNav">
         <ul>
           <li> <a href="index.html">Home</a></li>
-          <li> <a href="getstarted.html">Get Started</a></li>
+          <li> <a href="getstarted.html">Getting Started</a></li>
           <li> <a href="overview.html">Overview</a></li>
-          <li>Reference 
+          <li> <a href="devguide.html">Developer's Guide</a>
             <ul>
-              <li><a href="manifest.html">Manifest</a></li>
               <li><a href="toolstrip.html">Toolstrips</a></li>
               <li><a href="pageActions.html">Page Actions</a></li>
               <li><a href="background_pages.html">Background Pages</a></li>
               <li><a href="content_scripts.html">Content Scripts</a></li>
+              <li>Events</li>
               <li><a href="tabs.html">Tabs</a></li>
               <li><a href="windows.html">Windows</a></li>
               <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="extension.html">Extension</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
+              <li>Themes</li>
+              <li>NPAPI Plugins</li>
               <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li>Autoupdate</li>
+            </ul>
+          </li>
+          <li><a href="tutorials.html">Tutorials</a>
+            <ul>
+              <li><a href="tut_debugging.html">Debugging</a></li>
+            </ul>
+          </li>
+          <li>Reference 
+            <ul>
+              <li> Formats</a>
+                <ul>
+                  <li><a href="manifest.html">Manifest Files</a></li>
+                  <li>Match Patterns</li>
+                  <li>Packages (.crx)</li>
+                </ul>
+              </li>
+              <li> <a href="api_index.html">chrome.* APIs</a>
+                <ul>
+                  <li><a href="bookmarks.html">bookmarks</a></li>
+                  <li>extension</li>
+                  <li><a href="pageActions.html">pageActions</a></li>
+                  <li>self</li>
+                  <li><a href="tabs.html">tabs</a></li>
+                  <li><a href="toolstrip.html">toolstrip</a></li>
+                  <li><a href="windows.html">windows</a></li>
+                </ul>
+              </li>
+               <li>Other APIs</li>
             </ul>
           </li>
-          <li>Samples
+         <li>Samples
             <ul>
               <li>[sample 1]</li>
               <li>[sample 2]</li>