diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2021-01-21 18:21:12 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2021-01-21 18:21:35 +0100 |
| commit | 606af422d5475f1399abc70bff1c9e6fd6dd7828 (patch) | |
| tree | 3294f094dd3b74cecdb4bf8292bc12ed39390a63 | |
| parent | b09192021d9961694bf76fa33713aef39ff42939 (diff) | |
sq: Fix long about of certring join and merge.
| -rw-r--r-- | sq/src/sq-usage.rs | 4 | ||||
| -rw-r--r-- | sq/src/sq_cli.rs | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sq/src/sq-usage.rs b/sq/src/sq-usage.rs index 02971145..4250c281 100644 --- a/sq/src/sq-usage.rs +++ b/sq/src/sq-usage.rs @@ -374,6 +374,8 @@ //! ### Subcommand certring join //! //! ```text +//! Joins certs or certrings into a single certring. +//! //! Unlike 'sq certring merge', multiple versions of the same certificate are not //! merged together. //! @@ -420,6 +422,8 @@ //! ### Subcommand certring merge //! //! ```text +//! Merges certs or certrings into a single certring. +//! //! Unlike 'sq certring join', the certificates are buffered and multiple versions //! of the same certificate are merged together. Where data is replaced (e.g., //! secret key material), data from the later certificate is preferred. diff --git a/sq/src/sq_cli.rs b/sq/src/sq_cli.rs index 39097578..9fb4fedf 100644 --- a/sq/src/sq_cli.rs +++ b/sq/src/sq_cli.rs @@ -473,7 +473,9 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> { SubCommand::with_name("join") .about("Joins certs or certrings into a single certring") .long_about( - "Unlike 'sq certring merge', multiple versions \ + "Joins certs or certrings into a single certring.\n\ + \n\ + Unlike 'sq certring merge', multiple versions \ of the same certificate are not merged \ together.") .arg(Arg::with_name("input") @@ -491,7 +493,9 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> { SubCommand::with_name("merge") .about("Merges certs or certrings into a single certring") .long_about( - "Unlike 'sq certring join', the certificates \ + "Merges certs or certrings into a single certring.\n\ + \n\ + Unlike 'sq certring join', the certificates \ are buffered and multiple versions of the same \ certificate are merged together. Where data \ is replaced (e.g., secret key material), data \ |