aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2010-06-02 17:10:48 +0200
committerBadlop <badlop@process-one.net>2010-06-02 17:10:48 +0200
commit077626c40a722f627b8fadaa4b10bd65da9df4fa (patch)
tree98c3a8928c44e0fae13c958916a01b00fcc8e7fc
parentsync last changes in pubsub_odbc patch (diff)
Clarify in the Guide that mssql configuration is similar to odbc
-rw-r--r--doc/guide.html15
-rw-r--r--doc/guide.tex19
2 files changed, 10 insertions, 24 deletions
diff --git a/doc/guide.html b/doc/guide.html
index 96cca70d4..a0d5531e5 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -1535,17 +1535,12 @@ enabled. This can be done, by using next commands:
</P><PRE CLASS="verbatim">./configure --enable-odbc --enable-mssql &amp;&amp; make install
</PRE><P> <A NAME="configuremssql"></A> </P><!--TOC subsubsection Database Connection-->
<H4 CLASS="subsubsection"><!--SEC ANCHOR --><A HREF="#configuremssql">Database Connection</A></H4><!--SEC END --><P> <A NAME="configuremssql"></A>
-</P><P>By default <TT>ejabberd</TT> opens 10 connections to the database for each virtual host.
-Use this option to modify the value:
-</P><PRE CLASS="verbatim">{odbc_pool_size, 10}.
-</PRE><P>You can configure an interval to make a dummy SQL request
-to keep alive the connections to the database.
-The default value is &#X2019;undefined&#X2019;, so no keepalive requests are made.
-Specify in seconds: for example 28800 means 8 hours.
-</P><PRE CLASS="verbatim">{odbc_keepalive_interval, undefined}.
-</PRE><P> <A NAME="mssqlauth"></A> </P><!--TOC subsubsection Authentication-->
+</P><P>The configuration of Database Connection for a Microsoft SQL Server
+is the same as the configuration for
+ODBC compatible servers (see section&#XA0;<A HREF="#configureodbc">3.2.4</A>).</P><P> <A NAME="mssqlauth"></A> </P><!--TOC subsubsection Authentication-->
<H4 CLASS="subsubsection"><!--SEC ANCHOR --><A HREF="#mssqlauth">Authentication</A></H4><!--SEC END --><P> <A NAME="mssqlauth"></A>
-</P><P>The configuration of Microsoft SQL Server is the same as the configuration of
+</P><P>The configuration of Authentication for a Microsoft SQL Server
+is the same as the configuration for
ODBC compatible servers (see section&#XA0;<A HREF="#odbcauth">3.2.4</A>).</P><P> <A NAME="mssqlstorage"></A> </P><!--TOC subsubsection Storage-->
<H4 CLASS="subsubsection"><!--SEC ANCHOR --><A HREF="#mssqlstorage">Storage</A></H4><!--SEC END --><P> <A NAME="mssqlstorage"></A>
</P><P>Microsoft SQL Server also can be used to store information into from several
diff --git a/doc/guide.tex b/doc/guide.tex
index a0cf1b22c..a21d39dcd 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -1990,19 +1990,9 @@ enabled. This can be done, by using next commands:
\makesubsubsection{configuremssql}{Database Connection}
\ind{Microsoft SQL Server!Database Connection}
-By default \ejabberd{} opens 10 connections to the database for each virtual host.
-Use this option to modify the value:
-\begin{verbatim}
-{odbc_pool_size, 10}.
-\end{verbatim}
-
-You can configure an interval to make a dummy SQL request
-to keep alive the connections to the database.
-The default value is 'undefined', so no keepalive requests are made.
-Specify in seconds: for example 28800 means 8 hours.
-\begin{verbatim}
-{odbc_keepalive_interval, undefined}.
-\end{verbatim}
+The configuration of Database Connection for a Microsoft SQL Server
+is the same as the configuration for
+ODBC compatible servers (see section~\ref{configureodbc}).
\makesubsubsection{mssqlauth}{Authentication}
@@ -2010,7 +2000,8 @@ Specify in seconds: for example 28800 means 8 hours.
%TODO: not sure if this section is right!!!!!!
-The configuration of Microsoft SQL Server is the same as the configuration of
+The configuration of Authentication for a Microsoft SQL Server
+is the same as the configuration for
ODBC compatible servers (see section~\ref{odbcauth}).
\makesubsubsection{mssqlstorage}{Storage}