[asterisk-commits] kmoore: branch kmoore/parking_unload r396876 - in /team/kmoore/parking_unload...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Fri Aug 16 15:11:46 2013
New Revision: 396876

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=396876
Log:
Bring up to current

Modified:
    team/kmoore/parking_unload/   (props changed)
    team/kmoore/parking_unload/include/asterisk/bridge_channel_internal.h
    team/kmoore/parking_unload/include/asterisk/doxygen/architecture.h

Propchange: team/kmoore/parking_unload/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 16 15:11:46 2013
@@ -1,1 +1,1 @@
-/trunk:1-396858
+/trunk:1-396875

Modified: team/kmoore/parking_unload/include/asterisk/bridge_channel_internal.h
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/parking_unload/include/asterisk/bridge_channel_internal.h?view=diff&rev=396876&r1=396875&r2=396876
==============================================================================
--- team/kmoore/parking_unload/include/asterisk/bridge_channel_internal.h (original)
+++ team/kmoore/parking_unload/include/asterisk/bridge_channel_internal.h Fri Aug 16 15:11:46 2013
@@ -26,7 +26,7 @@
  * \author Matt Jordan <mjordan at digium.com>
  *
  * A private API to manipulate channels in a bridge. These can be called on a channel in
- * a bridge by \ref bridging.c. These functions should not be called elsewhere, including
+ * a bridge by \ref bridge.c. These functions should not be called elsewhere, including
  * by other members of the Bridging API.
  *
  * See Also:

Modified: team/kmoore/parking_unload/include/asterisk/doxygen/architecture.h
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/parking_unload/include/asterisk/doxygen/architecture.h?view=diff&rev=396876&r1=396875&r2=396876
==============================================================================
--- team/kmoore/parking_unload/include/asterisk/doxygen/architecture.h (original)
+++ team/kmoore/parking_unload/include/asterisk/doxygen/architecture.h Fri Aug 16 15:11:46 2013
@@ -265,7 +265,7 @@
 \arg <code>include/asterisk/bridge_after.h</code>
 
 For additional implementation details regarding the core bridging API, see
-<code>main/bridging.c</code> and <code>main/bridging_channel.c</code>.
+<code>main/bridge.c</code> and <code>main/bridge_channel.c</code>.
 
 \subsection ArchInterfaceCDR Call Detail Record (CDR) Handlers