7 files changed, 55 insertions, 29 deletions
diff --git a/docs/manual/smsd/config.rst b/docs/manual/smsd/config.rst
index f3caab9..b1a8349 100644
--- a/docs/manual/smsd/config.rst
+++ b/docs/manual/smsd/config.rst
@@ -248,6 +248,17 @@ General parameters of SMS daemon
 
     Default is 1 (enabled).
 
+.. config:option:: CheckNetwork
+
+    .. versionadded:: 1.37.90
+
+    Whether to check network status periodically.
+
+    If phone is reported to be not on the network, SMSD
+    tries to power it on.
+
+    Default is 1 (enabled).
+
 .. config:option:: ResetFrequency
 
     The number of seconds between performing a preventive soft reset in order to
@@ -302,6 +313,9 @@ General parameters of SMS daemon
     When you set PhoneID, all messages (including injected ones) will be marked
     by this string (stored as SenderID in the database) and it allows more SMS
     daemons to share a single database. 
+
+    SMSD daemon will in such case send :ref:`outbox` messages only with
+    matching or empty SenderID.
     
     This option has actually no effect with :ref:`gammu-smsd-files`.
 
@@ -508,6 +522,7 @@ database:
     * ``mssql`` - Microsoft SQL Server
     * ``sybase`` - Sybase
     * ``access`` - Microsoft Access
+    * ``oracle`` - Oracle
     * ``odbc`` - Generic ODBC
 
     .. versionadded:: 1.28.93
diff --git a/docs/manual/smsd/dbi.rst b/docs/manual/smsd/dbi.rst
index 812c709..d9f30ad 100644
--- a/docs/manual/smsd/dbi.rst
+++ b/docs/manual/smsd/dbi.rst
@@ -52,8 +52,10 @@ drivers for example include:
 .. _libdbi: http://libdbi.sourceforge.net/
 .. _libdbi-drivers: http://libdbi-drivers.sourceforge.net/
 
-Creating tables
----------------
+.. _sqlite-create:
+
+Creating tables for SQLite
+--------------------------
 
 SQL script for creating tables in SQLite database:
 
diff --git a/docs/manual/smsd/mysql.rst b/docs/manual/smsd/mysql.rst
index c446ba4..d57f6c0 100644
--- a/docs/manual/smsd/mysql.rst
+++ b/docs/manual/smsd/mysql.rst
@@ -54,8 +54,8 @@ privileges should be enough:
 
 .. _mysql-create:
 
-Creating tables
----------------
+Creating tables for MySQL
+-------------------------
 
 SQL script for creating tables in MySQL database:
 
diff --git a/docs/manual/smsd/odbc.rst b/docs/manual/smsd/odbc.rst
index 86091fb..4b3475d 100644
--- a/docs/manual/smsd/odbc.rst
+++ b/docs/manual/smsd/odbc.rst
@@ -49,6 +49,17 @@ http://support.microsoft.com/kb/305599
 For unixODBC this is documented in the user manual:
 http://www.unixodbc.org/doc/UserManual/
 
+Creating tables
+---------------
+
+Prior to starting SMSD you have to create tables it will use. Gammu ships SQL
+scripts for several databases to do that:
+
+* :ref:`mysql-create`
+* :ref:`pgsql-create`
+* :ref:`sqlite-create`
+
+
 Example
 -------
 
diff --git a/docs/manual/smsd/pgsql.rst b/docs/manual/smsd/pgsql.rst
index f2ed617..021456f 100644
--- a/docs/manual/smsd/pgsql.rst
+++ b/docs/manual/smsd/pgsql.rst
@@ -33,8 +33,10 @@ The configuration file then can look like:
 
 .. seealso:: :ref:`gammu-smsdrc`
 
-Creating tables
----------------
+.. _pgsql-create:
+
+Creating tables for PostgreSQL
+------------------------------
 
 SQL script for creating tables in PostgreSQL database:
 
diff --git a/docs/manual/smsd/sql.rst b/docs/manual/smsd/sql.rst
index 8c932a9..190abcf 100644
--- a/docs/manual/smsd/sql.rst
+++ b/docs/manual/smsd/sql.rst
@@ -47,10 +47,6 @@ Tables
 You can customize name of all tables in the :config:section:`[tables]`. The SQL
 queries will reflect this, so it's enough to change table name in this section.
 
-.. config:option:: daemons
-
-    Name of the :ref:`daemons` table.
-
 .. config:option:: gammu
 
     Name of the :ref:`gammu-table` table.
@@ -102,6 +98,8 @@ Phone Specific Parameters
 
 ``%I``
     IMEI of phone
+``%S``
+    SIM IMSI
 ``%P``
     PHONE ID (hostname)
 ``%N``
diff --git a/docs/manual/smsd/tables.rst b/docs/manual/smsd/tables.rst
index 37191b6..de02aa5 100644
--- a/docs/manual/smsd/tables.rst
+++ b/docs/manual/smsd/tables.rst
@@ -26,13 +26,6 @@ of the same message from :ref:`outbox_multipart`.
 Description of tables
 ---------------------
 
-.. _daemons:
-
-daemons
-+++++++
-
-Information about running daemons.
-
 .. _gammu-table: 
 
 gammu
@@ -153,7 +146,7 @@ Fields description:
 ``SenderID`` (text)
     which SMSD instance should send this one sequence, see
     :config:option:`PhoneID` and :ref:`smsd-multi`. If blank, first SMSD who
-    sees this message will process it.
+    sees this message first will process it.
 
 ``SendingTimeOut`` (timestamp)
     used by SMSD instance for own targets
@@ -167,6 +160,9 @@ Fields description:
 ``Retries`` (integer)
     number of attempted retries when sending this message
 
+``Priority`` (integer)
+    priority of message, messages with higher priority are processed first
+
 .. _outbox_multipart:
 
 outbox_multipart
@@ -226,6 +222,9 @@ Fields description:
 ``IMEI`` (text)
     IMEI of phone
 
+``IMSI`` (text)
+    SIM IMSI
+
 ``Client`` (text)
     client name, usually string Gammu with version
 
@@ -330,16 +329,6 @@ Fields description:
     copied from CreatorID from outbox table
 
 
-pbk
-+++
-
-Not used by SMSD currently, included only for application usage.
-
-pbk_groups
-++++++++++
-
-Not used by SMSD currently, included only for application usage.
-
 .. _smsd-tables-history:
 
 History of database structure
@@ -354,9 +343,18 @@ History of database structure
 
 History of schema versions:
 
+16
+
+    * Removed unused ``daemons``, ``pbk`` and ``pbk_groups`` tables.
+    * Added primary key to the ``gammu`` table.
+    * Added ``Priority`` field to the :ref:`outbox`.
+    * Added ``IMSI`` field to the :ref:`phones`.
+
+    .. versionchanged:: 1.37.90
+
 15
 
-    Added ``Retries`` field.
+    Added ``Retries`` field to the :ref:`outbox`.
 
     .. versionchanged:: 1.36.7