[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-211-g63d6f53

[Pawel Kot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".

The branch, master has been updated
       via  63d6f53b3d2978a79d187002bcf4bfae3f474a95 (commit)
      from  ab1984cc27498272b734622b5c7c64ff7541ccde (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=63d6f53b3d2978a79d187002bcf4bfae3f474a95


commit 63d6f53b3d2978a79d187002bcf4bfae3f474a95
Author: Pawel Kot <address@hidden>
Date:   Sun Apr 3 16:24:49 2011 +0200

    doc: Explain the compatibility between --getphonebook and --writephonebook

diff --git a/Docs/man/gnokii.1 b/Docs/man/gnokii.1
index b5160da..c2e495b 100644
--- a/Docs/man/gnokii.1
+++ b/Docs/man/gnokii.1
@@ -336,7 +336,7 @@ reads specified memory location from phone.
 If \fIend_number\fR is not specified only one location \- \fIstart\fR is read.
 If instead of \fIend_number\fR the text \fIend\fR is specified then gnokii
 will read from \fIstart_number\fR until it encounters a non\-existant location.
-Valid \fImemory types\fR are: ME, SM, FD, ON, EN, DC, RC, MC, LD:
+Valid \fImemory types\fR are ME, SM, FD, ON, EN, DC, RC, MC, LD:
 .IP
 .B ME
 Internal memory of the mobile equipment
@@ -365,14 +365,18 @@ Missed calls
 .B LD
 Last dialed numbers 
 .PP
-Normally you get verbose output. 
+Normally you get human readable output. Please note, that it is not
+compatible with expected input by \fI\-\-writephonebook\fR.
 You can use \fI\-v\fR or \fI\-\-vcard\fR switch to get output in vCard format 
or \fI\-l\fR or \fI\-\-ldif\fR switch to get output in ldif format or \fI\-r\fR 
or \fI\-\-raw\fR switch to get the raw output which is explained below.
 You can use it then with \fI\-\-writephonebook\fR.
 .TP 
 .BR "\-\-writephonebook [\fI\-o|\-\-overwrite] [\-f|\-\-find\-free] 
[\-m|\-\-memory-type|\-\-memory memory_type] 
[\-n|\-\-memory-location|\-\-location number] 
[[\-v|\-\-vcard]|[\-l|\-\-ldif]\fP]"
 reads data from stdin and writes to phonebook.
-Uses the same format as provided by the output of the getphonebook command.
+Uses the format as provided by the output of the getphonebook command using
+\fI\-\-raw\fR or \fI\-\-vcard\fR or \fI\-\-ldif\fR.
 Default is raw format (see below for details) and alternate formats are vCard 
and ldif.
+Default \fI\-\-getphonebook\fR output format is not compatible with
+\fI\-\-writephonebook\fR.
 .PP
 With \fI\-\-memory-type memory_type\fP and \fI\-\-memory-location number\fP
 you can set a memory type and a location if the input data doesn't specify 
them.

-----------------------------------------------------------------------

Summary of changes:
 Docs/man/gnokii.1 |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs