build system: updating gnuconfig files to 2013-06-10

[pkg/abook.git] / abook.1

diff --git a/abook.1 b/abook.1
index bb7ed4e831e4e93b158a9d8c2b12823be58d58aa..cec604759956598a9514c9f8e9028880ce698da3 100644 (file)
--- a/abook.1
+++ b/abook.1
@@ -27,12 +27,14 @@ Use an alternative configuration file (default is \fI$HOME/.abook/abookrc\fR).
 \fB\-\-datafile\fP \fI<filename>\fR
 Use an alternative addressbook file (default is \fI$HOME/.abook/addressbook\fR).
 .TP
-\fB\-\-mutt\-query\fP \fI<string>\fR
+\fB\-\-mutt\-query\fP \fI<string>\fR [ \fB\-\-outformat\fP \fI<outputformat>\fR ]
 Make a query for mutt (search the addressbook for \fI<string>\fR).
 .br
 The \fB\-\-datafile\fP option, as documented above, may be used
 .BI BEFORE
 this option to search a different addressbook file.
+.br
+Only a subset of the below \fI<outputformat>\fR are allowed: \fBmutt\fP (default), \fBvcard\fP and \fBcustom\fP
 .TP
 \fB\-\-convert\fP [ \fB\-\-informat\fP \fI<inputformat>\fR ] [ \fB\-\-infile\fP \fI<inputfile>\fR ] [ \fB\-\-outformat\fP \fI<outputformat>\fR ] [ \fB\-\-outfile\fP \fI<outputfile>\fR ]
 Converts \fI<inputfile>\fR in \fI<inputformat>\fR to \fI<outputfile>\fR in \fI<outputformat>\fR
@@ -52,6 +54,8 @@ The following \fIinputformats\fR are supported:
 - \fBcsv\fP comma separated values
 .br
 - \fBpalmcsv\fP Palm comma separated values
+.br
+- \fBvcard\fP VCard addressbook
 
 .br
 The following \fIoutputformats\fR are supported:
@@ -66,7 +70,7 @@ The following \fIoutputformats\fR are supported:
 .br
 - \fBpine\fP pine addressbook
 .br
-- \fBgcrd\fP GnomeCard (VCard) addressbook
+- \fBvcard\fP VCard addressbook
 .br
 - \fBcsv\fP comma separated values
 .br
@@ -81,6 +85,17 @@ The following \fIoutputformats\fR are supported:
 - \fBwl\fP Wanderlust address book
 .br
 - \fBbsdcal\fP BSD calendar
+.br
+- \fBcustom\fP Custom output format, see below
+.TP
+\fB\-\-outformatstr\fP \fI<string>\fR
+Only used if \fB\-\-mutt\-query\fP \fIor\fR \fB\-\-convert\fP is specified \fIand\fR \fB\-\-outformat\fP=\fIcustom\fR. \fI<string>\fR is a format string allowing placeholders.
+.br
+A placeholder can be any of the standard fields names (see \fBabookrc\fP(5)) and must be encapsulated by curly brackets.
+.br
+The default value is "{nick} ({name}): {mobile}"
+.br
+If \fI<string>\fR starts with \fI!\fR only entries whose all fields from \fI<string>\fR are non-NULL are included.
 .TP
 \fB\-\-add-email\fP
 Read an e-mail message from stdin and add the sender to the addressbook.