From: Russell Bryant <russell@russellbryant.com>
Date: Sat, 26 Jul 2008 15:31:21 +0000 (+0000)
Subject: Add the licensing section to the docs in 1.4, as well, so that we can work on
X-Git-Tag: 1.4.22-rc1~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=46b65b2cc07b0ba851b4d59ce5caff711fe7190a;p=thirdparty%2Fasterisk.git

Add the licensing section to the docs in 1.4, as well, so that we can work on
having an accurate list for each version of Asterisk that is supported


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@133980 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/doxyref.h b/include/asterisk/doxyref.h
index 74b7a5347d..2f786e20bc 100644
--- a/include/asterisk/doxyref.h
+++ b/include/asterisk/doxyref.h
@@ -486,3 +486,34 @@ DUNDi is not itself a Voice-over IP signaling or media protocol. Instead, it pub
  *  \verbinclude ajam.txt
  */
 
+/*!
+ * \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
+ * \arg <b>License</b>: BSD
+ */
diff --git a/main/asterisk.c b/main/asterisk.c
index a581508e53..cee50d6770 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -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,19 +37,11 @@
  * \author Mark Spencer <markster@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
- *
  */
 
 /*! \file