summaryrefslogtreecommitdiffstats
path: root/sq
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2021-03-11 14:03:41 +0100
committerJustus Winter <justus@sequoia-pgp.org>2021-03-11 14:03:41 +0100
commita2c8d4f1e8214f3873020f7042e67cb4d9381668 (patch)
treefaaba67860035f5be8f17567d7a249f18f2cec33 /sq
parent0ed7e4178c462946774d62016338c9f623aeab2e (diff)
sq: Clarify matching semantics.
- Fixes #690.
Diffstat (limited to 'sq')
-rw-r--r--sq/src/sq-usage.rs13
-rw-r--r--sq/src/sq_cli.rs20
2 files changed, 24 insertions, 9 deletions
diff --git a/sq/src/sq-usage.rs b/sq/src/sq-usage.rs
index b9a35f2f..b8c71cda 100644
--- a/sq/src/sq-usage.rs
+++ b/sq/src/sq-usage.rs
@@ -812,14 +812,15 @@
//!
//! OPTIONS:
//! --domain <FQDN>...
-//! Matches on email domain FQDN
-//!
+//! Parses user ids into name and email address and case-sensitively
+//! matches on the domain of the email address, requiring an exact
+//! match.
//! --email <ADDRESS>...
-//! Matches on email ADDRESS
-//!
+//! Parses user ids into name and email address and case-sensitively
+//! matches on the email address, requiring an exact match.
//! --name <NAME>...
-//! Matches on NAME
-//!
+//! Parses user ids into name and email and case-sensitively matches on
+//! the name, requiring an exact match.
//! -o, --output <FILE>
//! Writes to FILE or stdout if omitted
//!
diff --git a/sq/src/sq_cli.rs b/sq/src/sq_cli.rs
index aa624720..5c1a2970 100644
--- a/sq/src/sq_cli.rs
+++ b/sq/src/sq_cli.rs
@@ -779,15 +779,29 @@ $ sq keyring filter --domain example.org --prune-certs certs.pgp
.arg(Arg::with_name("name")
.long("name").value_name("NAME")
.multiple(true).number_of_values(1)
- .help("Matches on NAME"))
+ .help("Matches on NAME")
+ .long_help(
+ "Parses user ids into name and email \
+ and case-sensitively matches on the \
+ name, requiring an exact match."))
.arg(Arg::with_name("email")
.long("email").value_name("ADDRESS")
.multiple(true).number_of_values(1)
- .help("Matches on email ADDRESS"))
+ .help("Matches on email ADDRESS")
+ .long_help(
+ "Parses user ids into name and email \
+ address and case-sensitively matches \
+ on the email address, requiring an \
+ exact match."))
.arg(Arg::with_name("domain")
.long("domain").value_name("FQDN")
.multiple(true).number_of_values(1)
- .help("Matches on email domain FQDN"))
+ .help("Matches on email domain FQDN")
+ .long_help(
+ "Parses user ids into name and email \
+ address and case-sensitively matches \
+ on the domain of the email address, \
+ requiring an exact match."))
.arg(Arg::with_name("prune-certs")
.short("P").long("prune-certs")
.help("Removes certificate components not \