[asterisk-commits] russell: branch 1.6.0 r133982 - in /branches/1.6.0: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: russell
Date: Sat Jul 26 10:34:42 2008
New Revision: 133982

URL: http://svn.digium.com/view/asterisk?view=rev&rev=133982
Log:
Include the licensing page in 1.6.0 as well.  Now, this page exists in 1.4, trunk,
and 1.6.0.

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/doxyref.h
    branches/1.6.0/main/asterisk.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/include/asterisk/doxyref.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/doxyref.h?view=diff&rev=133982&r1=133981&r2=133982
==============================================================================
--- branches/1.6.0/include/asterisk/doxyref.h (original)
+++ branches/1.6.0/include/asterisk/doxyref.h Sat Jul 26 10:34:42 2008
@@ -561,3 +561,46 @@
  * \arg See also:
  * http://www.sqlite.org
  */
+
+/*!
+ * \page Licensing Asterisk Licensing Information
+ *
+ * \section license Asterisk License
+ * \verbinclude LICENSE
+ *
+ * \section otherlicenses Licensing of 3rd Party Code
+ *
+ * This section contains a (not yet complete) list of libraries that are used
+ * by various parts of Asterisk, including related licensing information.
+ *
+ * \subsection alsa_lib ALSA Library
+ * \arg <b>Library</b>: libasound
+ * \arg <b>Website</b>: http://www.alsa-project.org
+ * \arg <b>Used by</b>: chan_alsa
+ * \arg <b>License</b>: LGPL
+ *
+ * \subsection openssl_lib OpenSSL
+ * \arg <b>Library</b>: libcrypto, libssl
+ * \arg <b>Website</b>: http://www.openssl.org
+ * \arg <b>Used by</b>: Asterisk core (TLS for manager and HTTP), res_crypto
+ * \arg <b>License</b>: Apache 2.0
+ * \arg <b>Note</b>:    An exception has been granted to allow linking of 
+ *                      OpenSSL with Asterisk.
+ *
+ * \subsection curl_lib Curl
+ * \arg <b>Library</b>: libcurl
+ * \arg <b>Website</b>: http://curl.haxx.se
+ * \arg <b>Used by</b>: func_curl, res_config_curl, res_curl
+ * \arg <b>License</b>: BSD
+ *
+ * \subsection portaudio_lib PortAudio
+ * \arg <b>Library</b>: libportaudio
+ * \arg <b>Website</b>: http://www.portaudio.com
+ * \arg <b>Used by</b>: chan_console
+ * \arg <b>License</b>: BSD
+ * \arg <b>Note</b>:    Even though PortAudio is licensed under a BSD style
+ *                      license, PortAudio will make use of some audio interface,
+ *                      depending on how it was built.  That audio interface may
+ *                      introduce additional licensing restrictions.  On Linux,
+ *                      this would most commonly be ALSA: \ref alsa_lib.
+ */

Modified: branches/1.6.0/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/asterisk.c?view=diff&rev=133982&r1=133981&r2=133982
==============================================================================
--- branches/1.6.0/main/asterisk.c (original)
+++ branches/1.6.0/main/asterisk.c Sat Jul 26 10:34:42 2008
@@ -25,6 +25,7 @@
  * This is the main developer documentation for Asterisk. It is 
  * generated by running "make progdocs".
  * \par Additional documentation
+ * \arg \ref Licensing
  * \arg \ref DevDoc 
  * \arg \ref ConfigFiles
  *
@@ -36,18 +37,11 @@
  * \author Mark Spencer <markster at digium.com>
  * Also see \ref AstCREDITS
  *
- * \section license License
  * See http://www.asterisk.org for more information about
  * the Asterisk project. Please do not directly contact
  * any of the maintainers of this project for assistance;
  * the project provides a web site, mailing lists and IRC
  * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- *
- * \verbinclude LICENSE
  *
  */