Jonathan Rose 2882a9acff Redocuments sip types peer, user, friend in sip.conf.sample ...

There was faulty information in the sample config describing user as a synonym for friend
so it has been changed to better elaborate on the differences between the three entity
types.

(closes issue ASTERISK-15537)
Reported by: yarique
........

Merged revisions 352511 from http://svn.asterisk.org/svn/asterisk/branches/1.8


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

2012-01-25 16:41:29 +00:00

..

adsi.conf.sample

…

agents.conf.sample

…

ais.conf.sample

…

alarmreceiver.conf.sample

…

alsa.conf.sample

…

amd.conf.sample

…

app_mysql.conf.sample

…

asterisk.adsi

…

asterisk.conf.sample

Add ASTSBINDIR to the list of configurable paths

2011-12-07 20:12:53 +00:00

calendar.conf.sample

Add setvar option to calendaring

2011-03-04 23:22:39 +00:00

ccss.conf.sample

Add Device State Information CCSS for Generic Devices.

2011-04-14 18:22:35 +00:00

cdr_adaptive_odbc.conf.sample

Support negative filters.

2010-12-31 09:29:10 +00:00

cdr_custom.conf.sample

Add High Resolution Times to CDRs for Asterisk

2010-06-08 23:48:17 +00:00

cdr_manager.conf.sample

…

cdr_mysql.conf.sample

Merged revisions 311930 via svnmerge from

2011-03-31 06:44:08 +00:00

cdr_odbc.conf.sample

Add High Resolution Times to CDRs for Asterisk

2010-06-08 23:48:17 +00:00

cdr_pgsql.conf.sample

Merged revisions 291038 via svnmerge from

2010-10-11 03:20:17 +00:00

cdr_sqlite3_custom.conf.sample

Add High Resolution Times to CDRs for Asterisk

2010-06-08 23:48:17 +00:00

cdr_syslog.conf.sample

Add High Resolution Times to CDRs for Asterisk

2010-06-08 23:48:17 +00:00

cdr_tds.conf.sample

Add High Resolution Times to CDRs for Asterisk

2010-06-08 23:48:17 +00:00

cdr.conf.sample

Merged revisions 281325 via svnmerge from

2010-08-09 12:52:04 +00:00

cel_custom.conf.sample

Add missing CEL logging fields to various CEL backends.

2012-01-13 17:29:34 +00:00

cel_odbc.conf.sample

Correct eventtype names in cel_odbc and cel_pgsql sample files

2012-01-13 21:51:51 +00:00

cel_pgsql.conf.sample

Correct eventtype names in cel_odbc and cel_pgsql sample files

2012-01-13 21:51:51 +00:00

cel_sqlite3_custom.conf.sample

Add missing CEL logging fields to various CEL backends.

2012-01-13 17:29:34 +00:00

cel_tds.conf.sample

…

cel.conf.sample

Add missing CEL logging fields to various CEL backends.

2012-01-13 17:29:34 +00:00

chan_dahdi.conf.sample

Reverting -r347953 for ASTERISK-14122

2011-12-12 18:13:22 +00:00

chan_mobile.conf.sample

…

chan_ooh323.conf.sample

Reverting -r347953 for ASTERISK-14122

2011-12-12 18:13:22 +00:00

cli_aliases.conf.sample

…

cli_permissions.conf.sample

…

cli.conf.sample

…

codecs.conf.sample

Adds pass-through support for codec CELT.

2011-07-07 19:39:17 +00:00

confbridge.conf.sample

The default conf-usermenu says that '8' can be used to leave the conference, so

2011-07-28 13:03:58 +00:00

console.conf.sample

…

dbsep.conf.sample

Cleanup references to sipusers and sipfriends dynamic realtime families

2011-11-01 19:48:26 +00:00

dnsmgr.conf.sample

…

dsp.conf.sample

…

dundi.conf.sample

Replacing doc/* and asterisk.pdf with wiki links

2011-02-02 19:30:49 +00:00

enum.conf.sample

…

extconfig.conf.sample

Several fixes to the chan_sip dynamic realtime peer/user lookup

2011-11-01 20:58:18 +00:00

extensions_minivm.conf.sample

…

extensions.ael.sample

…

extensions.conf.sample

Reverting -r347953 for ASTERISK-14122

2011-12-12 18:13:22 +00:00

extensions.lua.sample

Reverting -r347953 for ASTERISK-14122

2011-12-12 18:13:22 +00:00

features.conf.sample

Fix accidental use of tabs instead of spaces from previous features.conf.sample change

2011-12-14 20:35:16 +00:00

festival.conf.sample

…

followme.conf.sample

…

func_odbc.conf.sample

…

gtalk.conf.sample

New CLI command 'gtalk show settings'.

2010-11-02 15:14:12 +00:00

h323.conf.sample

Replacing doc/* and asterisk.pdf with wiki links

2011-02-02 19:30:49 +00:00

http.conf.sample

Merged revisions 314628 via svnmerge from

2011-04-21 18:32:50 +00:00

iax.conf.sample

Reverting -r347953 for ASTERISK-14122

2011-12-12 18:13:22 +00:00

iaxprov.conf.sample

Replacing doc/* and asterisk.pdf with wiki links

2011-02-02 19:30:49 +00:00

indications.conf.sample

Merged revisions 329709 via svnmerge from

2011-07-27 18:11:07 +00:00

jabber.conf.sample

Support routing text messages outside of a call.

2011-06-01 21:31:40 +00:00

jingle.conf.sample

…

logger.conf.sample

Generate Security events in chan_sip using new Security Events Framework

2011-09-22 15:35:50 +00:00

manager.conf.sample

Merged revisions 332817 via svnmerge from

2011-08-22 18:40:33 +00:00

meetme.conf.sample

…

mgcp.conf.sample

Replacing doc/* and asterisk.pdf with wiki links

2011-02-02 19:30:49 +00:00

minivm.conf.sample

…

misdn.conf.sample

…

modules.conf.sample

…

musiconhold.conf.sample

Merged revisions 292050 via svnmerge from

2010-10-16 11:51:54 +00:00

muted.conf.sample

…

osp.conf.sample

Added support for indirect work mode.

2010-07-12 04:16:18 +00:00

oss.conf.sample

…

phone.conf.sample

…

phoneprov.conf.sample

res_phoneprov add snom 300, 320, 360, 370, 820, 821, 870 support

2011-02-03 16:13:40 +00:00

queuerules.conf.sample

Merged revisions 324241 via svnmerge from

2011-06-20 18:13:02 +00:00

queues.conf.sample

Update queues.conf.sample documentation.

2011-11-30 19:37:02 +00:00

res_config_mysql.conf.sample

Cleanup references to sipusers and sipfriends dynamic realtime families

2011-11-01 19:48:26 +00:00

res_config_sqlite.conf.sample

…

res_curl.conf.sample

Merged revisions 295361 via svnmerge from

2010-11-17 14:22:42 +00:00

res_fax.conf.sample

Merged revisions 289300 via svnmerge from

2010-09-29 17:54:49 +00:00

res_ldap.conf.sample

Cleanup references to sipusers and sipfriends dynamic realtime families

2011-11-01 19:48:26 +00:00

res_odbc.conf.sample

Merge the realtime failover branch

2010-07-23 16:19:21 +00:00

res_pgsql.conf.sample

…

res_pktccops.conf.sample

Merged revisions 337774 via svnmerge from

2011-09-23 00:45:35 +00:00

res_snmp.conf.sample

Replacing doc/* with wiki links

2011-02-02 18:59:29 +00:00

res_stun_monitor.conf.sample

Re-resolve the STUN address if a STUN poll fails for res_stun_monitor.

2011-12-01 21:14:55 +00:00

rpt.conf.sample

…

rtp.conf.sample

Adds pjmedia probation concepts to res_rtp_asterisk's learning mode.

2012-01-17 17:08:33 +00:00

say.conf.sample

Merged revisions 284318 via svnmerge from

2010-08-31 19:01:12 +00:00

sip_notify.conf.sample

Merged revisions 322189 via svnmerge from

2011-06-07 18:01:28 +00:00

sip.conf.sample

Redocuments sip types peer, user, friend in sip.conf.sample

2012-01-25 16:41:29 +00:00

skinny.conf.sample

Merged revisions 314628 via svnmerge from

2011-04-21 18:32:50 +00:00

sla.conf.sample

Replacing doc/* and asterisk.pdf with wiki links

2011-02-02 19:30:49 +00:00

smdi.conf.sample

…

telcordia-1.adsi

…

udptl.conf.sample

…

unistim.conf.sample

Replacing doc/* and asterisk.pdf with wiki links

2011-02-02 19:30:49 +00:00

usbradio.conf.sample

…

users.conf.sample

Add 'description' field for CLI and Manager output

2011-04-13 15:49:33 +00:00

voicemail.conf.sample

Merged revisions 306999 via svnmerge from

2011-08-09 15:50:07 +00:00

vpb.conf.sample

Reverting -r347953 for ASTERISK-14122

2011-12-12 18:13:22 +00:00