From a367fff6a7d477f853c731922785990674043693 Mon Sep 17 00:00:00 2001
From: Omer Preminger <omer@sylabs.io>
Date: Fri, 28 Jul 2023 13:45:26 -0400
Subject: [PATCH] update sample outputs of `key list` cmd to match
 SingularityCE PR 1957

Signed-off-by: jason yang <jasonyangshadow@gmail.com>
---
 key_commands.rst | 48 +++++++++++++++++++++++-------------------------
 signNverify.rst  | 17 ++++-------------
 2 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/key_commands.rst b/key_commands.rst
index 19b9c77f..621bc417 100644
--- a/key_commands.rst
+++ b/key_commands.rst
@@ -53,16 +53,15 @@ The output will look as it follows:
 
    Private key listing (/home/joana/.{command}/keys/pgp-secret):
 
-   0) U: Johnny Cash (none) <cash@example.com>
-   C: 2019-04-11 22:22:28 +0200 CEST
-   F: 47282BDC661F58FA4BEBEF47CA576CBD8EF1A2B4
-   L: 3072
-   --------
-   1) U: John Green (none) <john@example.com>
-   C: 2019-04-11 13:08:45 +0200 CEST
-   F: 5720799FE7B048CF36FAB8445EE1E2BD7B6342C5
-   L: 1024
-   --------
+   0)  User:              Johnny Cash (none) <cash@sylabs.io>
+       Creation time:     2019-04-11 22:22:28 +0200 CEST
+       Fingerprint:       47282BDC661F58FA4BEBEF47CA576CBD8EF1A2B4
+       Length (in bits):  3072
+
+   1)  User:              John Green (none) <john@sylabs.io>
+       Creation time:     2019-04-11 13:08:45 +0200 CEST
+       Fingerprint:       5720799FE7B048CF36FAB8445EE1E2BD7B6342C5
+       Length (in bits):  1024
 
 .. note::
 
@@ -102,21 +101,20 @@ keystore by running ``{command} key list -s`` command:
 
    Private key listing (/home/joana/.{command}/keys/pgp-secret):
 
-     0) U: Johnny Cash (none) <cash@example.com>
-     C: 2019-04-11 22:22:28 +0200 CEST
-     F: 47282BDC661F58FA4BEBEF47CA576CBD8EF1A2B4
-     L: 3072
-     --------
-     1) U: John Green (none) <john@example.com>
-     C: 2019-04-11 13:08:45 +0200 CEST
-     F: 5720799FE7B048CF36FAB8445EE1E2BD7B6342C5
-     L: 1024
-     --------
-     3) U: Pinkie Pie (Eternal chaos comes with chocolate rain!) <balloons@example.com>
-     C: 2019-04-26 12:07:07 +0200 CEST
-     F: 8C10B902F438E4D504C3ACF689FCFFAED5F34A77
-     L: 1024
-     --------
+   1)  User:              Johnny Cash (none) <cash@sylabs.io>
+       Creation time:     2019-04-11 22:22:28 +0200 CEST
+       Fingerprint:       47282BDC661F58FA4BEBEF47CA576CBD8EF1A2B4
+       Length (in bits):  3072
+
+   2)  User:              John Green (none) <john@sylabs.io>
+       Creation time:     2019-04-11 13:08:45 +0200 CEST
+       Fingerprint:       5720799FE7B048CF36FAB8445EE1E2BD7B6342C5
+       Length (in bits):  1024
+
+   3)  User:              Pinkie Pie (Eternal chaos comes with chocolate rain!) <balloons@sylabs.io>
+       Creation time:     2019-04-26 12:07:07 +0200 CEST
+       Fingerprint:       8C10B902F438E4D504C3ACF689FCFFAED5F34A77
+       Length (in bits):  1024
 
 You will see the imported key at the bottom of the list. Remember you
 can also import an ``ascii`` armored key and this will be automatically
diff --git a/signNverify.rst b/signNverify.rst
index 7244da04..63b66f15 100644
--- a/signNverify.rst
+++ b/signNverify.rst
@@ -106,19 +106,10 @@ or saved locally.
 
    Public key listing (/home/ian/.{command}/keys/pgp-public):
 
-   0) U: Ian Kaneshiro (example key) <ikaneshiro@apptainer.org>
-      C: 2022-02-23 15:12:19 -0800 PST
-      F: 8232570480B868E1473AEEB03DBCBA1EE9D661E5
-      L: 4096
-      --------
-
-In the output above the index of my key is ``0`` and the letters stand
-for the following:
-
-   -  U: User
-   -  C: Creation date and time
-   -  F: Fingerprint
-   -  L: Key length
+   0)  User:              Ian Kaneshiro (example key) <ikaneshiro@apptainer.org>
+       Creation time:     2022-02-23 15:12:19 -0800 PST
+       Fingerprint:       8232570480B868E1473AEEB03DBCBA1EE9D661E5
+       Length (in bits):  4096
 
 If you would like others in the community to easily be able to fetch your
 public key for image verification, you can push your key to a public keyserver.