Extension docs: Manual merge crrev.com/143652

chrome/common/extensions/docs/tts.html

Index: chrome/common/extensions/docs/tts.html
===================================================================
--- chrome/common/extensions/docs/tts.html	(revision 151318)
+++ chrome/common/extensions/docs/tts.html	(working copy)
@@ -235,11 +235,11 @@
             <a href="#types">Types</a>
             <ol>
               <li>
-                <a href="#type-TtsEvent">null</a>
+                <a href="#type-tts.TtsEvent">TtsEvent</a>
                 <ol>
                 </ol>
               </li><li>
-                <a href="#type-TtsVoice">null</a>
+                <a href="#type-tts.TtsVoice">TtsVoice</a>
                 <ol>
                 </ol>
               </li>
@@ -857,7 +857,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="tts.html#type-TtsEvent">TtsEvent</a>
+                        <a href="tts.html#type-tts.TtsEvent">tts.TtsEvent</a>
                       </span>
                     </span>
                   )
@@ -941,8 +941,8 @@
             <h3 id="types">Types</h3>
             <!-- iterates over all types -->
             <div class="apiItem">
-              <a name="type-TtsEvent"></a>
-              <h4>TtsEvent</h4>
+              <a name="type-tts.TtsEvent"></a>
+              <h4>tts.TtsEvent</h4>
               <div>
           <dt>
               <em>
@@ -1043,8 +1043,8 @@
           <!-- FUNCTION PARAMETERS -->
         </div>
             </div><div class="apiItem">
-              <a name="type-TtsVoice"></a>
-              <h4>TtsVoice</h4>
+              <a name="type-tts.TtsVoice"></a>
+              <h4>tts.TtsVoice</h4>
               <div>
           <dt>
               <em>