Fix date format

issues/_common/footer

@@ -1,4 +1,3 @@
-        </section>
         </main>
         <footer>
             <hr />

issues/_common/header

@@ -13,7 +13,7 @@
         <meta property="og:image" content="https://webzine.puffy.cafe/images/logo.png" />
         <meta property="og:type" content="website" />
         <meta property="og:locale" content="en_EN" />
-        <title>OpenBSD_WEBZINE_ISSUE #__ISSUE__</title>
+        <title>OpenBSD Webzine #__ISSUE__</title>
         <style>
 
 #title {

issues/_index/00_METADATA.html

@@ -1,12 +1,7 @@
 <header>
 <h1 id="title"><a href="https://webzine.puffy.cafe">OpenBSD Webzine</a></h1>
 <div id="banner">
-    <p>
+    <p><span aria-hidden="true">☕</span><em>Your tasty dose of OpenBSD news</em><span aria-hidden="true">☕</span></p>
-		<span aria-hidden="true">☕</span>
-		<em>Your tasty dose of OpenBSD news</em>
-		<span aria-hidden="true">☕</span>
-	</p>
 </div>
 </header>
 <main>
-<section>

issues/_template/00_METADATA.html

@@ -1,9 +1,8 @@
 <header>
-<h1 id="title"><a href="https://webzine.puffy.cafe">OpenBSD Webzine</a></h1>
+<h2 id="title"><a href="https://webzine.puffy.cafe">OpenBSD Webzine</a></h2>
 <div id="banner">
     <p>ISSUE #__ISSUE__</p>
     <p><time datetime="__DATETIME__">__HUMAN_DATE__</time></p>
 </div>
 </header>
 <main>
-<section>

issues/_template/10_HEADLINES.html

@@ -1,5 +1,5 @@
 <article id="headlines">
-<h1>TL;DR</h1>
+<h2>TL;DR</h2>
 <ul>
     <li>OpenBSD 7.0 release very soon</li>
 </ul>

issues/_template/15_JOBS.html

@@ -1,10 +1,9 @@
-<!-- SECTION -->
 <!--
 <article id="jobs">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
 <h1>Job offers</h1>
 <ul>
-    <li><a href=""></a></li>
+    <li><a class="permalink" href=""></a></li>
 </ul>
 </article>
 -->

issues/_template/20_CURRENT.html

@@ -1,6 +1,6 @@
 <article id="current">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Recent -current changes</h1>
+<h2>Recent -current changes</h2>
 <ul>
     <li></li>
 </ul>

issues/_template/30_STABLE.html

@@ -1,6 +1,6 @@
 <article id="stable">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>6.9-stable changes</h1>
+<h2>6.9-stable changes</h2>
 <ul>
     <li></li>
 </ul>

issues/_template/40_INTERVIEW.html

@@ -1,5 +1,5 @@
 <article id="interview">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Interview</h1>
+<h2>Interview</h2>
 <p>…</p>
 </article>

issues/_template/50_TIPS.html

@@ -1,6 +1,6 @@
 <article id="tips">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Shell tips</h1>
+<h2>Shell tips</h2>
 <p>
 </p>
 </article>

issues/_template/60_COMMENTS.html

@@ -1,6 +1,6 @@
 <article id="comments">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Reader comments</h1>
+<h2>Reader comments</h2>
 <p>
     <em>Message received from XXX: </em>
     <quote>blabla.</quote>

issues/_template/70_LINKS.html

@@ -1,6 +1,6 @@
 <article id="links">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Going further</h1>
+<h2>Going further</h2>
 <ul>
     <li><a class="permalink" href=""></a></li>
 </ul>

issues/_template/80_ARTWORK.html

@@ -1,16 +1,15 @@
-<!-- section commented --
+<!-- section commented
 <article id="artwork">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Artworks of the moment</h1>
+<h2>Artworks of the moment</h2>
 <figure>
-    <a href="static/images/puffer_city_original.jpg"
+    <a href="static/images/puffer_city_original.jpg">
     <picture>
-    <img src="static/images/puffer_city_small.jpg"
+        <img src="static/images/puffer_city_small.jpg"
-         alt="A drawing featuring a city viewed from some altitude with many characters looking like OpenBSD mascot."
+         alt="A drawing featuring a city viewed from some altitude with many characters looking like OpenBSD mascot." />
-         width="100%" />
     </picture>
     </a>
     <figcaption>MASCOT</figcaption>
 </figure>
 </article>
--- END HTML Comment -->
+END HTML Comment -->

issues/_template/90_SOCIALMEDIA.html

@@ -1,6 +1,6 @@
 <article id="socials">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>On social media</h1>
+<h2>On social media</h2>
 <ul>
     <li><a class="permalink" href=""></a></li>
 </ul>

issues/_template/91_QUOTES.html

@@ -1,7 +1,7 @@
-<!-- section commented --
+<!-- section commented
 <article id="quotes">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Quote</h1>
+<h2>Quote</h2>
 
 <blockquote>
     glub
@@ -9,4 +9,4 @@
 </blockquote>
 
 </article>
--- END HTML Comment -->
+END HTML Comment -->

issues/issue-1/00_METADATA.html

@@ -1,9 +1,8 @@
 <header>
 <h1 id="title"><a href="https://webzine.puffy.cafe">OpenBSD Webzine</a></h1>
 <div id="banner">
-	<p>ISSUE #__ISSUE__</p>
+    <p>ISSUE #__ISSUE__</p>
-    <p><time datetime="__DATE__">__DATE__</time></p>
+    <p><time datetime="__DATETIME__">__HUMAN_DATE__</time></p>
 </div>
 </header>
 <main>
-<section>

issues/issue-1/10_HEADLINES.html

@@ -1,5 +1,5 @@
 <article id="headlines">
-<h1>TL;DR</h1>
+<h2>TL;DR</h2>
 <ul>
     <li>OpenBSD 7.0 release very soon</li>
     <li>LibreSSL problem with Let's Encrypt certificates</li>

issues/issue-1/20_CURRENT.html

@@ -1,6 +1,6 @@
 <article id="current">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Recent -current changes</h1>
+<h2>Recent -current changes</h2>
 <ul>
     <li>Base system repository has been locked and tagged 7.0 and development is now continuing.</li>
     <li>Ports tree is locked, meaning no ports changes are allowed to developers.</li>

issues/issue-1/30_STABLE.html

@@ -1,6 +1,6 @@
 <article id="stable">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>6.9-stable changes</h1>
+<h2>6.9-stable changes</h2>
 <ul>
     <li>27 September 2021: Errata #16: sshd</li>
     <li>27 September 2021: Errata #17: libressl</li>

issues/issue-1/40_INTERVIEW.html

@@ -1,8 +1,8 @@
-<!-- Commented Section --
+<!-- Commented Section
 <article id="interview">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
 <h2>Interview</h2>
 <p>
 </p>
 </article>
--- END HTML Comment -->
+END HTML Comment -->

issues/issue-1/50_TIPS.html

@@ -1,6 +1,6 @@
 <article id="tips">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Shell tips</h1>
+<h2>Shell tips</h2>
 <p>
  With the default shell ksh, you may have noticed typing
  <code>history</code> would only display the last 10 lines of the

issues/issue-1/60_COMMENTS.html

@@ -1,6 +1,6 @@
 <article id="comments">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Reader comments</h1>
+<h2>Reader comments</h2>
 <p>I love the idea of a webzine! <cite>- many people after showing the Webzine mockup</cite></p>
 <p>Please, make an RSS feed! <cite>- anonymous</cite></p>
 </article>

issues/issue-1/70_LINKS.html

@@ -1,12 +1,12 @@
 <article id="links">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Going further</h1>
+<h2>Going further</h2>
 <ul>
     <li><a class="permalink" href="https://twitter.com/openbsdnow">OpenBSD Now! Unofficial OpenBSD news, updates and thoughts</a></li>
     <li><a class="permalink" href="https://github.com/ligurio/awesome-openbsd">A curated list of awesome OpenBSD resources</a></li>
     <li>
-		<a class="permalink" href="https://www.openbsd.org/papers/eurobsdcon2021-espie-debug.pdf">Debug Packages in OpenBSD : Marc Espie - EuroBSDCon conference</a> - 
+        <a class="permalink" href="https://www.openbsd.org/papers/eurobsdcon2021-espie-debug.pdf">Debug Packages in OpenBSD : Marc Espie - EuroBSDCon conference</a> -
-		<a class="permalink" href="https://www.youtube.com/watch?v=pcHn4dl-K5c&list=PLskKNopggjc4dadqaCDmctW-swHPD49td&index=6">video</a>
+        <a class="permalink" href="https://www.youtube.com/watch?v=pcHn4dl-K5c&list=PLskKNopggjc4dadqaCDmctW-swHPD49td&index=6">video</a>
-	</li>
+    </li>
 </ul>
 </article>

issues/issue-1/80_ARTWORK.html

@@ -1,15 +1,15 @@
 <article id="artwork">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Artworks of the moment</h1>
+<h2>Artworks of the moment</h2>
 <figure>
     <a href="images/puffy_city_original.jpg">
-		<picture>
+        <picture>
         <img src="images/puffy_city_small.jpg"
              alt="A drawing featuring a city viewed from some altitude with many characters looking like the OpenBSD mascot." />
         </picture>
     </a>
     <figcaption>
-		<p>Artwork originally found <a class="permalink" href="https://www.openbsd.org/artwork.html">here</a>.</p>
+        <p>Artwork originally found <a class="permalink" href="https://www.openbsd.org/artwork.html">here</a>.</p>
     </figcaption>
 </figure>
 </article>

issues/issue-1/90_SOCIALMEDIA.html

@@ -1,4 +1,4 @@
-<!-- Commented Section --
+<!-- Commented Section
 <article id="socials">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
 <h2>On social media</h2>
@@ -6,4 +6,4 @@
     <li><a href=""></a></li>
 </ul>
 </article>
--- END HTML Comment -->
+END HTML Comment -->

issues/issue-1/91_QUOTES.html

@@ -1,14 +1,14 @@
 <article id="quotes">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Quote</h1>
+<h2>Quote</h2>
 <blockquote>
-	<ul>
+    <ul>
         <li>if you want something conceptualy less broken, give plan9 a try</li>
         <li>if you want something more polished, give vim+coreutils a try</li>
         <li>if you want something convivialist, obenbsd is the best trade off i seen (you can also give try to sbase or 9base)</li>
         <li>if you want something more consistent, let's start our project :)</li>
         <li>if you want something perfect, let it go :)</li>
-	</ul>
+    </ul>
     <cite>— Marc Chantreux on misc@ <a class="permalink" href="https://marc.info/?l=openbsd-misc&m=163077585122070&w=2">Source</a></cite>
 </blockquote>
 </article>

issues/issue-2/00_METADATA.html

@@ -1,7 +1,8 @@
-<div id="title"><a href="https://webzine.puffy.cafe">OpenBSD Webzine</a></div>
+<header>
+<h2 id="title"><a href="https://webzine.puffy.cafe">OpenBSD Webzine</a></h2>
 <div id="banner">
-	<div>ISSUE #__ISSUE__</div>
+    <p>ISSUE #__ISSUE__</p>
-	<div>__DATE__</div>
+    <p><time datetime="__DATETIME__">__HUMAN_DATE__</time></p>
 </div>
+</header>
 <main>
-<section>

issues/issue-2/10_HEADLINES.html

@@ -1,7 +1,8 @@
-<!-- SECTION -->
+<article id="headlines">
-<h1>TL;DR</h1>
+<h2>TL;DR</h2>
 <ul>
     <li>OpenBSD 7.0 released!</li>
     <li>No more packages updates for 6.9, syspatch will still be published</li>
     <li>No more syspatches for 6.8, it is now end of life and shouldn't be used anymore</li>
 </ul>
+</article>

issues/issue-2/20_CURRENT.html

@@ -1,6 +1,6 @@
-<!-- SECTION -->
+<article id="current">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>New 7.0 release highlights</h1>
+<h2>New 7.0 release highlights</h2>
 <ul>
     <li>doas is now asking password again on failure</li>
     <li>better hardware support (AMD, docks)</li>
@@ -13,3 +13,4 @@
     <li>performance improvements for heavy loads on many cores</li>
     <li><a href="https://www.openbsd.org/plus70.html" class="permalink">Many other changes!</a></li>
 </ul>
+</article>

issues/issue-2/30_STABLE.html

@@ -1,6 +1,6 @@
 <!-- SECTION -->
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>7.0-stable changes</h1>
+<h2>7.0-stable changes</h2>
 <ul>
     <li>No syspatch yet.</li>
 </ul>

issues/issue-2/40_INTERVIEW.html

@@ -1,3 +1,4 @@
-<!-- SECTION -->
+<article id="interview">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Interview</h1>
+<h2>Interview</h2>
+</article>

issues/issue-2/50_TIPS.html

@@ -1,7 +1,8 @@
-<!-- SECTION -->
+<article id="tips">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Shell tips</h1>
+<h2>Shell tips</h2>
 <p>OpenBSD 7.0 comes with a new utility named <em>timeout</em> to run a command and stop it after an user defined time.  The <a class="permalink" href="https://man.openbsd.org/timeout">man page</a> is available for full information.
 While it was possible to achieve this in shell using a child process sleeping for some time and stopping the main process if it wasn't finished yet, <em>timeout</em> makes this job very easy.
 One simple real world use case would be a lazy site-to-site synchronization using a rsync job run every night when the Internet uplink can be fully used and stop it right before people will need the network.  Such a scenario can be done with <code>timeout 8h rsync -a /data/ remote:/data/</code> and started from a cron job at 00h00.  In this case rsync would run at midnight and <em>timeout</em> would stop it at 8h00 if the job is not finished.
 </p>
+</article>

issues/issue-2/60_COMMENTS.html

@@ -1,6 +1,7 @@
-<!-- SECTION -->
+<article id="comments">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Reader comments</h1>
+<h2>Reader comments</h2>
 <p>Nice!
-    <em>- jcs@openbsd</em>
+    <cite>- jcs@openbsd</cite>
 </p>
+</article>

issues/issue-2/70_LINKS.html

@@ -1,6 +1,10 @@
-<!-- SECTION -->
+<article id="links">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Going further</h1>
+<h2>Going further</h2>
 <ul>
-    <li><a href=""></a></li>
+    <li><a class="permalink" href=""></a></li>
+    <li><a class="permalink" href="https://www.openbsd.org/faq/upgrade70.html">Official OpenBSD upgrade guide to 7.0</a></li>
+    <li><a class="permalink" href="https://www.playonbsd.com/shopping_guide/">PlayOnBSD shopping Guide (list of compatible commercial games)</a></li>
+    <li><a class="permalink" href="https://videos.pair2jeux.tube/c/openbsd_gaming/videos">OpenBSD Gaming peertube channel</a></li>
 </ul>
+</article>

issues/issue-2/80_ARTWORK.html

@@ -1,8 +1,15 @@
-<!-- SECTION>
+<article id="artwork">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Artworks of the moment</h1>
+<h2>Artworks of the moment</h2>
-<a href="static/images/puffer_city_original.jpg"
+<figure>
-    <img src="static/images/puffer_city_small.jpg"
+    <a href="images/.jpg">
-         alt="A drawing featuring a city viewed from some altitude with many characters looking like OpenBSD mascot."
+        <picture>
-         width="100%" /></a-->
+        <img src="images/.jpg"
-
+             alt="." />
+        </picture>
+    </a>
+    <figcaption>
+        <p>Artwork originally published <a class="permalink" href="https://bsd.network/@prahou/107026745346972847">here</a>.</p>
+    </figcaption>
+</figure>
+</article>

issues/issue-2/90_SOCIALMEDIA.html

@@ -1,7 +1,8 @@
-<!-- SECTION -->
+<article id="socials">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>On social media</h1>
+<h2>On social media</h2>
 <ul>
     <li><a class="permalink" href="https://news.ycombinator.com/item?id=28711519">We did hit first page of hackernews at launch</a></li>
     <li><a class="permalink" href="https://bsd.network/@bcallah/107037881574770525">thfr@ needing help for improving audio support in the video game Celeste</a></li>
 </ul>
+</article>

issues/issue-2/91_QUOTES.html

@@ -1,7 +1,8 @@
-<!-- SECTION-->
+<article id="quotes">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Quote</h1>
+<h2>Quote</h2>
 <blockquote>
     Boredom is a powerful driving force.
-    <cite>&mdash; solene@openbsd</cite>
+    <cite>— solene@openbsd</cite>
 </blockquote>
+</article>

issues/tools/make_issue.sh

@@ -43,25 +43,26 @@ cat _common/header $DIR/*html _common/footer > $DESTFILENAME
 
 if ! [ "$DIR" = "_index" ]
 then
+    set -e
     # replace with issue number
     issue="${1#issue-}"
     sed -i "s/__ISSUE__/${issue}/g" $DESTFILENAME
     sed -i "s/__TITLE__/issue #${issue}/g" $DESTFILENAME
     sed -i "s/__FILENAME__/issue-${issue}.html/" $DESTFILENAME
     # replace date
-    DATETIME="$(date -j -f "%Y-%m-%dT%H:%M:%SZ" "${PUBLISHED_DATE}" +"%xT%XZ")" 2>/dev/null
+    DATETIME="$(date -j -f "%Y-%m-%dT%H:%M:%SZ" "${PUBLISHED_DATE}" +"%Y-%m-%d %H:%M")" 2>/dev/null
     HUMAN_DATE="$(date -j -f "%Y-%m-%dT%H:%M:%SZ" "${PUBLISHED_DATE}" +"%B %e, %Y")" 2>/dev/null
 
-    if [ $? -ne 0 ]; then
+    if [ $? -ne 0 ];
+    then
         echo "err: Please fill ${DIR}/metadata.sh with ISO-8601 valid date"
         exit 1
-    else
-		sed -i "s/__DATETIME__/${DATETIME}/" $DESTFILENAME
-        sed -i "s/__HUMAN_DATE__/${HUMAN_DATE}/" $DESTFILENAME
     fi
+    sed -i "s,__DATETIME__,${DATETIME}," $DESTFILENAME
+    sed -i "s/__HUMAN_DATE__/${HUMAN_DATE}/" $DESTFILENAME
 else
     # index.html changes
-    sed -i "s/OpenBSD_WEBZINE_ISSUE #__ISSUE__/The OpenBSD Webzine/g" $DESTFILENAME
+    sed -i "s/ #__ISSUE__//g" $DESTFILENAME
     sed -i "s/__TITLE__/homepage/g" $DESTFILENAME
     sed -i "s/__FILENAME__/index.html/" $DESTFILENAME
 fi