[svn-commits] branch russell/menuselect_buildoptions r34493 - in /team/russell/menuselect_b...

[svn-commits at lists.digium.com]

Author: russell
Date: Fri Jun 16 11:19:50 2006
New Revision: 34493

URL: http://svn.digium.com/view/asterisk?rev=34493&view=rev
Log:
Merged revisions 34491-34492 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r34491 | file | 2006-06-16 12:16:21 -0400 (Fri, 16 Jun 2006) | 2 lines

Update the RADIUS CDR module documentation (issue #7377 reported by phsultan)

........
r34492 | russell | 2006-06-16 12:17:43 -0400 (Fri, 16 Jun 2006) | 4 lines

add support for setting the CFLAGS for voicemail storage options in menuselect

Thanks to kpfleming for the Makefile magic :)

........

Modified:
    team/russell/menuselect_buildoptions/   (props changed)
    team/russell/menuselect_buildoptions/doc/radius.txt

Propchange: team/russell/menuselect_buildoptions/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun 16 11:19:50 2006
@@ -1,1 +1,1 @@
-/trunk:1-34487
+/trunk:1-34492

Modified: team/russell/menuselect_buildoptions/doc/radius.txt
URL: http://svn.digium.com/view/asterisk/team/russell/menuselect_buildoptions/doc/radius.txt?rev=34493&r1=34492&r2=34493&view=diff
==============================================================================
--- team/russell/menuselect_buildoptions/doc/radius.txt (original)
+++ team/russell/menuselect_buildoptions/doc/radius.txt Fri Jun 16 11:19:50 2006
@@ -81,15 +81,16 @@
 		File "dictionary"
 			
 		Asterisk uses some attributes that are not included in the 
-		dictionary of radiusclient library, therefore it is necesarry to add 
-		them. A file called dictionary.asterisk was created to list all new 
-		attributes used by Asterisk. Add into file
+		dictionary of radiusclient library, therefore it is necessary to add 
+		them. A file called dictionary.digium (kept in the contrib dir)
+ 		was created to list all new attributes used by Asterisk. 
+		Add to the end of the main dictionary file
 		/usr/local/etc/radiusclient-ng/dictionary
 		the line:
 
-			$INCLUDE /path/to/dictionary.asterisk
-
- 2.FreeRADIUS Server
+			$INCLUDE /path/to/dictionary.digium
+
+ 2.FreeRADIUS Server (Version 1.1.1)
  	2.a Installation
 			
 		Download sources tarball from:
@@ -135,9 +136,13 @@
 
 		File "dictionary"
 			
+		Note : as of version 1.1.2, the dictionary.digium file ships with FreeRADIUS. 
+		The following procedure brings the dictionary.digium file to previous versions 
+		of FreeRADIUS.
+		
 		File /usr/local/etc/raddb/dictionary contains the dictionary of 
 		FreeRADIUS server. You have to add the same dictionary file 
-		(dictionary.asterisk), which you added to the dictionary of radiusclient-ng
+		(dictionary.digium), which you added to the dictionary of radiusclient-ng
 		library. You can include it into the main file, adding the following line at the
 		end of file '/usr/local/etc/raddb/dictionary':