Merge 33967 - Added links to examples, plus added an explanation of how

to view the source files. We should improve on this soon.

Also copyedited and reformatted the Samples page.

TEST=none
BUG=none

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

TBR=kathyw@google.com
Review URL: http://codereview.chromium.org/501053

git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@34700 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 273 insertions, 62 deletions

diff --git a/chrome/common/extensions/docs/browserAction.html b/chrome/common/extensions/docs/browserAction.html
index e8e21e2..6401dfc 100644
--- a/chrome/common/extensions/docs/browserAction.html
+++ b/chrome/common/extensions/docs/browserAction.html
@@ -222,6 +222,13 @@
                   <a>h3Name</a>
                 </li>
               </ol>
+            </li><li>
+              <a href="#examples"> Examples </a>
+              <ol>
+                <li style="display: none; ">
+                  <a>h3Name</a>
+                </li>
+              </ol>
             </li>
             <div>
               <li>
@@ -427,6 +434,16 @@ using the <b>popup</b> field of <b>browser_action</b>.
     That's just annoying.
 </li></ul>
 
+<h2 id="examples"> Examples </h2>
+
+<p>
+You can find simple examples of using browser actions in the
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/browserAction/">examples/api/browserAction</a>
+directory.
+For other examples and for help in viewing the source code, see
+<a href="samples.html">Samples</a>.
+</p>
+
 <!-- END AUTHORED CONTENT -->
 </div>
 
diff --git a/chrome/common/extensions/docs/content_scripts.html b/chrome/common/extensions/docs/content_scripts.html
index 8773bb8..9923d1d 100644
--- a/chrome/common/extensions/docs/content_scripts.html
+++ b/chrome/common/extensions/docs/content_scripts.html
@@ -230,6 +230,13 @@
                   <a>h3Name</a>
                 </li>
               </ol>
+            </li><li>
+              <a href="#examples"> Examples </a>
+              <ol>
+                <li style="display: none; ">
+                  <a>h3Name</a>
+                </li>
+              </ol>
             </li>
             <div style="display: none; ">
               <li>
@@ -530,6 +537,17 @@ as the following code shows.
 var imgURL = <b>chrome.extension.getURL("images/myimage.png")</b>;
 document.getElementById("someImage").src = imgURL;
 </pre>
+
+<h2 id="examples"> Examples </h2>
+
+<p>
+You can find simple examples of communication via messages in the
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/messaging/">examples/api/messaging</a>
+directory.
+For other examples and for help in viewing the source code, see
+<a href="samples.html">Samples</a>.
+</p>
+
 </div>
 
         <!-- API PAGE -->
diff --git a/chrome/common/extensions/docs/override.html b/chrome/common/extensions/docs/override.html
index c5b18cb..0b9736d 100644
--- a/chrome/common/extensions/docs/override.html
+++ b/chrome/common/extensions/docs/override.html
@@ -192,18 +192,32 @@
         <h1 class="page_title">Override</h1>
       </div>
         <!-- TABLE OF CONTENTS -->
-        <div id="toc" style="display: none; ">
+        <div id="toc">
           <h2>Contents</h2>
           <ol>
             <li>
-              <a>h2Name</a>
+              <a href="#manifest">Manifest</a>
               <ol>
-                <li>
+                <li style="display: none; ">
+                  <a>h3Name</a>
+                </li>
+              </ol>
+            </li><li>
+              <a href="#tips">Tips</a>
+              <ol>
+                <li style="display: none; ">
+                  <a>h3Name</a>
+                </li>
+              </ol>
+            </li><li>
+              <a href="#examples"> Examples </a>
+              <ol>
+                <li style="display: none; ">
                   <a>h3Name</a>
                 </li>
               </ol>
             </li>
-            <div>
+            <div style="display: none; ">
               <li>
                 <a href="#apiReference">API reference</a>
                 <ol>
@@ -268,6 +282,7 @@
 </style>
 
 <div id="pageData-title" class="pageData">Override Pages</div>
+<div id="pageData-showTOC" class="pageData">true</div>
 
 <p>
 Override pages are a way to replace a page
@@ -363,16 +378,17 @@ For an effective New Tab page, follow these guidelines:
   </li>
 </ul>
 
-<h2 id="examples">Examples</h2>
+<h2 id="examples"> Examples </h2>
 
 <p>
-For an example of specifying a very simple New Tab page,
-see the
-<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/override/override_igoogle/">override_igoogle</a> sample.
-It uses a 3-line file named <code>redirect.html</code>
-to implement the New Tab page.
+You can find simple examples of defining override pages in the
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/override/">examples/api/override</a>
+directory.
+For other examples and for help in viewing the source code, see
+<a href="samples.html">Samples</a>.
 </p>
 
+
 <!-- [PENDING: Maybe have a gallery of NTPs?] -->
 </div>
 
diff --git a/chrome/common/extensions/docs/pageAction.html b/chrome/common/extensions/docs/pageAction.html
index 45390a9..5d2a58e 100644
--- a/chrome/common/extensions/docs/pageAction.html
+++ b/chrome/common/extensions/docs/pageAction.html
@@ -216,6 +216,13 @@
                   <a>h3Name</a>
                 </li>
               </ol>
+            </li><li>
+              <a href="#examples"> Examples </a>
+              <ol>
+                <li style="display: none; ">
+                  <a>h3Name</a>
+                </li>
+              </ol>
             </li>
             <div>
               <li>
@@ -366,6 +373,17 @@ follow these guidelines:</p>
     That's just annoying.
 </li></ul>
 
+
+<h2 id="examples"> Examples </h2>
+
+<p>
+You can find simple examples of using page actions in the
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/pageAction/">examples/api/pageAction</a>
+directory.
+For other examples and for help in viewing the source code, see
+<a href="samples.html">Samples</a>.
+</p>
+
 <!-- END AUTHORED CONTENT -->
 </div>
 
diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html
index 9a7e8cf..53b5a68 100644
--- a/chrome/common/extensions/docs/samples.html
+++ b/chrome/common/extensions/docs/samples.html
@@ -196,28 +196,25 @@
           <h2>Contents</h2>
           <ol>
             <li>
-              <a href="#H2-0">Google Mail Checker</a>
+              <a href="#featured">Sample extensions</a>
               <ol>
-                <li style="display: none; ">
-                  <a>h3Name</a>
-                </li>
-              </ol>
-            </li><li>
-              <a href="#H2-1">Subscribe in Feed Reader</a>
-              <ol>
-                <li style="display: none; ">
-                  <a>h3Name</a>
+                <li>
+                  <a href="#gmail">Google Mail Checker</a>
+                </li><li>
+                  <a href="#subscribe_page_action">Subscribe in Feed Reader</a>
+                </li><li>
+                  <a href="#news">News Reader</a>
                 </li>
               </ol>
             </li><li>
-              <a href="#H2-2">News Reader</a>
+              <a href="#otherExtensions">Other sample extensions</a>
               <ol>
                 <li style="display: none; ">
                   <a>h3Name</a>
                 </li>
               </ol>
             </li><li>
-              <a href="#H2-3">Other samples</a>
+              <a href="#viewsource">How to view the source code</a>
               <ol>
                 <li style="display: none; ">
                   <a>h3Name</a>
@@ -289,17 +286,20 @@ for each feature used by the sample.
 </p><p>
 For more example code, see the
 <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/" target="_blank">Chromium examples directory</a>.
+For tips on using the code viewer, see
+<a href="#viewsource">How to view the source code</a>.
 </p>
 
+<h2 id="featured">Sample extensions</h2>
 
-<a name="H2-0"></a><h2>Google Mail Checker</h2>
+<h3 id="gmail">Google Mail Checker</h3>
 
-<p>Adds a Google Mail button to the toolbar which displays the number of unread messages in your inbox. You can also click the button to open your inbox.
+<p>Adds a Google Mail button to the toolbar, displaying the number of unread messages in your inbox. Click the button to open your inbox.
 
 </p><p>Included with no charge is a swell animation when the number of unread items changes.
 
 </p><p><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dmihcahmgecmbnbcchbopgniflfhgnkff%26uc%26lang%3Den-US"><img src="images/google-mail-checker-capture.png" width="243" height="170" style="margin-bottom:0.5em"></a><br>
-<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dmihcahmgecmbnbcchbopgniflfhgnkff%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;
+<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dmihcahmgecmbnbcchbopgniflfhgnkff%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;&nbsp;
 <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/gmail/">Source code</a></b>
 
 <br><br>
@@ -315,15 +315,14 @@ For more example code, see the
 
 <br>
 
-<a name="H2-1"></a><h2>Subscribe in Feed Reader</h2>
+<h3 id="subscribe_page_action">Subscribe in Feed Reader</h3>
 
-<p>Adds a small icon to the omnibox when a web page contains a feed that can be subscribed to. When you click the icon, present a preview of the feed and the option to subscribe in the web-based reader of your choice.
+<p>Adds a small icon to the address bar when a web page contains a feed that can be subscribed to. When you click the icon, you'll see a preview of the feed and have the option to subscribe with the web-based reader of your choice.
 
 </p><p><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US"><img src="images/subscribe-cap1.png" style="margin-bottom:0.5em" width="342" height="165"></a>
 
 </p><p><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US"><img src="images/subscribe-cap2.png" style="margin-bottom:0.5em" width="566" height="327"></a><br>
-<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;
-<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/subscribe_page_action/">Source code</a></b>
+<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;&nbsp;<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/subscribe_page_action/">Source code</a></b>
 
 <br><br>
 </p><p>Features used:
@@ -338,14 +337,13 @@ For more example code, see the
 
 <br>
 
-<a name="H2-2"></a><h2>News Reader</h2>
+<h3 id="news">News Reader</h3>
 
-<p>Displays the first 5 items from the 'Google News - top news' RSS feed in a popup. Also shows how a popup can dynamically resize itself to fit additional content.
+<p>Uses a popup to display the first 5 items from the 'Google News - top news' RSS feed. The popup dynamically resizes itself to fit additional content.
 
 </p><p><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dmmdhomleggalggemanamhjdhafaabfdi%26uc%26lang%3Den-US"><img src="images/news.gif" style="margin-bottom:0.5em" width="475" height="346"></a><br>
 
-<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dmmdhomleggalggemanamhjdhafaabfdi%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;
-<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news/">Source code</a></b>
+<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dmmdhomleggalggemanamhjdhafaabfdi%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;&nbsp;<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news/">Source code</a></b>
 
 <br><br>
 </p><p>Features used:
@@ -356,13 +354,54 @@ For more example code, see the
 </li></ul>
 
 <br>
-<a name="H2-3"></a><h2>Other samples</h2>
+<h2 id="otherExtensions">Other sample extensions</h2>
 <p>These samples use similar capabilities to the ones above, but to implement different features.</p>
-<ul>
-  <li><b>Chromium buildbot monitor</b>: Monitors the Chromium tree status. <a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dafmppjmdopaajlhgcddfhfhfgincjeih%26uc%26lang%3Den-US">Install</a> <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news/">Source</a>
-  </li><li><b>Mappy</b>: Easily access a map for the first address on any web page. <a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dobjeacibkcphiplbghlbmlbnihbbmfjl%26uc%26lang%3Den-US">Install</a> <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/mappy/">Source</a>
-  </li><li><b>Email this page</b>: Share the web page you are viewing by sending it as an email.  <a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Ddbeoemfhkdniadbojeencpkgmobndpai%26uc%26lang%3Den-US">Install</a> <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/email_this_page/">Source</a>
-</li></ul>
+<dl>
+  <dt>Chromium buildbot monitor</dt>
+  <dd>Monitors the Chromium tree status <br>
+  <b><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dafmppjmdopaajlhgcddfhfhfgincjeih%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;&nbsp;<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news/">Source code</a></b>
+  </dd>
+
+  <dt>Mappy</dt>
+  <dd>Lets you bring up a map for the first address on any web page <br>
+  <b><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Dobjeacibkcphiplbghlbmlbnihbbmfjl%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;&nbsp;<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/mappy/">Source code</a></b>
+  </dd>
+
+  <dt>Email this page</dt>
+  <dd>Lets you share the current web page by sending it in an email <br>
+  <b><a href="https://clients2.google.com/service/update2/crx?response=redirect&amp;x=id%3Ddbeoemfhkdniadbojeencpkgmobndpai%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;&nbsp;<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/email_this_page/">Source code</a></b>
+  </dd>
+</dl>
+
+
+<h2 id="viewsource">How to view the source code</h2>
+
+<p>
+The source code links in this page take you to a directory
+(for example,
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/gmail/">examples/extensions/gmail</a>)
+that lists all the files in an extension.
+To view a file,
+first click its filename.
+If the page that comes up has an <b>as text</b> link,
+click that link to view the page's source code.
+</p>
+
+<p>
+To download the file,
+right-click the <b>download</b> link.
+You can also left-click the <b>download</b> link
+to view the source code for files such as
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/gmail/manifest.json">manifest.json</a>
+that have no <b>as text</b> link.
+</p>
+
+<p>
+We're working on a way to make it easier to look at the sample source code.
+If you'd like to track our progress,
+put a star by bug <a href="http://code.google.com/p/chromium/issues/detail?id=25247">25247</a>.
+</p>
+
 </div>
 
         <!-- API PAGE -->
diff --git a/chrome/common/extensions/docs/static/browserAction.html b/chrome/common/extensions/docs/static/browserAction.html
index 59476da..28711cc 100644
--- a/chrome/common/extensions/docs/static/browserAction.html
+++ b/chrome/common/extensions/docs/static/browserAction.html
@@ -153,4 +153,14 @@ using the <b>popup</b> field of <b>browser_action</b>.
     That's just annoying.
 </ul>
 
+<h2 id="examples"> Examples </h2>
+
+<p>
+You can find simple examples of using browser actions in the
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/browserAction/">examples/api/browserAction</a>
+directory.
+For other examples and for help in viewing the source code, see
+<a href="samples.html">Samples</a>.
+</p>
+
 <!-- END AUTHORED CONTENT -->
diff --git a/chrome/common/extensions/docs/static/content_scripts.html b/chrome/common/extensions/docs/static/content_scripts.html
index 8dda0ea..96ae9a4c 100644
--- a/chrome/common/extensions/docs/static/content_scripts.html
+++ b/chrome/common/extensions/docs/static/content_scripts.html
@@ -258,3 +258,14 @@ as the following code shows.
 var imgURL = <b>chrome.extension.getURL("images/myimage.png")</b>;
 document.getElementById("someImage").src = imgURL;
 </pre>
+
+<h2 id="examples"> Examples </h2>
+
+<p>
+You can find simple examples of communication via messages in the
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/messaging/">examples/api/messaging</a>
+directory.
+For other examples and for help in viewing the source code, see
+<a href="samples.html">Samples</a>.
+</p>
+
diff --git a/chrome/common/extensions/docs/static/override.html b/chrome/common/extensions/docs/static/override.html
index a25b845..77586ce 100644
--- a/chrome/common/extensions/docs/static/override.html
+++ b/chrome/common/extensions/docs/static/override.html
@@ -19,6 +19,7 @@
 </style>
 
 <div id="pageData-title" class="pageData">Override Pages</div>
+<div id="pageData-showTOC" class="pageData">true</div>
 
 <p>
 Override pages are a way to replace a page
@@ -117,14 +118,15 @@ For an effective New Tab page, follow these guidelines:
   </li>
 </ul>
 
-<h2 id="examples">Examples</h2>
+<h2 id="examples"> Examples </h2>
 
 <p>
-For an example of specifying a very simple New Tab page,
-see the
-<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/override/override_igoogle/">override_igoogle</a> sample.
-It uses a 3-line file named <code>redirect.html</code>
-to implement the New Tab page.
+You can find simple examples of defining override pages in the
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/override/">examples/api/override</a>
+directory.
+For other examples and for help in viewing the source code, see
+<a href="samples.html">Samples</a>.
 </p>
 
+
 <!-- [PENDING: Maybe have a gallery of NTPs?] -->
diff --git a/chrome/common/extensions/docs/static/pageAction.html b/chrome/common/extensions/docs/static/pageAction.html
index 524944e..bcf3b1a 100755
--- a/chrome/common/extensions/docs/static/pageAction.html
+++ b/chrome/common/extensions/docs/static/pageAction.html
@@ -98,4 +98,15 @@ follow these guidelines:</p>
     That's just annoying.
 </ul>
 
+
+<h2 id="examples"> Examples </h2>
+
+<p>
+You can find simple examples of using page actions in the
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/pageAction/">examples/api/pageAction</a>
+directory.
+For other examples and for help in viewing the source code, see
+<a href="samples.html">Samples</a>.
+</p>
+
 <!-- END AUTHORED CONTENT -->
diff --git a/chrome/common/extensions/docs/static/samples.html b/chrome/common/extensions/docs/static/samples.html
index aeda2d5..b35777c 100644
--- a/chrome/common/extensions/docs/static/samples.html
+++ b/chrome/common/extensions/docs/static/samples.html
@@ -19,17 +19,20 @@ for each feature used by the sample.
 <p>
 For more example code, see the
 <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/" target="_blank">Chromium examples directory</a>.
+For tips on using the code viewer, see
+<a href="#viewsource">How to view the source code</a>.
 </p>
 
+<h2 id="featured">Sample extensions</h2>
 
-<h2>Google Mail Checker</h2>
+<h3 id="gmail">Google Mail Checker</h3>
 
-<p>Adds a Google Mail button to the toolbar which displays the number of unread messages in your inbox. You can also click the button to open your inbox.
+<p>Adds a Google Mail button to the toolbar, displaying the number of unread messages in your inbox. Click the button to open your inbox.
 
 <p>Included with no charge is a swell animation when the number of unread items changes.
 
 <p><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dmihcahmgecmbnbcchbopgniflfhgnkff%26uc%26lang%3Den-US"><img src="images/google-mail-checker-capture.png" width="243" height="170" style="margin-bottom:0.5em"></a><br>
-<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dmihcahmgecmbnbcchbopgniflfhgnkff%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;
+<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dmihcahmgecmbnbcchbopgniflfhgnkff%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;&nbsp;
 <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/gmail/">Source code</a></b>
 
 <br><br>
@@ -45,15 +48,14 @@ For more example code, see the
 
 <br>
 
-<h2>Subscribe in Feed Reader</h2>
+<h3 id="subscribe_page_action">Subscribe in Feed Reader</h3>
 
-<p>Adds a small icon to the omnibox when a web page contains a feed that can be subscribed to. When you click the icon, present a preview of the feed and the option to subscribe in the web-based reader of your choice.
+<p>Adds a small icon to the address bar when a web page contains a feed that can be subscribed to. When you click the icon, you'll see a preview of the feed and have the option to subscribe with the web-based reader of your choice.
 
 <p><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US"><img src="images/subscribe-cap1.png" style="margin-bottom:0.5em" width="342" height="165"></a>
 
 <p><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US"><img src="images/subscribe-cap2.png" style="margin-bottom:0.5em" width="566" height="327"></a><br>
-<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;
-<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/subscribe_page_action/">Source code</a></b>
+<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dnlbjncdgjeocebhnmkbbbdekmmmcbfjd%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;&nbsp;<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/subscribe_page_action/">Source code</a></b>
 
 <br><br>
 <p>Features used:
@@ -68,14 +70,13 @@ For more example code, see the
 
 <br>
 
-<h2>News Reader</h2>
+<h3 id="news">News Reader</h3>
 
-<p>Displays the first 5 items from the 'Google News - top news' RSS feed in a popup. Also shows how a popup can dynamically resize itself to fit additional content.
+<p>Uses a popup to display the first 5 items from the 'Google News - top news' RSS feed. The popup dynamically resizes itself to fit additional content.
 
 <p><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dmmdhomleggalggemanamhjdhafaabfdi%26uc%26lang%3Den-US"><img src="images/news.gif" style="margin-bottom:0.5em" width="475" height="346"></a><br>
 
-<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dmmdhomleggalggemanamhjdhafaabfdi%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;
-<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news/">Source code</a></b>
+<b><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dmmdhomleggalggemanamhjdhafaabfdi%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;&nbsp;<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news/">Source code</a></b>
 
 <br><br>
 <p>Features used:
@@ -86,10 +87,51 @@ For more example code, see the
 </ul>
 
 <br>
-<h2>Other samples</h2>
+<h2 id="otherExtensions">Other sample extensions</h2>
 <p>These samples use similar capabilities to the ones above, but to implement different features.</p>
-<ul>
-  <li><b>Chromium buildbot monitor</b>: Monitors the Chromium tree status. <a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dafmppjmdopaajlhgcddfhfhfgincjeih%26uc%26lang%3Den-US">Install</a> <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news/">Source</a>
-  <li><b>Mappy</b>: Easily access a map for the first address on any web page. <a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dobjeacibkcphiplbghlbmlbnihbbmfjl%26uc%26lang%3Den-US">Install</a> <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/mappy/">Source</a>
-  <li><b>Email this page</b>: Share the web page you are viewing by sending it as an email.  <a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Ddbeoemfhkdniadbojeencpkgmobndpai%26uc%26lang%3Den-US">Install</a> <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/email_this_page/">Source</a>
-</ul>
+<dl>
+  <dt>Chromium buildbot monitor</dt>
+  <dd>Monitors the Chromium tree status <br />
+  <b><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dafmppjmdopaajlhgcddfhfhfgincjeih%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;&nbsp;<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news/">Source code</a></b>
+  </dd>
+
+  <dt>Mappy</dt>
+  <dd>Lets you bring up a map for the first address on any web page <br />
+  <b><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dobjeacibkcphiplbghlbmlbnihbbmfjl%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;&nbsp;<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/mappy/">Source code</a></b>
+  </dd>
+
+  <dt>Email this page</dt>
+  <dd>Lets you share the current web page by sending it in an email <br />
+  <b><a href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Ddbeoemfhkdniadbojeencpkgmobndpai%26uc%26lang%3Den-US">Install</a>&nbsp;&nbsp;&nbsp;<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/email_this_page/">Source code</a></b>
+  </dd>
+</dl>
+
+
+<h2 id="viewsource">How to view the source code</h2>
+
+<p>
+The source code links in this page take you to a directory
+(for example,
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/gmail/">examples/extensions/gmail</a>)
+that lists all the files in an extension.
+To view a file,
+first click its filename.
+If the page that comes up has an <b>as text</b> link,
+click that link to view the page's source code.
+</p>
+
+<p>
+To download the file,
+right-click the <b>download</b> link.
+You can also left-click the <b>download</b> link
+to view the source code for files such as
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/gmail/manifest.json">manifest.json</a>
+that have no <b>as text</b> link.
+</p>
+
+<p>
+We're working on a way to make it easier to look at the sample source code.
+If you'd like to track our progress,
+put a star by bug <a href="http://code.google.com/p/chromium/issues/detail?id=25247">25247</a>.
+</p>
+
diff --git a/chrome/common/extensions/docs/static/tabs.html b/chrome/common/extensions/docs/static/tabs.html
index 2a0af63..092cb63 100644
--- a/chrome/common/extensions/docs/static/tabs.html
+++ b/chrome/common/extensions/docs/static/tabs.html
@@ -23,4 +23,14 @@ For example:
   ]</b>
 }</pre>
 
+<h2 id="examples"> Examples </h2>
+
+<p>
+You can find simple examples of using the tabs module in the
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/tabs/">examples/api/tabs</a>
+directory.
+For other examples and for help in viewing the source code, see
+<a href="samples.html">Samples</a>.
+</p>
+
 <!-- END AUTHORED CONTENT -->
diff --git a/chrome/common/extensions/docs/tabs.html b/chrome/common/extensions/docs/tabs.html
index 841e2a8..3e52a39 100644
--- a/chrome/common/extensions/docs/tabs.html
+++ b/chrome/common/extensions/docs/tabs.html
@@ -202,6 +202,13 @@
                   <a>h3Name</a>
                 </li>
               </ol>
+            </li><li>
+              <a href="#examples"> Examples </a>
+              <ol>
+                <li style="display: none; ">
+                  <a>h3Name</a>
+                </li>
+              </ol>
             </li>
             <div>
               <li>
@@ -307,6 +314,16 @@ For example:
   ]</b>
 }</pre>
 
+<h2 id="examples"> Examples </h2>
+
+<p>
+You can find simple examples of using the tabs module in the
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/tabs/">examples/api/tabs</a>
+directory.
+For other examples and for help in viewing the source code, see
+<a href="samples.html">Samples</a>.
+</p>
+
 <!-- END AUTHORED CONTENT -->
 </div>