[NaCl SDK Docs] Update PPAPI docs to use Chromesite-friendly URLs.

* Chromesite URLs must end in .html, unlike devsite.
* Non-doxygen docs are no longer versioned, so {{pepperversion}} should
  be removed from all URLs.
* Added FixPepperDocLinks() function to generate_docs.py. This will fix links
  for stable/beta/dev headers until this change makes it to stable.

BUG=none
R=sbc@chromium.org

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

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

30 files changed, 76 insertions, 36 deletions

diff --git a/native_client_sdk/doc_generated/pepper_beta/c/group___typedefs.html b/native_client_sdk/doc_generated/pepper_beta/c/group___typedefs.html
index ce370bc..0ecec50 100644
--- a/native_client_sdk/doc_generated/pepper_beta/c/group___typedefs.html
+++ b/native_client_sdk/doc_generated/pepper_beta/c/group___typedefs.html
@@ -215,7 +215,7 @@ Typedefs</h2><table class="memberdecls">
 </div>
 <div class="memdoc">
 <p>This function pointer type defines the signature for the <code>PPB_GetInterface</code> function. </p>
-<p>A generic <code>PPB_GetInterface</code> pointer is passed to <code>PPP_InitializedModule</code> when your module is loaded. You can use this pointer to request a pointer to a specific browser interface. Browser interface names are ASCII strings and are generally defined in the header file for the interface, such as <code>PPB_AUDIO_INTERFACE</code> found in <code>ppb.audio.h</code> or <code>PPB_GRAPHICS_2D_INTERFACE</code> in <code><a class="el" href="ppb__graphics__2d_8h.html" title="Defines the PPB_Graphics2D struct representing a 2D graphics context within the browser.">ppb_graphics_2d.h</a></code>. Click <a href="/native-client/{{pepperversion}}/pepperc/globals_defs" title="macros">here</a> for a complete list of interface names.</p>
+<p>A generic <code>PPB_GetInterface</code> pointer is passed to <code>PPP_InitializedModule</code> when your module is loaded. You can use this pointer to request a pointer to a specific browser interface. Browser interface names are ASCII strings and are generally defined in the header file for the interface, such as <code>PPB_AUDIO_INTERFACE</code> found in <code>ppb.audio.h</code> or <code>PPB_GRAPHICS_2D_INTERFACE</code> in <code><a class="el" href="ppb__graphics__2d_8h.html" title="Defines the PPB_Graphics2D struct representing a 2D graphics context within the browser.">ppb_graphics_2d.h</a></code>. Click <a href="globals_defs.html" title="macros">here</a> for a complete list of interface names.</p>
 <p>This value will be NULL if the interface is not supported on the browser. </p>
 </div>
 </div>
diff --git a/native_client_sdk/doc_generated/pepper_beta/c/struct_p_p_b___audio__1__1.html b/native_client_sdk/doc_generated/pepper_beta/c/struct_p_p_b___audio__1__1.html
index c3b9a2f..35a9491 100644
--- a/native_client_sdk/doc_generated/pepper_beta/c/struct_p_p_b___audio__1__1.html
+++ b/native_client_sdk/doc_generated/pepper_beta/c/struct_p_p_b___audio__1__1.html
@@ -18,7 +18,7 @@ Data Fields</h2><table class="memberdecls">
 </table>
 <hr /><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>The <code>PPB_Audio</code> interface contains pointers to several functions for handling audio resources. </p>
-<p>Refer to the <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio</a> chapter in the Developer's Guide for information on using this interface. Please see descriptions for each <code>PPB_Audio</code> and <code>PPB_AudioConfig</code> function for more details. A C example using <code>PPB_Audio</code> and <code>PPB_AudioConfig</code> follows.</p>
+<p>Refer to the <a href="/native-client/devguide/coding/audio.html">Audio</a> chapter in the Developer's Guide for information on using this interface. Please see descriptions for each <code>PPB_Audio</code> and <code>PPB_AudioConfig</code> function for more details. A C example using <code>PPB_Audio</code> and <code>PPB_AudioConfig</code> follows.</p>
 <p><b>Example: </b></p>
 <div class="fragment"><pre class="fragment"> <span class="keywordtype">void</span> audio_callback(<span class="keywordtype">void</span>* sample_buffer,
                      uint32_t buffer_size_in_bytes,
diff --git a/native_client_sdk/doc_generated/pepper_beta/c/struct_p_p_b___audio_config__1__1.html b/native_client_sdk/doc_generated/pepper_beta/c/struct_p_p_b___audio_config__1__1.html
index 26e40a5..e2cf1ad 100644
--- a/native_client_sdk/doc_generated/pepper_beta/c/struct_p_p_b___audio_config__1__1.html
+++ b/native_client_sdk/doc_generated/pepper_beta/c/struct_p_p_b___audio_config__1__1.html
@@ -20,7 +20,7 @@ Data Fields</h2><table class="memberdecls">
 <hr /><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>The <code>PPB_AudioConfig</code> interface contains pointers to several functions for establishing your audio configuration within the browser. </p>
 <p>This interface only supports 16-bit stereo output.</p>
-<p>Refer to the <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio </a> chapter in the Developer's Guide for information on using this interface. </p>
+<p>Refer to the <a href="/native-client/devguide/coding/audio.html">Audio </a> chapter in the Developer's Guide for information on using this interface. </p>
 </div><hr /><h2>Field Documentation</h2>
 <a class="anchor" id="a541f636cd6818dbf09ff3680701753ae"></a><!-- doxytag: member="PPB_AudioConfig::CreateStereo16Bit" ref="a541f636cd6818dbf09ff3680701753ae" args=")(PP_Instance instance, PP_AudioSampleRate sample_rate, uint32_t sample_frame_count)" -->
 <div class="memitem">
diff --git a/native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_audio.html b/native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_audio.html
index 108be9e..c1edd25 100644
--- a/native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_audio.html
+++ b/native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_audio.html
@@ -29,7 +29,7 @@ Public Member Functions</h2><table class="memberdecls">
 </table>
 <hr /><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>An audio resource. </p>
-<p>Refer to the <a href="/native-client/devguide/coding/audio">Audio</a> chapter in the Developer's Guide for information on using this interface. </p>
+<p>Refer to the <a href="/native-client/devguide/coding/audio.html">Audio</a> chapter in the Developer's Guide for information on using this interface. </p>
 </div><hr /><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="abcb6131f91a53e36f9626843d86e8109"></a><!-- doxytag: member="pp::Audio::Audio" ref="abcb6131f91a53e36f9626843d86e8109" args="()" -->
 <div class="memitem">
diff --git a/native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_audio_config.html b/native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_audio_config.html
index e2c0c74..ccde0c5 100644
--- a/native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_audio_config.html
+++ b/native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_audio_config.html
@@ -30,7 +30,7 @@ Static Public Member Functions</h2><table class="memberdecls">
 </table>
 <hr /><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>A 16 bit stereo <a class="el" href="classpp_1_1_audio_config.html" title="A 16 bit stereo AudioConfig resource.">AudioConfig</a> resource. </p>
-<p>Refer to the <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio </a>chapter in the Developer's Guide for information on using this interface.</p>
+<p>Refer to the <a href="/native-client/devguide/coding/audio.html">Audio </a>chapter in the Developer's Guide for information on using this interface.</p>
 <p>A single sample frame on a stereo device means one value for the left channel and one value for the right channel.</p>
 <p>Buffer layout for a stereo int16 configuration:</p>
 <p><code>int16_t *buffer16;</code> <code>buffer16[0]</code> is the first left channel sample. <code>buffer16[1]</code> is the first right channel sample. <code>buffer16[2]</code> is the second left channel sample. <code>buffer16[3]</code> is the second right channel sample. <code>...</code> <code>buffer16[2 * (sample_frame_count - 1)]</code> is the last left channel sample. <code>buffer16[2 * (sample_frame_count - 1) + 1]</code> is the last right channel sample. Data will always be in the native endian format of the platform.</p>
diff --git a/native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_image_data.html b/native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_image_data.html
index a104b39..223d98c 100644
--- a/native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_image_data.html
+++ b/native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_image_data.html
@@ -150,7 +150,7 @@ Static Public Member Functions</h2><table class="memberdecls">
 <dl class="params"><dt><b>Parameters:</b></dt><dd>
 <table class="params">
 <tr><td class="paramdir">[in]</td><td class="paramname">instance</td><td>The instance with which this resource will be associated.</td></tr>
-<tr><td class="paramdir">[in]</td><td class="paramname">format</td><td>A PP_ImageDataFormat containing desired image format. PP_ImageDataFormat is an enumeration of the different types of image data formats. Refer to <a href="../pepperc/ppb__image__data_8h.html"><code>ppb_image_data.h</code></a> for further information.</td></tr>
+<tr><td class="paramdir">[in]</td><td class="paramname">format</td><td>A PP_ImageDataFormat containing desired image format. PP_ImageDataFormat is an enumeration of the different types of image data formats. Refer to <a href="../c/ppb__image__data_8h.html"><code>ppb_image_data.h</code></a> for further information.</td></tr>
 <tr><td class="paramdir">[in]</td><td class="paramname">size</td><td>A pointer to a <code><a class="el" href="classpp_1_1_size.html" title="A size of an object based on width and height.">Size</a></code> containing the image size.</td></tr>
 <tr><td class="paramdir">[in]</td><td class="paramname">init_to_zero</td><td>A bool used to determine transparency at creation. Set the <code>init_to_zero</code> flag if you want the bitmap initialized to transparent during the creation process. If this flag is not set, the current contents of the bitmap will be undefined, and the module should be sure to set all the pixels. </td></tr>
 </table>
diff --git a/native_client_sdk/doc_generated/pepper_dev/c/group___typedefs.html b/native_client_sdk/doc_generated/pepper_dev/c/group___typedefs.html
index ce370bc..0ecec50 100644
--- a/native_client_sdk/doc_generated/pepper_dev/c/group___typedefs.html
+++ b/native_client_sdk/doc_generated/pepper_dev/c/group___typedefs.html
@@ -215,7 +215,7 @@ Typedefs</h2><table class="memberdecls">
 </div>
 <div class="memdoc">
 <p>This function pointer type defines the signature for the <code>PPB_GetInterface</code> function. </p>
-<p>A generic <code>PPB_GetInterface</code> pointer is passed to <code>PPP_InitializedModule</code> when your module is loaded. You can use this pointer to request a pointer to a specific browser interface. Browser interface names are ASCII strings and are generally defined in the header file for the interface, such as <code>PPB_AUDIO_INTERFACE</code> found in <code>ppb.audio.h</code> or <code>PPB_GRAPHICS_2D_INTERFACE</code> in <code><a class="el" href="ppb__graphics__2d_8h.html" title="Defines the PPB_Graphics2D struct representing a 2D graphics context within the browser.">ppb_graphics_2d.h</a></code>. Click <a href="/native-client/{{pepperversion}}/pepperc/globals_defs" title="macros">here</a> for a complete list of interface names.</p>
+<p>A generic <code>PPB_GetInterface</code> pointer is passed to <code>PPP_InitializedModule</code> when your module is loaded. You can use this pointer to request a pointer to a specific browser interface. Browser interface names are ASCII strings and are generally defined in the header file for the interface, such as <code>PPB_AUDIO_INTERFACE</code> found in <code>ppb.audio.h</code> or <code>PPB_GRAPHICS_2D_INTERFACE</code> in <code><a class="el" href="ppb__graphics__2d_8h.html" title="Defines the PPB_Graphics2D struct representing a 2D graphics context within the browser.">ppb_graphics_2d.h</a></code>. Click <a href="globals_defs.html" title="macros">here</a> for a complete list of interface names.</p>
 <p>This value will be NULL if the interface is not supported on the browser. </p>
 </div>
 </div>
diff --git a/native_client_sdk/doc_generated/pepper_dev/c/struct_p_p_b___audio__1__1.html b/native_client_sdk/doc_generated/pepper_dev/c/struct_p_p_b___audio__1__1.html
index c3b9a2f..35a9491 100644
--- a/native_client_sdk/doc_generated/pepper_dev/c/struct_p_p_b___audio__1__1.html
+++ b/native_client_sdk/doc_generated/pepper_dev/c/struct_p_p_b___audio__1__1.html
@@ -18,7 +18,7 @@ Data Fields</h2><table class="memberdecls">
 </table>
 <hr /><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>The <code>PPB_Audio</code> interface contains pointers to several functions for handling audio resources. </p>
-<p>Refer to the <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio</a> chapter in the Developer's Guide for information on using this interface. Please see descriptions for each <code>PPB_Audio</code> and <code>PPB_AudioConfig</code> function for more details. A C example using <code>PPB_Audio</code> and <code>PPB_AudioConfig</code> follows.</p>
+<p>Refer to the <a href="/native-client/devguide/coding/audio.html">Audio</a> chapter in the Developer's Guide for information on using this interface. Please see descriptions for each <code>PPB_Audio</code> and <code>PPB_AudioConfig</code> function for more details. A C example using <code>PPB_Audio</code> and <code>PPB_AudioConfig</code> follows.</p>
 <p><b>Example: </b></p>
 <div class="fragment"><pre class="fragment"> <span class="keywordtype">void</span> audio_callback(<span class="keywordtype">void</span>* sample_buffer,
                      uint32_t buffer_size_in_bytes,
diff --git a/native_client_sdk/doc_generated/pepper_dev/c/struct_p_p_b___audio_config__1__1.html b/native_client_sdk/doc_generated/pepper_dev/c/struct_p_p_b___audio_config__1__1.html
index 26e40a5..e2cf1ad 100644
--- a/native_client_sdk/doc_generated/pepper_dev/c/struct_p_p_b___audio_config__1__1.html
+++ b/native_client_sdk/doc_generated/pepper_dev/c/struct_p_p_b___audio_config__1__1.html
@@ -20,7 +20,7 @@ Data Fields</h2><table class="memberdecls">
 <hr /><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>The <code>PPB_AudioConfig</code> interface contains pointers to several functions for establishing your audio configuration within the browser. </p>
 <p>This interface only supports 16-bit stereo output.</p>
-<p>Refer to the <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio </a> chapter in the Developer's Guide for information on using this interface. </p>
+<p>Refer to the <a href="/native-client/devguide/coding/audio.html">Audio </a> chapter in the Developer's Guide for information on using this interface. </p>
 </div><hr /><h2>Field Documentation</h2>
 <a class="anchor" id="a541f636cd6818dbf09ff3680701753ae"></a><!-- doxytag: member="PPB_AudioConfig::CreateStereo16Bit" ref="a541f636cd6818dbf09ff3680701753ae" args=")(PP_Instance instance, PP_AudioSampleRate sample_rate, uint32_t sample_frame_count)" -->
 <div class="memitem">
diff --git a/native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_audio.html b/native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_audio.html
index 108be9e..c1edd25 100644
--- a/native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_audio.html
+++ b/native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_audio.html
@@ -29,7 +29,7 @@ Public Member Functions</h2><table class="memberdecls">
 </table>
 <hr /><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>An audio resource. </p>
-<p>Refer to the <a href="/native-client/devguide/coding/audio">Audio</a> chapter in the Developer's Guide for information on using this interface. </p>
+<p>Refer to the <a href="/native-client/devguide/coding/audio.html">Audio</a> chapter in the Developer's Guide for information on using this interface. </p>
 </div><hr /><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="abcb6131f91a53e36f9626843d86e8109"></a><!-- doxytag: member="pp::Audio::Audio" ref="abcb6131f91a53e36f9626843d86e8109" args="()" -->
 <div class="memitem">
diff --git a/native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_audio_config.html b/native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_audio_config.html
index e2c0c74..ccde0c5 100644
--- a/native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_audio_config.html
+++ b/native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_audio_config.html
@@ -30,7 +30,7 @@ Static Public Member Functions</h2><table class="memberdecls">
 </table>
 <hr /><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>A 16 bit stereo <a class="el" href="classpp_1_1_audio_config.html" title="A 16 bit stereo AudioConfig resource.">AudioConfig</a> resource. </p>
-<p>Refer to the <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio </a>chapter in the Developer's Guide for information on using this interface.</p>
+<p>Refer to the <a href="/native-client/devguide/coding/audio.html">Audio </a>chapter in the Developer's Guide for information on using this interface.</p>
 <p>A single sample frame on a stereo device means one value for the left channel and one value for the right channel.</p>
 <p>Buffer layout for a stereo int16 configuration:</p>
 <p><code>int16_t *buffer16;</code> <code>buffer16[0]</code> is the first left channel sample. <code>buffer16[1]</code> is the first right channel sample. <code>buffer16[2]</code> is the second left channel sample. <code>buffer16[3]</code> is the second right channel sample. <code>...</code> <code>buffer16[2 * (sample_frame_count - 1)]</code> is the last left channel sample. <code>buffer16[2 * (sample_frame_count - 1) + 1]</code> is the last right channel sample. Data will always be in the native endian format of the platform.</p>
diff --git a/native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_image_data.html b/native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_image_data.html
index a104b39..223d98c 100644
--- a/native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_image_data.html
+++ b/native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_image_data.html
@@ -150,7 +150,7 @@ Static Public Member Functions</h2><table class="memberdecls">
 <dl class="params"><dt><b>Parameters:</b></dt><dd>
 <table class="params">
 <tr><td class="paramdir">[in]</td><td class="paramname">instance</td><td>The instance with which this resource will be associated.</td></tr>
-<tr><td class="paramdir">[in]</td><td class="paramname">format</td><td>A PP_ImageDataFormat containing desired image format. PP_ImageDataFormat is an enumeration of the different types of image data formats. Refer to <a href="../pepperc/ppb__image__data_8h.html"><code>ppb_image_data.h</code></a> for further information.</td></tr>
+<tr><td class="paramdir">[in]</td><td class="paramname">format</td><td>A PP_ImageDataFormat containing desired image format. PP_ImageDataFormat is an enumeration of the different types of image data formats. Refer to <a href="../c/ppb__image__data_8h.html"><code>ppb_image_data.h</code></a> for further information.</td></tr>
 <tr><td class="paramdir">[in]</td><td class="paramname">size</td><td>A pointer to a <code><a class="el" href="classpp_1_1_size.html" title="A size of an object based on width and height.">Size</a></code> containing the image size.</td></tr>
 <tr><td class="paramdir">[in]</td><td class="paramname">init_to_zero</td><td>A bool used to determine transparency at creation. Set the <code>init_to_zero</code> flag if you want the bitmap initialized to transparent during the creation process. If this flag is not set, the current contents of the bitmap will be undefined, and the module should be sure to set all the pixels. </td></tr>
 </table>
diff --git a/native_client_sdk/doc_generated/pepper_stable/c/group___typedefs.html b/native_client_sdk/doc_generated/pepper_stable/c/group___typedefs.html
index ce370bc..0ecec50 100644
--- a/native_client_sdk/doc_generated/pepper_stable/c/group___typedefs.html
+++ b/native_client_sdk/doc_generated/pepper_stable/c/group___typedefs.html
@@ -215,7 +215,7 @@ Typedefs</h2><table class="memberdecls">
 </div>
 <div class="memdoc">
 <p>This function pointer type defines the signature for the <code>PPB_GetInterface</code> function. </p>
-<p>A generic <code>PPB_GetInterface</code> pointer is passed to <code>PPP_InitializedModule</code> when your module is loaded. You can use this pointer to request a pointer to a specific browser interface. Browser interface names are ASCII strings and are generally defined in the header file for the interface, such as <code>PPB_AUDIO_INTERFACE</code> found in <code>ppb.audio.h</code> or <code>PPB_GRAPHICS_2D_INTERFACE</code> in <code><a class="el" href="ppb__graphics__2d_8h.html" title="Defines the PPB_Graphics2D struct representing a 2D graphics context within the browser.">ppb_graphics_2d.h</a></code>. Click <a href="/native-client/{{pepperversion}}/pepperc/globals_defs" title="macros">here</a> for a complete list of interface names.</p>
+<p>A generic <code>PPB_GetInterface</code> pointer is passed to <code>PPP_InitializedModule</code> when your module is loaded. You can use this pointer to request a pointer to a specific browser interface. Browser interface names are ASCII strings and are generally defined in the header file for the interface, such as <code>PPB_AUDIO_INTERFACE</code> found in <code>ppb.audio.h</code> or <code>PPB_GRAPHICS_2D_INTERFACE</code> in <code><a class="el" href="ppb__graphics__2d_8h.html" title="Defines the PPB_Graphics2D struct representing a 2D graphics context within the browser.">ppb_graphics_2d.h</a></code>. Click <a href="globals_defs.html" title="macros">here</a> for a complete list of interface names.</p>
 <p>This value will be NULL if the interface is not supported on the browser. </p>
 </div>
 </div>
diff --git a/native_client_sdk/doc_generated/pepper_stable/c/struct_p_p_b___audio__1__1.html b/native_client_sdk/doc_generated/pepper_stable/c/struct_p_p_b___audio__1__1.html
index c3b9a2f..35a9491 100644
--- a/native_client_sdk/doc_generated/pepper_stable/c/struct_p_p_b___audio__1__1.html
+++ b/native_client_sdk/doc_generated/pepper_stable/c/struct_p_p_b___audio__1__1.html
@@ -18,7 +18,7 @@ Data Fields</h2><table class="memberdecls">
 </table>
 <hr /><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>The <code>PPB_Audio</code> interface contains pointers to several functions for handling audio resources. </p>
-<p>Refer to the <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio</a> chapter in the Developer's Guide for information on using this interface. Please see descriptions for each <code>PPB_Audio</code> and <code>PPB_AudioConfig</code> function for more details. A C example using <code>PPB_Audio</code> and <code>PPB_AudioConfig</code> follows.</p>
+<p>Refer to the <a href="/native-client/devguide/coding/audio.html">Audio</a> chapter in the Developer's Guide for information on using this interface. Please see descriptions for each <code>PPB_Audio</code> and <code>PPB_AudioConfig</code> function for more details. A C example using <code>PPB_Audio</code> and <code>PPB_AudioConfig</code> follows.</p>
 <p><b>Example: </b></p>
 <div class="fragment"><pre class="fragment"> <span class="keywordtype">void</span> audio_callback(<span class="keywordtype">void</span>* sample_buffer,
                      uint32_t buffer_size_in_bytes,
diff --git a/native_client_sdk/doc_generated/pepper_stable/c/struct_p_p_b___audio_config__1__1.html b/native_client_sdk/doc_generated/pepper_stable/c/struct_p_p_b___audio_config__1__1.html
index 26e40a5..e2cf1ad 100644
--- a/native_client_sdk/doc_generated/pepper_stable/c/struct_p_p_b___audio_config__1__1.html
+++ b/native_client_sdk/doc_generated/pepper_stable/c/struct_p_p_b___audio_config__1__1.html
@@ -20,7 +20,7 @@ Data Fields</h2><table class="memberdecls">
 <hr /><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>The <code>PPB_AudioConfig</code> interface contains pointers to several functions for establishing your audio configuration within the browser. </p>
 <p>This interface only supports 16-bit stereo output.</p>
-<p>Refer to the <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio </a> chapter in the Developer's Guide for information on using this interface. </p>
+<p>Refer to the <a href="/native-client/devguide/coding/audio.html">Audio </a> chapter in the Developer's Guide for information on using this interface. </p>
 </div><hr /><h2>Field Documentation</h2>
 <a class="anchor" id="a541f636cd6818dbf09ff3680701753ae"></a><!-- doxytag: member="PPB_AudioConfig::CreateStereo16Bit" ref="a541f636cd6818dbf09ff3680701753ae" args=")(PP_Instance instance, PP_AudioSampleRate sample_rate, uint32_t sample_frame_count)" -->
 <div class="memitem">
diff --git a/native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_audio.html b/native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_audio.html
index 108be9e..c1edd25 100644
--- a/native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_audio.html
+++ b/native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_audio.html
@@ -29,7 +29,7 @@ Public Member Functions</h2><table class="memberdecls">
 </table>
 <hr /><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>An audio resource. </p>
-<p>Refer to the <a href="/native-client/devguide/coding/audio">Audio</a> chapter in the Developer's Guide for information on using this interface. </p>
+<p>Refer to the <a href="/native-client/devguide/coding/audio.html">Audio</a> chapter in the Developer's Guide for information on using this interface. </p>
 </div><hr /><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="abcb6131f91a53e36f9626843d86e8109"></a><!-- doxytag: member="pp::Audio::Audio" ref="abcb6131f91a53e36f9626843d86e8109" args="()" -->
 <div class="memitem">
diff --git a/native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_audio_config.html b/native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_audio_config.html
index e2c0c74..ccde0c5 100644
--- a/native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_audio_config.html
+++ b/native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_audio_config.html
@@ -30,7 +30,7 @@ Static Public Member Functions</h2><table class="memberdecls">
 </table>
 <hr /><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>A 16 bit stereo <a class="el" href="classpp_1_1_audio_config.html" title="A 16 bit stereo AudioConfig resource.">AudioConfig</a> resource. </p>
-<p>Refer to the <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio </a>chapter in the Developer's Guide for information on using this interface.</p>
+<p>Refer to the <a href="/native-client/devguide/coding/audio.html">Audio </a>chapter in the Developer's Guide for information on using this interface.</p>
 <p>A single sample frame on a stereo device means one value for the left channel and one value for the right channel.</p>
 <p>Buffer layout for a stereo int16 configuration:</p>
 <p><code>int16_t *buffer16;</code> <code>buffer16[0]</code> is the first left channel sample. <code>buffer16[1]</code> is the first right channel sample. <code>buffer16[2]</code> is the second left channel sample. <code>buffer16[3]</code> is the second right channel sample. <code>...</code> <code>buffer16[2 * (sample_frame_count - 1)]</code> is the last left channel sample. <code>buffer16[2 * (sample_frame_count - 1) + 1]</code> is the last right channel sample. Data will always be in the native endian format of the platform.</p>
diff --git a/native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_image_data.html b/native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_image_data.html
index a104b39..223d98c 100644
--- a/native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_image_data.html
+++ b/native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_image_data.html
@@ -150,7 +150,7 @@ Static Public Member Functions</h2><table class="memberdecls">
 <dl class="params"><dt><b>Parameters:</b></dt><dd>
 <table class="params">
 <tr><td class="paramdir">[in]</td><td class="paramname">instance</td><td>The instance with which this resource will be associated.</td></tr>
-<tr><td class="paramdir">[in]</td><td class="paramname">format</td><td>A PP_ImageDataFormat containing desired image format. PP_ImageDataFormat is an enumeration of the different types of image data formats. Refer to <a href="../pepperc/ppb__image__data_8h.html"><code>ppb_image_data.h</code></a> for further information.</td></tr>
+<tr><td class="paramdir">[in]</td><td class="paramname">format</td><td>A PP_ImageDataFormat containing desired image format. PP_ImageDataFormat is an enumeration of the different types of image data formats. Refer to <a href="../c/ppb__image__data_8h.html"><code>ppb_image_data.h</code></a> for further information.</td></tr>
 <tr><td class="paramdir">[in]</td><td class="paramname">size</td><td>A pointer to a <code><a class="el" href="classpp_1_1_size.html" title="A size of an object based on width and height.">Size</a></code> containing the image size.</td></tr>
 <tr><td class="paramdir">[in]</td><td class="paramname">init_to_zero</td><td>A bool used to determine transparency at creation. Set the <code>init_to_zero</code> flag if you want the bitmap initialized to transparent during the creation process. If this flag is not set, the current contents of the bitmap will be undefined, and the module should be sure to set all the pixels. </td></tr>
 </table>
diff --git a/native_client_sdk/src/doc/Makefile b/native_client_sdk/src/doc/Makefile
index e7a3aaa..0c81812 100644
--- a/native_client_sdk/src/doc/Makefile
+++ b/native_client_sdk/src/doc/Makefile
@@ -207,6 +207,7 @@ devsite:
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/devsite."
 
 chromesite:
+	-rm $(CHROMESITE_BUILDDIR)/.buildinfo
 	doxygen/generate_docs.py $(CHROMESITE_BUILDDIR)
 	$(SPHINXBUILD) -b chromesite $(ALLSPHINXOPTS) $(CHROMESITE_BUILDDIR)
 	rm -rf $(CHROMESITE_BUILDDIR)/images
diff --git a/native_client_sdk/src/doc/doxygen/generate_docs.py b/native_client_sdk/src/doc/doxygen/generate_docs.py
index 6584131..8d731cc 100755
--- a/native_client_sdk/src/doc/doxygen/generate_docs.py
+++ b/native_client_sdk/src/doc/doxygen/generate_docs.py
@@ -102,6 +102,46 @@ def CheckoutPepperDocs(branch, doc_dirname):
   subprocess.check_call(cmd)
 
 
+def FixPepperDocLinks(doc_dirname):
+  # TODO(binji): We can remove this step when the correct links are in the
+  # stable branch.
+  Trace('Looking for links to fix in Pepper headers...')
+  for root, dirs, filenames in os.walk(doc_dirname):
+    # Don't recurse into .svn
+    if '.svn' in dirs:
+      dirs.remove('.svn')
+
+    for filename in filenames:
+      header_filename = os.path.join(root, filename)
+      Trace('  Checking file %r...' % header_filename)
+      replacements = {
+        '<a href="/native-client/{{pepperversion}}/devguide/coding/audio">':
+            '<a href="/native-client/devguide/coding/audio.html">',
+        '<a href="/native-client/devguide/coding/audio">':
+            '<a href="/native-client/devguide/coding/audio.html">',
+        '<a href="/native-client/{{pepperversion}}/pepperc/globals_defs"':
+            '<a href="globals_defs.html"',
+        '<a href="../pepperc/ppb__image__data_8h.html">':
+            '<a href="../c/ppb__image__data_8h.html">'}
+
+      with open(header_filename) as f:
+        lines = []
+        replaced = False
+        for line in f:
+          for find, replace in replacements.iteritems():
+            pos = line.find(find)
+            if pos != -1:
+              Trace('    Found %r...' % find)
+              replaced = True
+              line = line[:pos] + replace + line[pos + len(find):]
+          lines.append(line)
+
+      if replaced:
+        Trace('  Writing new file.')
+        with open(header_filename, 'w') as f:
+          f.writelines(lines)
+
+
 def GenerateCHeaders(pepper_version, doc_dirname):
   script = os.path.join(os.pardir, 'generators', 'generator.py')
   cwd = os.path.join(doc_dirname, 'api')
@@ -171,6 +211,7 @@ def GenerateDocs(root_dirname, channel, pepper_version, branch):
     doxyfile_dirname = tempfile.mkdtemp(prefix='%s_doxyfiles' % pepper_dirname)
 
     CheckoutPepperDocs(branch, svn_dirname)
+    FixPepperDocLinks(svn_dirname)
     GenerateCHeaders(pepper_version, svn_dirname)
 
     doxyfile_c = ''
diff --git a/ppapi/api/ppb.idl b/ppapi/api/ppb.idl
index 465b7e5..76d80b3 100644
--- a/ppapi/api/ppb.idl
+++ b/ppapi/api/ppb.idl
@@ -19,7 +19,7 @@
  * <code>ppb.audio.h</code> or
  * <code>PPB_GRAPHICS_2D_INTERFACE</code> in <code>ppb_graphics_2d.h</code>.
  * Click
- * <a href="/native-client/{{pepperversion}}/pepperc/globals_defs" 
+ * <a href="globals_defs.html"
  * title="macros">here</a> for a complete list of interface
  * names.
  *
diff --git a/ppapi/api/ppb_audio.idl b/ppapi/api/ppb_audio.idl
index 7a996ba..d79ca97 100644
--- a/ppapi/api/ppb_audio.idl
+++ b/ppapi/api/ppb_audio.idl
@@ -33,7 +33,7 @@ typedef void PPB_Audio_Callback([out] mem_t sample_buffer,
 /**
  * The <code>PPB_Audio</code> interface contains pointers to several functions
  * for handling audio resources. Refer to the
- * <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio</a>
+ * <a href="/native-client/devguide/coding/audio.html">Audio</a>
  * chapter in the Developer's Guide for information on using this interface.
  * Please see descriptions for each <code>PPB_Audio</code> and
  * <code>PPB_AudioConfig</code> function for more details. A C example using
diff --git a/ppapi/api/ppb_audio_config.idl b/ppapi/api/ppb_audio_config.idl
index 1d64b4f..fd4cef4 100644
--- a/ppapi/api/ppb_audio_config.idl
+++ b/ppapi/api/ppb_audio_config.idl
@@ -45,7 +45,7 @@ enum PP_AudioSampleRate {
  * This interface only supports 16-bit stereo output.
  *
  * Refer to the
- * <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio
+ * <a href="/native-client/devguide/coding/audio.html">Audio
  * </a> chapter in the Developer's Guide for information on using this
  * interface.
  */
diff --git a/ppapi/c/ppb.h b/ppapi/c/ppb.h
index 4c228b0..cb6e6b4 100644
--- a/ppapi/c/ppb.h
+++ b/ppapi/c/ppb.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* From ppb.idl modified Thu Mar  1 14:49:34 2012. */
+/* From ppb.idl modified Fri Jan 24 16:19:56 2014. */
 
 #ifndef PPAPI_C_PPB_H_
 #define PPAPI_C_PPB_H_
@@ -33,7 +33,7 @@
  * <code>ppb.audio.h</code> or
  * <code>PPB_GRAPHICS_2D_INTERFACE</code> in <code>ppb_graphics_2d.h</code>.
  * Click
- * <a href="/native-client/{{pepperversion}}/pepperc/globals_defs"
+ * <a href="globals_defs.html"
  * title="macros">here</a> for a complete list of interface
  * names.
  *
diff --git a/ppapi/c/ppb_audio.h b/ppapi/c/ppb_audio.h
index d41839a..edfb7f7 100644
--- a/ppapi/c/ppb_audio.h
+++ b/ppapi/c/ppb_audio.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* From ppb_audio.idl modified Thu Aug 01 13:19:46 2013. */
+/* From ppb_audio.idl modified Fri Jan 24 16:18:44 2014. */
 
 #ifndef PPAPI_C_PPB_AUDIO_H_
 #define PPAPI_C_PPB_AUDIO_H_
@@ -61,7 +61,7 @@ typedef void (*PPB_Audio_Callback_1_0)(void* sample_buffer,
 /**
  * The <code>PPB_Audio</code> interface contains pointers to several functions
  * for handling audio resources. Refer to the
- * <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio</a>
+ * <a href="/native-client/devguide/coding/audio.html">Audio</a>
  * chapter in the Developer's Guide for information on using this interface.
  * Please see descriptions for each <code>PPB_Audio</code> and
  * <code>PPB_AudioConfig</code> function for more details. A C example using
diff --git a/ppapi/c/ppb_audio_config.h b/ppapi/c/ppb_audio_config.h
index a1e2e4b..87f861b 100644
--- a/ppapi/c/ppb_audio_config.h
+++ b/ppapi/c/ppb_audio_config.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* From ppb_audio_config.idl modified Thu Mar 28 10:07:11 2013. */
+/* From ppb_audio_config.idl modified Fri Jan 24 16:19:35 2014. */
 
 #ifndef PPAPI_C_PPB_AUDIO_CONFIG_H_
 #define PPAPI_C_PPB_AUDIO_CONFIG_H_
@@ -66,7 +66,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_AudioSampleRate, 4);
  * This interface only supports 16-bit stereo output.
  *
  * Refer to the
- * <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio
+ * <a href="/native-client/devguide/coding/audio.html">Audio
  * </a> chapter in the Developer's Guide for information on using this
  * interface.
  */
diff --git a/ppapi/cpp/audio.h b/ppapi/cpp/audio.h
index 29a19f3..7f37cb8 100644
--- a/ppapi/cpp/audio.h
+++ b/ppapi/cpp/audio.h
@@ -19,7 +19,7 @@ namespace pp {
 class InstanceHandle;
 
 /// An audio resource. Refer to the
-/// <a href="/native-client/devguide/coding/audio">Audio</a>
+/// <a href="/native-client/devguide/coding/audio.html">Audio</a>
 /// chapter in the Developer's Guide for information on using this interface.
 class Audio : public Resource {
  public:
diff --git a/ppapi/cpp/audio_config.h b/ppapi/cpp/audio_config.h
index e7ade54..7e12e9d 100644
--- a/ppapi/cpp/audio_config.h
+++ b/ppapi/cpp/audio_config.h
@@ -18,7 +18,7 @@ namespace pp {
 class InstanceHandle;
 
 /// A 16 bit stereo AudioConfig resource. Refer to the
-/// <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio
+/// <a href="/native-client/devguide/coding/audio.html">Audio
 /// </a>chapter in the Developer's Guide for information on using this
 /// interface.
 ///
diff --git a/ppapi/cpp/image_data.h b/ppapi/cpp/image_data.h
index d94ea82..e9366ce 100644
--- a/ppapi/cpp/image_data.h
+++ b/ppapi/cpp/image_data.h
@@ -46,7 +46,7 @@ class ImageData : public Resource {
   /// @param[in] format A PP_ImageDataFormat containing desired image format.
   /// PP_ImageDataFormat is an enumeration of the different types of
   /// image data formats. Refer to
-  /// <a href="../pepperc/ppb__image__data_8h.html">
+  /// <a href="../c/ppb__image__data_8h.html">
   /// <code>ppb_image_data.h</code></a> for further information.
   ///
   /// @param[in] size A pointer to a <code>Size</code> containing the image
diff --git a/ppapi/thunk/ppb_uma_private_thunk.cc b/ppapi/thunk/ppb_uma_private_thunk.cc
index 4a0d9d3..1171d19 100644
--- a/ppapi/thunk/ppb_uma_private_thunk.cc
+++ b/ppapi/thunk/ppb_uma_private_thunk.cc
@@ -1,17 +1,15 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From private/ppb_uma_private.idl modified Mon Nov 18 14:39:43 2013.
+// From private/ppb_uma_private.idl modified Fri Jan 24 13:23:21 2014.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_uma_private.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_uma_singleton_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace thunk {
@@ -76,7 +74,7 @@ const PPB_UMA_Private_0_2 g_ppb_uma_private_thunk_0_2 = {
 
 }  // namespace
 
-const PPB_UMA_Private_0_2* GetPPB_UMA_Private_0_2_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_UMA_Private_0_2* GetPPB_UMA_Private_0_2_Thunk() {
   return &g_ppb_uma_private_thunk_0_2;
 }