Merge 205320 "Update to the manifest-v1 deprecation schedule, pu..."

> Update to the manifest-v1 deprecation schedule, pushing some deadlines out.
> 
> R=joemarini@google.com, pludwig@google.com, yoz@chromium.org
> 
> Review URL: https://codereview.chromium.org/15931010

TBR=jyasskin@chromium.org

Review URL: https://codereview.chromium.org/16703010

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

3 files changed, 60 insertions, 14 deletions

diff --git a/chrome/common/extensions/docs/templates/articles/app_manifestVersion.html b/chrome/common/extensions/docs/templates/articles/app_manifestVersion.html
new file mode 100644
index 0000000..abce8ee
--- /dev/null
+++ b/chrome/common/extensions/docs/templates/articles/app_manifestVersion.html
@@ -0,0 +1,42 @@
+<h1>Manifest Version</h1>
+
+<style type="text/css">
+#schedule h3 {
+  margin-bottom:0;
+}
+
+#schedule p {
+  margin-top:0;
+  margin-bottom:1em;
+}
+</style>
+
+<p>
+  Applications are simply bundles of resources, wrapped
+  up with a <a href="manifest.html"><code>manifest.json</code></a> file that
+  describes the package's contents. The format of this file is generally stable,
+  but occasionally breaking changes must be made to address important issues.
+  Developers should specify which version of the manifest specification their
+  package targets by setting a <code>manifest_version</code> key in their
+  manifests.
+</p>
+
+<h2 id="current-version">Current Version</h2>
+
+<p>
+  Packaged app developers must currently specify
+  <strong><code>'manifest_version': 2</code></strong>:
+</p>
+
+<pre>{
+  ...,
+  "manifest_version": 2,
+  ...
+}</pre>
+
+<p>
+  Manifest version 1 only applied to extensions and hosted apps, not
+  packaged apps.  It
+  was <a href="../extensions/manifestVersion.html">deprecated</a> in
+  Chrome 18.
+</p>
diff --git a/chrome/common/extensions/docs/templates/articles/manifestVersion.html b/chrome/common/extensions/docs/templates/articles/manifestVersion.html
index c9846ff..029c700 100644
--- a/chrome/common/extensions/docs/templates/articles/manifestVersion.html
+++ b/chrome/common/extensions/docs/templates/articles/manifestVersion.html
@@ -44,40 +44,44 @@
 <div id="schedule">
 <h3 id="manifest-v1-august2012">August 2012</h3>
 <ul>
-  <li>The Web Store will block creation of new manifest version 1 items.
-  <li>The Web Store will allow updates to existing manifest version 1 items.
+  <li>The Web Store will block creation of new manifest version 1 extensions.
+  <li>The Web Store will allow updates to existing manifest version 1 extensions.
 </ul>
 
 <h3 id="manifest-v1-march2013">March 2013</h3>
 <ul>
-  <li>The Web Store will block updates to manifest version 1 items on March
+  <li>The Web Store will block updates to manifest version 1 extensions on March
   4th, 2013.
 </ul>
 
 <h3 id="manifest-v1-april2013">April 2013</h3>
 <ul>
-  <li>Chrome 27 Beta will stop packaging manifest version 1 items (or loading
+  <li>Chrome 27 Beta will stop packaging manifest version 1 extensions (or loading
     them for development).
-  <li>The Web Store will remove manifest version 1 items from the wall,
+</ul>
+
+<h3 id="manifest-v1-june2013">June 2013</h3>
+<ul>
+  <li>The Web Store will remove manifest version 1 extensions from the wall,
     search results, and category pages.
   <li>Notice emails will be sent to all developers with manifest
-    version 1 items still in the store reminding them that these
-    items will be unpublished and providing update instructions.
+    version 1 extensions still in the store reminding them that these
+    extensions will be unpublished and providing update instructions.
 </ul>
 
-<h3 id="manifest-v1-july2013">July 2013</h3>
+<h3 id="manifest-v1-september2013">September 2013</h3>
 <ul>
-  <li>The Web Store will unpublish all manifest version 1 items.
+  <li>The Web Store will unpublish all manifest version 1 extensions.
   <li>Final notice emails will be sent to developers with manifest
-    version 1 items still in the Web Store.
+    version 1 extensions still in the Web Store.
   <li>Chrome will continue to load and run installed manifest
-    version 1 items.
+    version 1 extensions.
 </ul>
 
-<h3 id="manifest-v1-september2013">September 2013</h3>
+<h3 id="manifest-v1-january2014">January 2014</h3>
 <ul>
   <li>Chrome will stop loading or running manifest
-    version 1 items.
+    version 1 extensions.
 </ul>
 </div>
 
diff --git a/chrome/common/extensions/docs/templates/public/apps/manifestVersion.html b/chrome/common/extensions/docs/templates/public/apps/manifestVersion.html
index b49d5fa..3ab65907 100644
--- a/chrome/common/extensions/docs/templates/public/apps/manifestVersion.html
+++ b/chrome/common/extensions/docs/templates/public/apps/manifestVersion.html
@@ -1 +1 @@
-{{+partials.standard_apps_article article:intros.manifestVersion}}
+{{+partials.standard_apps_article article:intros.app_manifestVersion}}