sq: Avoid OpenPGP and negation in the help of --binary.

2 files changed, 16 insertions, 18 deletions

diff --git a/sq/src/sq-usage.rs b/sq/src/sq-usage.rs
index f3c9c61c..99c6cf38 100644
--- a/sq/src/sq-usage.rs
+++ b/sq/src/sq-usage.rs
@@ -49,7 +49,7 @@
 //!     sq encrypt [FLAGS] [OPTIONS] [--] [FILE]
 //!
 //! FLAGS:
-//!     -B, --binary                Don't ASCII-armor encode the OpenPGP data
+//!     -B, --binary                Emit binary data
 //!     -h, --help                  Prints help information
 //!     -s, --symmetric             Encrypt with a password (can be given multiple
 //!                                 times)
@@ -122,7 +122,7 @@
 //!
 //! FLAGS:
 //!     -a, --append      Append signature to existing signature
-//!     -B, --binary      Don't ASCII-armor encode the OpenPGP data
+//!     -B, --binary      Emit binary data
 //!         --detached    Create a detached signature
 //!     -h, --help        Prints help information
 //!     -n, --notarize    Signs a message and all existing signatures
@@ -323,7 +323,7 @@
 //!
 //! FLAGS:
 //!     -B, --binary
-//!             Don't ASCII-armor the certring
+//!             Emit binary data
 //!
 //!     -h, --help
 //!             Prints help information
@@ -363,7 +363,7 @@
 //!     sq certring join [FLAGS] [OPTIONS] [FILE]...
 //!
 //! FLAGS:
-//!     -B, --binary     Don't ASCII-armor the certring
+//!     -B, --binary     Emit binary data
 //!     -h, --help       Prints help information
 //!     -V, --version    Prints version information
 //!
@@ -550,7 +550,7 @@
 //!     sq keyserver get [FLAGS] [OPTIONS] <QUERY>
 //!
 //! FLAGS:
-//!     -B, --binary     Don't ASCII-armor encode the OpenPGP data
+//!     -B, --binary     Emit binary data
 //!     -h, --help       Prints help information
 //!     -V, --version    Prints version information
 //!
@@ -632,7 +632,7 @@
 //!     sq wkd get [FLAGS] <EMAIL_ADDRESS>
 //!
 //! FLAGS:
-//!     -B, --binary     Don't ASCII-armor encode the OpenPGP data
+//!     -B, --binary     Emit binary data
 //!     -h, --help       Prints help information
 //!     -V, --version    Prints version information
 //!
@@ -742,7 +742,7 @@
 //!     sq packet decrypt [FLAGS] [OPTIONS] [--] [FILE]
 //!
 //! FLAGS:
-//!     -B, --binary              Don't ASCII-armor encode the OpenPGP data
+//!     -B, --binary              Emit binary data
 //!         --dump-session-key    Prints the session key to stderr
 //!     -h, --help                Prints help information
 //!     -V, --version             Prints version information
@@ -790,7 +790,7 @@
 //!     sq packet join [FLAGS] [OPTIONS] [FILE]...
 //!
 //! FLAGS:
-//!     -B, --binary     Don't ASCII-armor encode the OpenPGP data
+//!     -B, --binary     Emit binary data
 //!     -h, --help       Prints help information
 //!     -V, --version    Prints version information
 //!
diff --git a/sq/src/sq_cli.rs b/sq/src/sq_cli.rs
index 77f14e0a..84418261 100644
--- a/sq/src/sq_cli.rs
+++ b/sq/src/sq_cli.rs
@@ -81,7 +81,7 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> {
                          .help("Sets the output file to use"))
                     .arg(Arg::with_name("binary")
                          .short("B").long("binary")
-                         .help("Don't ASCII-armor encode the OpenPGP data"))
+                         .help("Emit binary data"))
                     .arg(Arg::with_name("recipients-cert-file")
                          .long("recipient-cert").value_name("CERT-RING")
                          .multiple(true).number_of_values(1)
@@ -149,7 +149,7 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> {
                          .help("Sets the output file to use"))
                     .arg(Arg::with_name("binary")
                          .short("B").long("binary")
-                         .help("Don't ASCII-armor encode the OpenPGP data"))
+                         .help("Emit binary data"))
                     .arg(Arg::with_name("detached")
                          .long("detached")
                          .help("Create a detached signature"))
@@ -427,7 +427,7 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> {
                                     the filter"))
                         .arg(Arg::with_name("binary")
                              .short("B").long("binary")
-                             .help("Don't ASCII-armor the certring"))
+                             .help("Emit binary data"))
                 )
                 .subcommand(
                     SubCommand::with_name("join")
@@ -441,7 +441,7 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> {
                              .help("Sets the output file to use"))
                         .arg(Arg::with_name("binary")
                              .short("B").long("binary")
-                             .help("Don't ASCII-armor the certring"))
+                             .help("Emit binary data"))
                 )
                 .subcommand(
                     SubCommand::with_name("list")
@@ -576,8 +576,7 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> {
                                      .help("Sets the output file to use"))
                                 .arg(Arg::with_name("binary")
                                      .short("B").long("binary")
-                                     .help("Don't ASCII-armor encode the \
-                                            OpenPGP data"))
+                                     .help("Emit binary data"))
                                 .arg(Arg::with_name("secret-key-file")
                                      .long("recipient-key").value_name("KEY")
                                      .multiple(true).number_of_values(1)
@@ -619,8 +618,7 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> {
                                             produce"))
                                 .arg(Arg::with_name("binary")
                                      .short("B").long("binary")
-                                     .help("Don't ASCII-armor encode the \
-                                            OpenPGP data"))));
+                                     .help("Emit binary data"))));
 
     let app = if ! cfg!(feature = "net") {
         // Without networking support.
@@ -645,7 +643,7 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> {
                                      .help("Sets the output file to use"))
                                 .arg(Arg::with_name("binary")
                                      .short("B").long("binary")
-                                     .help("Don't ASCII-armor encode the OpenPGP data"))
+                                     .help("Emit binary data"))
                                 .arg(Arg::with_name("query")
                                      .value_name("QUERY")
                                      .required(true)
@@ -687,7 +685,7 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> {
                                             obtain the Cert from a WKD."))
                                 .arg(Arg::with_name("binary")
                                      .short("B").long("binary")
-                                     .help("Don't ASCII-armor encode the OpenPGP data"))
+                                     .help("Emit binary data"))
                     )
                     .subcommand(SubCommand::with_name("generate")
                                 .about("Generates a Web Key Directory \