Minor changes as per Christians most-recent review of the docs.

ppapi/cpp/audio.h

 // 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.
 
 #ifndef PPAPI_CPP_AUDIO_H_
 #define PPAPI_CPP_AUDIO_H_
 
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/ppb_audio.h"
 #include "ppapi/cpp/audio_config.h"
 #include "ppapi/cpp/resource.h"
 
 /// @file
 /// This file defines the API to create realtime stereo audio streaming
 /// capabilities.
 
 namespace pp {
 
 class InstanceHandle;
 
 /// An audio resource. Refer to the
+<<<<<<< .mine
+/// <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio</a>
+/// chapter in the Developer's Guide for information on using this interface.
+=======
 /// <a href="/native-client/devguide/coding/audio">Audio</a>
 /// chapter in the Developer's Guide for information on using this interface.
+>>>>>>> .r122520
 class Audio : public Resource {
  public:
 
   /// An empty constructor for an Audio resource.
   Audio() {}
 
   /// A constructor that creates an Audio resource. No sound will be heard
   /// until StartPlayback() is called. The callback is called with the buffer
   /// address and given user data whenever the buffer needs to be filled.
   /// From within the callback, you should not call <code>PPB_Audio</code>
@@ skipping 44 matching lines @@
   bool StopPlayback();
 
  private:
   AudioConfig config_;
 };
 
 }  // namespace pp
 
 #endif  // PPAPI_CPP_AUDIO_H_