--- gsmlib-1.10.orig/doc/gsmpb.man
+++ gsmlib-1.10/doc/gsmpb.man
@@ -15,32 +15,32 @@
 gsmpb \- GSM mobile phone phonebook manipulation program
 .SH SYNOPSIS
 .B gsmpb
-[ \fB-b\fP \fIbaudrate\fP ]
-[ \fB--baudrate\fP \fIbaudrate\fP ]
-[ \fB-c\fP ]
-[ \fB--copy\fP ]
-[ \fB-d\fP \fIdestination device or file\fP ]
-[ \fB--destination\fP \fIdestination device or file\fP ]
-[ \fB-h\fP ]
-[ \fB--help\fP ]
-[ \fB-i\fP ]
-[ \fB--index\fP ]
-[ \fB-I\fP \fIinit string\fP ]
-[ \fB--init\fP \fIinit string\fP ]
-[ \fB-p\fP \fIphonebook name\fP ]
-[ \fB--phonebook\fP \fIphonebook name\fP ]
-[ \fB-s\fP \fIsource device or file\fP ]
-[ \fB--source\fP \fIsource device or file\fP ]
-[ \fB-t\fP \fIcharacter set\fP ]
-[ \fB--charset\fP \fIcharacter set\fP ]
-[ \fB-v\fP ]
-[ \fB--version\fP ]
-[ \fB-V\fP ]
-[ \fB--verbose\fP ]
-[ \fB-X\fP ]
-[ \fB--xonxoff\fP ]
-[ \fB-y\fP ]
-[ \fB--synchronize\fP ]
+[ \fB\-b\fP \fIbaudrate\fP ]
+[ \fB\-\-baudrate\fP \fIbaudrate\fP ]
+[ \fB\-c\fP ]
+[ \fB\-\-copy\fP ]
+[ \fB\-d\fP \fIdestination device or file\fP ]
+[ \fB\-\-destination\fP \fIdestination device or file\fP ]
+[ \fB\-h\fP ]
+[ \fB\-\-help\fP ]
+[ \fB\-i\fP ]
+[ \fB\-\-index\fP ]
+[ \fB\-I\fP \fIinit string\fP ]
+[ \fB\-\-init\fP \fIinit string\fP ]
+[ \fB\-p\fP \fIphonebook name\fP ]
+[ \fB\-\-phonebook\fP \fIphonebook name\fP ]
+[ \fB\-s\fP \fIsource device or file\fP ]
+[ \fB\-\-source\fP \fIsource device or file\fP ]
+[ \fB\-t\fP \fIcharacter set\fP ]
+[ \fB\-\-charset\fP \fIcharacter set\fP ]
+[ \fB\-v\fP ]
+[ \fB\-\-version\fP ]
+[ \fB\-V\fP ]
+[ \fB\-\-verbose\fP ]
+[ \fB\-X\fP ]
+[ \fB\-\-xonxoff\fP ]
+[ \fB\-y\fP ]
+[ \fB\-\-synchronize\fP ]
 .PP
 .SH DESCRIPTION
 \fIgsmpb\fP can store or retrieve phonebook entries residing in a GSM
@@ -55,45 +55,45 @@
 destination, or the destination is synchronized with regard to the
 source which is the default (details see below).
 .PP
-If "-" is given as the parameter for the \fB--source\fP or
-\fB--destination\fP options, the phonebook is read from standard input 
+If "\-" is given as the parameter for the \fB\-\-source\fP or
+\fB\-\-destination\fP options, the phonebook is read from standard input 
 and/or written to standard output, respectively.
 .PP
 Phonebook entries names are encoded using the GSM default alphabet in
-the mobile phone, whereas they are stored using the Latin-1 encoding
+the mobile phone, whereas they are stored using the Latin\-1 encoding
 in phonebook files. When reading phonebook entries from a mobile phone 
-entry names are converted from the GSM default to Latin-1. Characters
-that can not be converted to Latin-1 are encoded as character code
-172 (Latin-1 boolean "not"). When writing file-based phonebook entries 
+entry names are converted from the GSM default to Latin\-1. Characters
+that can not be converted to Latin\-1 are encoded as character code
+172 (Latin\-1 boolean "not"). When writing file-based phonebook entries 
 to a mobile phone a conversion to the GSM default alphabet takes
 place. Characters that can not be converted are encoded as GSM delta
 (code 16). If the default character set has been changed using the
-\fB--charset\fP option no conversion takes place.
+\fB\-\-charset\fP option no conversion takes place.
 .PP
 Error messages are printed to the standard error output. If the program
 terminates on error the error code 1 is returned.
 .PP
 .SH OPTIONS
 .TP .7i
-\fB-b\fP \fIbaudrate\fP, \fB--baudrate\fP \fIbaudrate\fP
+\fB\-b\fP \fIbaudrate\fP, \fB\-\-baudrate\fP \fIbaudrate\fP
 The baud rate to use. The default baudrate is 38400.
 .TP .7i
-\fB-c\fP, \fB--copy\fP
+\fB\-c\fP, \fB\-\-copy\fP
 This causes the contents of the source to be copied to the
 destination. After this operation the destination has exactly the same 
 contents as the source.
 .TP .7i
-\fB-d\fP \fIdestination\fP, \fB--destination\fP \fIdestination\fP
+\fB\-d\fP \fIdestination\fP, \fB\-\-destination\fP \fIdestination\fP
 The destination device or file.
 .TP .7i
-\fB-h\fP, \fB--help\fP
+\fB\-h\fP, \fB\-\-help\fP
 Prints an option summary.
 .TP .7i
-\fB-I\fP \fIinit string\fP, \fB--init\fP \fIinit string\fP
+\fB\-I\fP \fIinit string\fP, \fB\-\-init\fP \fIinit string\fP
 Initialization string to send to the TA (default: "E0"). Note that the
 sequence "ATZ" is sent first.
 .TP .7i
-\fB-i\fP, \fB--index\fP
+\fB\-i\fP, \fB\-\-index\fP
 If the index position is given, \fIgsmpb\fP preserves the assignment
 of entries to memory slots in the mobile phone's phonebook. This can
 be used to backup phonebook entries with their position into a
@@ -104,7 +104,7 @@
 be unique, ie. it is not allowed to assign one entry twice to a
 specific position in the mobile phone's phonebook.
 .TP .7i
-\fB-p\fP \fIphonebook\fP, \fB--phonebook\fP \fIphonebook\fP
+\fB\-p\fP \fIphonebook\fP, \fB\-\-phonebook\fP \fIphonebook\fP
 The name of the phonebook to read from or write to. This is only used
 for device sources and destinations. Commonly available phonebooks
 are:
@@ -112,10 +112,10 @@
 .po +0.7i
 .ll 5.8i
 \fIFD\fP
-SIM fixdialling-phonebook
+SIM fixdialling\-phonebook
 .TP .3i
 \fILD\fP
-SIM last-dialling-phonebook
+SIM last\-dialling\-phonebook
 .TP .3i
 \fIME\fP
 ME phonebook
@@ -131,23 +131,23 @@
 .TP .7i
 .po -0.7i
 .ll 6.5i
-\fB-s\fP \fIsource\fP, \fB--source\fP \fIsource\fP
+\fB\-s\fP \fIsource\fP, \fB\-\-source\fP \fIsource\fP
 The source device or file.
 .TP
-\fB-t\fP \fIcharacter set\fP, \fB--charset\fP \fIcharacter set\fP
+\fB\-t\fP \fIcharacter set\fP, \fB\-\-charset\fP \fIcharacter set\fP
 Set the character set to use for phonebook operations (default is the
 GSM default alphabet).
 .TP
-\fB-v\fP, \fB--version\fP
+\fB\-v\fP, \fB\-\-version\fP
 Prints the program version.
 .TP .7i
-\fB-V\fP, \fB--verbose\fP
+\fB\-V\fP, \fB\-\-verbose\fP
 Prints out a detailed progress report.
 .TP .7i
-\fB-X\fP, \fB--xonxoff\fP
+\fB\-X\fP, \fB\-\-xonxoff\fP
 Uses software handshaking (XON/XOFF) for accessing the device.
 .TP .7i
-\fB-y\fP, \fB--synchronize\fP
+\fB\-y\fP, \fB\-\-synchronize\fP
 This causes the contents of the source to be synchronized with the
 destination (default). Synchronization in this context means:
 .TP .2i
@@ -188,7 +188,7 @@
 \fIindex\fP
 The index of the entry which must be a positive number. The index may
 also be empty. Indices can be used in conjunction with the
-\fB--index\fP option to store the entry into a specific position in
+\fB\-\-index\fP option to store the entry into a specific position in
 the mobile phone.
 .TP .7i
 \fItext\fP
@@ -199,7 +199,7 @@
 encoded using the GSM default alphabet (see comments above).
 .TP .7i
 \fIphone number\fP
-Phone numbers can only contains the digits 0-9 and the '+' sign. A '+' 
+Phone numbers can only contains the digits 0\-9 and the '+' sign. A '+' 
 sign denotes an international number.
 .PP
 .SH EXAMPLES
@@ -207,8 +207,8 @@
 SIM phonebook with the file $HOME/.phonebook:
 .PP
 .nf
-gsmpb --synchronize -b 19200 -d /dev/mobilephone \\
-      -s $HOME/.phonebook -p "SM"
+gsmpb \-\-synchronize \-b 19200 \-d /dev/mobilephone \\
+      \-s $HOME/.phonebook \-p "SM"
 .fi
 .PP
 .SH AUTHOR