Merge 76274 - Add info about "background" permission (new for M10)....

chrome/common/extensions/docs/static/manifest.html

Index: chrome/common/extensions/docs/static/manifest.html
===================================================================
--- chrome/common/extensions/docs/static/manifest.html	(revision 76276)
+++ chrome/common/extensions/docs/static/manifest.html	(working copy)
@@ -297,7 +297,7 @@
 <p class="note">
 <strong>Note:</strong>
 Hosted apps can use the
-"geolocation", "notifications", and "unlimitedStorage" permissions,
+"background", "geolocation", "notifications", and "unlimitedStorage" permissions,
 but not any other permissions listed in this table.
 </p>
 
@@ -319,6 +319,37 @@
   </td>
 </tr>
 <tr>
+  <td> "background" </td>
+  <td> <p>
+       Makes Chrome start up early and and shut down late,
+       so that apps and extensions can have a longer life.
+       </p>
+
+       <p>
+       When any installed hosted app, packaged app, or extension
+       has "background" permission, Chrome runs (invisibly)
+       as soon as the user logs into their computer&mdash;before
+       the user launches Chrome.
+       The "background" permission also makes Chrome continue running
+       (even after its last window is closed)
+       until the user explicitly quits Chrome.
+       </p>
+
+       <p class="note">
+       <b>Note:</b>
+       Disabled apps and extensions
+       are treated as if they aren't installed.
+       </p>
+
+       <p>
+       You typically use the "background" permission with a
+       <a href="background_pages.html">background page</a>
+       or (for hosted apps) a
+       <a href="http://code.google.com/chrome/apps/docs/background.html">background window</a>.
+       </p>
+       </td>
+</tr>
+<tr>
   <td> "bookmarks" </td>
   <td> Required if the extension uses the
        <a href="bookmarks.html">chrome.bookmarks</a> module. </td>