diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-18 20:42:51 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-18 20:42:51 +0000 |
commit | 5ef9a2e57358be099657dd572fcd0d31c134f654 (patch) | |
tree | c2ec987f7f8a54654b643cf4c667b7d3e634da8e /doc | |
parent | abb1e7f3b66c3f1e06a0200db5a6d01a6d10f41b (diff) |
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.4.21-rc2@212958 f38db490-d61c-443f-a65b-d21fe96a405bv1.4.21-rc2
Diffstat (limited to 'doc')
-rw-r--r-- | doc/00README.1st | 2 | ||||
-rw-r--r-- | doc/musiconhold-fpm.txt | 8 | ||||
-rw-r--r-- | doc/musiconhold-opsound.txt | 7 |
3 files changed, 8 insertions, 9 deletions
diff --git a/doc/00README.1st b/doc/00README.1st index ef4b326a7..baddeabd1 100644 --- a/doc/00README.1st +++ b/doc/00README.1st @@ -35,7 +35,7 @@ ices.txt Integrating ICEcast streaming in Asterisk jitterbuffer.txt About the IAX2 jitterbuffer implementation math.txt About the math() application mp3.txt About MP3 support in Asterisk -musiconhold-fpm.txt Free Music On Hold music +musiconhold-opsound.txt Free Music On Hold music mysql.txt About MYSQL support in Asterisk odbcstorage.txt Voicemail storage of messages in UnixODBC privacy.txt Privacy enhancements in Asterisk diff --git a/doc/musiconhold-fpm.txt b/doc/musiconhold-fpm.txt deleted file mode 100644 index ad11c4815..000000000 --- a/doc/musiconhold-fpm.txt +++ /dev/null @@ -1,8 +0,0 @@ -About Hold Music -================ -Digium has licensed the music included with -the Asterisk distribution From FreePlayMusic -for use and distribution with Asterisk. It -is licensed ONLY for use as hold music within -an Asterisk based PBX. - diff --git a/doc/musiconhold-opsound.txt b/doc/musiconhold-opsound.txt new file mode 100644 index 000000000..08c79f919 --- /dev/null +++ b/doc/musiconhold-opsound.txt @@ -0,0 +1,7 @@ +About Hold Music +================ +These files were obtained from http://opsound.org, where the authors placed them +under the Creative Commons Attribution-Share Alike 2.5 license, a copy of which +may be found at http://creativecommons.org. + + |