11 files changed, 28 insertions, 24 deletions
diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index 91112cc..4463a3c 100644
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -115,7 +115,7 @@
           {
             "type": "string",
             "name": "path",
-            "description": "A path to a resource within an extension expressed relative to it's install directory."
+            "description": "A path to a resource within an extension expressed relative to its install directory."
           }
         ],
         "returns": {
@@ -2885,7 +2885,7 @@
               "parentId": {
                 "type": "integer",
                 "optional": true,
-                "description": "Note: you cannot change an item to be a child of one of it's own descendants."
+                "description": "Note: You cannot change an item to be a child of one of its own descendants."
               },
               "documentUrlPatterns": {
                 "type": "array",
diff --git a/chrome/common/extensions/docs/browserAction.html b/chrome/common/extensions/docs/browserAction.html
index b9827ea..441422d 100644
--- a/chrome/common/extensions/docs/browserAction.html
+++ b/chrome/common/extensions/docs/browserAction.html
@@ -365,6 +365,11 @@ use a <a href="pageAction.html">page action</a>
 instead of a browser action.
 </p>
 
+<p class="caution">
+<strong>Note:</strong>
+Packaged apps cannot use browser actions.
+</p>
+
 <!-- [PENDING: We should show tooltips and badges, as well.] -->
 
 <h2 id="manifest">Manifest</h2>
diff --git a/chrome/common/extensions/docs/contextMenus.html b/chrome/common/extensions/docs/contextMenus.html
index 4e9833a..7f7bba61 100644
--- a/chrome/common/extensions/docs/contextMenus.html
+++ b/chrome/common/extensions/docs/contextMenus.html
@@ -2006,7 +2006,7 @@ You can find samples of this API on the
           <dd class="todo" style="display: none; ">
             Undocumented.
           </dd>
-          <dd>Note: you cannot change an item to be a child of one of it's own descendants.</dd>
+          <dd>Note: You cannot change an item to be a child of one of its own descendants.</dd>
           <dd style="display: none; ">
             This parameter was added in version
             <b><span></span></b>.
diff --git a/chrome/common/extensions/docs/extension.html b/chrome/common/extensions/docs/extension.html
index dc5beda..c817d70 100644
--- a/chrome/common/extensions/docs/extension.html
+++ b/chrome/common/extensions/docs/extension.html
@@ -1224,7 +1224,7 @@ For details, see
           <dd class="todo" style="display: none; ">
             Undocumented.
           </dd>
-          <dd>A path to a resource within an extension expressed relative to it's install directory.</dd>
+          <dd>A path to a resource within an extension expressed relative to its install directory.</dd>
           <dd style="display: none; ">
             This parameter was added in version
             <b><span></span></b>.
diff --git a/chrome/common/extensions/docs/i18n.html b/chrome/common/extensions/docs/i18n.html
index cfdd957..c45e017 100644
--- a/chrome/common/extensions/docs/i18n.html
+++ b/chrome/common/extensions/docs/i18n.html
@@ -825,10 +825,8 @@ For example:
 You can find simple examples of internationalization in the
 <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/i18n/">examples/api/i18n</a>
 directory.
-For a more complete example, see
-<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news_i18n/">examples/extensions/news_i18n</a>
-(compare it to
-<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news/">examples/extensions/news</a>).
+For a complete example, see
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news/">examples/extensions/news</a>.
 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/pageAction.html b/chrome/common/extensions/docs/pageAction.html
index 17212b7..b7486c6 100644
--- a/chrome/common/extensions/docs/pageAction.html
+++ b/chrome/common/extensions/docs/pageAction.html
@@ -359,6 +359,11 @@ If you want the extension's icon to always be visible,
 use a <a href="browserAction.html">browser action</a> instead.
 </p>
 
+<p class="caution">
+<strong>Note:</strong>
+Packaged apps cannot use page actions.
+</p>
+
 
 <h2 id="manifest">Manifest</h2>
 
diff --git a/chrome/common/extensions/docs/static/browserAction.html b/chrome/common/extensions/docs/static/browserAction.html
index 2a35b5d..40da968 100644
--- a/chrome/common/extensions/docs/static/browserAction.html
+++ b/chrome/common/extensions/docs/static/browserAction.html
@@ -28,6 +28,11 @@ use a <a href="pageAction.html">page action</a>
 instead of a browser action.
 </p>
 
+<p class="caution">
+<strong>Note:</strong>
+Packaged apps cannot use browser actions.
+</p>
+
 <!-- [PENDING: We should show tooltips and badges, as well.] -->
 
 <h2 id="manifest">Manifest</h2>
diff --git a/chrome/common/extensions/docs/static/i18n.html b/chrome/common/extensions/docs/static/i18n.html
index c56abc6..4d0f9b3 100644
--- a/chrome/common/extensions/docs/static/i18n.html
+++ b/chrome/common/extensions/docs/static/i18n.html
@@ -509,10 +509,8 @@ LANGUAGE=es ./chrome
 You can find simple examples of internationalization in the
 <a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/api/i18n/">examples/api/i18n</a>
 directory.
-For a more complete example, see
-<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news_i18n/">examples/extensions/news_i18n</a>
-(compare it to
-<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news/">examples/extensions/news</a>).
+For a complete example, see
+<a href="http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/extensions/docs/examples/extensions/news/">examples/extensions/news</a>.
 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/pageAction.html b/chrome/common/extensions/docs/static/pageAction.html
index 0c515b9..3def87e 100644
--- a/chrome/common/extensions/docs/static/pageAction.html
+++ b/chrome/common/extensions/docs/static/pageAction.html
@@ -28,6 +28,11 @@ If you want the extension's icon to always be visible,
 use a <a href="browserAction.html">browser action</a> instead.
 </p>
 
+<p class="caution">
+<strong>Note:</strong>
+Packaged apps cannot use page actions.
+</p>
+
 
 <h2 id="manifest">Manifest</h2>
 
diff --git a/chrome/common/extensions/docs/static/xhr.html b/chrome/common/extensions/docs/static/xhr.html
index a7be123..84cecfc 100644
--- a/chrome/common/extensions/docs/static/xhr.html
+++ b/chrome/common/extensions/docs/static/xhr.html
@@ -36,12 +36,6 @@ xhr.open("GET", chrome.extension.getURL('/config_resources/config.json'), true);
 xhr.send();
 </pre>
 
-<p class="caution">
-<b>Bug note:</b>
-Until <a href="http://crbug.com/41024">bug 41024</a> is fixed,
-the preceding code won't work.
-</p>
-
 <p>If the extension attempts to use a security origin other than itself,
 say http://www.google.com,
 the browser disallows it
diff --git a/chrome/common/extensions/docs/xhr.html b/chrome/common/extensions/docs/xhr.html
index d3c32e2..756e189 100644
--- a/chrome/common/extensions/docs/xhr.html
+++ b/chrome/common/extensions/docs/xhr.html
@@ -338,12 +338,6 @@ xhr.open("GET", chrome.extension.getURL('/config_resources/config.json'), true);
 xhr.send();
 </pre>
 
-<p class="caution">
-<b>Bug note:</b>
-Until <a href="http://crbug.com/41024">bug 41024</a> is fixed,
-the preceding code won't work.
-</p>
-
 <p>If the extension attempts to use a security origin other than itself,
 say http://www.google.com,
 the browser disallows it