Merged revisions 202840-202841 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r202840 | seanbright | 2009-06-23 19:53:45 -0400 (Tue, 23 Jun 2009) | 1 line
  
  Remove some trailing whitespace before making content changes.
........
  r202841 | seanbright | 2009-06-23 19:57:07 -0400 (Tue, 23 Jun 2009) | 1 line
  
  Change some section names in the CDR tex documentation.
........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@202842 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 35 insertions, 31 deletions

diff --git a/doc/tex/billing.tex b/doc/tex/billing.tex
index 9fae40be8..5c7f68a60 100644
--- a/doc/tex/billing.tex
+++ b/doc/tex/billing.tex
@@ -15,7 +15,7 @@ For more information, use the "core show application $<$application$>$" command.
 You can set default account codes and AMA flags for devices in
 channel configuration files, like sip.conf, iax.conf etc.
 
-\section{Fields of the CDR in Asterisk}
+\section{CDR Fields}
 
 \begin{itemize}
    \item accountcode:  What account number to use, (string, 20 characters)
@@ -53,11 +53,11 @@ transfers with IAX2 to avoid this problem, or turn off transfers completely
 (although this can result in a media latency increase since the media packets
 have to traverse the middle server(s) in the call).
 
-\section{CDR Variables}
+\section{Variables}
 
-If the channel has a cdr, that cdr record has its own set of variables which
-can be accessed just like channel variables. The following builtin variables
-are available.
+If the channel has a CDR, that CDR has its own set of variables which can be
+accessed just like channel variables. The following builtin variables are
+available.
 
 \begin{verbatim}
 ${CDR(clid)}         Caller ID
diff --git a/doc/tex/cdrdriver.tex b/doc/tex/cdrdriver.tex
index 2937fc9fc..3fe7e148b 100644
--- a/doc/tex/cdrdriver.tex
+++ b/doc/tex/cdrdriver.tex
@@ -1,10 +1,10 @@
-\section{CDR Back Ends}
+\section{Storage Backends}
 
-\subsection{MSSQL}
+\subsection{Microsoft SQL Server}
 
 	Asterisk can currently store CDRs into an MSSQL database in
 	two different ways:  cdr\_odbc or cdr\_tds
-	
+
 	Call Data Records can be stored using unixODBC (which requires
 	the FreeTDS package) [cdr\_odbc] or directly by using just the
 	FreeTDS package [cdr\_tds]  The following provide some
@@ -195,11 +195,11 @@
                 call to the database when it's complete.
 
 
-\subsection{MYSQL}
+\subsection{MySQL}
 
 Using MySQL for CDR records is supported by using ODBC and the cdr\_odbc module.
 
-\subsection{PGSQL}
+\subsection{PostgreSQL}
         If you want to go directly to postgresql database, and have the cdr\_pgsql.so
         compiled you can use the following sample setup.
         On Debian, before compiling asterisk, just install libpqxx-dev.
@@ -246,10 +246,14 @@ Using MySQL for CDR records is supported by using ODBC and the cdr\_odbc module.
 \end{verbatim}
 \end{astlisting}
 
-\subsection{SQLLITE}
+\subsection{SQLite 2}
 
 SQLite version 2 is supported in cdr\_sqlite.
 
+\subsection{SQLite 3}
+
+SQLite version 3 is supported in cdr\_sqlite3\_custom.
+
 \subsection{RADIUS}
 
 \subsubsection{What is needed}
@@ -291,9 +295,9 @@ SQLite version 2 is supported in cdr\_sqlite.
 
 \subsubsection{Installation of the Radiusclient library}
 
-	Download the sources from	
+	Download the sources from
 	\url{http://developer.berlios.de/projects/radiusclient-ng/}
-		
+
 	Untar the source tarball:
 
 \begin{verbatim}
@@ -310,15 +314,15 @@ SQLite version 2 is supported in cdr\_sqlite.
 \end{verbatim}
 
 \subsubsection{Configuration of the Radiusclient library}
-	
+
 	By default all the configuration files of the radiusclient library will
 	be in \path{/usr/local/etc/radiusclient-ng} directory.
-		
+
 	File "radiusclient.conf"
 		Open the file and find lines containing the following:
 
 			authserver      localhost
-	
+
 	This is the hostname or IP address of the RADIUS server used for
 	authentication. You will have to change this unless the server is
 	running on the same host as your Asterisk PBX.
@@ -330,10 +334,10 @@ SQLite version 2 is supported in cdr\_sqlite.
 	on the same host as your Asterisk PBX.
 
 	\textbf{File "servers"}
-		
+
 	RADIUS protocol uses simple access control mechanism based on shared
 	secrets that allows RADIUS servers to limit access from RADIUS clients.
-		
+
 	A RADIUS server is configured with a secret string and only RADIUS
 	clients that have the same secret will be accepted.
 
@@ -347,7 +351,7 @@ SQLite version 2 is supported in cdr\_sqlite.
 	are going to use.
 
 	\textbf{File "dictionary"}
-			
+
 	Asterisk uses some attributes that are not included in the
 	dictionary of radiusclient library, therefore it is necessary to add
 	them. A file called dictionary.digium (kept in the contrib dir)
@@ -362,7 +366,7 @@ SQLite version 2 is supported in cdr\_sqlite.
 	Download sources tarball from:
 
 		\url{http://freeradius.org/}
-			
+
 	Untar, configure, build, and install the server:
 
 \begin{verbatim}
@@ -375,15 +379,15 @@ SQLite version 2 is supported in cdr\_sqlite.
 
 	All the configuration files of FreeRADIUS server will be in
 	/usr/local/etc/raddb directory.
-		
+
 
 \subsubsection{Configuration of the FreeRADIUS Server}
-			
+
 	There are several files that have to be modified to configure the
 	RADIUS server. These are presented next.
 
 	File "clients.conf"
-			
+
 	File \path{/usr/local/etc/raddb/clients.conf} contains description of
 	RADIUS clients that are allowed to use the server. For each of the
 	clients you need to specify its hostname or IP address and also a
@@ -396,26 +400,26 @@ SQLite version 2 is supported in cdr\_sqlite.
 		    secret = mysecret
 		    shortname = foo
 		}
-\end{verbatim}	
+\end{verbatim}
 
 	This fragment allows access from RADIUS clients on "myhost" if they use
-	"mysecret" as the shared secret.	
+	"mysecret" as the shared secret.
 	The file already contains an entry for localhost (127.0.0.1), so if you
 	are running the RADIUS server on the same host as your Asterisk server,
 	then modify the existing entry instead, replacing the default password.
-		
+
 	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 \path{/usr/local/etc/raddb/dictionary} contains the dictionary of
 	FreeRADIUS server. You have to add the same dictionary file
 	(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 \path{/usr/local/etc/raddb/dictionary}:
-		
+
 	\$INCLUDE /path/to/dictionary.digium
 
 	That will include the same new attribute definitions that are used
@@ -429,7 +433,7 @@ SQLite version 2 is supported in cdr\_sqlite.
 
         The module will be compiled as long as the radiusclient-ng
         library has been detected on your system.
-	
+
 	By default FreeRADIUS server will log all accounting requests into
 	\path{/usr/local/var/log/radius/radacct} directory in form of plain text files.
 	The server will create one file for each hostname in the directory. The
@@ -440,7 +444,7 @@ SQLite version 2 is supported in cdr\_sqlite.
 	separated values will be created in \path{/var/log/asterisk/cdr-csv}.
 
 	The configuration file for cdr\_radius.so module is \path{/etc/asterisk/cdr.conf}
-	
+
 	This is where you can set CDR related parameters as well as the path to
 	the radiusclient-ng library configuration file.