From 23527ebce221c0a0fc63c3583b67b57b21d73cf3 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Thu, 21 Jan 2021 08:21:13 +0100 Subject: sq: Do not mention OpenPGP that often in the cli's help. --- sq/src/sq-usage.rs | 32 ++++++++++++++++---------------- sq/src/sq_cli.rs | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/sq/src/sq-usage.rs b/sq/src/sq-usage.rs index c9fcd7de..8af9b767 100644 --- a/sq/src/sq-usage.rs +++ b/sq/src/sq-usage.rs @@ -22,7 +22,7 @@ //! //! SUBCOMMANDS: //! encrypt Encrypts a message -//! decrypt Decrypts an OpenPGP message +//! decrypt Decrypts a message //! sign Signs a message //! verify Verifies a message //! merge-signatures Merges two signatures @@ -33,8 +33,8 @@ //! wkd Interacts with Web Key Directories //! armor Applies ASCII Armor to a file //! dearmor Removes ASCII Armor from a file -//! inspect Inspects a sequence of OpenPGP packets -//! packet OpenPGP Packet manipulation +//! inspect Inspects data, like file(1) +//! packet Packet manipulation //! certify Certify a User ID for a Certificate //! help Prints this message or the help of the given //! subcommand(s) @@ -85,7 +85,7 @@ //! ## Subcommand decrypt //! //! ```text -//! Decrypts an OpenPGP message +//! Decrypts a message //! //! USAGE: //! sq decrypt [FLAGS] [OPTIONS] [--] [FILE] @@ -652,7 +652,7 @@ //! ## Subcommand inspect //! //! ```text -//! Inspects a sequence of OpenPGP packets +//! Inspects data, like file(1) //! //! USAGE: //! sq inspect [FLAGS] [FILE] @@ -668,7 +668,7 @@ //! ## Subcommand packet //! //! ```text -//! OpenPGP Packet manipulation +//! Packet manipulation //! //! USAGE: //! sq packet @@ -677,19 +677,19 @@ //! -h, --help Prints help information //! //! SUBCOMMANDS: -//! decrypt Decrypts an OpenPGP message, dumping the content of the -//! encryption container without further processing -//! dump Lists OpenPGP packets +//! decrypt Decrypts a message, dumping the content of the encryption +//! container without further processing +//! dump Lists packets //! help Prints this message or the help of the given subcommand(s) -//! join Joins OpenPGP packets split across files -//! split Splits a message into OpenPGP packets +//! join Joins packets split across files +//! split Splits a message into packets //! ``` //! //! ### Subcommand packet decrypt //! //! ```text -//! Decrypts an OpenPGP message, dumping the content of the encryption container -//! without further processing +//! Decrypts a message, dumping the content of the encryption container without +//! further processing //! //! USAGE: //! sq packet decrypt [FLAGS] [OPTIONS] [--] [FILE] @@ -713,7 +713,7 @@ //! ### Subcommand packet dump //! //! ```text -//! Lists OpenPGP packets +//! Lists packets //! //! USAGE: //! sq packet dump [FLAGS] [OPTIONS] [FILE] @@ -737,7 +737,7 @@ //! ### Subcommand packet join //! //! ```text -//! Joins OpenPGP packets split across files +//! Joins packets split across files //! //! USAGE: //! sq packet join [FLAGS] [OPTIONS] [FILE]... @@ -760,7 +760,7 @@ //! ### Subcommand packet split //! //! ```text -//! Splits a message into OpenPGP packets +//! Splits a message into packets //! //! USAGE: //! sq packet split [OPTIONS] [FILE] diff --git a/sq/src/sq_cli.rs b/sq/src/sq_cli.rs index e432b980..8bdd6ea0 100644 --- a/sq/src/sq_cli.rs +++ b/sq/src/sq_cli.rs @@ -37,7 +37,7 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> { .subcommand(SubCommand::with_name("decrypt") .display_order(110) - .about("Decrypts an OpenPGP message") + .about("Decrypts a message") .arg(Arg::with_name("input") .value_name("FILE") .help("Sets the input file to use")) @@ -265,7 +265,7 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> { .subcommand(SubCommand::with_name("inspect") .display_order(600) - .about("Inspects a sequence of OpenPGP packets") + .about("Inspects data, like file(1)") .arg(Arg::with_name("input") .value_name("FILE") .help("Sets the input file to use")) @@ -550,10 +550,10 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> { .subcommand(SubCommand::with_name("packet") .display_order(610) - .about("OpenPGP Packet manipulation") + .about("Packet manipulation") .setting(AppSettings::SubcommandRequiredElseHelp) .subcommand(SubCommand::with_name("dump") - .about("Lists OpenPGP packets") + .about("Lists packets") .arg(Arg::with_name("input") .value_name("FILE") .help("Sets the input file to use")) @@ -573,7 +573,7 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> { ) .subcommand(SubCommand::with_name("decrypt") .display_order(10) - .about("Decrypts an OpenPGP message, dumping \ + .about("Decrypts a message, dumping \ the content of the encryption \ container without further processing") .arg(Arg::with_name("input") @@ -597,7 +597,7 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> { .help("Prints the session key to stderr")) ) .subcommand(SubCommand::with_name("split") - .about("Splits a message into OpenPGP packets") + .about("Splits a message into packets") .arg(Arg::with_name("input") .value_name("FILE") .help("Sets the input file to use")) @@ -608,7 +608,7 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> { or 'output')")) ) .subcommand(SubCommand::with_name("join") - .about("Joins OpenPGP packets split across \ + .about("Joins packets split across \ files") .arg(Arg::with_name("input") .value_name("FILE") -- cgit v1.2.3