[asterisk-commits] lmadsen: trunk r300434 - in /trunk: ./ configs/users.conf.sample

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Tue Jan  4 15:01:30 2011
New Revision: 300434

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=300434
Log:
Merged revisions 300433 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r300433 | lmadsen | 2011-01-04 15:00:55 -0600 (Tue, 04 Jan 2011) | 15 lines
  
  Merged revisions 300431 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r300431 | lmadsen | 2011-01-04 15:00:29 -0600 (Tue, 04 Jan 2011) | 7 lines
    
    Add some documentation to users.conf.sample.
    
    (closes issue #18531)
    Reported by: lathama
    Patches: 
          users.conf.sample2.diff uploaded by lathama (license 1028)
    Tested by: lathama
  ........
................

Modified:
    trunk/   (props changed)
    trunk/configs/users.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configs/users.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/users.conf.sample?view=diff&rev=300434&r1=300433&r2=300434
==============================================================================
--- trunk/configs/users.conf.sample (original)
+++ trunk/configs/users.conf.sample Tue Jan  4 15:01:30 2011
@@ -51,6 +51,27 @@
 ;managerread = system,call,log,verbose,command,agent,user,config
 ;managerwrite = system,call,log,verbose,command,agent,user,config
 ;
+;
+; MAC Address for res_phoneprov
+;
+;macaddress = 112233445566
+;
+; Auto provision the phone with res_phoneprov
+;
+;autoprov = yes
+;
+; Line Keys for hardphone
+;
+;LINEKEYS = 1
+;
+; Line number for hardphone
+;
+;linenumber = 1
+;
+; Local Caller ID number used with res_phoneprov and Asterisk GUI
+;
+;cid_number = 6000
+;
 ; Remaining options are not specific to users.conf entries but are general.
 ;
 callwaiting = yes
@@ -62,7 +83,7 @@
 callreturn = yes
 callgroup = 1
 pickupgroup = 1
-
+;nat = no
 
 ;[6000]
 ;fullname = Joe User
@@ -83,3 +104,9 @@
 ; alternateexts entry.
 ;
 ;alternateexts = 7057,3249
+;macaddress = 112233445566
+;autoprov = yes
+;LINEKEYS = 1
+;linenumber = 1
+;cid_number = 6000
+