Merge 33159 - Changed comments to use HTML comments instead of class="comment".

TEST=none
BUG=none
TBR=aa

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

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

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

34 files changed, 85 insertions, 246 deletions

diff --git a/chrome/common/extensions/docs/api_index.html b/chrome/common/extensions/docs/api_index.html
index 9c7ae1c..2ae73da 100644
--- a/chrome/common/extensions/docs/api_index.html
+++ b/chrome/common/extensions/docs/api_index.html
@@ -273,7 +273,7 @@ they return immediately,
 without waiting for the operation to finish.
 If you need to know the outcome of an operation,
 then you pass a callback function into the method.
-<span class="comment">[PENDING: update/elaborate on that]</span>
+<!-- [PENDING: update/elaborate on that] -->
 </p>
 </div>
 
diff --git a/chrome/common/extensions/docs/api_other.html b/chrome/common/extensions/docs/api_other.html
index fb35016..dfe2306 100644
--- a/chrome/common/extensions/docs/api_other.html
+++ b/chrome/common/extensions/docs/api_other.html
@@ -267,7 +267,7 @@ you can bundle additional API libraries into your extension.
   <a href="http://www.w3.org/TR/DOM-Level-2-HTML/">Document Object Model</a>
   (DOM) APIs
   that you can use in ordinary web apps.
-  <span class="comment">[PENDING: check! should link to complete list]</span>
+  <!-- [PENDING: check! should link to complete list] -->
 <!-- Use onclick in your toolbar div to add click behavior.
 E.g. window.open(someUrl). --></dd>
 <dt><strong> XMLHttpRequest </strong></dt>
@@ -293,16 +293,16 @@ E.g. window.open(someUrl). --></dd>
   }
 &lt;/style&gt;
 </pre>
-  <p class="comment">[PENDING: link to complete list of webkit apis]</p>
+  <!-- [PENDING: link to complete list of webkit apis] -->
 </dd>
 <dt><strong> V8 APIs</strong>, such as<strong> JSON </strong></dt>
-<dd> Because JSON is in V8, you don't need to include a JSON library to use JSON functions. <span class="comment">[PENDING: what other APIs are in v8? link to complete list]</span></dd>
+<dd> Because JSON is in V8, you don't need to include a JSON library to use JSON functions. <!-- [PENDING: what other APIs are in v8? link to complete list] --></dd>
 <dt> <strong>HTML5</strong> <strong>APIs</strong>, such as <strong>localStorage</strong></dt>
 <dd> HTML5 is still being defined and implemented,
   but Google Chrome already supports local storage,
   which extensions can use to store data.
 <!--
-localStorage.setItem(&quot;foo&quot;, &quot;bar&quot;); ... localStorage.getItem(&quot;foo&quot;); --> <span class="comment">[PENDING: Other important API? link to complete list]</span></dd>
+localStorage.setItem(&quot;foo&quot;, &quot;bar&quot;); ... localStorage.getItem(&quot;foo&quot;); --> <!-- [PENDING: Other important API? link to complete list] --></dd>
 <dt><strong>APIs in bundled libraries</strong></dt>
 <dd> If you want to use a library that the browser doesn't provide
 (for example, jQuery),
diff --git a/chrome/common/extensions/docs/background_pages.html b/chrome/common/extensions/docs/background_pages.html
index 3182ff7..ef9b0a9 100644
--- a/chrome/common/extensions/docs/background_pages.html
+++ b/chrome/common/extensions/docs/background_pages.html
@@ -331,13 +331,7 @@ and multiple pages created
 (with
 <a href="tabs.html#method-create"><code>chrome.tabs.create()</code></a>)
 from a file named <code>image.html</code>.
-<span class="comment">
-[PENDING: Once we have our set of samples,
-we should point to the example this is from
-and to other relevant examples.
-This is currently untested code derived from
-the screenshot sample.]
-</span>
+<!-- [PENDING: Once we have our set of samples, we should point to the example this is from and to other relevant examples.  This is currently untested code derived from the screenshot sample.] -->
 </p>
 
 <pre><em>//In the background page:</em>
diff --git a/chrome/common/extensions/docs/bookmarks.html b/chrome/common/extensions/docs/bookmarks.html
index 2877e52..28d8928a 100644
--- a/chrome/common/extensions/docs/bookmarks.html
+++ b/chrome/common/extensions/docs/bookmarks.html
@@ -331,18 +331,16 @@ See <a href="#type-BookmarkTreeNode"><code>BookmarkTreeNode</code></a>
 for information about the properties a node can have.
 </p>
 
-<div class="comment">
-<p>
-[PENDING:
-Update and introduce the following image or delete the file.]
-</p>
+<!-- [PENDING: Update and introduce the following image or delete the file.]
 
-<img alt="2 kinds of bookmark objects" width="415" height="123" src="images/bookmarks.png">
-</div>
+<img
+  alt="2 kinds of bookmark objects"
+  width="415"
+  height="123"
+  src="images/bookmarks.png" />
+-->
 
-<div class="comment">
-
-<p> [PENDING: The following section needs to be updated or deleted.] </p>
+<!-- [PENDING: The following section needs to be updated or deleted.]
 <p>
 Say you have bookmark hierarchy that looks like this:</p>
 
@@ -366,9 +364,13 @@ Say you have bookmark hierarchy that looks like this:</p>
 <p>
 Here's how those bookmarks might be represented with bookmark objects:</p>
 
-<img alt="a hierarchy of bookmarks" width="522" height="594" src="images/bookmarks-hierarchy.png">
+<img
+  alt="a hierarchy of bookmarks"
+  width="522"
+  height="594"
+  src="images/bookmarks-hierarchy.png">
 
-</div>
+-->
 
 
 <h2 id="overview-examples">Examples</h2>
diff --git a/chrome/common/extensions/docs/browserAction.html b/chrome/common/extensions/docs/browserAction.html
index d191189..f46b16c 100644
--- a/chrome/common/extensions/docs/browserAction.html
+++ b/chrome/common/extensions/docs/browserAction.html
@@ -302,9 +302,7 @@ use a <a href="pageAction.html">page action</a>
 instead of a browser action.
 </p>
 
-<p class="comment">
-[PENDING: We should show tooltips and badges, as well.]
-</p>
+<!-- [PENDING: We should show tooltips and badges, as well.] -->
 
 <h2 id="manifest">Manifest</h2>
 
@@ -381,8 +379,7 @@ Set the text and color of the badge using
 <a href="#method-setBadgeText">setBadgeText()</a> and
 <a href="#method-setBadgeBackgroundColor">setBadgeBackgroundColor()</a>,
 respectively.
-<span class="comment">[PENDING:
-if you have a color but no text, will anything display?]</span>
+<!-- [PENDING: if you have a color but no text, will anything display?] -->
 </p>
 
 
diff --git a/chrome/common/extensions/docs/events.html b/chrome/common/extensions/docs/events.html
index ae9a385..1da72ae 100644
--- a/chrome/common/extensions/docs/events.html
+++ b/chrome/common/extensions/docs/events.html
@@ -292,9 +292,8 @@ void removeListener(function callback(...))
 bool hasListener(function callback(...))
 </pre>
 
-<p class="comment">
-[PENDING: explain removeListener and hasListener]
-</p></div>
+<!-- [PENDING: explain removeListener and hasListener] -->
+</div>
 
         <!-- API PAGE -->
         <div class="apiPage" style="display: none; ">
diff --git a/chrome/common/extensions/docs/faq.html b/chrome/common/extensions/docs/faq.html
index a06a81a..97ceb05 100644
--- a/chrome/common/extensions/docs/faq.html
+++ b/chrome/common/extensions/docs/faq.html
@@ -249,13 +249,10 @@
         <!-- STATIC CONTENT PLACEHOLDER -->
         <div id="static"><div id="pageData-title" class="pageData">FAQ</div>
 
-<div class="comment">
 <!--
 <div id="pageData-showTOC" class="pageData">true</div>
 -->
 
-</div>
-
 <p>
 This page will give answers to frequently asked questions.
 </p>
diff --git a/chrome/common/extensions/docs/getstarted.html b/chrome/common/extensions/docs/getstarted.html
index 2d4690b..3aeb173 100644
--- a/chrome/common/extensions/docs/getstarted.html
+++ b/chrome/common/extensions/docs/getstarted.html
@@ -403,11 +403,7 @@ it won't work! </p>
 
 <h2 id="summary">Now what?</h2>
 
-<p class="comment">
-[PENDING: Summarize what we did,
-what it means,
-what else we would've done if this were a real extension (e.g. package it),
-and where to find more information.]</p>
+<!-- [PENDING: Summarize what we did, what it means, what else we would've done if this were a real extension (e.g. package it), and where to find more information.] -->
 
 <p>
 Here are some suggestions for what to do next:
diff --git a/chrome/common/extensions/docs/i18n.html b/chrome/common/extensions/docs/i18n.html
index 0b28b3d..229b829 100644
--- a/chrome/common/extensions/docs/i18n.html
+++ b/chrome/common/extensions/docs/i18n.html
@@ -255,10 +255,7 @@
 <p id="classSummary">
 Use the <code>chrome.i18n</code> module to manipulate the i18n related browser
 settings, such as the accept languages.
-<span class="comment">
-[PENDING: add when getMessage works:
-"or to get localized messages for the current locale."]
-</span>
+<!-- [PENDING: add when getMessage works: "or to get localized messages for the current locale."] -->
 </p>
 
 <h3 id="overview-examples">Examples</h3>
@@ -276,21 +273,21 @@ string by separating each accept-language with ','.
 }
 </pre>
 
-<div class="comment">
-[PENDING: add the following when getMessage is working]
-
+<!-- [PENDING: add the following when getMessage is working]
 <p>
 The following code gets a localized message from the browser and displays it as a
 string. It replaces two placeholders within the message with values arg1 and
 arg2.
 </p>
 
-<pre>function getMessage() {
+<pre>
+function getMessage() {
   var message = chrome.i18n.getMessage("click_here", ["arg1", "arg2"]);
   document.getElementById("languageSpan").innerHTML = message;
 }
 </pre>
-</div>
+-->
+
 <!-- END AUTHORED CONTENT -->
 </div>
 
diff --git a/chrome/common/extensions/docs/index.html b/chrome/common/extensions/docs/index.html
index 909b251..0ebd80b 100644
--- a/chrome/common/extensions/docs/index.html
+++ b/chrome/common/extensions/docs/index.html
@@ -287,10 +287,7 @@ you need to know to write extensions.
 
 <p>
 Here are some examples of what you can build with extensions:
-<span class="comment">
-[PENDING: improve * actions screenshots, so there are fewer unnecessary
-differences between them.]
-</span>
+<!-- [PENDING: improve * actions screenshots, so there are fewer unnecessary differences between them.] -->
 </p>
 
 <table id="pics">
diff --git a/chrome/common/extensions/docs/manifest.html b/chrome/common/extensions/docs/manifest.html
index 023da7e..3f1de64 100644
--- a/chrome/common/extensions/docs/manifest.html
+++ b/chrome/common/extensions/docs/manifest.html
@@ -449,11 +449,7 @@ For more information, see
 <a href="autoupdate.html">Autoupdating</a>.
 </p>
 
-<p class="comment">
-[PENDING: Once the gallery is published, point to it
-and make a big deal of the fact that autoupdating is free
-if you use the gallery.]
-</p>
+<!-- [PENDING: Possibly: point to the gallery and make a big deal of the fact that autoupdating is free if you use the gallery.] -->
 </div>
 
         <!-- API PAGE -->
diff --git a/chrome/common/extensions/docs/override.html b/chrome/common/extensions/docs/override.html
index 22d4c2c..5d83684 100644
--- a/chrome/common/extensions/docs/override.html
+++ b/chrome/common/extensions/docs/override.html
@@ -300,9 +300,7 @@ when the user creates a new tab or window.
 </tbody></table>
 
 
-<p class="comment">
-[PENDING: update these screenshots.]
-</p>
+<!-- [PENDING: update these screenshots.] -->
 
 <h2 id="manifest">Manifest</h2>
 
@@ -375,9 +373,7 @@ It uses a 3-line file named <code>redirect.html</code>
 to implement the New Tab page.
 </p>
 
-<p class="comment">
-[PENDING: Maybe have a gallery of NTPs?]
-</p>
+<!-- [PENDING: Maybe have a gallery of NTPs?] -->
 </div>
 
         <!-- API PAGE -->
diff --git a/chrome/common/extensions/docs/overview.html b/chrome/common/extensions/docs/overview.html
index 795d682..9b16690 100644
--- a/chrome/common/extensions/docs/overview.html
+++ b/chrome/common/extensions/docs/overview.html
@@ -393,11 +393,7 @@ under the extension's top folder;
 it's the same as the relative URL.
 </p>
 
-<p class="comment">
-[PENDING: Should mention/reflect/link to
-<a href="http://dev.chromium.org/developers/design-documents/extensions/i18n">internationalization</a>
-when it's ready.]
-</p>
+<!-- [PENDING: Should mention/reflect/link to <a href="http://dev.chromium.org/developers/design-documents/extensions/i18n">internationalization</a> when it's ready.] -->
 
 
 <a name="H3-3"></a><h3>The manifest file</h3>
@@ -437,11 +433,6 @@ Most extensions have a
 <a href="background_pages.html">background page</a>,
 an invisible page
 that holds the main logic of the extension.
-<span class="comment">
-[PENDING: unnecessary?]
-No matter how many windows or tabs the user opens,
-there's only one copy of the background page.
-</span>
 </p>
 
 <img src="images/arch-1.gif">
@@ -512,17 +503,14 @@ not as part of the extension it was packaged with
 (its <em>parent extension</em>).
 </p>
 
-<p class="comment">
-[PENDING: Consider explaining that the reason content scripts
-are separated from the extension is due to chrome's multiprocess design.
-Something like:
+<!-- [PENDING: Consider explaining that the reason content scripts are separated from the extension is due to chrome's multiprocess design.  Something like:
 
 Each extension runs in its own process.
 To have rich interaction with a web page, however,
 the extension must be able to
 run some code in the web page's process.
 Extensions accomplish this with content scripts.]
-</p>
+-->
 
 <p>
 Content scripts can read details of the web pages the browser visits,
@@ -548,9 +536,7 @@ asking a content script to change the appearance of its browser page.
 
 <img src="images/arch-cs.gif">
 
-<p class="comment">
-[PENDING: Add overview of message passing.]
-</p>
+<!-- [PENDING: Add overview of message passing.] -->
 
 <p>
 For more information,
@@ -562,9 +548,7 @@ see <a href="content_scripts.html">Content Scripts</a>.
 
 <p>
 The HTML pages within an extension often need to communicate.
-<span class="comment">
-[PENDING: For example, ...]
-</span>
+<!-- [PENDING: For example, ...] -->
 Because all of an extension's pages
 execute in same process on the same thread,
 the pages can make direct function calls to each other.
@@ -581,11 +565,7 @@ the first page can invoke functions on the other pages,
 and it can manipulate their DOMs.
 </p>
 
-<p class="comment">
-[PENDING: Here's an example of
-communication between xyz and the background page.
-(code example goes here)]
-</p>
+<!-- [PENDING: Here's an example of communication between xyz and the background page.  (code example goes here)] -->
 
 
 <a name="H2-8"></a><h2> Now what? </h2>
diff --git a/chrome/common/extensions/docs/packaging.html b/chrome/common/extensions/docs/packaging.html
index 1c4a806..65b3b3e 100644
--- a/chrome/common/extensions/docs/packaging.html
+++ b/chrome/common/extensions/docs/packaging.html
@@ -289,6 +289,8 @@ would be to distribute a non-public version —
 for example, to alpha testers.
 </p>
 
+<!-- [PENDING: Refer to instructions on submitting an extension for inclusion in the gallery.] -->
+
 <p>
 When you package an extension,
 the extension is assigned a unique key pair.
@@ -297,12 +299,6 @@ The private key is kept private
 and used to sign each version of the extension.
 </p>
 
-<p class="comment">
-[PENDING: Perhaps mention that once the gallery is up,
-creating and updating a package will be much easier.
-Also refer to instructions on submitting an extension
-for inclusion in the gallery.]
-</p>
 
 <a name="H2-0"></a><h2>Creating a package</h2>
 
diff --git a/chrome/common/extensions/docs/pageAction.html b/chrome/common/extensions/docs/pageAction.html
index f804c3e..92d1971 100644
--- a/chrome/common/extensions/docs/pageAction.html
+++ b/chrome/common/extensions/docs/pageAction.html
@@ -337,14 +337,7 @@ or starts displaying a different URL
 (because the user clicks a link, for example).
 </p>
 
-<div class="comment">
-[PENDING:
-We should discuss how tabs and page actions are related.
-All methods take a tab ID argument.
-How do you get that tab ID?
-What's the usual way of arranging the code that monitors pages?
-Point to examples.]
-</div>
+<!-- [PENDING: We should discuss how tabs and page actions are related.  All methods take a tab ID argument.  How do you get that tab ID?  What's the usual way of arranging the code that monitors pages?  Point to examples.] -->
 
 
 <h2 id="tips">Tips</h2>
diff --git a/chrome/common/extensions/docs/static/api_index.html b/chrome/common/extensions/docs/static/api_index.html
index d8078b5..5da7bbc 100644
--- a/chrome/common/extensions/docs/static/api_index.html
+++ b/chrome/common/extensions/docs/static/api_index.html
@@ -24,5 +24,5 @@ they return immediately,
 without waiting for the operation to finish.
 If you need to know the outcome of an operation,
 then you pass a callback function into the method.
-<span class="comment">[PENDING: update/elaborate on that]</span>
+<!-- [PENDING: update/elaborate on that] -->
 </p>
diff --git a/chrome/common/extensions/docs/static/api_other.html b/chrome/common/extensions/docs/static/api_other.html
index 02f76a0..2904b20 100644
--- a/chrome/common/extensions/docs/static/api_other.html
+++ b/chrome/common/extensions/docs/static/api_other.html
@@ -18,7 +18,7 @@ you can bundle additional API libraries into your extension.
   <a href="http://www.w3.org/TR/DOM-Level-2-HTML/">Document Object Model</a>
   (DOM) APIs
   that you can use in ordinary web apps.
-  <span class="comment">[PENDING: check! should link to complete list]</span>
+  <!-- [PENDING: check! should link to complete list] -->
 <!-- Use onclick in your toolbar div to add click behavior.
 E.g. window.open(someUrl). --></dd>
 <dt><strong> XMLHttpRequest </strong></dt>
@@ -44,16 +44,16 @@ E.g. window.open(someUrl). --></dd>
   }
 &lt;/style>
 </pre>
-  <p class="comment">[PENDING: link to complete list of webkit apis]</p>
+  <!-- [PENDING: link to complete list of webkit apis] -->
 </dd>
 <dt><strong> V8 APIs</strong>, such as<strong> JSON </strong></dt>
-<dd> Because JSON is in V8, you don't need to include a JSON library to use JSON functions. <span class="comment">[PENDING: what other APIs are in v8? link to complete list]</span></dd>
+<dd> Because JSON is in V8, you don't need to include a JSON library to use JSON functions. <!-- [PENDING: what other APIs are in v8? link to complete list] --></dd>
 <dt> <strong>HTML5</strong> <strong>APIs</strong>, such as <strong>localStorage</strong></dt>
 <dd> HTML5 is still being defined and implemented,
   but Google Chrome already supports local storage,
   which extensions can use to store data.
 <!--
-localStorage.setItem(&quot;foo&quot;, &quot;bar&quot;); ... localStorage.getItem(&quot;foo&quot;); --> <span class="comment">[PENDING: Other important API? link to complete list]</span></dd>
+localStorage.setItem(&quot;foo&quot;, &quot;bar&quot;); ... localStorage.getItem(&quot;foo&quot;); --> <!-- [PENDING: Other important API? link to complete list] --></dd>
 <dt><strong>APIs in bundled libraries</strong></dt>
 <dd> If you want to use a library that the browser doesn't provide
 (for example, jQuery),
diff --git a/chrome/common/extensions/docs/static/background_pages.html b/chrome/common/extensions/docs/static/background_pages.html
index 903a9bc..9213172 100644
--- a/chrome/common/extensions/docs/static/background_pages.html
+++ b/chrome/common/extensions/docs/static/background_pages.html
@@ -69,13 +69,7 @@ and multiple pages created
 (with
 <a href="tabs.html#method-create"><code>chrome.tabs.create()</code></a>)
 from a file named <code>image.html</code>.
-<span class="comment">
-[PENDING: Once we have our set of samples,
-we should point to the example this is from
-and to other relevant examples.
-This is currently untested code derived from
-the screenshot sample.]
-</span>
+<!-- [PENDING: Once we have our set of samples, we should point to the example this is from and to other relevant examples.  This is currently untested code derived from the screenshot sample.] -->
 </p>
 
 <pre>
diff --git a/chrome/common/extensions/docs/static/bookmarks.html b/chrome/common/extensions/docs/static/bookmarks.html
index 4b7f65c..0fa962c 100644
--- a/chrome/common/extensions/docs/static/bookmarks.html
+++ b/chrome/common/extensions/docs/static/bookmarks.html
@@ -44,22 +44,16 @@ See <a href="#type-BookmarkTreeNode"><code>BookmarkTreeNode</code></a>
 for information about the properties a node can have.
 </p>
 
-<div class="comment">
-<p>
-[PENDING:
-Update and introduce the following image or delete the file.]
-</p>
+<!-- [PENDING: Update and introduce the following image or delete the file.]
 
 <img
   alt="2 kinds of bookmark objects"
   width="415"
   height="123"
   src="images/bookmarks.png" />
-</div>
-
-<div class="comment">
+-->
 
-<p> [PENDING: The following section needs to be updated or deleted.] </p>
+<!-- [PENDING: The following section needs to be updated or deleted.]
 <p>
 Say you have bookmark hierarchy that looks like this:</p>
 
@@ -89,7 +83,7 @@ Here's how those bookmarks might be represented with bookmark objects:</p>
   height="594"
   src="images/bookmarks-hierarchy.png">
 
-</div>
+-->
 
 
 <h2 id="overview-examples">Examples</h2>
diff --git a/chrome/common/extensions/docs/static/browserAction.html b/chrome/common/extensions/docs/static/browserAction.html
index 0d42e60..6ed3845 100644
--- a/chrome/common/extensions/docs/static/browserAction.html
+++ b/chrome/common/extensions/docs/static/browserAction.html
@@ -28,9 +28,7 @@ use a <a href="pageAction.html">page action</a>
 instead of a browser action.
 </p>
 
-<p class="comment">
-[PENDING: We should show tooltips and badges, as well.]
-</p>
+<!-- [PENDING: We should show tooltips and badges, as well.] -->
 
 <h2 id="manifest">Manifest</h2>
 
@@ -107,8 +105,7 @@ Set the text and color of the badge using
 <a href="#method-setBadgeText">setBadgeText()</a> and
 <a href="#method-setBadgeBackgroundColor">setBadgeBackgroundColor()</a>,
 respectively.
-<span class="comment">[PENDING:
-if you have a color but no text, will anything display?]</span>
+<!-- [PENDING: if you have a color but no text, will anything display?] -->
 </p>
 
 
diff --git a/chrome/common/extensions/docs/static/events.html b/chrome/common/extensions/docs/static/events.html
index bb9757f..dfb5089 100644
--- a/chrome/common/extensions/docs/static/events.html
+++ b/chrome/common/extensions/docs/static/events.html
@@ -45,5 +45,4 @@ void removeListener(function callback(...))
 bool hasListener(function callback(...))
 </pre>
 
-<p class="comment">
-[PENDING: explain removeListener and hasListener]
+<!-- [PENDING: explain removeListener and hasListener] -->
diff --git a/chrome/common/extensions/docs/static/faq.html b/chrome/common/extensions/docs/static/faq.html
index 8c8f88e..df0795f 100644
--- a/chrome/common/extensions/docs/static/faq.html
+++ b/chrome/common/extensions/docs/static/faq.html
@@ -1,12 +1,9 @@
 <div id="pageData-title" class="pageData">FAQ</div>
 
-<div class="comment">
 <!--
 <div id="pageData-showTOC" class="pageData">true</div>
 -->
 
-</div>
-
 <p>
 This page will give answers to frequently asked questions.
 </p>
diff --git a/chrome/common/extensions/docs/static/getstarted.html b/chrome/common/extensions/docs/static/getstarted.html
index c82096b..f2e6595 100644
--- a/chrome/common/extensions/docs/static/getstarted.html
+++ b/chrome/common/extensions/docs/static/getstarted.html
@@ -146,11 +146,7 @@ it won't work! </p>
 
 <h2 id="summary">Now what?</h2>
 
-<p class="comment">
-[PENDING: Summarize what we did,
-what it means,
-what else we would've done if this were a real extension (e.g. package it),
-and where to find more information.]</p>
+<!-- [PENDING: Summarize what we did, what it means, what else we would've done if this were a real extension (e.g. package it), and where to find more information.] -->
 
 <p>
 Here are some suggestions for what to do next:
diff --git a/chrome/common/extensions/docs/static/i18n.html b/chrome/common/extensions/docs/static/i18n.html
index 360a8d5..4ec9007 100644
--- a/chrome/common/extensions/docs/static/i18n.html
+++ b/chrome/common/extensions/docs/static/i18n.html
@@ -4,10 +4,7 @@
 <p id="classSummary">
 Use the <code>chrome.i18n</code> module to manipulate the i18n related browser
 settings, such as the accept languages.
-<span class="comment">
-[PENDING: add when getMessage works:
-"or to get localized messages for the current locale."]
-</span>
+<!-- [PENDING: add when getMessage works: "or to get localized messages for the current locale."] -->
 </p>
 
 <h3 id="overview-examples">Examples</h3>
@@ -26,9 +23,7 @@ function getAcceptLanguages() {
 }
 </pre>
 
-<div class="comment">
-[PENDING: add the following when getMessage is working]
-
+<!-- [PENDING: add the following when getMessage is working]
 <p>
 The following code gets a localized message from the browser and displays it as a
 string. It replaces two placeholders within the message with values arg1 and
@@ -41,5 +36,6 @@ function getMessage() {
   document.getElementById("languageSpan").innerHTML = message;
 }
 </pre>
-</div>
+-->
+
 <!-- END AUTHORED CONTENT -->
diff --git a/chrome/common/extensions/docs/static/index.html b/chrome/common/extensions/docs/static/index.html
index 9ad0f02..8563fc1 100644
--- a/chrome/common/extensions/docs/static/index.html
+++ b/chrome/common/extensions/docs/static/index.html
@@ -38,10 +38,7 @@ you need to know to write extensions.
 
 <p>
 Here are some examples of what you can build with extensions:
-<span class="comment">
-[PENDING: improve * actions screenshots, so there are fewer unnecessary
-differences between them.]
-</span>
+<!-- [PENDING: improve * actions screenshots, so there are fewer unnecessary differences between them.] -->
 </p>
 
 <table id="pics">
diff --git a/chrome/common/extensions/docs/static/manifest.html b/chrome/common/extensions/docs/static/manifest.html
index c9edcae..5d42731 100644
--- a/chrome/common/extensions/docs/static/manifest.html
+++ b/chrome/common/extensions/docs/static/manifest.html
@@ -188,8 +188,4 @@ For more information, see
 <a href="autoupdate.html">Autoupdating</a>.
 </p>
 
-<p class="comment">
-[PENDING: Once the gallery is published, point to it
-and make a big deal of the fact that autoupdating is free
-if you use the gallery.]
-</p>
+<!-- [PENDING: Possibly: point to the gallery and make a big deal of the fact that autoupdating is free if you use the gallery.] -->
diff --git a/chrome/common/extensions/docs/static/override.html b/chrome/common/extensions/docs/static/override.html
index 2fbc0f8..a25b845 100644
--- a/chrome/common/extensions/docs/static/override.html
+++ b/chrome/common/extensions/docs/static/override.html
@@ -53,9 +53,7 @@ when the user creates a new tab or window.
 </table>
 
 
-<p class="comment">
-[PENDING: update these screenshots.]
-</p>
+<!-- [PENDING: update these screenshots.] -->
 
 <h2 id="manifest">Manifest</h2>
 
@@ -129,6 +127,4 @@ It uses a 3-line file named <code>redirect.html</code>
 to implement the New Tab page.
 </p>
 
-<p class="comment">
-[PENDING: Maybe have a gallery of NTPs?]
-</p>
+<!-- [PENDING: Maybe have a gallery of NTPs?] -->
diff --git a/chrome/common/extensions/docs/static/overview.html b/chrome/common/extensions/docs/static/overview.html
index 2cbbae5..18c81ab 100644
--- a/chrome/common/extensions/docs/static/overview.html
+++ b/chrome/common/extensions/docs/static/overview.html
@@ -113,11 +113,7 @@ under the extension's top folder;
 it's the same as the relative URL.
 </p>
 
-<p class="comment">
-[PENDING: Should mention/reflect/link to
-<a href="http://dev.chromium.org/developers/design-documents/extensions/i18n">internationalization</a>
-when it's ready.]
-</p>
+<!-- [PENDING: Should mention/reflect/link to <a href="http://dev.chromium.org/developers/design-documents/extensions/i18n">internationalization</a> when it's ready.] -->
 
 
 <h3>The manifest file</h3>
@@ -158,11 +154,6 @@ Most extensions have a
 <a href="background_pages.html">background page</a>,
 an invisible page
 that holds the main logic of the extension.
-<span class="comment">
-[PENDING: unnecessary?]
-No matter how many windows or tabs the user opens,
-there's only one copy of the background page.
-</span>
 </p>
 
 <img src="images/arch-1.gif">
@@ -233,17 +224,14 @@ not as part of the extension it was packaged with
 (its <em>parent extension</em>).
 </p>
 
-<p class="comment">
-[PENDING: Consider explaining that the reason content scripts
-are separated from the extension is due to chrome's multiprocess design.
-Something like:
+<!-- [PENDING: Consider explaining that the reason content scripts are separated from the extension is due to chrome's multiprocess design.  Something like:
 
 Each extension runs in its own process.
 To have rich interaction with a web page, however,
 the extension must be able to
 run some code in the web page's process.
 Extensions accomplish this with content scripts.]
-</p>
+-->
 
 <p>
 Content scripts can read details of the web pages the browser visits,
@@ -269,9 +257,7 @@ asking a content script to change the appearance of its browser page.
 
 <img src="images/arch-cs.gif">
 
-<p class="comment">
-[PENDING: Add overview of message passing.]
-</p>
+<!-- [PENDING: Add overview of message passing.] -->
 
 <p>
 For more information,
@@ -283,9 +269,7 @@ see <a href="content_scripts.html">Content Scripts</a>.
 
 <p>
 The HTML pages within an extension often need to communicate.
-<span class="comment">
-[PENDING: For example, ...]
-</span>
+<!-- [PENDING: For example, ...] -->
 Because all of an extension's pages
 execute in same process on the same thread,
 the pages can make direct function calls to each other.
@@ -302,11 +286,7 @@ the first page can invoke functions on the other pages,
 and it can manipulate their DOMs.
 </p>
 
-<p class="comment">
-[PENDING: Here's an example of
-communication between xyz and the background page.
-(code example goes here)]
-</p>
+<!-- [PENDING: Here's an example of communication between xyz and the background page.  (code example goes here)] -->
 
 
 <h2> Now what? </h2>
diff --git a/chrome/common/extensions/docs/static/packaging.html b/chrome/common/extensions/docs/static/packaging.html
index 5115173..008b401 100644
--- a/chrome/common/extensions/docs/static/packaging.html
+++ b/chrome/common/extensions/docs/static/packaging.html
@@ -19,6 +19,8 @@ would be to distribute a non-public version &mdash;
 for example, to alpha testers.
 </p>
 
+<!-- [PENDING: Refer to instructions on submitting an extension for inclusion in the gallery.] -->
+
 <p>
 When you package an extension,
 the extension is assigned a unique key pair.
@@ -27,12 +29,6 @@ The private key is kept private
 and used to sign each version of the extension.
 </p>
 
-<p class="comment">
-[PENDING: Perhaps mention that once the gallery is up,
-creating and updating a package will be much easier.
-Also refer to instructions on submitting an extension
-for inclusion in the gallery.]
-</p>
 
 <h2>Creating a package</h2>
 
diff --git a/chrome/common/extensions/docs/static/pageAction.html b/chrome/common/extensions/docs/static/pageAction.html
index ec49c4f..7991938 100755
--- a/chrome/common/extensions/docs/static/pageAction.html
+++ b/chrome/common/extensions/docs/static/pageAction.html
@@ -69,14 +69,7 @@ or starts displaying a different URL
 (because the user clicks a link, for example).
 </p>
 
-<div class="comment">
-[PENDING:
-We should discuss how tabs and page actions are related.
-All methods take a tab ID argument.
-How do you get that tab ID?
-What's the usual way of arranging the code that monitors pages?
-Point to examples.]
-</div>
+<!-- [PENDING: We should discuss how tabs and page actions are related.  All methods take a tab ID argument.  How do you get that tab ID?  What's the usual way of arranging the code that monitors pages?  Point to examples.] -->
 
 
 <h2 id="tips">Tips</h2>
diff --git a/chrome/common/extensions/docs/static/themes.html b/chrome/common/extensions/docs/static/themes.html
index 6ea83d0..de6c74c 100644
--- a/chrome/common/extensions/docs/static/themes.html
+++ b/chrome/common/extensions/docs/static/themes.html
@@ -19,11 +19,7 @@ Here is an example
 file for a theme:
 </p>
 
-<p class="comment">
-[PENDING: This page should eventually be (or point to) something
-that's very friendly to artists.
-You should only have to look at one page to create a theme.]
-</p>
+<!-- [PENDING: This page should eventually be (or point to) something that's very friendly to artists.  You should only have to look at one page to create a theme. -->
 
 <pre>
 {
@@ -88,7 +84,7 @@ background repeat,
 and an alternate logo.
 To see the properties and the values they can have, see
 <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/browser_theme_provider.cc"><code>browser_theme_provider.cc</code></a>.
-<span class="comment"> [PENDING: We should flesh this out.] </span>
+<!-- [PENDING: We should flesh this out.] -->
 </p>
 
 <h3 id="tints">tints</h3>
diff --git a/chrome/common/extensions/docs/static/tut_debugging.html b/chrome/common/extensions/docs/static/tut_debugging.html
index c7a3c5a..bc4c887 100644
--- a/chrome/common/extensions/docs/static/tut_debugging.html
+++ b/chrome/common/extensions/docs/static/tut_debugging.html
@@ -55,11 +55,6 @@ in the Extensions page.
   Look at the Hello World extension's information on that page.
   You can see details such as the extension's
   name, description, and ID.
-
-<p class="comment">
-[PENDING: screenshot here?]
-</p>
-
   </li>
 
   <li>
@@ -94,9 +89,6 @@ The next section shows how you can inspect popup pages.
 <p>
 Using the <b>chrome-extension</b> protocol,
 you can view any file in your extension.
-<span class="comment">
-[PENDING: check]
-</span>
 This feature is especially handy for debugging popups.
 </p>
 
@@ -129,8 +121,7 @@ This feature is especially handy for debugging popups.
   Back in the Extensions page,
   press <b>F5</b> or click the browser's Reload button
   to update the Hello World extension's information.
-  <span class="comment">[PENDING: this seems like it should be unnecessary --
-  like the page should update itself]</span>
+  <!-- [PENDING: this seems like it should be unnecessary, like the page should update itself] -->
   </li>
 
   <li>
@@ -146,7 +137,7 @@ This feature is especially handy for debugging popups.
   <li>
   If the <strong>Scripts</strong> button isn't already selected,
   click it.
-  <span class="comment">[PENDING: can we omit this step?]</span>
+  <!-- [PENDING: can we omit this step?] -->
   </li>
   <li>
   Click the console button
@@ -305,10 +296,7 @@ here are suggestions for what to do next:
   </li>
 </ul>
 
-<p class="comment">
-[PENDING: do something to help people debug
-content scripts, which show up in blue]
-</p>
+<!-- [PENDING: do something to help people debug content scripts, which show up in blue] -->
 
 <p>
 For more ideas,
diff --git a/chrome/common/extensions/docs/themes.html b/chrome/common/extensions/docs/themes.html
index d17499a..3ae62dd 100644
--- a/chrome/common/extensions/docs/themes.html
+++ b/chrome/common/extensions/docs/themes.html
@@ -274,11 +274,7 @@ Here is an example
 file for a theme:
 </p>
 
-<p class="comment">
-[PENDING: This page should eventually be (or point to) something
-that's very friendly to artists.
-You should only have to look at one page to create a theme.]
-</p>
+<!-- [PENDING: This page should eventually be (or point to) something that's very friendly to artists.  You should only have to look at one page to create a theme. -->
 
 <pre>{
 &nbsp;&nbsp;"version": "2.6",
@@ -342,7 +338,7 @@ background repeat,
 and an alternate logo.
 To see the properties and the values they can have, see
 <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/browser_theme_provider.cc"><code>browser_theme_provider.cc</code></a>.
-<span class="comment"> [PENDING: We should flesh this out.] </span>
+<!-- [PENDING: We should flesh this out.] -->
 </p>
 
 <h3 id="tints">tints</h3>
diff --git a/chrome/common/extensions/docs/tut_debugging.html b/chrome/common/extensions/docs/tut_debugging.html
index 912d5f5..f7b23df 100644
--- a/chrome/common/extensions/docs/tut_debugging.html
+++ b/chrome/common/extensions/docs/tut_debugging.html
@@ -330,11 +330,6 @@ in the Extensions page.
   Look at the Hello World extension's information on that page.
   You can see details such as the extension's
   name, description, and ID.
-
-<p class="comment">
-[PENDING: screenshot here?]
-</p>
-
   </li>
 
   <li>
@@ -366,9 +361,6 @@ The next section shows how you can inspect popup pages.
 <p>
 Using the <b>chrome-extension</b> protocol,
 you can view any file in your extension.
-<span class="comment">
-[PENDING: check]
-</span>
 This feature is especially handy for debugging popups.
 </p>
 
@@ -400,8 +392,7 @@ This feature is especially handy for debugging popups.
   Back in the Extensions page,
   press <b>F5</b> or click the browser's Reload button
   to update the Hello World extension's information.
-  <span class="comment">[PENDING: this seems like it should be unnecessary --
-  like the page should update itself]</span>
+  <!-- [PENDING: this seems like it should be unnecessary, like the page should update itself] -->
   </li>
 
   <li>
@@ -416,7 +407,7 @@ This feature is especially handy for debugging popups.
   <li>
   If the <strong>Scripts</strong> button isn't already selected,
   click it.
-  <span class="comment">[PENDING: can we omit this step?]</span>
+  <!-- [PENDING: can we omit this step?] -->
   </li>
   <li>
   Click the console button
@@ -564,10 +555,7 @@ here are suggestions for what to do next:
   </li>
 </ul>
 
-<p class="comment">
-[PENDING: do something to help people debug
-content scripts, which show up in blue]
-</p>
+<!-- [PENDING: do something to help people debug content scripts, which show up in blue] -->
 
 <p>
 For more ideas,