Moving "doc/db-backend.txt" to the administrator's manual.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12300 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/config/config_default.php b/config/config_default.php
index 43f4125e7774781e2af46f63c28d64372aadd26a..a4dd81cac286c3db95cb2081c7608433a239566d 100644 (file)
--- a/config/config_default.php
+++ b/config/config_default.php
@@ -899,13 +899,13 @@ $disable_plugins_user = '';
 
 /*** Database ***/
 /**
- * Read doc/database.txt in order to get more information
+ * Read the administrator's manual in order to get more information
  * about these settings.
  */
 /**
  * Database-driven private addressbooks
  *   DSN (Data Source Name) for a database where the private
- *   addressbooks are stored.  See doc/db-backend.txt for more info.
+ *   addressbooks are stored.  See the administrator's manual for more info.
  *   If it is not set, the addressbooks are stored in files
  *   in the data dir.
  *   The DSN is in the format: mysql://user:pass@hostname/dbname

diff --git a/doc/index.html b/doc/index.html
index f1846cf44a96e76ab6ff2d28ecca30d6b10eb8f7..202d38d3f83e4a40728a962ff6dc7336c3458a09 100644 (file)
--- a/doc/index.html
+++ b/doc/index.html
@@ -47,13 +47,6 @@ manual.</p>
      This document describes how to use this new code, and the requirements.
    </dd>
 
-   <dt><a href="db-backend.txt">Database Backend</a></dt>
-   <dd>
-     SquirrelMail allows you to store user's preferences and address books
-     in database that is compatible with PHP Pear DB libraries. This document
-     describes how to setup database.
-   </dd>
-
    <dt><a href="presets.txt">Specific IMAP server setups</a></dt>
    <dd>
      SquirrelMail configuration utility allows adjusting settings for selected

diff --git a/functions/db_prefs.php b/functions/db_prefs.php
index 7b59c7215b0630c4b36ee92fbe82239af66bc51e..0c203840809bb31f4cb0013583e07dbd3b05ee30 100644 (file)
--- a/functions/db_prefs.php
+++ b/functions/db_prefs.php
@@ -299,7 +299,7 @@ class dbPrefs {
         if (strlen($user) > $this->user_size) {
             $this->error = "Oversized username value."
                 ." Your preferences can't be saved."
-                ." See doc/db-backend.txt or contact your system administrator.";
+                ." See the administrator's manual or contact your system administrator.";
 
             /**
              * Debugging function. Can be used to log all issues that trigger
@@ -317,7 +317,7 @@ class dbPrefs {
         if (strlen($key) > $this->key_size) {
             $err_msg = "Oversized user's preference key."
                 ." Some preferences were not saved."
-                ." See doc/db-backend.txt or contact your system administrator.";
+                ." See the administrator's manual or contact your system administrator.";
             // error is not fatal. Only some preference is not saved.
             trigger_error($err_msg,E_USER_WARNING);
             return false;
@@ -328,7 +328,7 @@ class dbPrefs {
         if (strlen($value) > $this->val_size) {
             $err_msg = "Oversized user's preference value."
                 ." Some preferences were not saved."
-                ." See doc/db-backend.txt or contact your system administrator.";
+                ." See the administrator's manual or contact your system administrator.";
             // error is not fatal. Only some preference is not saved.
             trigger_error($err_msg,E_USER_WARNING);
             return false;
@@ -541,5 +541,3 @@ function getSig($data_dir, $username, $number) {
     }
     return getPref($data_dir, $username, $key);
 }
-
-// vim: et ts=4