Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/permissions.html

Index: chrome/common/extensions/docs/permissions.html
===================================================================
--- chrome/common/extensions/docs/permissions.html	(revision 151318)
+++ chrome/common/extensions/docs/permissions.html	(working copy)
@@ -242,7 +242,7 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-Permissions">null</a>
+                <a href="#type-permissions.Permissions">Permissions</a>
                 <ol>
                 </ol>
               </li>
@@ -431,7 +431,7 @@
               <h4>contains</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.permissions.contains</span>(<span class="null"><span>Permissions</span>
+                  <span>chrome.permissions.contains</span>(<span class="null"><span>permissions.Permissions</span>
                       <var><span>permissions</span></var></span><span class="null"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -449,7 +449,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="permissions.html#type-Permissions">Permissions</a>
+                        <a href="permissions.html#type-permissions.Permissions">permissions.Permissions</a>
                       </span>
                     </span>
                   )
@@ -547,7 +547,7 @@
               <h4>remove</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.permissions.remove</span>(<span class="null"><span>Permissions</span>
+                  <span>chrome.permissions.remove</span>(<span class="null"><span>permissions.Permissions</span>
                       <var><span>permissions</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -565,7 +565,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="permissions.html#type-Permissions">Permissions</a>
+                        <a href="permissions.html#type-permissions.Permissions">permissions.Permissions</a>
                       </span>
                     </span>
                   )
@@ -619,7 +619,7 @@
               <h4>request</h4>
               <div class="summary">
                   <!-- Note: intentionally longer 80 columns -->
-                  <span>chrome.permissions.request</span>(<span class="null"><span>Permissions</span>
+                  <span>chrome.permissions.request</span>(<span class="null"><span>permissions.Permissions</span>
                       <var><span>permissions</span></var></span><span class="optional"><span>, </span><span>function</span>
                       <var><span>callback</span></var></span>)</div>
               <div class="description">
@@ -637,7 +637,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="permissions.html#type-Permissions">Permissions</a>
+                        <a href="permissions.html#type-permissions.Permissions">permissions.Permissions</a>
                       </span>
                     </span>
                   )
@@ -698,7 +698,7 @@
               <h4>onAdded</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.permissions.</span><span>onAdded</span><span class="subdued">.addListener</span>(function(<span>Permissions permissions</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.permissions.</span><span>onAdded</span><span class="subdued">.addListener</span>(function(<span>permissions.Permissions permissions</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired when the extension acquires new permissions.</p>
@@ -716,7 +716,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="permissions.html#type-Permissions">Permissions</a>
+                        <a href="permissions.html#type-permissions.Permissions">permissions.Permissions</a>
                       </span>
                     </span>
                   )
@@ -743,7 +743,7 @@
               <h4>onRemoved</h4>
               <div class="summary">
                 <!-- Note: intentionally longer 80 columns -->
-                <span class="subdued">chrome.permissions.</span><span>onRemoved</span><span class="subdued">.addListener</span>(function(<span>Permissions permissions</span>) <span class="subdued">{...}</span><span></span>);
+                <span class="subdued">chrome.permissions.</span><span>onRemoved</span><span class="subdued">.addListener</span>(function(<span>permissions.Permissions permissions</span>) <span class="subdued">{...}</span><span></span>);
               </div>
               <div class="description">
                 <p>Fired when access to permissions has been removed from the extension.</p>
@@ -761,7 +761,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="permissions.html#type-Permissions">Permissions</a>
+                        <a href="permissions.html#type-permissions.Permissions">permissions.Permissions</a>
                       </span>
                     </span>
                   )
@@ -791,8 +791,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-Permissions"></a>
-              <h4>Permissions</h4>
+              <a name="type-permissions.Permissions"></a>
+              <h4>permissions.Permissions</h4>
               <div>
           <dt>
               <em>