Imported Upstream version 1.30.92

22 files changed, 129 insertions, 20 deletions

diff --git a/docs/man/gammu-backup.5 b/docs/man/gammu-backup.5
index baf4371..6b0e0eb 100644
--- a/docs/man/gammu-backup.5
+++ b/docs/man/gammu-backup.5
@@ -1,4 +1,4 @@
-.TH "GAMMU-BACKUP" "5" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-BACKUP" "5" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu-backup \- gammu(1) backup file format.
 .
diff --git a/docs/man/gammu-config.1 b/docs/man/gammu-config.1
index e0dcbc3..db1fe54 100644
--- a/docs/man/gammu-config.1
+++ b/docs/man/gammu-config.1
@@ -1,4 +1,4 @@
-.TH "GAMMU-CONFIG" "1" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-CONFIG" "1" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu-config \- Gammu configurator
 .
diff --git a/docs/man/gammu-detect.1 b/docs/man/gammu-detect.1
index ee596f6..48c3f19 100644
--- a/docs/man/gammu-detect.1
+++ b/docs/man/gammu-detect.1
@@ -1,4 +1,4 @@
-.TH "GAMMU-DETECT" "1" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-DETECT" "1" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu-detect \- Gammu device detection
 .
diff --git a/docs/man/gammu-smsbackup.5 b/docs/man/gammu-smsbackup.5
index e918f79..d5c9163 100644
--- a/docs/man/gammu-smsbackup.5
+++ b/docs/man/gammu-smsbackup.5
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSBACKUP" "5" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-SMSBACKUP" "5" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu-smsbackup \- gammu(1) SMS backup file format.
 .
diff --git a/docs/man/gammu-smsd-dbi.7 b/docs/man/gammu-smsd-dbi.7
index 948cd46..53e4873 100644
--- a/docs/man/gammu-smsd-dbi.7
+++ b/docs/man/gammu-smsd-dbi.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-DBI" "7" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-SMSD-DBI" "7" "November 29, 2011" "1.30.92" "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/man/gammu-smsd-files.7 b/docs/man/gammu-smsd-files.7
index 5442492..fd64ad3 100644
--- a/docs/man/gammu-smsd-files.7
+++ b/docs/man/gammu-smsd-files.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-FILES" "7" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-SMSD-FILES" "7" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu-smsd-files \- gammu-smsd(1) backend using filesystem as a message storage
 .
diff --git a/docs/man/gammu-smsd-inject.1 b/docs/man/gammu-smsd-inject.1
index fb5eb5d..ffc2ffe 100644
--- a/docs/man/gammu-smsd-inject.1
+++ b/docs/man/gammu-smsd-inject.1
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-INJECT" "1" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-SMSD-INJECT" "1" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu-smsd-inject \- Inject messages into queue of SMS daemon for Gammu
 .
diff --git a/docs/man/gammu-smsd-monitor.1 b/docs/man/gammu-smsd-monitor.1
index ce51efc..7ec6e40 100644
--- a/docs/man/gammu-smsd-monitor.1
+++ b/docs/man/gammu-smsd-monitor.1
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-MONITOR" "1" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-SMSD-MONITOR" "1" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu-smsd-monitor \- Monitor state of SMS daemon for Gammu
 .
diff --git a/docs/man/gammu-smsd-mysql.7 b/docs/man/gammu-smsd-mysql.7
index f30cce2..6bd945b 100644
--- a/docs/man/gammu-smsd-mysql.7
+++ b/docs/man/gammu-smsd-mysql.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-MYSQL" "7" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-SMSD-MYSQL" "7" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu-smsd-mysql \- gammu-smsd(1) backend using MySQL database server as a message storage
 .
diff --git a/docs/man/gammu-smsd-null.7 b/docs/man/gammu-smsd-null.7
index 6f84f6c..2958ea6 100644
--- a/docs/man/gammu-smsd-null.7
+++ b/docs/man/gammu-smsd-null.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-NULL" "7" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-SMSD-NULL" "7" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu-smsd-null \- gammu-smsd(1) backend not storing messages
 .
diff --git a/docs/man/gammu-smsd-odbc.7 b/docs/man/gammu-smsd-odbc.7
index 8e79d39..fd4ce6a 100644
--- a/docs/man/gammu-smsd-odbc.7
+++ b/docs/man/gammu-smsd-odbc.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-ODBC" "7" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-SMSD-ODBC" "7" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu-smsd-odbc \- gammu-smsd(1) backend using ODBC abstraction layer to use any supported database as a message storage
 .
diff --git a/docs/man/gammu-smsd-pgsql.7 b/docs/man/gammu-smsd-pgsql.7
index 7c450e3..32fc0f2 100644
--- a/docs/man/gammu-smsd-pgsql.7
+++ b/docs/man/gammu-smsd-pgsql.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-PGSQL" "7" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-SMSD-PGSQL" "7" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu-smsd-pgsql \- gammu-smsd(1) backend using PostgreSQL database server as a message storage
 .
diff --git a/docs/man/gammu-smsd-run.7 b/docs/man/gammu-smsd-run.7
index d9591a3..e2451a0 100644
--- a/docs/man/gammu-smsd-run.7
+++ b/docs/man/gammu-smsd-run.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-RUN" "7" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-SMSD-RUN" "7" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu-smsd-run \- documentation for RunOnReceive directive
 .
diff --git a/docs/man/gammu-smsd-sql.7 b/docs/man/gammu-smsd-sql.7
index 1cf6ab5..90ffb07 100644
--- a/docs/man/gammu-smsd-sql.7
+++ b/docs/man/gammu-smsd-sql.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-SQL" "7" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-SMSD-SQL" "7" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu-smsd-sql \- gammu-smsd(1) backend using SQL abstraction layer to use any supported database as a message storage
 .
diff --git a/docs/man/gammu-smsd-tables.7 b/docs/man/gammu-smsd-tables.7
index 875a93a..f15e067 100644
--- a/docs/man/gammu-smsd-tables.7
+++ b/docs/man/gammu-smsd-tables.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-TABLES" "7" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-SMSD-TABLES" "7" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu-smsd-tables \- description of tables for database backends of gammu-smsd(1)
 .
diff --git a/docs/man/gammu-smsd.1 b/docs/man/gammu-smsd.1
index d134726..3b3de3a 100644
--- a/docs/man/gammu-smsd.1
+++ b/docs/man/gammu-smsd.1
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD" "1" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-SMSD" "1" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu-smsd \- SMS daemon for Gammu
 .
diff --git a/docs/man/gammu-smsdrc.5 b/docs/man/gammu-smsdrc.5
index c10df8c..4f52f45 100644
--- a/docs/man/gammu-smsdrc.5
+++ b/docs/man/gammu-smsdrc.5
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSDRC" "5" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU-SMSDRC" "5" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu-smsdrc \- gammu-smsd(1) configuration file
 .
@@ -257,6 +257,9 @@ activity. Please note that setting this to higher value than 1 will have
 effects to other time based configurations, because they will be effectively
 rounded to multiply of this value.
 .sp
+Setting this to 0 disables sleeping. Please not this might cause Gammu to
+consume quite a lot of CPU power.
+.sp
 Default is 1.
 .UNINDENT
 .INDENT 0.0
diff --git a/docs/man/gammu.1 b/docs/man/gammu.1
index 20090eb..420f5ef 100644
--- a/docs/man/gammu.1
+++ b/docs/man/gammu.1
@@ -1,4 +1,4 @@
-.TH "GAMMU" "1" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMU" "1" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammu \- Does some neat things with your cellular phone or modem.
 .
@@ -1347,12 +1347,19 @@ based on file extension:
 .IP \(bu 2
 Any other extension is Gammu backup file and it supports all data mentioned above, see \fIgammu\-backup\fP for more details.
 .UNINDENT
+.sp
+By default this command is interactive and asks which items tou want to backup.
+.sp
+Use \-yes for answering yes to all questions.
 .UNINDENT
 .INDENT 0.0
 .TP
 .B backupsms file [\-yes|\-all]
 Stores all SMSes from phone to file into \fIgammu\-smsbackup\fP.
 .sp
+By default this command is interactive and asks which folders you want
+to backup and whether you want to remove messages from phone afterwards.
+.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
 messages in phone.
@@ -2324,6 +2331,15 @@ Send protected message with ringtone:
 gammu sendsms EMS 123456 \-protected 2 \-variablebitmaplong ala.bmp \-toneSElong axelf.txt \-toneSE ring.txt
 .ft P
 .fi
+.SS Retrieving USSD replies
+.sp
+For example for retrieving prepaid card status or retrieving various network info:
+.sp
+.nf
+.ft C
+gammu getussd \(aq#555#\(aq
+.ft P
+.fi
 .SS Uploading files to Nokia
 .sp
 Add Alien to applications in your phone (you need to have files Alien.JAD and Alien.JAR in current directory):
diff --git a/docs/man/gammurc.5 b/docs/man/gammurc.5
index baac878..96d7c75 100644
--- a/docs/man/gammurc.5
+++ b/docs/man/gammurc.5
@@ -1,4 +1,4 @@
-.TH "GAMMURC" "5" "November 09, 2011" "1.30.91" "Gammu"
+.TH "GAMMURC" "5" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 gammurc \- gammu(1) configuration file
 .
@@ -153,6 +153,10 @@ Connection to Series60 applet in S60 phones, see \fIs60\fP.
 .sp
 New in version 1.29.90.
 .UNINDENT
+.IP "See also"
+.sp
+\fIfaq\-config\fP
+.RE
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -247,6 +251,10 @@ modprobe irtty\-sir
 .ft P
 .fi
 .RE
+.IP "See also"
+.sp
+\fIfaq\-config\fP
+.RE
 .UNINDENT
 .INDENT 0.0
 .TP
diff --git a/docs/man/jadmaker.1 b/docs/man/jadmaker.1
index b4e8e21..4fadf46 100644
--- a/docs/man/jadmaker.1
+++ b/docs/man/jadmaker.1
@@ -1,4 +1,4 @@
-.TH "JADMAKER" "1" "November 09, 2011" "1.30.91" "Gammu"
+.TH "JADMAKER" "1" "November 29, 2011" "1.30.92" "Gammu"
 .SH NAME
 jadmaker \- JAD File Generator
 .
diff --git a/docs/manual/faq/config.rst b/docs/manual/faq/config.rst
index 3c7a493..6da4011 100644
--- a/docs/manual/faq/config.rst
+++ b/docs/manual/faq/config.rst
@@ -3,6 +3,8 @@
 Configuring Gammu FAQ
 =====================
 
+.. _faq-config-at:
+
 How to configure 3G/UMTS/... modem or AT capable phone?
 -------------------------------------------------------
 
@@ -24,6 +26,24 @@ one - for example only one of them can receive USSD notifications.
 
 .. _usb-modeswitch: http://www.draisberghof.de/usb_modeswitch/
 
+Example configuration on Linux:
+
+.. code-block:: ini
+
+    [gammu]
+    device = /dev/ttyACM3
+    connection = at
+
+Example configuration on Windows:
+
+.. code-block:: ini
+
+    [gammu]
+    device = COM12:
+    connection = at
+
+.. _faq-config-symbian:
+
 How to configure Symbian based phone?
 -------------------------------------
 
@@ -33,6 +53,20 @@ and Bluetooth address of phone as :config:option:`Device`.
 
 .. seealso:: :ref:`s60`, :ref:`gammurc`
 
+.. note::
+
+    Do not forget to start the applet before trying to connect to the phone.
+
+Example configuration:
+
+.. code-block:: ini
+
+    [gammu]
+    device = 11:22:33:44:55:66 # Bluetooth address of your phone
+    connection = blues60
+
+.. _faq-config-nokia:
+
 How to configure Nokia phone?
 -----------------------------
 
@@ -51,10 +85,45 @@ Should you have old phone with serial cable (and USB to serial converter),
 
 .. seealso:: :ref:`gammurc`
 
+Example configuration for Bluetooth:
+
+.. code-block:: ini
+
+    [gammu]
+    device = 11:22:33:44:55:66 # Bluetooth address of your phone
+    connection = bluephonet
+
+Example configuration for newer phones:
+
+.. code-block:: ini
+
+    [gammu]
+    connection = dku2
+
+Example configuration for older phones on Linux:
+
+.. code-block:: ini
+
+    [gammu]
+    device = /dev/ttyACM3
+    connection = dlr3
+
+Example configuration for older phones on Windows:
+
+.. code-block:: ini
+
+    [gammu]
+    device = COM12:
+    connection = dlr3
+
 How to configure phone not listed above?
 ----------------------------------------
 
 First check whether your phone is supported. In case it is, it most likely
 falls into one of above categories.
 
+You can also find additional user experiences in `Gammu Phones Database`_.
+
 .. seealso:: :ref:`faq-phones`, :ref:`gammurc`
+
+.. _Gammu Phones Database: http://wammu.eu/phones/
diff --git a/docs/manual/faq/phone.rst b/docs/manual/faq/phone.rst
index b8f9729..089bfc4 100644
--- a/docs/manual/faq/phone.rst
+++ b/docs/manual/faq/phone.rst
@@ -10,6 +10,8 @@ Generally any phone capable of AT commands or IrMC should be supported. Also
 any Nokia phone using Nokia OS should work. For Symbian please check separate
 topic. You can check other user experiences in `Gammu Phones Database`_.
 
+For information how to configure your phone, see :ref:`faq-config`.
+
 .. seealso:: :ref:`faq-symbian`, :ref:`faq-android`, :ref:`faq-blackberry`, :ref:`faq-iphone`, :ref:`gammurc`
 
 Which phone is best for SMS gateway?
@@ -21,6 +23,15 @@ option seem to be Siemens modems (eg. ES75/MC35i/MC55i). Slightly cheaper,
 while still good are modems made by Huawei (eg. E160/E220/E1750/...). You can
 check other user experiences in `Gammu Phones Database`_.
 
+.. _faq-nokia:
+
+Are Nokia phones supported?
+---------------------------
+
+It depends on used operating systems Series40 and older phones should work 
+(see :ref:`faq-config-nokia` for information how to configure them), Symbian 
+based phones are covered in separate topic, check :ref:`faq-symbian`.
+
 .. _faq-symbian:
 
 Are Symbian phones supported?
@@ -31,6 +42,8 @@ phones (Symbian 9.0 and older), install gnapplet (see :ref:`gnapplet`). Newer
 phones can use Python based applet called Series60-remote (see :ref:`s60`).
 This option is supported since Gammu 1.29.90.
 
+.. seealso:: :ref:`faq-config-symbian`
+
 .. _faq-android:
 
 Are Andriod phones supported?