Imported Upstream version 1.28.94

35 files changed, 653 insertions, 94 deletions

diff --git a/docs/manual/c/index.rst b/docs/manual/c/index.rst
index 45e7208..ed44e49 100644
--- a/docs/manual/c/index.rst
+++ b/docs/manual/c/index.rst
@@ -7,6 +7,11 @@ The libGammu library exposes all Gammu functionality for various phones in
 standard API. It can be used to do anything with your phone, however for
 easier tasks you might prefer to use Python and :doc:`../python/index`.
 
+If you intend to use libGammu in your application, all you should need
+is to ``#include <gammu.h>`` and then use Gammu functions. You can check
+docs/examples/ for some small example applications. You don't need real phone
+for testing, use :ref:`dummy-driver` instead.
+
 .. warning::
 
    The C API documentation is still more complete in Doxygen format
diff --git a/docs/manual/conf.py b/docs/manual/conf.py
index 03d0db4..c225c78 100644
--- a/docs/manual/conf.py
+++ b/docs/manual/conf.py
@@ -73,7 +73,7 @@ copyright = u'2009-2010, Michal Čihař <michal@cihar.com>'
 # built documents.
 #
 # The short X.Y version.
-version = '@VERSION@'
+version = '@GAMMU_VERSION@'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/docs/manual/config/index.rst b/docs/manual/config/index.rst
index 7399622..b2a6481 100644
--- a/docs/manual/config/index.rst
+++ b/docs/manual/config/index.rst
@@ -22,10 +22,16 @@ On Microsoft Windows:
 Description
 -----------
 
+Gammu requires configuration to be able to properly talk to your phone.
 :ref:`gammu` reads configuration from a config file. It's location is determined
 on runtime, see above for search paths.
 
-You can use :ref:`gammu-config` to generate configuration file.
+You can use :ref:`gammu-config` 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
+experienced.
 
 This file use ini file syntax, see :ref:`ini`.
 
@@ -234,7 +240,7 @@ Debugging options
 
     Custom features for phone. This can be used as override when values coded
     in ``common/gsmphones.c`` are bad or missing. Consult
-    ``include/gammu-info.h`` for possible values (all GSM_Feature values
+    ``include/gammu-info.h`` for possible values (all :c:type:`GSM_Feature` values
     without leading ``F_`` prefix). Please report correct values to Gammu
     authors.
 
@@ -316,3 +322,14 @@ like following:
     [gammmu2]
     device = /dev/ttyS2
     connection = at
+
+.. _Fully documented example:
+
+Fully documented example
+++++++++++++++++++++++++
+
+You can find this sample file as :file:`docs/config/gammurc` in Gammu sources.
+
+.. literalinclude:: ../../../docs/config/gammurc
+   :language: ini
+
diff --git a/docs/manual/formats/backup.rst b/docs/manual/formats/backup.rst
index f054268..7e59651 100644
--- a/docs/manual/formats/backup.rst
+++ b/docs/manual/formats/backup.rst
@@ -52,3 +52,5 @@ Find::
 Replace::
 
     Type = NumberMobile\nEntry\1Text = "\+36\2\3"\n
+
+.. seealso:: :ref:`converting-formats`
diff --git a/docs/manual/gammu/index.rst b/docs/manual/gammu/index.rst
index 6b0e627..37dd1ce 100644
--- a/docs/manual/gammu/index.rst
+++ b/docs/manual/gammu/index.rst
@@ -173,8 +173,12 @@ Unicode
 ~~~~~~~
 
 With `Unicode` single SMS can contain at most 70 chars, but these can be
-any chars including all national and special ones. Please note, that some
-older phones might have problems displaying such message.
+any chars including all national and special ones. 
+
+.. warning::
+   
+   Please note, that some older phones might have problems displaying such
+   message.
 
 Conversion
 ~~~~~~~~~~
@@ -340,9 +344,11 @@ ____________
         Save caller logo as sms in Nokia (Smart Messaging)
         format - size 72x14, two colors.
 
-        Please note, that it isn't designed for colour logos available for example in
-        DCT4/TIKU - you need to put bitmap file there inside phone using filesystem
-        commands.
+        .. warning:: 
+           
+           Please note, that it isn't designed for colour logos available for
+           example in DCT4/TIKU - you need to put bitmap file there inside
+           phone using filesystem commands.
 
 
 
@@ -480,8 +486,12 @@ ____________
     .. option:: PROFILE  [-name name] [-bitmap bitmap] [-ringtone ringtone]
 
         Read ringtone (RTTL) format, bitmap (Picture Image size) and name, format into
-        Smart Messaging profile and send/save as SMS. Please note, that this format is
-        abandomed by Nokia and supported by some (older) devices only like Nokia 3310.
+        Smart Messaging profile and send/save as SMS. 
+        
+        .. warning::
+           
+           Please note, that this format is abandoned by Nokia and supported
+           by some (older) devices only like Nokia 3310.
 
 
     .. option:: RINGTONE file  [-long] [-scale]
@@ -809,7 +819,12 @@ level and Gammu does not use that.
 
     Display files and folders available in folder with given folder ID. You can get ID's using getfilesystem -flatall.
 
-    Please note, that in some phones (like N6230) content of some folders (with more files) can be cut (only part of files will be displayed) for example on infrared connection. This is not Gammu issue, but phone firmware problem.
+    .. warning::
+       
+       Please note, that in some phones (like N6230) content of some folders
+       (with more files) can be cut (only part of files will be displayed) for
+       example on infrared connection. This is not Gammu issue, but phone
+       firmware problem.
 
 .. option:: getrootfolders
 
@@ -1078,7 +1093,7 @@ Backing up and restoring commands
 
 .. option:: addsms folder file [-yes]
 
-    Adds SMSes from file (format like backupsms uses) to
+    Adds SMSes from file (format like :option:`gammu backupsms` uses) to
     selected folder in phone.
 
 .. option:: backup file [-yes]
@@ -1107,7 +1122,7 @@ Backing up and restoring commands
 
 .. option:: backupsms file [-yes|-all]
 
-    Stores all SMSes from phone to file. 
+    Stores all SMSes from phone to file into :ref:`gammu-smsbackup`. 
 
     Use -yes for answering yes to all questions (backup all messages and 
     delete them from phone), or -all to just backup all folders while keeping
@@ -1115,23 +1130,29 @@ Backing up and restoring commands
 
 .. option:: restore file [-yes]
 
+    .. warning:: 
+       
+        Please note that restoring deletes all current content in phone. If you
+        want only to add entries to phone, use :option:`gammu addnew`.
+
     Restore settings written in file created using :option:`gammu backup` command. 
 
-    Please note that restoring deletes all current content in phone. If you
-    want only to add entries to phone, use addnew.
 
     In some phones restoring calendar notes will not show error, but won't
     be done, when phone doesn't have set clock inside.
 
 .. option:: restoresms file [-yes]
+    
+    .. warning:: 
+       
+       Please note that this overwrites existing messages in phone (if it supports it).
 
-    Restores SMSes from file (format like backupsms uses) to
-    selected folder in phone. Please note that this overwrites existing
-    messages in phone (if it supports it).
+    Restores SMSes from file (format like :option:`gammu backupsms` uses) to
+    selected folder in phone. 
 
 .. option:: savefile TYPE [type options]
 
-    Coverts between various file formats supported by Gammu, following types
+    Converts between various file formats supported by Gammu, following types
     are supported:
 
     .. option:: BOOKMARK target.url file location
@@ -1160,6 +1181,18 @@ Backing up and restoring commands
         guess is based on extension and file content, for output solely on 
         extension).
 
+    .. seealso:: :option:`gammu convertbackup`
+
+.. option:: convertbackup source.file output.file
+
+    .. versionadded:: 1.28.94
+
+    Converts backup between formats supported by Gammu. Unlike 
+    :option:`gammu savefile`, this does not give you any options what to
+    convert, it simply takes converts all what can be saved into output file.
+
+    .. seealso:: :option:`gammu savefile`
+
 
 Nokia specific commands
 -----------------------
@@ -1563,10 +1596,13 @@ Configuration commands
 
 .. option:: searchphone [-debug]
 
-    Attempts to search for a connected phone. Please note
-    that this can take a very long time, but in case you have no clue how to
-    configure phone connection, this is a convenient way to find working setup for
-    Gammu.
+    Attempts to search for a connected phone. 
+    
+    .. warning:: 
+       
+       Please note that this can take a very long time, but in case you have
+       no clue how to configure phone connection, this is a convenient way to
+       find working setup for Gammu.
 
 Gammu information commands
 --------------------------
@@ -1775,7 +1811,7 @@ or
 
 .. code-block:: sh
 
-    gammu savesms TEXT -text "All your base are belong to us
+    gammu savesms TEXT -text "All your base are belong to us"
 
 Save long text message:
 
@@ -1787,13 +1823,13 @@ or
 
 .. code-block:: sh
 
-    gammu savesms TEXT -len 400 -text "All your base are belong to us
+    gammu savesms TEXT -len 400 -text "All your base are belong to us"
 
 or
 
 .. code-block:: sh
 
-    gammu savesms EMS -text "All your base are belong to us
+    gammu savesms EMS -text "All your base are belong to us"
 
 Save some funky message with predefined sound and animation from 2 bitmaps:
 
@@ -1831,15 +1867,32 @@ Set logo for network ``230 03`` (Vodafone CZ):
 
     gammu setbitmap OPERATOR ala.bmp "230 03"
 
+.. _converting-formats:
+
 Converting file formats
 -----------------------
 
-Convert single entry (at position 260) from gammu native backup to vCalendar:
+The formats conversion can done using :option:`gammu savefile` or
+:option:`gammu convertbackup` commands.
+
+Convert single entry (at position 260) from :ref:`gammu-backup` to vCalendar:
 
 .. code-block:: sh
 
     gammu savefile CALENDAR output.vcs myCalendar.backup 260
 
+Convert first phonebook entry from :ref:`gammu-backup` to vCard:
+
+.. code-block:: sh
+
+    gammu savefile VCARD21 output.vcf phone.backup ME 1
+
+Convert all contacts from backup to vCard:
+
+.. code-block:: sh
+
+    gammu convertbackup phone.backup output.vcf
+
 
 Reporting bugs
 --------------
diff --git a/docs/manual/project/directories.rst b/docs/manual/project/directories.rst
index a6ef0d3..6742623 100644
--- a/docs/manual/project/directories.rst
+++ b/docs/manual/project/directories.rst
@@ -106,5 +106,89 @@ Various utilities usable with Gammu.
 contrib directory
 -----------------
 
-Third party contributions based on Gammu.
+This directory contains various things which might be useful with Gammu.
+Please note that that code here might have different license terms than
+Gammu itself.
 
+bash-completion
+***************
+
+Completion script for bash.
+
+conversion
+**********
+
+Various scripts for converting data.
+
+init
+****
+
+Init scripts for Gammu SMSD.
+
+linux-driver
+************
+
+DKU-2 driver for Linux. This will be removed in future, please use
+fbususb connection type instead.
+
+media
+*****
+
+Sample media files which can be used with Gammu.
+
+other
+*****
+
+Some scripts not related directly to Gammu, but more to modems and GSM
+phones in general.
+
+packaging
+*********
+
+Support for creating packages on various distributions. Please note that
+support for RPM (gammu.spec) and Slackware (description-pak) is included
+in top level directory.
+
+perl
+****
+
+Various perl scripts which interface to Gammu or SMSD.
+
+php
+***
+
+Various PHP frontends to SMSD or Gammu directly.
+
+smscgi
+******
+
+Simple cgi application gor handling SMS messages (a bit lighter version
+of SMSD).
+
+sql
+***
+
+Various SQL snippets and triggers useful with SMSD.
+
+testing
+*******
+
+Helper scripts for automatic testing or git bisect.
+
+sqlreply
+********
+
+System for automatic replying to SMS messages.
+
+symbian
+*******
+
+GNapplet sources and binaries. This comes from Gnokii project, but Gammu
+includes slightly modified version.
+
+win32
+*****
+
+Unsupported applications built on top of libGammu.dll on Windows.
+
+# vim: et ts=4 sw=4 sts=4 tw=72 spell spelllang=en_us
diff --git a/docs/manual/project/index.rst b/docs/manual/project/index.rst
index fc64464..e7731f7 100644
--- a/docs/manual/project/index.rst
+++ b/docs/manual/project/index.rst
@@ -12,5 +12,6 @@ Gammu project
     localization
     testing
     coding-style
+    versioning
     documentation
     directories
diff --git a/docs/manual/project/install.rst b/docs/manual/project/install.rst
index cea5462..83752dd 100644
--- a/docs/manual/project/install.rst
+++ b/docs/manual/project/install.rst
@@ -366,3 +366,10 @@ detected), please attach :file:`CMakeCache.txt`,
 :file:`CMakeFiles/CMakeError.log` and :file:`CMakeFiles/CMakeOutput.log` files
 to the report. It will help diagnose what was detected on the system and
 possibly fix these errors.
+
+Debugging crashes
+=================
+
+To debug program crashes, you might want to build Gammu with
+``-DENABLE_PROTECTION=OFF``, otherwise debugging tools are somehow confused
+with protections GCC makes and produce bogus back traces.
diff --git a/docs/manual/project/versioning.rst b/docs/manual/project/versioning.rst
new file mode 100644
index 0000000..da7dea1
--- /dev/null
+++ b/docs/manual/project/versioning.rst
@@ -0,0 +1,7 @@
+Versioning
+==========
+
+There are two types of releases - testing and stable, both having
+version x.y.z. Stable releases have usually z = 0 or some small number,
+while testing ones have z >= 90. Testing releases usually provide latest
+features, but everything does not have to be stabilized yet.
diff --git a/docs/manual/smsd/mysql.rst b/docs/manual/smsd/mysql.rst
index 8ba55d2..e74875e 100644
--- a/docs/manual/smsd/mysql.rst
+++ b/docs/manual/smsd/mysql.rst
@@ -10,3 +10,20 @@ options).
 For tables description see :ref:`gammu-smsd-tables`.
 
 This backend is based on :ref:`gammu-smsd-sql`.
+
+Privileges
+----------
+
+The user accessing the database does not need much privileges, the following
+privleges should be enough:
+
+.. code-block:: sql
+
+    GRANT USAGE ON *.* TO 'smsd'@'localhost' IDENTIFIED BY 'password';
+
+    GRANT SELECT, INSERT, UPDATE, DELETE ON `smsd`.* TO 'smsd'@'localhost';
+
+.. note:: 
+
+   For creating the SQL tables you need more privileges, especially for
+   creating triggers, which are used for some functionality.
diff --git a/docs/manual/smsd/sql.rst b/docs/manual/smsd/sql.rst
index 63ac67f..1db29f1 100644
--- a/docs/manual/smsd/sql.rst
+++ b/docs/manual/smsd/sql.rst
@@ -176,7 +176,7 @@ are selected for default queries during initialization.
 
         UPDATE phones SET Received = Received + 1 WHERE IMEI = %I
 
-.. config:option:: reresh_send_status
+.. config:option:: refresh_send_status
 
     Update messages in outbox.
 
diff --git a/docs/manual/smsd/tables.rst b/docs/manual/smsd/tables.rst
index f6ab872..cf01236 100644
--- a/docs/manual/smsd/tables.rst
+++ b/docs/manual/smsd/tables.rst
@@ -317,6 +317,11 @@ History
 
 History of schema versions:
 
+12
+    the changes only affect MySQL structure changing default values for
+    timestamps from ``0000-00-00 00:00:00`` to ``CURRENT_TIMESTAMP()`` by 
+    using triggers, to update to this version, just execute triggers 
+    definition at the end of SQL file.
 11
     all fields for storing message text are no longer limited to 160 chars,
     but are arbitrary length text fields (1.25.92)
diff --git a/docs/manual/testing/dummy-driver.rst b/docs/manual/testing/dummy-driver.rst
index ed462b8..3556244 100644
--- a/docs/manual/testing/dummy-driver.rst
+++ b/docs/manual/testing/dummy-driver.rst
@@ -1,22 +1,21 @@
+.. _dummy-driver:
+
 Dummy Driver
 ============
 
-Recently there has been added dummy driver to Gammu, which emulates all
-operations on filesystem. It is used by :doc:`testsuite`, but it is also very
-helpful for application developers, because they can test the functionality
-without using real phone and avoiding risk of corrupting data in the phone.
-To use dummy driver, you need something like following in :file:`~/.gammurc`::
+.. versionadded:: 1.22.93
 
-    [gammu]
-    model = dummy
-    connection = none
-    port = /path/to/direcotry/
+The ``dummy`` driver in Gammu emulates all operations on filesystem. It is
+used by :doc:`testsuite`, but it is also very helpful for application
+developers, because they can test the functionality without using real phone
+and avoiding risk of corrupting data in the phone.
 
 Filesystem structure
 --------------------
 
-The dummy driver emulates all phone functionality on filesystem. The ``port``
-configuration directive sets top level directory, where all data are stored.
+The dummy driver emulates all phone functionality on filesystem. The
+:config:option:`Device` configuration directive sets top level directory,
+where all data are stored.
 
 This directory contains file :file:`operations.log`, where are logged
 operations which do not modify any data in the dummy phone (eg. sending
@@ -54,3 +53,36 @@ Filesystem
 
 Filesystem is stored in :file:`fs` directory. You can create another
 subdirectories there.
+
+Other features
+--------------
+
+By specifying :config:option:`Features` you can configure some specific behavior:
+
+``DISABLE_GETNEXT``
+    Makes the dummy driver fail all GetNext* calls as not supported (with
+    exception of GetNextSMS* and GetNextFile*).
+``DISABLE_GETNEXTSMS``
+    Makes the dummy driver fail all GetNextSMS* calls as not supported.
+
+Examples
+--------
+
+To use dummy driver, you need something like following in :file:`~/.gammurc`:
+
+.. code-block:: ini
+
+    [gammu]
+    model = dummy
+    connection = none
+    device = /path/to/directory/
+
+For disabling GetNext* functions within dummy driver, you need something like following in :file:`~/.gammurc`:
+
+.. code-block:: ini
+
+    [gammu]
+    model = dummy
+    connection = none
+    features = DISABLE_GETNEXT
+    device = /path/to/directory/
diff --git a/docs/manual/testing/testsuite.rst b/docs/manual/testing/testsuite.rst
index b31016a..52ee711 100644
--- a/docs/manual/testing/testsuite.rst
+++ b/docs/manual/testing/testsuite.rst
@@ -66,7 +66,7 @@ or also with checking for memory leaks::
 Testing of SMSD
 ---------------
 
-SMSD tests are performed using :doc:`dummy-driver` and uses file backend and
+SMSD tests are performed using :ref:`dummy-driver` and uses file backend and
 sqlite database by default. For this you nee Gammu compiled with libdbi, have
 installed sqlite driver for libdbi and have :program:`sqlite3` binary available
 on the syste,.
@@ -82,7 +82,7 @@ Testing of additional database backends must be enabled separately:
 Testing of command line utility
 -------------------------------
 
-Gammu command line tests are performed using :doc:`dummy-driver` where
+Gammu command line tests are performed using :ref:`dummy-driver` where
 required. It covers most of command line interface, but some parts need to be
 explicitly enabled:
 
@@ -92,7 +92,7 @@ explicitly enabled:
 Testing of Python interface
 ---------------------------
 
-Python module tests are performed using :doc:`dummy-driver` where required. It
+Python module tests are performed using :ref:`dummy-driver` where required. It
 does also cover testing of SMSD interface, which is done using libdbi(sqlite)
 driver.
 
diff --git a/docs/sql/mysql.sql b/docs/sql/mysql.sql
index 6a50de8..5d4930b 100644
--- a/docs/sql/mysql.sql
+++ b/docs/sql/mysql.sql
@@ -40,7 +40,7 @@ CREATE TABLE `gammu` (
 -- Dumping data for table `gammu`
 -- 
 
-INSERT INTO `gammu` (`Version`) VALUES (11);
+INSERT INTO `gammu` (`Version`) VALUES (12);
 
 -- --------------------------------------------------------
 
@@ -225,3 +225,56 @@ CREATE INDEX sentitems_sender ON sentitems(SenderID);
 -- Dumping data for table `sentitems`
 -- 
 
+
+-- 
+-- Triggers for setting default timestamps
+-- 
+
+DELIMITER //
+
+CREATE TRIGGER inbox_timestamp BEFORE INSERT ON inbox
+FOR EACH ROW
+BEGIN
+    IF NEW.ReceivingDateTime = '0000-00-00 00:00:00' THEN
+        SET NEW.ReceivingDateTime = CURRENT_TIMESTAMP();
+    END IF;
+END;//
+
+CREATE TRIGGER outbox_timestamp BEFORE INSERT ON outbox
+FOR EACH ROW
+BEGIN
+    IF NEW.InsertIntoDB = '0000-00-00 00:00:00' THEN
+        SET NEW.InsertIntoDB = CURRENT_TIMESTAMP();
+    END IF;
+    IF NEW.SendingDateTime = '0000-00-00 00:00:00' THEN
+        SET NEW.SendingDateTime = CURRENT_TIMESTAMP();
+    END IF;
+    IF NEW.SendingTimeOut = '0000-00-00 00:00:00' THEN
+        SET NEW.SendingTimeOut = CURRENT_TIMESTAMP();
+    END IF;
+END;//
+
+CREATE TRIGGER phones_timestamp BEFORE INSERT ON phones
+FOR EACH ROW
+BEGIN
+    IF NEW.InsertIntoDB = '0000-00-00 00:00:00' THEN
+        SET NEW.InsertIntoDB = CURRENT_TIMESTAMP();
+    END IF;
+    IF NEW.TimeOut = '0000-00-00 00:00:00' THEN
+        SET NEW.TimeOut = CURRENT_TIMESTAMP();
+    END IF;
+END;//
+
+CREATE TRIGGER sentitems_timestamp BEFORE INSERT ON sentitems
+FOR EACH ROW
+BEGIN
+    IF NEW.InsertIntoDB = '0000-00-00 00:00:00' THEN
+        SET NEW.InsertIntoDB = CURRENT_TIMESTAMP();
+    END IF;
+    IF NEW.SendingDateTime = '0000-00-00 00:00:00' THEN
+        SET NEW.SendingDateTime = CURRENT_TIMESTAMP();
+    END IF;
+END;//
+
+DELIMITER ;
+
diff --git a/docs/sql/pgsql.sql b/docs/sql/pgsql.sql
index 42dfaf9..2d88ac5 100644
--- a/docs/sql/pgsql.sql
+++ b/docs/sql/pgsql.sql
@@ -80,7 +80,7 @@ CREATE TABLE gammu (
 -- Dumping data for table "gammu"
 -- 
 
-INSERT INTO gammu (Version) VALUES (11);
+INSERT INTO gammu (Version) VALUES (12);
 
 -- --------------------------------------------------------
 
diff --git a/docs/sql/sqlite.sql b/docs/sql/sqlite.sql
index 034429b..06fdb6d 100644
--- a/docs/sql/sqlite.sql
+++ b/docs/sql/sqlite.sql
@@ -7,7 +7,7 @@ CREATE TABLE gammu (
   Version INTEGER NOT NULL DEFAULT '0'
 );
 
-INSERT INTO gammu (Version) VALUES (11);
+INSERT INTO gammu (Version) VALUES (12);
 
 CREATE TABLE inbox (
   UpdatedInDB NUMERIC NOT NULL DEFAULT (datetime('now')),
diff --git a/docs/user/gammu-backup.5 b/docs/user/gammu-backup.5
index 0f69ac7..0e8ec45 100644
--- a/docs/user/gammu-backup.5
+++ b/docs/user/gammu-backup.5
@@ -1,4 +1,4 @@
-.TH "GAMMU-BACKUP" "5" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMU-BACKUP" "5" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammu-backup \- gammu(1) backup file format.
 .
@@ -102,6 +102,10 @@ Replace:
 Type = NumberMobile\enEntry\e1Text = "\e+36\e2\e3"\en
 .ft P
 .fi
+.IP "See also"
+.sp
+\fIconverting\-formats\fP
+.RE
 .SH AUTHOR
 Michal Čihař <michal@cihar.com>
 .SH COPYRIGHT
diff --git a/docs/user/gammu-config.1 b/docs/user/gammu-config.1
index 9eb78a5..b94b314 100644
--- a/docs/user/gammu-config.1
+++ b/docs/user/gammu-config.1
@@ -1,4 +1,4 @@
-.TH "GAMMU-CONFIG" "1" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMU-CONFIG" "1" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammu-config \- Gammu configurator
 .
diff --git a/docs/user/gammu-smsbackup.5 b/docs/user/gammu-smsbackup.5
index 0395270..668c904 100644
--- a/docs/user/gammu-smsbackup.5
+++ b/docs/user/gammu-smsbackup.5
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSBACKUP" "5" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMU-SMSBACKUP" "5" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammu-smsbackup \- gammu(1) SMS backup file format.
 .
diff --git a/docs/user/gammu-smsd-dbi.7 b/docs/user/gammu-smsd-dbi.7
index 0031693..67147b6 100644
--- a/docs/user/gammu-smsd-dbi.7
+++ b/docs/user/gammu-smsd-dbi.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-DBI" "7" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMU-SMSD-DBI" "7" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammu-smsd-dbi \- gammu-smsd(1) backend using DBI abstraction layer to use any supported database as a message storage
 .
diff --git a/docs/user/gammu-smsd-files.7 b/docs/user/gammu-smsd-files.7
index 23b11f8..ef4ce99 100644
--- a/docs/user/gammu-smsd-files.7
+++ b/docs/user/gammu-smsd-files.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-FILES" "7" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMU-SMSD-FILES" "7" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammu-smsd-files \- gammu-smsd(1) backend using filesystem as a message storage
 .
diff --git a/docs/user/gammu-smsd-inject.1 b/docs/user/gammu-smsd-inject.1
index 39d590c..959d719 100644
--- a/docs/user/gammu-smsd-inject.1
+++ b/docs/user/gammu-smsd-inject.1
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-INJECT" "1" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMU-SMSD-INJECT" "1" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammu-smsd-inject \- Inject messages into queue of SMS daemon for Gammu
 .
diff --git a/docs/user/gammu-smsd-monitor.1 b/docs/user/gammu-smsd-monitor.1
index 0cbc0b9..d55c7ba 100644
--- a/docs/user/gammu-smsd-monitor.1
+++ b/docs/user/gammu-smsd-monitor.1
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-MONITOR" "1" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMU-SMSD-MONITOR" "1" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammu-smsd-monitor \- Monitor state of SMS daemon for Gammu
 .
diff --git a/docs/user/gammu-smsd-mysql.7 b/docs/user/gammu-smsd-mysql.7
index 5d305b8..9dcadee 100644
--- a/docs/user/gammu-smsd-mysql.7
+++ b/docs/user/gammu-smsd-mysql.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-MYSQL" "7" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMU-SMSD-MYSQL" "7" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammu-smsd-mysql \- gammu-smsd(1) backend using MySQL database server as a message storage
 .
@@ -38,6 +38,23 @@ options).
 For tables description see \fIgammu\-smsd\-tables\fP.
 .sp
 This backend is based on \fIgammu\-smsd\-sql\fP.
+.SH PRIVILEGES
+.sp
+The user accessing the database does not need much privileges, the following
+privleges should be enough:
+.sp
+.nf
+.ft C
+GRANT USAGE ON *.* TO \(aqsmsd\(aq@\(aqlocalhost\(aq IDENTIFIED BY \(aqpassword\(aq;
+
+GRANT SELECT, INSERT, UPDATE, DELETE ON \(gasmsd\(ga.* TO \(aqsmsd\(aq@\(aqlocalhost\(aq;
+.ft P
+.fi
+.IP Note
+.
+For creating the SQL tables you need more privileges, especially for
+creating triggers, which are used for some functionality.
+.RE
 .SH AUTHOR
 Michal Čihař <michal@cihar.com>
 .SH COPYRIGHT
diff --git a/docs/user/gammu-smsd-null.7 b/docs/user/gammu-smsd-null.7
index ce5e86d..f1007c8 100644
--- a/docs/user/gammu-smsd-null.7
+++ b/docs/user/gammu-smsd-null.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-NULL" "7" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMU-SMSD-NULL" "7" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammu-smsd-null \- gammu-smsd(1) backend not storing messages
 .
diff --git a/docs/user/gammu-smsd-pgsql.7 b/docs/user/gammu-smsd-pgsql.7
index e8951b3..a70eab8 100644
--- a/docs/user/gammu-smsd-pgsql.7
+++ b/docs/user/gammu-smsd-pgsql.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-PGSQL" "7" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMU-SMSD-PGSQL" "7" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammu-smsd-pgsql \- gammu-smsd(1) backend using PostgreSQL database server as a message storage
 .
diff --git a/docs/user/gammu-smsd-run.7 b/docs/user/gammu-smsd-run.7
index 16d3ee2..269a6d3 100644
--- a/docs/user/gammu-smsd-run.7
+++ b/docs/user/gammu-smsd-run.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-RUN" "7" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMU-SMSD-RUN" "7" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammu-smsd-run \- documentation for RunOnReceive directive
 .
diff --git a/docs/user/gammu-smsd-sql.7 b/docs/user/gammu-smsd-sql.7
index 69cad68..0041bbe 100644
--- a/docs/user/gammu-smsd-sql.7
+++ b/docs/user/gammu-smsd-sql.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-SQL" "7" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMU-SMSD-SQL" "7" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammu-smsd-sql \- gammu-smsd(1) backend using SQL abstraction layer to use any supported database as a message storage
 .
@@ -376,7 +376,7 @@ UPDATE phones SET Received = Received + 1 WHERE IMEI = %I
 .UNINDENT
 .INDENT 0.0
 .TP
-.B reresh_send_status
+.B refresh_send_status
 .
 Update messages in outbox.
 .sp
diff --git a/docs/user/gammu-smsd-tables.7 b/docs/user/gammu-smsd-tables.7
index fbfc922..fd455b4 100644
--- a/docs/user/gammu-smsd-tables.7
+++ b/docs/user/gammu-smsd-tables.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-TABLES" "7" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMU-SMSD-TABLES" "7" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammu-smsd-tables \- description of tables for database backends of gammu-smsd(1)
 .
@@ -416,6 +416,13 @@ Not used by SMSD currently, included only for application usage.
 History of schema versions:
 .INDENT 0.0
 .TP
+.B 12
+.
+the changes only affect MySQL structure changing default values for
+timestamps from \fB0000\-00\-00 00:00:00\fP to \fBCURRENT_TIMESTAMP()\fP by
+using triggers, to update to this version, just execute triggers
+definition at the end of SQL file.
+.TP
 .B 11
 .
 all fields for storing message text are no longer limited to 160 chars,
diff --git a/docs/user/gammu-smsd.1 b/docs/user/gammu-smsd.1
index 8bd47c8..e54a2d8 100644
--- a/docs/user/gammu-smsd.1
+++ b/docs/user/gammu-smsd.1
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD" "1" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMU-SMSD" "1" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammu-smsd \- SMS daemon for Gammu
 .
diff --git a/docs/user/gammu-smsdrc.5 b/docs/user/gammu-smsdrc.5
index 5b0b4ea..401db87 100644
--- a/docs/user/gammu-smsdrc.5
+++ b/docs/user/gammu-smsdrc.5
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSDRC" "5" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMU-SMSDRC" "5" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammu-smsdrc \- gammu-smsd(1) configuration file
 .
diff --git a/docs/user/gammu.1 b/docs/user/gammu.1
index 95d1a8e..87bd70e 100644
--- a/docs/user/gammu.1
+++ b/docs/user/gammu.1
@@ -1,4 +1,4 @@
-.TH "GAMMU" "1" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMU" "1" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammu \- Does some neat things with your cellular phone or modem.
 .
@@ -250,8 +250,12 @@ few others
 .SS Unicode
 .sp
 With \fIUnicode\fP single SMS can contain at most 70 chars, but these can be
-any chars including all national and special ones. Please note, that some
-older phones might have problems displaying such message.
+any chars including all national and special ones.
+.IP Warning
+.
+Please note, that some older phones might have problems displaying such
+message.
+.RE
 .SS Conversion
 .sp
 Gammu tries to do the best to handle non ASCII characters in your message.
@@ -462,10 +466,12 @@ more items).
 .sp
 Save caller logo as sms in Nokia (Smart Messaging)
 format \- size 72x14, two colors.
-.sp
-Please note, that it isn\(aqt designed for colour logos available for example in
-DCT4/TIKU \- you need to put bitmap file there inside phone using filesystem
-commands.
+.IP Warning
+.
+Please note, that it isn\(aqt designed for colour logos available for
+example in DCT4/TIKU \- you need to put bitmap file there inside
+phone using filesystem commands.
+.RE
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -697,8 +703,12 @@ and saved with text) or Alcatel format and send/save over SMS.
 .B PROFILE  [\-name name] [\-bitmap bitmap] [\-ringtone ringtone]
 .sp
 Read ringtone (RTTL) format, bitmap (Picture Image size) and name, format into
-Smart Messaging profile and send/save as SMS. Please note, that this format is
-abandomed by Nokia and supported by some (older) devices only like Nokia 3310.
+Smart Messaging profile and send/save as SMS.
+.IP Warning
+.
+Please note, that this format is abandoned by Nokia and supported
+by some (older) devices only like Nokia 3310.
+.RE
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -1139,8 +1149,13 @@ bytes available, used or used by some specific content.
 .B getfolderlisting folderID
 .sp
 Display files and folders available in folder with given folder ID. You can get ID\(aqs using getfilesystem \-flatall.
-.sp
-Please note, that in some phones (like N6230) content of some folders (with more files) can be cut (only part of files will be displayed) for example on infrared connection. This is not Gammu issue, but phone firmware problem.
+.IP Warning
+.
+Please note, that in some phones (like N6230) content of some folders
+(with more files) can be cut (only part of files will be displayed) for
+example on infrared connection. This is not Gammu issue, but phone
+firmware problem.
+.RE
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -1480,7 +1495,7 @@ regardless what backu format says.
 .TP
 .B addsms folder file [\-yes]
 .sp
-Adds SMSes from file (format like backupsms uses) to
+Adds SMSes from file (format like \fI\%gammu backupsms\fP uses) to
 selected folder in phone.
 .UNINDENT
 .INDENT 0.0
@@ -1545,7 +1560,7 @@ Any other extension is Gammu backup file and it supports all data mentioned abov
 .TP
 .B backupsms file [\-yes|\-all]
 .sp
-Stores all SMSes from phone to file.
+Stores all SMSes from phone to file into \fIgammu\-smsbackup\fP.
 .sp
 Use \-yes for answering yes to all questions (backup all messages and
 delete them from phone), or \-all to just backup all folders while keeping
@@ -1554,28 +1569,33 @@ messages in phone.
 .INDENT 0.0
 .TP
 .B restore file [\-yes]
+.IP Warning
+.
+Please note that restoring deletes all current content in phone. If you
+want only to add entries to phone, use \fI\%gammu addnew\fP.
+.RE
 .sp
 Restore settings written in file created using \fI\%gammu backup\fP command.
 .sp
-Please note that restoring deletes all current content in phone. If you
-want only to add entries to phone, use addnew.
-.sp
 In some phones restoring calendar notes will not show error, but won\(aqt
 be done, when phone doesn\(aqt have set clock inside.
 .UNINDENT
 .INDENT 0.0
 .TP
 .B restoresms file [\-yes]
+.IP Warning
+.
+Please note that this overwrites existing messages in phone (if it supports it).
+.RE
 .sp
-Restores SMSes from file (format like backupsms uses) to
-selected folder in phone. Please note that this overwrites existing
-messages in phone (if it supports it).
+Restores SMSes from file (format like \fI\%gammu backupsms\fP uses) to
+selected folder in phone.
 .UNINDENT
 .INDENT 0.0
 .TP
 .B savefile TYPE [type options]
 .sp
-Coverts between various file formats supported by Gammu, following types
+Converts between various file formats supported by Gammu, following types
 are supported:
 .INDENT 7.0
 .TP
@@ -1611,6 +1631,24 @@ supports for phonebook events. The file type is guessed (for input file
 guess is based on extension and file content, for output solely on
 extension).
 .UNINDENT
+.IP "See also"
+.sp
+\fI\%gammu convertbackup\fP
+.RE
+.UNINDENT
+.INDENT 0.0
+.TP
+.B convertbackup source.file output.file
+.sp
+New in version 1.28.94.
+.sp
+Converts backup between formats supported by Gammu. Unlike
+\fI\%gammu savefile\fP, this does not give you any options what to
+convert, it simply takes converts all what can be saved into output file.
+.IP "See also"
+.sp
+\fI\%gammu savefile\fP
+.RE
 .UNINDENT
 .SS Nokia specific commands
 .INDENT 0.0
@@ -2221,10 +2259,13 @@ input).
 .TP
 .B searchphone [\-debug]
 .sp
-Attempts to search for a connected phone. Please note
-that this can take a very long time, but in case you have no clue how to
-configure phone connection, this is a convenient way to find working setup for
-Gammu.
+Attempts to search for a connected phone.
+.IP Warning
+.
+Please note that this can take a very long time, but in case you have
+no clue how to configure phone connection, this is a convenient way to
+find working setup for Gammu.
+.RE
 .UNINDENT
 .SS Gammu information commands
 .INDENT 0.0
@@ -2584,7 +2625,7 @@ or
 .sp
 .nf
 .ft C
-gammu savesms TEXT \-text "All your base are belong to us
+gammu savesms TEXT \-text "All your base are belong to us"
 .ft P
 .fi
 .sp
@@ -2600,7 +2641,7 @@ or
 .sp
 .nf
 .ft C
-gammu savesms TEXT \-len 400 \-text "All your base are belong to us
+gammu savesms TEXT \-len 400 \-text "All your base are belong to us"
 .ft P
 .fi
 .sp
@@ -2608,7 +2649,7 @@ or
 .sp
 .nf
 .ft C
-gammu savesms EMS \-text "All your base are belong to us
+gammu savesms EMS \-text "All your base are belong to us"
 .ft P
 .fi
 .sp
@@ -2655,13 +2696,32 @@ gammu setbitmap OPERATOR ala.bmp "230 03"
 .fi
 .SS Converting file formats
 .sp
-Convert single entry (at position 260) from gammu native backup to vCalendar:
+The formats conversion can done using \fI\%gammu savefile\fP or
+\fI\%gammu convertbackup\fP commands.
+.sp
+Convert single entry (at position 260) from \fIgammu\-backup\fP to vCalendar:
 .sp
 .nf
 .ft C
 gammu savefile CALENDAR output.vcs myCalendar.backup 260
 .ft P
 .fi
+.sp
+Convert first phonebook entry from \fIgammu\-backup\fP to vCard:
+.sp
+.nf
+.ft C
+gammu savefile VCARD21 output.vcf phone.backup ME 1
+.ft P
+.fi
+.sp
+Convert all contacts from backup to vCard:
+.sp
+.nf
+.ft C
+gammu convertbackup phone.backup output.vcf
+.ft P
+.fi
 .SS Reporting bugs
 .sp
 There are definitely many bugs, reporting to author is welcome. Please include
diff --git a/docs/user/gammurc.5 b/docs/user/gammurc.5
index 9d5164a..eeb71fe 100644
--- a/docs/user/gammurc.5
+++ b/docs/user/gammurc.5
@@ -1,4 +1,4 @@
-.TH "GAMMURC" "5" "December 02, 2010" "1.28.93" "Gammu"
+.TH "GAMMURC" "5" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 gammurc \- gammu(1) configuration file
 .
@@ -60,10 +60,16 @@ On Microsoft Windows:
 .UNINDENT
 .SH DESCRIPTION
 .sp
+Gammu requires configuration to be able to properly talk to your phone.
 \fIgammu\fP reads configuration from a config file. It\(aqs location is determined
 on runtime, see above for search paths.
 .sp
-You can use \fIgammu\-config\fP to generate configuration file.
+You can use \fIgammu\-config\fP to generate configuration file or start from
+\fI\%Fully documented example\fP.
+.sp
+For hints about configuring your phone, you can check Gammu Phone
+Database <\fI\%http://wammu.eu/phones/\fP> to see what user users
+experienced.
 .sp
 This file use ini file syntax, see \fIini\fP.
 .sp
@@ -366,7 +372,7 @@ needed information to diagnose problems.
 .
 Custom features for phone. This can be used as override when values coded
 in \fBcommon/gsmphones.c\fP are bad or missing. Consult
-\fBinclude/gammu\-info.h\fP for possible values (all GSM_Feature values
+\fBinclude/gammu\-info.h\fP for possible values (all \fBGSM_Feature\fP values
 without leading \fBF_\fP prefix). Please report correct values to Gammu
 authors.
 .UNINDENT
@@ -455,6 +461,188 @@ device = /dev/ttyS2
 connection = at
 .ft P
 .fi
+.SS Fully documented example
+.sp
+You can find this sample file as \fBdocs/config/gammurc\fP in Gammu sources.
+.sp
+.nf
+.ft C
+; This is a sample ~/.gammurc file.
+; In Unix/Linux  copy it into your home directory and name it .gammurc
+;                or into /etc and name it gammurc
+; In Win32       copy it into directory with Gammu.exe and name gammurc
+; More about parameters later
+; Anything behind ; or # is comment.
+; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+
+[gammu]
+
+device = com8:
+connection = irdaphonet
+; Do not use model configuration unless you really need it
+;model = 6110
+;synchronizetime = yes
+;logfile = gammulog
+;logformat = textall
+;use_locking = yes
+;gammuloc = locfile
+;startinfo = yes
+;gammucoding = utf8
+;usephonedb = yes
+
+[gammu1]
+
+device = com8:
+;model = 6110
+connection = fbusblue
+;synchronizetime = yes
+;logfile = gammulog
+;logformat = textall
+;use_locking = yes
+;gammuloc = locfile
+;startinfo = yes
+;gammucoding = utf8
+
+; Step 1. Please find required Connection parameter and look into assigned 
+; with it device type. With some Connection you must set concrete model
+
+; ================================================================ cables =====
+; New Nokia protocol for FBUS/DAU9P
+;    Connection "fbus", device type serial
+; New Nokia protocol for DLR3/DLR3P
+;    Connection "fbusdlr3"/"dlr3", device type serial 
+; New Nokia protocol for DKU2 (and phone with USB converter on phone mainboard
+;                              like 6230)
+;    Connection "dku2phonet"/"dku2", device type dku2 on Windows
+;    Connection "fbususb" on Linux
+; New Nokia protocol for DKU5 (and phone without USB converter on phone
+;                              mainboard like 5100)
+;    Connection "dku5fbus"/"dku5", device type dku5
+; New Nokia protocol for PL2303 USB cable (and phone without USB converter
+;                                          on phone mainboard like 5100)
+;    Connection "fbuspl2303", device type usb
+; Old Nokia protocol for MBUS/DAU9P
+;    Connection "mbus", device type serial
+; Variants: 
+; You can modify a bit behaviour of connection using additional flags
+; specified just after connection name like connection\-variant.
+; If you\(aqre using ARK3116 cable (or any other which does not like dtr 
+; handling), you might need \-nodtr variant of connection, eg. dlr3\-nodtr.
+; If cable you use is not powered over DTR/RTS, try using \-nopower variant of 
+; connection, eg. fbus\-nopower.
+; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; AT commands for DLR3, DKU5 or other AT compatible cable (8 bits, None
+; parity, no flow control, 1 stop bit). Used with Nokia, Alcatel, Siemens, etc.
+;    Connection "at19200"/"at115200"/.., device type serial
+; AT commands for DKU2 cable
+;    Connection "dku2at", device type dku2
+; ============================================================== infrared =====
+; Nokia protocol for infrared with Nokia 6110/6130/6150
+;    Connection "fbusirda"/"infrared", device type serial
+; Nokia protocol for infrared with other Nokia models
+;    Connection "irdaphonet"/"irda", device type irda
+; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; AT commands for infrared. Used with Nokia, Alcatel, Siemens, etc.
+;    Connection "irdaat", device type irda
+; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; OBEX for infrared
+;    Connection "irdaobex", device type irda.
+; ============================================================= Bluetooth =====
+; Nokia protocol with serial device set in BT stack (WidComm, other) from
+; adequate service and Nokia 6210
+;    Connection "fbusblue", device type serial
+; Nokia protocol with serial device set in BT stack (WidComm, other) from
+; adequate service and other Nokia models
+;    Connection "phonetblue", device type serial
+; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; Nokia protocol for Bluetooth stack with Nokia 6210
+;    Connection "bluerffbus", device type BT
+; Nokia protocol for Bluetooth stack with DCT4 Nokia models, which don\(aqt inform
+; about services correctly (6310, 6310i with firmware lower than 5.50, 8910,..)
+;    Connection "bluerfphonet", device type BT
+; Nokia protocol for Bluetooth stack with other DCT4 Nokia models
+;    Connection "bluephonet", device type BT
+; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; AT commands for Bluetooth stack and 6210 / DCT4 Nokia models, which don\(aqt
+; inform about BT services correctly (6310, 6310i with firmware lower 
+; than 5.50, 8910,..)
+;    Connection "bluerfat", device type BT
+; AT commands for Bluetooth stack with other phones (Siemens, other Nokia,etc.)
+;    Connection "blueat", device type BT
+; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; OBEX for Bluetooth stack with DCT4 Nokia models, which don\(aqt inform about
+; BT services correctly (6310, 6310i with firmware lower than 5.50, 8910,...)
+;    Connection "bluerfobex", device type BT
+; OBEX for Bluetooth stack with other phones (Siemens, other Nokia, etc.)
+;    Connection "blueobex", device type BT.
+; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+;    Connection "bluerfgnapbus", device type BT, model "gnap"
+;    Connection "irdagnapbus", device type irda, model "gnap"
+
+; Step2. According to device type from Step1 and used OS set Port parameter
+
+; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; Port type | "Port" parameter in Windows/DOS | "Port" parameter in Linux/Unix
+; \-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; serial    | "com*:"                         | "/dev/ttyS*"
+;           | (example "com1:")               | (example "/dev/ttyS1")
+;           |                                 | or "/dev/tts/**" (with DevFS)
+;           |                                 | virtual serial ports like
+;           |                                 | "/dev/ircomm*" or "/dev/rfcomm*"
+; \-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; irda      | ignored (can be empty)          | ignored (can be empty)
+; \-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; BT        | Bluetooth device address (example "00:11:22:33:44:55").
+;           | Optionally you can also include channel after slash
+;           | (example "00:11:22:33:44:55/12"). Can be also empty.
+; \-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; dku2      | ignored (can be empty)          | /dev/ttyUSB* or /dev/ttyACM*
+; \-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; dku5      | ignored (can be empty)          | connection with it not possible
+; \-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; usb       | connection with it not possible | "/dev/ttyUSB*"
+
+; Step3. Set other config parameters
+
+; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; Parameter name  | Description
+; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; Model           | Should not be used unless you have a good reason to do so.
+;                 | If Gammu doesn\(aqt recognize your phone model, put it here. 
+;                 | Example values: "6110", "6150", "6210", "8210"
+; SynchronizeTime | if you want to set time from computer to phone during
+;                 | starting connection. Do not rather use this option when
+;                 | when to reset phone during connection (in some phones need
+;                 | to set time again after restart)
+; GammuLoc        | name of localisation file
+; StartInfo       | this option allow to set, that you want (setting "yes")
+;                 | to see message on the phone screen or phone should enable
+;                 | light for a moment during starting connection. Phone
+;                 | WON\(aqT beep during starting connection with this option.
+; GammuCoding     | forces using specified codepage (in win32 \- for example
+;                 | "1250" will force CP1250) or UTF8 (in Linux \- "utf8")
+; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; Logfile         | Use, when want to have logfile from communication.
+; Logformat       | What debug info and format should be used:
+;                 |   "nothing" \- no debug level (default)
+;                 |   "text"    \- transmission dump in text format
+;                 |   "textall" \- all possible info in text format
+;                 |   "errors"  \- errors in text format
+;                 |   "binary"  \- transmission dump in binary format
+; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; Features        | Custom features for phone. This can be used as override
+;                 | when values coded in common/gsmphones.c are bad or
+;                 | missing. Consult include/gammu\-info.h for possible values
+;                 | (all Feature values without leading F_ prefix).
+;                 | Please report correct values to Gammu authors.
+; \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+; Use_Locking     | under Unix/Linux use "yes", if want to lock used device
+;                 | to prevent using it by other applications. In win32 ignored
+
+; vim: et ts=4 sw=4 sts=4 tw=78 spell spelllang=en_us
+
+.ft P
+.fi
 .SH AUTHOR
 Michal Čihař <michal@cihar.com>
 .SH COPYRIGHT
diff --git a/docs/user/jadmaker.1 b/docs/user/jadmaker.1
index 4d0f807..93af7a1 100644
--- a/docs/user/jadmaker.1
+++ b/docs/user/jadmaker.1
@@ -1,4 +1,4 @@
-.TH "JADMAKER" "1" "December 02, 2010" "1.28.93" "Gammu"
+.TH "JADMAKER" "1" "December 22, 2010" "1.28.94" "Gammu"
 .SH NAME
 jadmaker \- JAD File Generator
 .