diff -r c403d9dd5e0e -r 10bd406e1c51 asterisk/asterisk.txt
--- a/asterisk/asterisk.txt	Sun May 29 17:14:31 2011 +0200
+++ b/asterisk/asterisk.txt	Sun Jun 05 11:43:33 2011 +0200
@@ -79,10 +79,19 @@
 webenabled         = no
 bindaddr           = 127.0.0.1
 port               = 5038
-sslenable          = no
-sslbindaddr        = 127.0.0.1
-sslbindport        = 5039
-sslcert            = @l_prefix@/etc/asterisk/asterisk.pem
+
+; You can open a TLS connection to this socket with:
+;
+;	openssl s_client -connect my_host:5039
+;
+tlsenable          = no
+tlsbindaddr        = 127.0.0.1
+tlsbindport        = 5039
+tlscertfile        = @l_prefix@/etc/asterisk/asterisk.pem
+; if tlsprivatekey is not specified search tlscertfile for key
+;tlsprivatekey      = @l_prefix@/etc/asterisk/asterkey.pem
+;tlscipher         = ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
+
 displayconnects    = yes
 allowmultiplelogin = yes
 timestampevents    = yes
@@ -104,10 +113,10 @@
 enabled            = no
 bindaddr           = 127.0.0.1
 bindport           = 8088
-sslenable          = no
-sslbindport        = 8089
-sslbindaddr        = 127.0.0.1
-sslcert            = @l_prefix@/etc/asterisk/asterisk.pem
+tlsenable          = no
+tlsbindport        = 8089
+tlsbindaddr        = 127.0.0.1
+tlscertfile        = @l_prefix@/etc/asterisk/asterisk.pem
 enablestatic       = yes
 prefix             = asterisk
 redirect           = / /asterisk/static/docs/index.html
@@ -222,6 +231,30 @@
 mailbox            = 12@internal
 
 </file>
+<file name="iax.conf">
+;;
+;;  iax.conf -- Asterisk IAX configuration
+;;
+
+;; This configuration is reread at reload
+;; or with the CLI command
+;; 	reload chan_iax2.so
+;;
+;; General settings, like port number to bind to, and
+;; an option address (the default is to bind to all
+;; local addresses).
+;;
+;[general]
+;bindport=4569       ; bindport and bindaddr may be specified
+;                    ; NOTE: bindport must be specified BEFORE
+;                    ; bindaddr or may be specified on a specific
+;                    ; bindaddr if followed by colon and port
+;                    ; (e.g. bindaddr=192.168.0.1:4569)
+;bindaddr=127.0.0.1  ; more than once to bind to multiple
+;                    ; addresses, but the first will be the 
+;                    ; default
+
+</file>
 <file name="rtp.conf">
 ;;
 ;;  rtp.conf -- Asterisk RTP configuration
@@ -755,6 +788,59 @@
 stutter            = 425+400
 
 </file>
+<file name="ccss.conf">
+;;
+;;  ccss.conf -- Asterisk Call Completion Supplementary Services configuration
+;;
+
+; Warning! The CCSS implementation brings several changes to the
+; channel components of Asterisk. To use CCSS, specify the number
+; of maximum requests in this file but do not forget to specify
+; the new CCSS related channel specific options in other config
+; files as well! Some are 'cc_offer_timer', 'ccbs_available_timer',
+; 'cc_agent_policy=never' and many more (in other files.)
+
+[general]
+; There is only a single option that may be defined in this file.
+; The cc_max_requests option is a global limit on the number of
+; CC requests that may be in the Asterisk system at any time.
+;
+cc_max_requests = 20
+
+</file>
+<file name="res_fax.conf">
+;;
+;;  res_fax.conf -- Asterisk fax resource configuration
+;;
+
+[general]
+; Maximum Transmission Rate
+; Possible values are { 2400 | 4800 | 7200 | 9600 | 12000 | 14400 }
+; Set this value to the maximum desired transfer rate.  Default: 14400
+maxrate=14400
+
+; Minimum Transmission Rate
+; Possible values are { 2400 | 4800 | 7200 | 9600 | 12000 | 14400 }
+; Set this value to the minimum desired transfer rate.  Default: 2400
+minrate=2400
+
+; Send Progress/Status events to manager session
+; Manager events with 'call' class permissions will receive events indicating the
+; steps to initiate a fax session.  Fax completion events are always sent to manager
+; sessions with 'call' class permissions, regardless of the value of this option.
+; Default: no
+statusevents=yes
+
+; modem capabilities
+; Possible values are { v17 | v27 | v29 }
+; Set this value to modify the default modem options.  Default: v17,v27,v29
+modems=v17,v27,v29
+
+; Enable/disable T.30 ECM (error correction mode) by default.
+; Default: Enabled
+ecm=yes
+
+</file>
 <file name="res_odbc.conf">
 ;;
 ;;  res_odbc.conf -- Asterisk ODBC resource configuration