Fix blank lines between security advisories

The new pam-krb5 test revealed a whitespace problem causing blank
lines to be introduced between security advisories in the sidebar.
Avoid that with more careful templating.

4 files changed, 9 insertions, 9 deletions

diff --git a/Changes b/Changes
index 948113f..c31715d 100644
--- a/Changes
+++ b/Changes
@@ -6,6 +6,8 @@
    to be RFC 2822 dates and therefore always use English month and day of
    week names.  Thanks to Slaven Rezić for testing.
 
+ - Fix small whitespace problems in thread output.
+
 5.00 - 2021-09-12
 
  - Merge spin and spin-rss into this package, making it a full, if highly
diff --git a/share/templates/thread.tmpl b/share/templates/thread.tmpl
index 7bfd907..cffeb18 100644
--- a/share/templates/thread.tmpl
+++ b/share/templates/thread.tmpl
@@ -47,8 +47,8 @@
     \h2[Security Advisories]
 [% FOREACH advisory IN advisories %]
     \link[security/[% advisory.date %].html]
-        [[% advisory.date %]]: [% name %] [% advisory.versions %]\break
-[% END %][% END %]
+        [[% advisory.date %]]: [% name %] [% advisory.versions %] \break[% END %]
+[% END %]
     \h2[Development]
 [% FOREACH doc IN docs.developer %]
     \link[[% doc.name %].html][[% doc.title %]] \break[% END %][% IF vcs.github %]
@@ -189,8 +189,8 @@ User documentation:
 Security advisories:
 [% FOREACH advisory IN advisories %]
 \doc[security/[% advisory.date %].html]
-    [[% advisory.date %]: [% advisory.versions %]]
-[% END %][% END %]
+    [[% advisory.date %]: [% advisory.versions %]][% END %]
+[% END %]
 Developer documentation:
 [% FOREACH doc IN docs.developer %]
 \doc[[% doc.name %].html][[% doc.title %]][% END %][% IF vcs.github %]
diff --git a/t/data/generate/pam-krb5/output/thread b/t/data/generate/pam-krb5/output/thread
index 6554083..a370131 100644
--- a/t/data/generate/pam-krb5/output/thread
+++ b/t/data/generate/pam-krb5/output/thread
@@ -49,10 +49,9 @@
     \h2[Security Advisories]
 
     \link[security/2020-03-30.html]
-        [2020-03-30]: pam-krb5 4.8 and earlier\break
-
+        [2020-03-30]: pam-krb5 4.8 and earlier \break
     \link[security/2009-02-11.html]
-        [2009-02-11]: pam-krb5 3.12 and earlier\break
+        [2009-02-11]: pam-krb5 3.12 and earlier \break
 
     \h2[Development]
 
@@ -196,7 +195,6 @@ Security advisories:
 
 \doc[security/2020-03-30.html]
     [2020-03-30: 4.8 and earlier]
-
 \doc[security/2009-02-11.html]
     [2009-02-11: 3.12 and earlier]
 
diff --git a/t/data/generate/remctl/output/thread b/t/data/generate/remctl/output/thread
index 615ed8f..3ecd5f8 100644
--- a/t/data/generate/remctl/output/thread
+++ b/t/data/generate/remctl/output/thread
@@ -54,7 +54,7 @@
     \h2[Security Advisories]
 
     \link[security/2018-04-01.html]
-        [2018-04-01]: remctl 3.12 and 3.13\break
+        [2018-04-01]: remctl 3.12 and 3.13 \break
 
     \h2[Development]