tweak previous;

3 files changed, 15 insertions, 13 deletions

diff --git a/usr.sbin/acme-client/acme-client.1 b/usr.sbin/acme-client/acme-client.1
index 27296e07b5e..41edabc4645 100644
--- a/usr.sbin/acme-client/acme-client.1
+++ b/usr.sbin/acme-client/acme-client.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: acme-client.1,v 1.18 2017/01/21 09:05:31 benno Exp $
+.\"	$OpenBSD: acme-client.1,v 1.19 2017/01/21 15:53:15 jmc Exp $
 .\"
 .\" Copyright (c) 2016 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
@@ -22,7 +22,7 @@
 .Nd ACME client
 .Sh SYNOPSIS
 .Nm acme-client
-.Op Fl FADrvn
+.Op Fl ADFnrv
 .Op Fl f Ar configfile
 .Ar domain
 .Sh DESCRIPTION
@@ -33,21 +33,21 @@ Automatic Certificate Management Environment (ACME) client.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
+.It Fl A
+Create a new RSA account key if one does not already exist.
+.It Fl D
+Create a new RSA domain key if one does not already exist.
 .It Fl F
 Force updating the certificate signature even if it's too soon.
 .It Fl f Ar configfile
 Specify an alternative configuration file.
-.It Fl D
-Create a new RSA domain key if one does not already exist.
-.It Fl A
-Create a new RSA account key if one does not already exist.
+.It Fl n
+No operation: check and print configuration.
 .It Fl r
 Revoke the X509 certificate found in the certificates.
 .It Fl v
 Verbose operation.
 Specify twice to also trace communication and data transfers.
-.It Fl n
-No operation, check and print configuration.
 .It Ar domain
 The domain name.
 .El
diff --git a/usr.sbin/acme-client/acme-client.conf.5 b/usr.sbin/acme-client/acme-client.conf.5
index 6a0728e66cc..5986af16007 100644
--- a/usr.sbin/acme-client/acme-client.conf.5
+++ b/usr.sbin/acme-client/acme-client.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: acme-client.conf.5,v 1.7 2017/01/21 09:05:31 benno Exp $
+.\"	$OpenBSD: acme-client.conf.5,v 1.8 2017/01/21 15:53:15 jmc Exp $
 .\"
 .\" Copyright (c) 2005 Esben Norby <norby@openbsd.org>
 .\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
@@ -123,12 +123,14 @@ The private key file for which the certificate will be obtained.
 .It Ic domain certificate Ar file
 The filename of the certificate that will be issued.
 .It Ic domain chain certificate Ar file
-The filename in which to store the certificate chain that will be returned by the CA.
+The filename in which to store the certificate chain
+that will be returned by the CA.
 It needs to be in the same directory as the
 .Ar domain certificate
 (or in a subdirectory) and can be specified as a relative or absolute path.
 .It Ic domain full chain certificate Ar file
-The filename  in which to store the full certificate chain that will be returned by the CA.
+The filename in which to store the full certificate chain
+that will be returned by the CA.
 It needs to be in the same directory as the
 .Ar domain certificate
 (or in a subdirectory) and can be specified as a relative or absolute path.
diff --git a/usr.sbin/acme-client/main.c b/usr.sbin/acme-client/main.c
index 00c10e18d19..b4840cc4532 100644
--- a/usr.sbin/acme-client/main.c
+++ b/usr.sbin/acme-client/main.c
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.28 2017/01/21 12:59:06 benno Exp $ */
+/*	$Id: main.c,v 1.29 2017/01/21 15:53:15 jmc Exp $ */
 /*
  * Copyright (c) 2016 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -434,6 +434,6 @@ main(int argc, char *argv[])
 	    (2 == c ? EXIT_SUCCESS : 2));
 usage:
 	fprintf(stderr,
-	    "usage: acme-client [-FADrvn] [-f file] domain\n");
+	    "usage: acme-client [-ADFnrv] [-f configfile] domain\n");
 	return (EXIT_FAILURE);
 }