Autogenerated HTML docs for v2.33.1-835-ge9e5b

2 files changed, 39 insertions, 9 deletions

diff --git a/technical/signature-format.html b/technical/signature-format.html
index f3958d168..d05e780af 100644
--- a/technical/signature-format.html
+++ b/technical/signature-format.html
@@ -748,6 +748,20 @@ embeds the signature into the object or transaction.</p></div>
 <div class="paragraph"><p>Signatures always begin with <code>-----BEGIN PGP SIGNATURE-----</code>

 and end with <code>-----END PGP SIGNATURE-----</code>, unless gpg is told to

 produce RFC1991 signatures which use <code>MESSAGE</code> instead of <code>SIGNATURE</code>.</p></div>

+<div class="paragraph"><p>Signatures sometimes appear as a part of the normal payload

+(e.g. a signed tag has the signature block appended after the payload

+that the signature applies to), and sometimes appear in the value of

+an object header (e.g. a merge commit that merged a signed tag would

+have the entire tag contents on its "mergetag" header).  In the case

+of the latter, the usual multi-line formatting rule for object

+headers applies.  I.e. the second and subsequent lines are prefixed

+with a SP to signal that the line is continued from the previous

+line.</p></div>

+<div class="paragraph"><p>This is even true for an originally empty line.  In the following

+examples, the end of line that ends with a whitespace letter is

+highlighted with a <code>$</code> sign; if you are trying to recreate these

+example by hand, do not cut and paste them---they are there

+primarily to highlight extra whitespace at the end of some lines.</p></div>

 <div class="paragraph"><p>The signed payload and the way the signature is embedded depends

 on the type of the object resp. transaction.</p></div>

 </div>

@@ -858,7 +872,7 @@ author A U Thor &lt;author@example.com&gt; 1465981137 +0000
 committer C O Mitter &lt;committer@example.com&gt; 1465981137 +0000

 gpgsig -----BEGIN PGP SIGNATURE-----

  Version: GnuPG v1

-

+ $

  iQEcBAABAgAGBQJXYRjRAAoJEGEJLoW3InGJ3IwIAIY4SA6GxY3BjL60YyvsJPh/

  HRCJwH+w7wt3Yc/9/bW2F+gF72kdHOOs2jfv+OZhq0q4OAN6fvVSczISY/82LpS7

  DVdMQj2/YcHDT4xrDNBnXnviDO9G7am/9OE77kEbXrp7QPxvhjkicHNwy2rEflAA

@@ -929,13 +943,13 @@ mergetag object 04b871796dc0420f8e7561a895b52484b701d51a
  type commit

  tag signedtag

  tagger C O Mitter &lt;committer@example.com&gt; 1465981006 +0000

-

+ $

  signed tag

-

+ $

  signed tag message body

  -----BEGIN PGP SIGNATURE-----

  Version: GnuPG v1

-

+ $

  iQEcBAABAgAGBQJXYRhOAAoJEGEJLoW3InGJklkIAIcnhL7RwEb/+QeX9enkXhxn

  rxfdqrvWd1K80sl2TOt8Bg/NYwrUBw/RWJ+sg/hhHp4WtvE1HDGHlkEz3y11Lkuh

  8tSxS3qKTxXUGozyPGuE90sJfExhZlW4knIQ1wt/yWqM+33E9pN4hzPqLwyrdods

@@ -997,7 +1011,7 @@ Date:   Wed Jun 15 09:13:29 2016 +0000
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-03-10 15:02:33 PDT

+ 2021-10-25 16:35:08 PDT

 </div>

 </div>

 </body>

diff --git a/technical/signature-format.txt b/technical/signature-format.txt
index 2c9406a56..166721be6 100644
--- a/technical/signature-format.txt
+++ b/technical/signature-format.txt
@@ -13,6 +13,22 @@ Signatures always begin with `-----BEGIN PGP SIGNATURE-----`
 and end with `-----END PGP SIGNATURE-----`, unless gpg is told to
 produce RFC1991 signatures which use `MESSAGE` instead of `SIGNATURE`.
 
+Signatures sometimes appear as a part of the normal payload
+(e.g. a signed tag has the signature block appended after the payload
+that the signature applies to), and sometimes appear in the value of
+an object header (e.g. a merge commit that merged a signed tag would
+have the entire tag contents on its "mergetag" header).  In the case
+of the latter, the usual multi-line formatting rule for object
+headers applies.  I.e. the second and subsequent lines are prefixed
+with a SP to signal that the line is continued from the previous
+line.
+
+This is even true for an originally empty line.  In the following
+examples, the end of line that ends with a whitespace letter is
+highlighted with a `$` sign; if you are trying to recreate these
+example by hand, do not cut and paste them---they are there
+primarily to highlight extra whitespace at the end of some lines.
+
 The signed payload and the way the signature is embedded depends
 on the type of the object resp. transaction.
 
@@ -78,7 +94,7 @@ author A U Thor <author@example.com> 1465981137 +0000
 committer C O Mitter <committer@example.com> 1465981137 +0000
 gpgsig -----BEGIN PGP SIGNATURE-----
  Version: GnuPG v1
-
+ $
  iQEcBAABAgAGBQJXYRjRAAoJEGEJLoW3InGJ3IwIAIY4SA6GxY3BjL60YyvsJPh/
  HRCJwH+w7wt3Yc/9/bW2F+gF72kdHOOs2jfv+OZhq0q4OAN6fvVSczISY/82LpS7
  DVdMQj2/YcHDT4xrDNBnXnviDO9G7am/9OE77kEbXrp7QPxvhjkicHNwy2rEflAA
@@ -128,13 +144,13 @@ mergetag object 04b871796dc0420f8e7561a895b52484b701d51a
  type commit
  tag signedtag
  tagger C O Mitter <committer@example.com> 1465981006 +0000
-
+ $
  signed tag
-
+ $
  signed tag message body
  -----BEGIN PGP SIGNATURE-----
  Version: GnuPG v1
-
+ $
  iQEcBAABAgAGBQJXYRhOAAoJEGEJLoW3InGJklkIAIcnhL7RwEb/+QeX9enkXhxn
  rxfdqrvWd1K80sl2TOt8Bg/NYwrUBw/RWJ+sg/hhHp4WtvE1HDGHlkEz3y11Lkuh
  8tSxS3qKTxXUGozyPGuE90sJfExhZlW4knIQ1wt/yWqM+33E9pN4hzPqLwyrdods