Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/proxy.html

Index: chrome/common/extensions/docs/proxy.html
===================================================================
--- chrome/common/extensions/docs/proxy.html	(revision 151318)
+++ chrome/common/extensions/docs/proxy.html	(working copy)
@@ -238,19 +238,19 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-ProxyServer">null</a>
+                <a href="#type-proxy.ProxyServer">ProxyServer</a>
                 <ol>
                 </ol>
               </li><li>
-                <a href="#type-ProxyRules">null</a>
+                <a href="#type-proxy.ProxyRules">ProxyRules</a>
                 <ol>
                 </ol>
               </li><li>
-                <a href="#type-PacScript">null</a>
+                <a href="#type-proxy.PacScript">PacScript</a>
                 <ol>
                 </ol>
               </li><li>
-                <a href="#type-ProxyConfig">null</a>
+                <a href="#type-proxy.ProxyConfig">ProxyConfig</a>
                 <ol>
                 </ol>
               </li>
@@ -470,7 +470,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a>types.ChromeSetting</a>
+                        <a href="types.html#type-types.ChromeSetting">types.ChromeSetting</a>
                       </span>
                     </span>
                   )
@@ -621,8 +621,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-ProxyServer"></a>
-              <h4>ProxyServer</h4>
+              <a name="type-proxy.ProxyServer"></a>
+              <h4>proxy.ProxyServer</h4>
               <div>
           <dt>
               <em>
@@ -723,8 +723,8 @@
           <!-- FUNCTION PARAMETERS -->
         </div>
             </div><div class="apiItem">
-              <a name="type-ProxyRules"></a>
-              <h4>ProxyRules</h4>
+              <a name="type-proxy.ProxyRules"></a>
+              <h4>proxy.ProxyRules</h4>
               <div>
           <dt>
               <em>
@@ -755,7 +755,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="proxy.html#type-ProxyServer">ProxyServer</a>
+                        <a href="proxy.html#type-proxy.ProxyServer">proxy.ProxyServer</a>
                       </span>
                     </span>
                   )
@@ -779,7 +779,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="proxy.html#type-ProxyServer">ProxyServer</a>
+                        <a href="proxy.html#type-proxy.ProxyServer">proxy.ProxyServer</a>
                       </span>
                     </span>
                   )
@@ -803,7 +803,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="proxy.html#type-ProxyServer">ProxyServer</a>
+                        <a href="proxy.html#type-proxy.ProxyServer">proxy.ProxyServer</a>
                       </span>
                     </span>
                   )
@@ -827,7 +827,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="proxy.html#type-ProxyServer">ProxyServer</a>
+                        <a href="proxy.html#type-proxy.ProxyServer">proxy.ProxyServer</a>
                       </span>
                     </span>
                   )
@@ -851,7 +851,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="proxy.html#type-ProxyServer">ProxyServer</a>
+                        <a href="proxy.html#type-proxy.ProxyServer">proxy.ProxyServer</a>
                       </span>
                     </span>
                   )
@@ -902,8 +902,8 @@
           <!-- FUNCTION PARAMETERS -->
         </div>
             </div><div class="apiItem">
-              <a name="type-PacScript"></a>
-              <h4>PacScript</h4>
+              <a name="type-proxy.PacScript"></a>
+              <h4>proxy.PacScript</h4>
               <div>
           <dt>
               <em>
@@ -1003,8 +1003,8 @@
           <!-- FUNCTION PARAMETERS -->
         </div>
             </div><div class="apiItem">
-              <a name="type-ProxyConfig"></a>
-              <h4>ProxyConfig</h4>
+              <a name="type-proxy.ProxyConfig"></a>
+              <h4>proxy.ProxyConfig</h4>
               <div>
           <dt>
               <em>
@@ -1035,7 +1035,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="proxy.html#type-ProxyRules">ProxyRules</a>
+                        <a href="proxy.html#type-proxy.ProxyRules">proxy.ProxyRules</a>
                       </span>
                     </span>
                   )
@@ -1059,7 +1059,7 @@
                     <span class="optional">optional</span>
                     <span id="typeTemplate">
                       <span>
-                        <a href="proxy.html#type-PacScript">PacScript</a>
+                        <a href="proxy.html#type-proxy.PacScript">proxy.PacScript</a>
                       </span>
                     </span>
                   )