18 files changed, 80 insertions, 61 deletions
diff --git a/docs/manual/config/index.rst b/docs/manual/config/index.rst
index f98f731..02bd0af 100644
--- a/docs/manual/config/index.rst
+++ b/docs/manual/config/index.rst
@@ -30,7 +30,7 @@ You can use :ref:`gammu-config` or :ref:`gammu-detect` to generate
 configuration file or start from :ref:`Fully documented example`.
 
 For hints about configuring your phone, you can check Gammu Phone
-Database <http://wammu.eu/phones/> to see what user users
+Database <https://wammu.eu/phones/> to see what user users
 experienced.
 
 This file use ini file syntax, see :ref:`ini`.
diff --git a/docs/manual/faq/config.rst b/docs/manual/faq/config.rst
index 976a406..37c3b48 100644
--- a/docs/manual/faq/config.rst
+++ b/docs/manual/faq/config.rst
@@ -127,4 +127,4 @@ You can also find additional user experiences in `Gammu Phones Database`_.
 
 .. seealso:: :ref:`faq-phones`, :ref:`gammurc`
 
-.. _Gammu Phones Database: http://wammu.eu/phones/
+.. _Gammu Phones Database: https://wammu.eu/phones/
diff --git a/docs/manual/faq/phone.rst b/docs/manual/faq/phone.rst
index 9a57a90..c0a3d43 100644
--- a/docs/manual/faq/phone.rst
+++ b/docs/manual/faq/phone.rst
@@ -48,7 +48,7 @@ This option is supported since Gammu 1.29.90.
 
 .. _faq-android:
 
-Are Andriod phones supported?
+Are Android phones supported?
 -----------------------------
 
 Unfortunately no at the moment. Any help in this area is welcome.
@@ -67,4 +67,4 @@ Are iPhone phones supported?
 
 Unfortunately no at the moment. Any help in this area is welcome.
 
-.. _Gammu Phones Database: http://wammu.eu/phones/
+.. _Gammu Phones Database: https://wammu.eu/phones/
diff --git a/docs/manual/faq/python.rst b/docs/manual/faq/python.rst
index d63d455..033dd25 100644
--- a/docs/manual/faq/python.rst
+++ b/docs/manual/faq/python.rst
@@ -16,4 +16,4 @@ the :file:`examples` subdirectory.
 
 .. seealso:: :ref:`python`, :ref:`python-gammu-examples`
 
-.. _Gammu: http://wammu.eu/gammu/
+.. _Gammu: https://wammu.eu/gammu/
diff --git a/docs/manual/faq/smsd.rst b/docs/manual/faq/smsd.rst
index 01412fb..851f8d2 100644
--- a/docs/manual/faq/smsd.rst
+++ b/docs/manual/faq/smsd.rst
@@ -86,4 +86,4 @@ This can occasionally happen and can have several reasons.
 .. _MySQL: http://www.mysql.com/
 .. _PostgreSQL: http://www.postgresql.org/
 .. _libdbi: http://libdbi.sourceforge.net/
-.. _Gammu Phones Database: http://wammu.eu/phones/
+.. _Gammu Phones Database: https://wammu.eu/phones/
diff --git a/docs/manual/gammu/index.rst b/docs/manual/gammu/index.rst
index 4ab1cfe..eba4cba 100644
--- a/docs/manual/gammu/index.rst
+++ b/docs/manual/gammu/index.rst
@@ -20,7 +20,7 @@ Description
 +++++++++++
 
 This program is a tool for mobile phones. Many vendors and phones
-are supported, for actual listing see `Gammu Phones Database <http://wammu.eu/phones/>`_.
+are supported, for actual listing see `Gammu Phones Database <https://wammu.eu/phones/>`_.
 
 
 Options
@@ -1466,12 +1466,6 @@ Phone information commands
 
 .. option:: getdisplaystatus
 
-.. option:: getlocation
-
-    Gets network information from phone (same as networkinfo)
-    and prints location (latitude and longitude) based on information from
-    `OpenCellID <http://opencellid.org>`_.
-
 .. option:: getsecuritystatus
 
     Show, if phone wait for security code (like PIN, PUK, etc.) or not
@@ -1723,11 +1717,11 @@ values increased by 100:
 114
     No response in specified timeout. Probably phone not connected.
 115
-    Frame not requested right now. See <http://wammu.eu/support/bugs/> for information how to report it.
+    Frame not requested right now. See <https://wammu.eu/support/bugs/> for information how to report it.
 116
-    Unknown response from phone. See <http://wammu.eu/support/bugs/> for information how to report it.
+    Unknown response from phone. See <https://wammu.eu/support/bugs/> for information how to report it.
 117
-    Unknown frame. See <http://wammu.eu/support/bugs/> for information how to report it.
+    Unknown frame. See <https://wammu.eu/support/bugs/> for information how to report it.
 118
     Unknown connection type string. Check config file.
 119
@@ -1985,6 +1979,6 @@ With this settings, Gammu generates /tmp/gammu.log on each connection to
 phone and stores dump of communication there. You can also find some
 hints for improving support for your phone in this log.
 
-See <http://wammu.eu/support/bugs/> for more information on reporting bugs.
+See <https://wammu.eu/support/bugs/> for more information on reporting bugs.
 
 Please report bugs to `Gammu bug tracker <https://github.com/gammu/gammu/issues>`_.
diff --git a/docs/manual/project/contributing.rst b/docs/manual/project/contributing.rst
index ede7cc0..364e174 100644
--- a/docs/manual/project/contributing.rst
+++ b/docs/manual/project/contributing.rst
@@ -5,7 +5,7 @@ We welcome contribution in any area, if you don't have developer skills, you
 can always contribute to :doc:`localization` or just `donate us money`_. In case you are
 interested in fixing some code, please read :doc:`../internal/index` to
 understand structure of Gammu code. We also maintain list of
-`wanted skills <http://wammu.eu/contribute/wanted/>`_ where you can find in
+`wanted skills <https://wammu.eu/contribute/wanted/>`_ where you can find in
 which areas we currently mostly lack manpower.
 
 Sending patches
@@ -49,4 +49,4 @@ To manually create patch you can use following steps:
 5. Call ``diff -rup -X .git gammu work > patchfile``.
 6. Send ``patchfile`` to us (you can use bug tracker or mailing list).
 
-.. _donate us money: http://wammu.eu/donate/
+.. _donate us money: https://wammu.eu/donate/
diff --git a/docs/manual/project/install.rst b/docs/manual/project/install.rst
index e70ac07..539137e 100644
--- a/docs/manual/project/install.rst
+++ b/docs/manual/project/install.rst
@@ -9,7 +9,7 @@ Prebuilt Binaries for Linux
 Many distributions come with prebuilt Gammu binaries, if you can use
 them, it is definitely the easiest thing. There are also binary packages
 of latest release built for many distributions available on Gammu home
-page <http://wammu.eu/gammu/>.
+page <https://wammu.eu/gammu/>.
 
 You can usually also find Gammu in your distribution, so unless you need a
 newer version, just install package from your distribution.
@@ -38,7 +38,7 @@ Gammu packages are included in Gentoo. Additionally source tarball contains
 Prebuilt Binaries for Windows
 -----------------------------
 
-You can download Windows binaries from <http://wammu.eu/gammu/>. For
+You can download Windows binaries from <https://wammu.eu/gammu/>. For
 Windows 95, 98 and NT 4.0 you will also need ShFolder DLL, which can be
 downloaded from Microsoft:
 
@@ -50,7 +50,7 @@ http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=6AE02498
 Dependencies
 ------------
 
-You need CMake from <http://www.cmake.org/> for compiling Gammu.
+You need CMake from <https://cmake.org/> for compiling Gammu.
 
 Additionally pkg-config <http://pkg-config.freedesktop.org/> is used for
 detecting available libraries.
@@ -80,8 +80,7 @@ Required for fbususb/dku2 connection support on Linux.
 libCURL
 +++++++
 
-Required for new versions notification (see :option:`gammu checkversion`) and
-OpenCellID access (see :option:`gammu getlocation`).
+Required for new versions notification (see :option:`gammu checkversion`).
 
 .. seealso:: http://curl.haxx.se/libcurl/
 
diff --git a/docs/manual/protocol/s60.rst b/docs/manual/protocol/s60.rst
index f1f8d92..9eeecf9 100644
--- a/docs/manual/protocol/s60.rst
+++ b/docs/manual/protocol/s60.rst
@@ -78,7 +78,7 @@ not distributed with Gammu due to licensing reasons.
     On some phones, the Python for S60 2.0 will not start, in this case you
     need to install some additional support libraries coming with Python for S60 2.0 - 
     :file:`pips.sis`, :file:`ssl.sis` and :file:`stdioserver.sis`. You can get
-    all of them at http://wammu.eu/s60/ as well.
+    all of them at https://wammu.eu/s60/ as well.
 
 Installing Python for S60 and Series60 remote applet can be done in several
 ways:
@@ -112,10 +112,10 @@ Downloading from phone
 ++++++++++++++++++++++
 
 Downloading files from the phone and installing them directly. You can
-download all required files from http://wammu.eu/s60/.
+download all required files from https://wammu.eu/s60/.
 
 .. figure:: s60-download-qr.png
-   :target: http://wammu.eu/s60/
+   :target: https://wammu.eu/s60/
    :alt: QR code for download of applet.
    
    QR code for download of applet.
diff --git a/docs/manual/python/exceptions.rst b/docs/manual/python/exceptions.rst
index f65b26f..771aaf0 100644
--- a/docs/manual/python/exceptions.rst
+++ b/docs/manual/python/exceptions.rst
@@ -162,7 +162,7 @@
 .. exception:: gammu.ERR_FRAMENOTREQUESTED
 
     Exception corresponding to gammu error ERR_FRAMENOTREQUESTED.
-    Verbose error description: Frame not requested right now. See <http://wammu.eu/support/bugs/> for information how to report it.
+    Verbose error description: Frame not requested right now. See <https://wammu.eu/support/bugs/> for information how to report it.
 
 .. exception:: gammu.ERR_FULL
 
@@ -337,7 +337,7 @@
 .. exception:: gammu.ERR_UNKNOWNFRAME
 
     Exception corresponding to gammu error ERR_UNKNOWNFRAME.
-    Verbose error description: Unknown frame. See <http://wammu.eu/support/bugs/> for information how to report it.
+    Verbose error description: Unknown frame. See <https://wammu.eu/support/bugs/> for information how to report it.
 
 .. exception:: gammu.ERR_UNKNOWNMODELSTRING
 
@@ -347,7 +347,7 @@
 .. exception:: gammu.ERR_UNKNOWNRESPONSE
 
     Exception corresponding to gammu error ERR_UNKNOWNRESPONSE.
-    Verbose error description: Unknown response from phone. See <http://wammu.eu/support/bugs/> for information how to report it.
+    Verbose error description: Unknown response from phone. See <https://wammu.eu/support/bugs/> for information how to report it.
 
 .. exception:: gammu.ERR_USING_DEFAULTS
 
diff --git a/docs/manual/quick/index.rst b/docs/manual/quick/index.rst
index bfdb9d1..b83c13e 100644
--- a/docs/manual/quick/index.rst
+++ b/docs/manual/quick/index.rst
@@ -11,7 +11,7 @@ Gammu family consists of several programs and libraries:
 :ref:`gammu`
     Command line utility to talk to the phone. It performs one time operations
     only.
-`Wammu <http://wammu.eu/wammu>`_
+`Wammu <https://wammu.eu/wammu>`_
     Graphical interface for Gammu, providing basic functions.
 :ref:`gammu-smsd`
     Daemon to receive and send messages using your phone.
@@ -30,7 +30,7 @@ Installing Gammu
 
 On most platforms you can install Gammu from binaries - most Linux
 distributions ship Gammu and for Windows you can download binaries from 
-`Gammu website <http://wammu.eu/download/>`_. You can find more detailed
+`Gammu website <https://wammu.eu/download/>`_. You can find more detailed
 instructions (including instructions for compiling from source) in
 :ref:`installing`.
 
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