Docserver: fix bug where we were overriding hand-written descriptions of

permissions by automatically generated ones for declare_permissions.html.
Add docs for the tabs permission. Remove the unused tabCapture docs.
Fix some missed cases where we didn't change "module" terminology to "API".

R=jyasskin@chromium.org
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/23494015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220644 0039d316-1c4b-4281-b951-d872f2087c98

chrome/common/extensions/docs/server2/app.yaml

 application: chrome-apps-doc
-version: 2-27-3
+version: 2-28-0
 runtime: python27
 api_version: 1
 threadsafe: false

chrome/common/extensions/docs/server2/cron.yaml

@@ -2,4 +2,4 @@ cron:
 - description: Repopulates all cached data.
   url: /_cron
   schedule: every 5 minutes
-  target: 2-27-3
+  target: 2-28-0

chrome/common/extensions/docs/server2/permissions_data_source.py

@@ -25,7 +25,7 @@ def _AddDependencyDescriptions(permissions, api_features):
   '''
   for name, permission in permissions.iteritems():
     # Don't overwrite the description created by expanding a partial template.
-    if 'description' in permission or not permission['platforms']:
+    if 'partial' in permission or not permission['platforms']:
       continue
 
     has_deps = False

chrome/common/extensions/docs/server2/permissions_data_source_test.py

@@ -63,6 +63,9 @@ file_system = TestFileSystem({
   '_api_features.json': json.dumps({
     'cookies': {
       'dependencies': ['permission:cookies']
+    },
+    'alarms': {
+      'dependencies': ['permission:alarms']
     }
   })
 })

chrome/common/extensions/docs/templates/json/permissions.json

@@ -44,8 +44,8 @@
   "syncFileSystem": {
     "partial": "permissions/sync_file_system.html"
   },
-  "tabCapture": {
-    "partial": "permissions/tab_capture.html"
+  "tabs": {
+    "partial": "permissions/tabs.html"
   },
   "unlimitedStorage": {
     "partial": "permissions/unlimited_storage.html"

chrome/common/extensions/docs/templates/private/permissions/notifications.html

 {{^is_apps}}
 Allows the extension to use the proposed HTML5 <a href="http://www.chromium.org/developers/design-documents/desktop-notifications/api-specification">notification API</a> without calling permission methods (such as <code>checkPermission()</code>). For more information see <a href="desktop_notifications.html">Desktop Notifications</a>.
 {{:is_apps}}
-Required if the app uses the <a href="notifications.html">chrome.notifications</a> module. Also allows the app to use the proposed HTML5 <a href="http://www.chromium.org/developers/design-documents/desktop-notifications/api-specification">notification API</a> without calling permission methods (such as <code>checkPermission()</code>). For more information see <a href="desktop_notifications.html">Desktop Notifications</a>.
+Required if the app uses the <a href="notifications.html">chrome.notifications</a> API. Also allows the app to use the proposed HTML5 <a href="http://www.chromium.org/developers/design-documents/desktop-notifications/api-specification">notification API</a> without calling permission methods (such as <code>checkPermission()</code>). For more information see <a href="desktop_notifications.html">Desktop Notifications</a>.
 {{/is_apps}}

chrome/common/extensions/docs/templates/private/permissions/sync_file_system.html

-Required if the app uses the <a href="syncFileSystem.html">chrome.syncFileSystem</a> module to save and synchronize data on Google Drive.
+Required if the app uses the <a href="syncFileSystem.html">chrome.syncFileSystem</a> API to save and synchronize data on Google Drive.

chrome/common/extensions/docs/templates/private/permissions/tab_capture.html

-Required if the extension uses the <a href="tabCapture.html">chrome.tabCapture</a> module.

chrome/common/extensions/docs/templates/private/permissions/tabs.html

+Gives your {{platform}} access to privileged fields of the <code>$ref:[tabs.Tab Tab]</code> objects used by several APIs including $ref:[tabs chrome.tabs] and $ref:[windows chrome.windows]. In many circumstances your {{platform}} will not need to declare the <code>"tabs"</code> permission to make use of these APIs.

chrome/common/extensions/docs/templates/private/permissions/web_request_blocking.html

-Required if the extension uses the <a href="webRequest.html">chrome.webRequest</a> module in a blocking fashion.
+Required if the extension uses the <a href="webRequest.html">chrome.webRequest</a> API in a blocking fashion.