Skip to content
Snippets Groups Projects
Commit 70d22f2a authored by Automerge script's avatar Automerge script
Browse files

Merged revisions 379211 via svnmerge from

file:///srv/subversion/repos/asterisk/trunk

................
  r379211 | mjordan | 2013-01-16 09:33:05 -0600 (Wed, 16 Jan 2013) | 21 lines
  
  Multiple revisions 379209-379210
  
  ........
    r379209 | mjordan | 2013-01-16 09:27:44 -0600 (Wed, 16 Jan 2013) | 8 lines
    
    Add module tags to documentation for res_jabber/res_xmpp
    
    Since res_jabber/res_xmpp provide the same APIs (app/func/manager/etc.),
    the XML documentation for each needs to call out which module is providing
    the documentation. The module attribute has been added to the various XML
    fragments for this purpose.
  ........
    r379210 | mjordan | 2013-01-16 09:30:20 -0600 (Wed, 16 Jan 2013) | 4 lines
    
    Update the dtd to actually *support* the module attribute in all elements
    
    Mea culpa.
  ........
  
  Merged revisions 379209-379210 from http://svn.asterisk.org/svn/asterisk/branches/11
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379218 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 4986651f
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment