Document new flag and output arrangement better

1 files changed, 33 insertions, 14 deletions

diff --git a/usr.sbin/rpki-client/rpki-client.8 b/usr.sbin/rpki-client/rpki-client.8
index 5c9722d0ef5..f625908644e 100644
--- a/usr.sbin/rpki-client/rpki-client.8
+++ b/usr.sbin/rpki-client/rpki-client.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rpki-client.8,v 1.12 2019/11/30 02:31:12 deraadt Exp $
+.\"	$OpenBSD: rpki-client.8,v 1.13 2019/11/30 02:39:22 deraadt Exp $
 .\"
 .\" Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
@@ -40,13 +40,17 @@ to fetch certificates, manifests, revocation lists and ROAs.
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl B
-Format the output suitable for the BIRD internet routing daemon.
+Create output in the file
+.Pa bird
+in the output directory which is suitable for the BIRD internet routing daemon.
 .It Fl b Ar bind_addr
 Tell the rsync client to use the specified
 .Ar bind_addr
 as the source address for connections.
 .It Fl c
-Format the output as comma-separated values of the prefix in slash notation,
+Create output in the file
+.Pa csv
+in the output directory as comma-separated values of the prefix in slash notation,
 the maximum prefix length, the autonomous system number, and an abbreviation
 for the trust anchor the entry is derived from.
 .It Fl e Ar rsync_prog
@@ -65,13 +69,29 @@ flags and connect with rsync-protocol locations.
 Accept out-of-date manifests.
 This will still report if a manifest has expired.
 .It Fl j
-Format the output as JSON object.
+Create output in the file
+.Pa json
+in the output directory as JSON object.
 This format is identical to that
 produced by the RIPE NCC RPKI Validator and NLnet Labs routinator.
 .It Fl n
 Assume that all requested repositories exist: don't update.
+.It Fl o
+Create output in the file
+.Pa openbgpd
+in the output directory as
+.Xr openbgpd 8
+compatible input.
+If the
+.Fl b ,
+.Fl c ,
+and
+.Fl j
+options are not specified this is the default.
 .It Fl T Ar table
-For BIRD output use
+For BIRD output generated with the
+.Fl b
+option use
 .Ar table
 as roa table name instead of the default 'roa'.
 .It Fl t Ar tal
@@ -84,22 +104,21 @@ will load all TAL files in
 .It Fl v
 Specified once, prints information about status.
 Twice, prints each filename as it's processed.
-.It Ar output
-The file
+.It Ar outputdir
+The directory where
 .Nm
-will write the
-.Li roa-set
-to.
+will write the output files.
 Defaults to
-.Pa /var/db/rpki-client/roa .
+.Pa /var/db/rpki-client/ .
 .El
 .Pp
 By default
 .Nm
 produces a list of unique
 .Li roa-set
-statements as specified by
-.Xr bgpd.conf 5 .
+statements in
+.Fl o
+(OpenBGPD compatible) output.
 .\" .Sh ENVIRONMENT
 .\" For sections 1, 6, 7, and 8 only.
 .Sh FILES
@@ -110,7 +129,7 @@ default TAL files used unless
 is specified.
 .It Pa /var/cache/rpki-client
 cached repository data.
-.It Pa /var/db/rpki-client/roa
+.It Pa /var/db/rpki-client/openbsd
 default roa-set output file.
 .El
 .Sh EXIT STATUS