X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=abook.1;h=26282004e12710723a01ee631700a93380862c2d;hb=126dbdaf881905b0406be15a27fa842fd91d11e1;hp=3e37f98c6773345e346af4603ed8d796e0ef45fd;hpb=e412bbaaf492422e593312d7768f5b7e8261eb58;p=pkg%2Fabook.git

diff --git a/abook.1 b/abook.1
index 3e37f98..2628200 100644
--- a/abook.1
+++ b/abook.1
@@ -1,7 +1,7 @@
 .TH ABOOK 1 2006-09-06
 .nh
 .SH NAME
-abook \- text-based address book program
+abook \- text\-based address book program
 .SH SYNOPSIS
 .B abook
 [ \fIOPTION\fR ]
@@ -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
@@ -41,63 +43,65 @@ Converts \fI<inputfile>\fR in \fI<inputformat>\fR to \fI<outputfile>\fR in \fI<o
 .br
 The following \fIinputformats\fR are supported:
 .br
-- \fBabook\fP abook native format
+\- \fBabook\fP abook native format
 .br
-- \fBldif\fP ldif / Netscape addressbook
+\- \fBldif\fP ldif / Netscape addressbook
 .br
-- \fBmutt\fP mutt alias
+\- \fBmutt\fP mutt alias
 .br
-- \fBpine\fP pine addressbook
+\- \fBpine\fP pine addressbook
 .br
-- \fBcsv\fP comma separated values
+\- \fBcsv\fP comma separated values
 .br
-- \fBpalmcsv\fP Palm comma separated values
+\- \fBpalmcsv\fP Palm comma separated values
 .br
-- \fBvcard\fP VCard addressbook
+\- \fBvcard\fP VCard addressbook
 
 .br
 The following \fIoutputformats\fR are supported:
 .br
-- \fBabook\fP abook native format
+\- \fBabook\fP abook native format
 .br
-- \fBldif\fP ldif / Netscape addressbook (.4ld)
+\- \fBldif\fP ldif / Netscape addressbook (.4ld)
 .br
-- \fBmutt\fP mutt alias
+\- \fBmutt\fP mutt alias
 .br
-- \fBhtml\fP html document
+\- \fBhtml\fP html document
 .br
-- \fBpine\fP pine addressbook
+\- \fBpine\fP pine addressbook
 .br
-- \fBvcard\fP VCard addressbook
+\- \fBvcard\fP VCard addressbook
 .br
-- \fBcsv\fP comma separated values
+\- \fBcsv\fP comma separated values
 .br
-- \fBpalmcsv\fP Palm comma separated values
+\- \fBpalmcsv\fP Palm comma separated values
 .br
-- \fBelm\fP elm alias
+\- \fBelm\fP elm alias
 .br
-- \fBtext\fP plain text
+\- \fBtext\fP plain text
 .br
-- \fBspruce\fP Spruce address book
+\- \fBspruce\fP Spruce address book
 .br
-- \fBwl\fP Wanderlust address book
+\- \fBwl\fP Wanderlust address book
 .br
-- \fBbsdcal\fP BSD calendar
+\- \fBbsdcal\fP BSD calendar
 .br
-- \fBcustom\fP Custom output format, see below
+\- \fBcustom\fP Custom output format, see below
 .TP
 \fB\-\-outformatstr\fP \fI<string>\fR
-Only used in the context of \fB\-\-mutt\-query\fP \fIand\fR \fB\-\-outformat\fP=\fIcustom\fR. \fI<string>\fR is a format string allowing placeholders.
-A placeholder can be any of the standard fields names (see \fBabookrc\fP(5)) and must be
-encapsulated by curly brackets.
+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}"
-If \fI<string>\fR starts with \fI!\fR only entries whose every fields from \fI<string>\fR are non-NULL are part of the output.
+.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.
+\fB\-\-add\-email\fP
+Read an e\-mail message from stdin and add the sender to the addressbook.
 .TP
-\fB\-\-add-email-quiet\fP
-Same as --add-email but doesn't confirm adding.
+\fB\-\-add\-email\-quiet\fP
+Same as \-\-add\-email but doesn't confirm adding.
 .TP
 \fB\-\-formats\fP
 List available formats.