[PATCH v3 0/2] ref-manual: release process: update LTS section

public inbox for docs@lists.yoctoproject.org
 help / color / mirror / Atom feed

* [PATCH v3 0/2] ref-manual: release process: update LTS section
@ 2024-10-23  7:32 Antonin Godard
  2024-10-23  7:32 ` [PATCH v3 1/2] ref-manual: release-process: update releases.svg Antonin Godard
  2024-10-23  7:32 ` [PATCH v3 2/2] ref-manual: release-process: refresh the current LTS releases Antonin Godard
  0 siblings, 2 replies; 9+ messages in thread
From: Antonin Godard @ 2024-10-23  7:32 UTC (permalink / raw)
  To: docs; +Cc: Michael Opdenacker, Quentin Schulz, Thomas Petazzoni,
	Antonin Godard

Update the releases.svg file. Link to preview:
https://lufi.bootlin.com/r/f_BcMLMB0o#UERvnOvvaoXRzxpwnmTmlgghoojSkBeKYYTI73i+xQ0=

Rewrite the paragraph above the diagram to mention the Scarthgap release.

Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
---
Changes in v3:
- Fix Styhead's color, it's now a current release.
- Add Reviewed-by from Michael (thanks!).
- Link to v2: https://lore.kernel.org/r/20241022-update-releases-svg-v2-0-6e7740f9a41c@bootlin.com

Changes in v2:
- Update release.svg with different colors for future/eol (see link
  above).
- Rewrite paragraph on releases and mention scarthgap. Add a list of
  currently supported LTS releases.
- Link to v1: https://lore.kernel.org/r/20241018-update-releases-svg-v1-1-502899b5d780@bootlin.com

---
Antonin Godard (2):
      ref-manual: release-process: update releases.svg
      ref-manual: release-process: refresh the current LTS releases

 documentation/ref-manual/release-process.rst |  15 +-
 documentation/ref-manual/svg/releases.svg    | 907 ++++++++++-----------------
 2 files changed, 355 insertions(+), 567 deletions(-)
---
base-commit: 143c3cacdec36c9d7ab81c89bbcc12c0c3936bd9
change-id: 20241018-update-releases-svg-be52387ec8cc

Best regards,
-- 
Antonin Godard <antonin.godard@bootlin.com>



^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH v3 1/2] ref-manual: release-process: update releases.svg
  2024-10-23  7:32 [PATCH v3 0/2] ref-manual: release process: update LTS section Antonin Godard
@ 2024-10-23  7:32 ` Antonin Godard
  2024-10-28 10:40   ` Quentin Schulz
  2024-10-23  7:32 ` [PATCH v3 2/2] ref-manual: release-process: refresh the current LTS releases Antonin Godard
  1 sibling, 1 reply; 9+ messages in thread
From: Antonin Godard @ 2024-10-23  7:32 UTC (permalink / raw)
  To: docs; +Cc: Michael Opdenacker, Quentin Schulz, Thomas Petazzoni,
	Antonin Godard

* Add Walnascar release.
* Remove dunfell, gatesgarth, hardknott, honister: these release are not
  supported anymore. Start from kirkstone, which is still supported.

Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
---
 documentation/ref-manual/svg/releases.svg | 907 ++++++++++++------------------
 1 file changed, 346 insertions(+), 561 deletions(-)

diff --git a/documentation/ref-manual/svg/releases.svg b/documentation/ref-manual/svg/releases.svg
index 036aa467cc2e646e99bc407bbf0ea7ff8825f57b..b1036e066ceb65a7391cec616cb4304094728f3f 100644
--- a/documentation/ref-manual/svg/releases.svg
+++ b/documentation/ref-manual/svg/releases.svg
@@ -2,11 +2,14 @@
 <svg
    version="1.1"
    id="svg2"
-   width="2040.0006"
-   height="669.30511"
-   viewBox="0 0 2040.0006 669.30509"
+   width="1523.001"
+   height="504.30499"
+   viewBox="0 0 1523.001 504.30497"
    sodipodi:docname="releases.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
+   inkscape:export-filename="../../../../../../../../tmp/releases.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -24,29 +27,29 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://artlibre.org/licence/lal" />
         <dc:title>Yocto Project Release Timeline</dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>The Yocto Project</dc:title>
           </cc:Agent>
         </dc:creator>
+        <cc:license
+           rdf:resource="http://artlibre.org/licence/lal" />
       </cc:Work>
       <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+         rdf:about="http://artlibre.org/licence/lal">
         <cc:permits
            rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
            rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
         <cc:permits
            rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
         <cc:requires
            rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
       </cc:License>
     </rdf:RDF>
   </metadata>
@@ -66,7 +69,8 @@
        miter_limit="4"
        scale_width="1"
        end_linecap_type="zerowidth"
-       not_jump="false" />
+       not_jump="false"
+       message="&lt;b&gt;Ctrl + click&lt;/b&gt; on existing node and move it" />
     <marker
        style="overflow:visible"
        id="marker5783"
@@ -404,15 +408,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1043"
+     inkscape:window-width="3826"
+     inkscape:window-height="2049"
      id="namedview4"
      showgrid="true"
-     inkscape:zoom="1.4472045"
-     inkscape:cx="987.76641"
-     inkscape:cy="357.93145"
-     inkscape:window-x="1728"
-     inkscape:window-y="0"
+     inkscape:zoom="1.5536106"
+     inkscape:cx="868.94361"
+     inkscape:cy="273.87815"
+     inkscape:window-x="0"
+     inkscape:window-y="80"
      inkscape:window-maximized="1"
      inkscape:current-layer="g10"
      inkscape:document-rotation="0"
@@ -422,12 +426,19 @@
      fit-margin-left="30"
      fit-margin-right="30"
      fit-margin-bottom="30"
-     inkscape:pagecheckerboard="0">
+     inkscape:pagecheckerboard="0"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1"
+     showguides="true">
     <inkscape:grid
        type="xygrid"
        id="grid1257"
        originx="-289.99936"
-       originy="369.99998" />
+       originy="369.99997"
+       spacingy="1"
+       spacingx="1"
+       units="px"
+       visible="true" />
   </sodipodi:namedview>
   <g
      inkscape:groupmode="layer"
@@ -435,81 +446,65 @@
      id="g10"
      transform="translate(-289.99936,370.00003)">
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1080,220.00003 v -515.00007 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 563.40434,64.000628 v -415.635938 0 0"
        id="path207708" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1200,220.00003 v -515.00007 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 683.40434,64.000628 v -415.635938 0 0"
        id="path207708-4" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1320,220.00003 v -515.00007 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 803.40434,64.000628 v -415.635938 0 0"
        id="path207708-4-3" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1440,219.99998 v -515.00002 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 923.40434,64.000588 v -415.635898 0 0"
        id="path207708-4-3-6" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1560,219.99998 v -515.00001 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1043.4043,64.000588 v -415.635898 0 0"
        id="path207708-4-3-6-2" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1680,219.99998 v -515.00002 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1163.4043,64.000588 v -415.635898 0 0"
        id="path207708-4-3-6-2-8" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1800,219.99998 v -515.00002 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1283.4043,64.000588 v -415.635898 0 0"
        id="path207708-4-3-6-2-8-4" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1920,219.99998 v -515.00002 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1403.4043,64.000588 v -415.635898 0 0"
        id="path207708-4-3-6-2-8-4-3" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 2040,219.99997 v -460.00002 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.475347;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1523.4043,64.000568 v -415.757648 0 0"
        id="path207708-4-3-6-2-8-4-3-8" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 2040,219.99998 v -515.00002 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1523.4043,64.000588 v -415.635898 0 0"
        id="path207708-4-3-6-2-8-4-3-8-0" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 2159.954,219.99997 v -514.99999 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1643.3583,64.000578 v -415.635868 0 0"
        id="path207708-4-3-6-2-8-4-3-8-4" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 2280,219.99997 v -514.99999 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1763.4043,64.000578 v -415.635868 0 0"
        id="path207708-4-3-6-2-8-4-3-8-4-0" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 960,220.00003 v -515.00007 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 443.40434,64.000628 v -415.635938 0 0"
        id="path207708-9" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 840,220.00001 v -375 0 0"
+       d="m 323.40434,64.000608 v -375.000008 0 0"
        id="path207708-9-6" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 840,220.00002 v -515.00004 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 323.40434,64.000618 v -415.635908 0 0"
        id="path207708-9-6-2" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 720,220.00003 v -515.00007 0 0"
-       id="path207708-9-6-2-5" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 600,220.00003 v -515.00007 0 0"
-       id="path207708-9-6-2-5-9" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 480,220.00003 v -515.00007 0 0"
-       id="path207708-9-6-2-5-9-0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 360,220.00003 v -515.00007 0 0"
-       id="path207708-9-6-2-5-9-0-5" />
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:42.5884px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -541,186 +536,104 @@
          x="-59.575905"
          y="580.05695" /></text>
     <rect
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
-       id="rect917-0-0"
-       width="980"
-       height="45.000004"
-       x="360"
-       y="154.99997"
-       ry="2.2558987" />
-    <text
-       xml:space="preserve"
-       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="420.52835"
-       y="174.12433"
-       id="text1185-3-55-4"><tspan
-         sodipodi:role="line"
-         x="420.52835"
-         y="174.12433"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
-         id="tspan957-2-8">Dunfell (LTS)</tspan><tspan
-         sodipodi:role="line"
-         x="420.52835"
-         y="192.121"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
-         id="tspan10317">3.1</tspan></text>
-    <rect
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
-       id="rect917-0-0-4"
-       width="140.00002"
-       height="45.000004"
-       x="480"
-       y="99.999969"
-       ry="2.2558987" />
-    <text
-       xml:space="preserve"
-       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="534.10651"
-       y="118.94971"
-       id="text1185-3-55-4-0"><tspan
-         sodipodi:role="line"
-         x="534.10651"
-         y="118.94971"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
-         id="tspan957-2-8-6">Gatesgarth</tspan><tspan
-         sodipodi:role="line"
-         x="534.10651"
-         y="136.94638"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
-         id="tspan10317-2">3.2</tspan></text>
-    <rect
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
-       id="rect917-0-0-4-4"
-       width="260"
-       height="45.000004"
-       x="599.99994"
-       y="45.000011"
-       ry="2.2558987" />
-    <rect
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
-       id="rect917-0-0-4-4-9"
-       width="160.00002"
-       height="45.000004"
-       x="720"
-       y="-9.9999905"
-       ry="2.2558987" />
-    <text
-       xml:space="preserve"
-       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="766.10297"
-       y="9.57586"
-       id="text1185-3-55-4-0-0"><tspan
-         sodipodi:role="line"
-         x="766.10297"
-         y="9.57586"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
-         id="tspan957-2-8-6-3">Honister</tspan><tspan
-         sodipodi:role="line"
-         x="766.10297"
-         y="27.57254"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
-         id="tspan10317-2-9">3.4</tspan></text>
-    <rect
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
+       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1;opacity:0.5"
        id="rect917-0-0-4-4-9-4"
        width="160.00002"
        height="45.000004"
-       x="959.99994"
-       y="-120"
+       x="443.40427"
+       y="-55.999405"
        ry="2.2558987" />
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1008.4941"
-       y="-100.605"
+       x="491.89841"
+       y="-36.604408"
        id="text1185-3-55-4-0-0-0"><tspan
          sodipodi:role="line"
-         x="1008.4941"
-         y="-100.605"
+         x="491.89841"
+         y="-36.604408"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
          id="tspan957-2-8-6-3-9">Langdale</tspan><tspan
          sodipodi:role="line"
-         x="1008.4941"
-         y="-82.608322"
+         x="491.89841"
+         y="-18.607729"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
          id="tspan10317-2-9-1">4.1</tspan></text>
     <rect
-       style="opacity:1;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
+       style="opacity:0.5;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
        id="rect917-0-0-4-4-9-4-5"
        width="140.00003"
        height="45.000004"
-       x="1100"
-       y="-175.00003"
+       x="583.40436"
+       y="-110.99944"
        ry="2.2558987" />
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1156.057"
-       y="-155.49881"
+       x="639.46136"
+       y="-91.498215"
        id="text1185-3-55-4-0-0-0-1"><tspan
          sodipodi:role="line"
-         x="1156.057"
-         y="-155.49881"
+         x="639.46136"
+         y="-91.498215"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
          id="tspan957-2-8-6-3-9-7">Mickledore</tspan><tspan
          sodipodi:role="line"
-         x="1156.057"
-         y="-137.50214"
+         x="639.46136"
+         y="-73.501534"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
          id="tspan10317-2-9-1-4">4.2</tspan></text>
-    <g
-       id="g1258">
-      <rect
-         style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
-         id="rect917-0-0-4-4-9-4-5-38"
-         width="120.00002"
-         height="45.000004"
-         x="1220"
-         y="-230.00005"
-         ry="2.2558987" />
-      <text
-         xml:space="preserve"
-         style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         x="1269.2329"
-         y="-210.32925"
-         id="text1185-3-55-4-0-0-0-1-1"><tspan
-           sodipodi:role="line"
-           x="1269.2329"
-           y="-210.32925"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
-           id="tspan957-2-8-6-3-9-7-4">Nanbield</tspan><tspan
-           sodipodi:role="line"
-           x="1269.2329"
-           y="-192.33258"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
-           id="tspan10317-2-9-1-4-6">4.3</tspan></text>
-    </g>
     <rect
-       style="opacity:0.75;fill:#241f31;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
-       id="rect917-0-0-4-4-9-4-5-3-9-2"
+       style="opacity:0.75;fill:#251f32;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
+       id="rect917-0-0-4-4-9-4-5-3-9-2-3"
+       width="140"
+       height="45.000004"
+       x="1043.132"
+       y="-328.2114"
+       ry="2.2558987" />
+    <rect
+       style="opacity:1;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
+       id="rect917-0-0-4-4-9-4-5-3-9-2-3-6"
        width="140"
        height="45.000004"
-       x="1440"
-       y="-340.00003"
+       x="923.65302"
+       y="-275.19217"
        ry="2.2558987" />
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1487.233"
-       y="-320.32928"
+       x="970.63739"
+       y="-256.32867"
        id="text1185-3-55-4-0-0-0-1-1-6-4"><tspan
          sodipodi:role="line"
-         x="1487.233"
-         y="-320.32928"
+         x="970.63739"
+         y="-256.32867"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
          id="tspan957-2-8-6-3-9-7-4-2-0">Styhead</tspan><tspan
          sodipodi:role="line"
-         x="1487.233"
-         y="-302.33261"
+         x="970.63739"
+         y="-238.332"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
          id="tspan10317-2-9-1-4-6-5-6">5.1</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1094.2197"
+       y="-309.83084"
+       id="text1185-3-55-4-0-0-0-1-1-6-4-3"><tspan
+         sodipodi:role="line"
+         x="1094.2197"
+         y="-309.83084"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
+         id="tspan957-2-8-6-3-9-7-4-2-0-5">Walnascar</tspan><tspan
+         sodipodi:role="line"
+         x="1094.2197"
+         y="-291.83417"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
+         id="tspan10317-2-9-1-4-6-5-6-6">5.2</tspan></text>
     <g
-       id="g1591">
+       id="g1591"
+       transform="translate(-516.59566,64.000598)">
       <rect
          style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
          id="rect917-0-0-4-4-9-9"
@@ -749,42 +662,26 @@
     <path
        id="rect917-0-0-4-4-9-9-9"
        style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
-       d="m 1322.3015,-285.00003 c -1.2753,0 -2.302,1.00609 -2.302,2.25586 v 40.48828 c 0,1.24977 1.0267,2.25586 2.302,2.25586 h 975.0412 c 1.2754,0 2.302,-1.00609 2.302,-2.25586 v -40.48828 c 0,-1.24977 -1.0266,-2.25586 -2.302,-2.25586 z" />
+       d="m 805.70584,-220.99944 c -1.2753,0 -2.302,1.00609 -2.302,2.25586 v 40.48828 c 0,1.24977 1.0267,2.25586 2.302,2.25586 H 1780.747 c 1.2754,0 2.302,-1.00609 2.302,-2.25586 v -40.48828 c 0,-1.24977 -1.0266,-2.25586 -2.302,-2.25586 z" />
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1390.4988"
-       y="-265.64832"
+       x="873.90314"
+       y="-201.64772"
        id="text1185-3-55-4-0-0-9-0"><tspan
          sodipodi:role="line"
-         x="1390.4988"
-         y="-265.64832"
+         x="873.90314"
+         y="-201.64772"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
          id="tspan957-2-8-6-3-6-8">Scarthgap (LTS)</tspan><tspan
          sodipodi:role="line"
-         x="1390.4988"
-         y="-247.65164"
+         x="873.90314"
+         y="-183.65105"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
          id="tspan10317-2-9-0-1">5.0</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="653.72168"
-       y="64.866302"
-       id="text1185-3-55-4-0-0-7"><tspan
-         sodipodi:role="line"
-         x="653.72168"
-         y="64.866302"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
-         id="tspan957-2-8-6-3-2">Hardknott </tspan><tspan
-         sodipodi:role="line"
-         x="653.72168"
-         y="82.862984"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
-         id="tspan10317-2-9-8">3.3</tspan></text>
     <g
        id="g1125-0"
-       transform="matrix(0.42240595,0,0,0.41654472,354.53445,-399.96314)"
+       transform="matrix(0.42240595,0,0,0.41654472,330.77064,-441.11721)"
        style="stroke:none;stroke-width:2.38399">
       <rect
          style="opacity:1;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.76797;stroke-opacity:1"
@@ -873,232 +770,147 @@
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1199.6055"
-       y="250.21216"
+       x="683.00983"
+       y="94.212761"
        id="text1185-9-7-1-1"><tspan
          sodipodi:role="line"
-         x="1199.6055"
-         y="250.21216"
+         x="683.00983"
+         y="94.212761"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan31345">Oct.</tspan><tspan
          sodipodi:role="line"
-         x="1199.6055"
-         y="268.20883"
+         x="683.00983"
+         y="112.20944"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan49906">2023</tspan></text>
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1439.3904"
-       y="249.86044"
+       x="922.79474"
+       y="93.861046"
        id="text1185-9-7-1-1-89"><tspan
          sodipodi:role="line"
-         x="1439.3904"
-         y="249.86044"
+         x="922.79474"
+         y="93.861046"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan31345-7">Oct.</tspan><tspan
          sodipodi:role="line"
-         x="1439.3904"
-         y="267.85712"
+         x="922.79474"
+         y="111.85773"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan49906-76">2024</tspan></text>
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1679.3094"
-       y="250.58356"
+       x="1162.7139"
+       y="94.58416"
        id="text1185-9-7-1-1-89-6"><tspan
          sodipodi:role="line"
-         x="1679.3094"
-         y="250.58356"
+         x="1162.7139"
+         y="94.58416"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan31345-7-8">Oct.</tspan><tspan
          sodipodi:role="line"
-         x="1679.3094"
-         y="268.58023"
+         x="1162.7139"
+         y="112.58084"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan49906-76-0">2025</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-weight:bold;font-size:6.66667px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="849.49744"
-       y="61.106953"
-       id="text1185-9-7-1-1-0"><tspan
-         sodipodi:role="line"
-         x="849.49744"
-         y="61.106953"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.66667px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:end;text-anchor:end;fill:#fffefe;fill-opacity:1;stroke:none"
-         id="tspan46212">Support for this version was extended to leave</tspan><tspan
-         sodipodi:role="line"
-         x="849.49744"
-         y="70.105324"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.66667px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:end;text-anchor:end;fill:#fffefe;fill-opacity:1;stroke:none"
-         id="tspan120364">users more time to adapt to override syntax</tspan><tspan
-         sodipodi:role="line"
-         x="849.49744"
-         y="79.103691"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.66667px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:end;text-anchor:end;fill:#fffefe;fill-opacity:1;stroke:none"
-         id="tspan123280">changes in the 3.4 release.</tspan></text>
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="959.52008"
-       y="250.67822"
+       x="442.92441"
+       y="94.678825"
        id="text1185-9-7-1-1-0-7"><tspan
          sodipodi:role="line"
-         x="959.52008"
-         y="250.67822"
+         x="442.92441"
+         y="94.678825"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan31345-42-7">Oct.</tspan><tspan
          sodipodi:role="line"
-         x="959.52008"
-         y="268.6749"
+         x="442.92441"
+         y="112.67551"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan49906-9-6">2022</tspan></text>
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="719.13617"
-       y="250.21216"
-       id="text1185-9-7-1-1-2"><tspan
-         sodipodi:role="line"
-         x="719.13617"
-         y="250.21216"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
-         id="tspan31345-1">Oct.</tspan><tspan
-         sodipodi:role="line"
-         x="719.13617"
-         y="268.20883"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
-         id="tspan49906-5">2021</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="478.82367"
-       y="250.21216"
-       id="text1185-9-7-1-1-80"><tspan
-         sodipodi:role="line"
-         x="478.82367"
-         y="250.21216"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
-         id="tspan31345-5">Oct.</tspan><tspan
-         sodipodi:role="line"
-         x="478.82367"
-         y="268.20883"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
-         id="tspan49906-6">2020</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="361.81961"
-       y="250.07544"
-       id="text1185-9-7-1-1-8"><tspan
-         sodipodi:role="line"
-         x="361.81961"
-         y="250.07544"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
-         id="tspan31345-4">Apr.</tspan><tspan
-         sodipodi:role="line"
-         x="361.81961"
-         y="268.07211"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
-         id="tspan49906-7">2020</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="840.9248"
-       y="250.07544"
+       x="324.32913"
+       y="94.076042"
        id="text1185-9-7-1-1-8-1"><tspan
          sodipodi:role="line"
-         x="840.9248"
-         y="250.07544"
+         x="324.32913"
+         y="94.076042"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan31345-4-0">Apr</tspan><tspan
          sodipodi:role="line"
-         x="840.9248"
-         y="268.07211"
+         x="324.32913"
+         y="112.07272"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan49906-7-3">2022</tspan></text>
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1321.8608"
-       y="250.07544"
+       x="805.2652"
+       y="94.076042"
        id="text1185-9-7-1-1-8-1-0"><tspan
          sodipodi:role="line"
-         x="1321.8608"
-         y="250.07544"
+         x="805.2652"
+         y="94.076042"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan31345-4-0-4">Apr.</tspan><tspan
          sodipodi:role="line"
-         x="1321.8608"
-         y="268.07211"
+         x="805.2652"
+         y="112.07272"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan49906-7-3-8">2024</tspan></text>
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1561.8163"
-       y="249.66977"
+       x="1045.2207"
+       y="93.670372"
        id="text1185-9-7-1-1-8-1-0-4"><tspan
          sodipodi:role="line"
-         x="1561.8163"
-         y="249.66977"
+         x="1045.2207"
+         y="93.670372"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan31345-4-0-4-81">Apr.</tspan><tspan
          sodipodi:role="line"
-         x="1561.8163"
-         y="267.66644"
+         x="1045.2207"
+         y="111.66705"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan49906-7-3-8-2">2025</tspan></text>
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1802.1477"
-       y="250.26334"
+       x="1285.5521"
+       y="94.263939"
        id="text1185-9-7-1-1-8-1-0-4-2"><tspan
          sodipodi:role="line"
-         x="1802.1477"
-         y="250.26334"
+         x="1285.5521"
+         y="94.263939"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan31345-4-0-4-81-5">Apr.</tspan><tspan
          sodipodi:role="line"
-         x="1802.1477"
-         y="268.26001"
+         x="1285.5521"
+         y="112.26062"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan49906-7-3-8-2-8">2026</tspan></text>
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1081.4458"
-       y="250.07544"
+       x="564.85016"
+       y="94.076042"
        id="text1185-9-7-1-1-8-1-0-2"><tspan
          sodipodi:role="line"
-         x="1081.4458"
-         y="250.07544"
+         x="564.85016"
+         y="94.076042"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan31345-4-0-4-8">Apr.</tspan><tspan
          sodipodi:role="line"
-         x="1081.4458"
-         y="268.07211"
+         x="564.85016"
+         y="112.07272"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan49906-7-3-8-3">2023</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="602.51526"
-       y="250.07544"
-       id="text1185-9-7-1-1-8-1-7"><tspan
-         sodipodi:role="line"
-         x="602.51526"
-         y="250.07544"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
-         id="tspan31345-4-0-5">Apr.</tspan><tspan
-         sodipodi:role="line"
-         x="602.51526"
-         y="268.07211"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
-         id="tspan49906-7-3-6">2021</tspan></text>
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:42.5884px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -1111,252 +923,117 @@
          y="345.7359" /></text>
     <path
        id="path29430"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 319.99936,219.99912 H 2300 Z" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 360,219.99997 v 10.00004 0"
-       id="path29548" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 480,219.99996 v 10 0"
-       id="path29548-5" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 600,219.99992 v 10.00005 0"
-       id="path29548-5-1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 720,220.00002 v 9.99999 0"
-       id="path29548-5-1-3" />
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.72671;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 307.54809,63.999718 H 1783.4043 Z" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 840,220.00002 v 9.99995 0"
+       d="m 323.40434,64.000618 v 9.99995 0"
        id="path29548-5-1-3-6" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 960,220.00002 v 9.99999 0"
+       d="m 443.40434,64.000618 v 9.99999 0"
        id="path29548-5-1-3-6-3" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1080,220.00002 v 9.99999 0"
+       d="m 563.40434,64.000618 v 9.99999 0"
        id="path29548-5-1-3-6-3-1" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 380,219.99997 v 5.00004 0"
-       id="path29548-8"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 400,219.99997 v 5.00004 0"
-       id="path29548-8-5"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 420,219.99997 v 5 0"
-       id="path29548-8-5-0"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282155" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 440,219.99997 v 5 0"
-       id="path29548-8-5-0-6"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282155" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 460,219.99997 v 5.00004 0"
-       id="path29548-8-5-0-6-4-6"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 500,219.99997 v 5.00004 0"
-       id="path29548-8-5-0-6-4-6-2"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 520,219.99997 v 5 0"
-       id="path29548-8-5-0-6-4-6-2-9"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282155" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 540,219.99997 v 5.00004 0"
-       id="path29548-8-5-0-6-4-6-2-9-0"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 560,219.99997 v 5.00004 0"
-       id="path29548-8-5-0-6-4-6-2-9-0-8"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 580,219.99997 v 5.00004 0"
-       id="path29548-8-5-0-6-4-6-2-9-0-8-1"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 620.266,219.99997 v 5.00004 0"
-       id="path29548-8-5-0-6-4-6-2-9-0-8-1-3"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 640,219.99997 v 5.00004 0"
-       id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 660,219.99997 v 5.00004 0"
-       id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 679.61073,219.99997 v 5.00004 0"
-       id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 700,219.99997 v 5.00004 0"
-       id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 740,219.99997 v 5.00004 0"
-       id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 760,219.99997 v 5.00004 0"
-       id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 780.36587,219.99997 v 5.00004 0"
-       id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 800,219.99997 v 5.00004 0"
-       id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 820,219.99997 v 5.00004 0"
-       id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6"
-       inkscape:transform-center-x="14.782001"
-       inkscape:transform-center-y="-0.085282837" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 860,219.99997 v 5.00004 0"
+       d="m 343.40434,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 880,219.99997 v 5.00004 0"
+       d="m 363.40434,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 899.72384,219.99997 v 5.00004 0"
+       d="m 383.12818,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 920,219.99997 v 5.00004 0"
+       d="m 403.40434,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 940,219.99997 v 5.00004 0"
+       d="m 423.40434,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 980,219.99997 v 5.00004 0"
+       d="m 463.40434,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1000,219.99997 v 5.00004 0"
+       d="m 483.40434,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1020,219.99997 v 5.00004 0"
+       d="m 503.40434,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1040,219.99997 v 5.00004 0"
+       d="m 523.40434,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-4"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1059.7216,219.99997 v 5.00004 0"
+       d="m 543.12594,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-4-9"
        inkscape:transform-center-x="-14.78205"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1100,219.99997 v 5.00004 0"
+       d="m 583.40434,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-0"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1120,219.99997 v 5.00004 0"
+       d="m 603.40434,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-7"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1140,219.99997 v 5.00004 0"
+       d="m 623.40434,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-5"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1160,219.99997 v 5.00004 0"
+       d="m 643.40434,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-4-8"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1179.7216,219.99997 v 5.00004 0"
+       d="m 663.12594,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-4-9-7"
        inkscape:transform-center-x="-14.78205"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1320,219.99996 v 10 0"
+       d="m 803.40434,64.000558 v 10 0"
        id="path29548-5-1-3-6-3-1-0-8" />
     <g
-       id="g1267">
+       id="g1267"
+       transform="translate(-516.59566,-155.99941)">
       <path
          style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 1200,220.00002 v 9.99999 0"
@@ -1394,7 +1071,7 @@
     </g>
     <g
        id="g1267-4"
-       transform="translate(240,-4e-5)">
+       transform="translate(-276.59566,-155.99945)">
       <path
          style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 1200,220.00002 v 9.99999 0"
@@ -1432,7 +1109,7 @@
     </g>
     <g
        id="g1267-4-5"
-       transform="translate(480,-5e-5)">
+       transform="translate(-36.595659,-155.99946)">
       <path
          style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 1200,220.00002 v 9.99999 0"
@@ -1470,7 +1147,7 @@
     </g>
     <g
        id="g1267-4-5-22"
-       transform="translate(600,-4e-5)">
+       transform="translate(83.404341,-155.99945)">
       <path
          style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 1200,220.00002 v 9.99999 0"
@@ -1508,7 +1185,7 @@
     </g>
     <g
        id="g1267-4-5-9"
-       transform="translate(360,-4e-5)">
+       transform="translate(-156.59566,-155.99945)">
       <path
          style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 1200,220.00002 v 9.99999 0"
@@ -1546,105 +1223,105 @@
     </g>
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1800,219.99997 v 9.99999 0"
+       d="m 1283.4043,64.000568 v 9.99999 0"
        id="path29548-5-1-3-6-3-1-0-3-4-2-0" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1340,219.99997 v 5.00004 0"
+       d="m 823.40434,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-0-5-3"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1360,219.99997 v 5.00004 0"
+       d="m 843.40434,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-7-5-0"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1380,219.99997 v 5.00004 0"
+       d="m 863.40434,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-5-2-3"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1400,219.99997 v 5.00004 0"
+       d="m 883.40434,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-4-8-9-0"
        inkscape:transform-center-x="14.782001"
        inkscape:transform-center-y="-0.085282837" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1419.7216,219.99997 v 5.00004 0"
+       d="m 903.12594,64.000568 v 5.00004 0"
        id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-4-9-7-0-9"
        inkscape:transform-center-x="-14.78205"
        inkscape:transform-center-y="-0.085282837" />
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1919.3904"
-       y="249.86044"
+       x="1402.7948"
+       y="93.861046"
        id="text1185-9-7-1-1-89-62"><tspan
          sodipodi:role="line"
-         x="1919.3904"
-         y="249.86044"
+         x="1402.7948"
+         y="93.861046"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan31345-7-6">Oct.</tspan><tspan
          sodipodi:role="line"
-         x="1919.3904"
-         y="267.85712"
+         x="1402.7948"
+         y="111.85773"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan49906-76-7">2026</tspan></text>
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="2159.3093"
-       y="250.58356"
+       x="1642.7137"
+       y="94.58416"
        id="text1185-9-7-1-1-89-6-5"><tspan
          sodipodi:role="line"
-         x="2159.3093"
-         y="250.58356"
+         x="1642.7137"
+         y="94.58416"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan31345-7-8-6">Oct.</tspan><tspan
          sodipodi:role="line"
-         x="2159.3093"
-         y="268.58023"
+         x="1642.7137"
+         y="112.58084"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan49906-76-0-9">2027</tspan></text>
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="2041.8163"
-       y="249.66977"
+       x="1525.2207"
+       y="93.670372"
        id="text1185-9-7-1-1-8-1-0-4-8"><tspan
          sodipodi:role="line"
-         x="2041.8163"
-         y="249.66977"
+         x="1525.2207"
+         y="93.670372"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan31345-4-0-4-81-7">Apr.</tspan><tspan
          sodipodi:role="line"
-         x="2041.8163"
-         y="267.66644"
+         x="1525.2207"
+         y="111.66705"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan49906-7-3-8-2-2">2027</tspan></text>
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="2282.1477"
-       y="250.26334"
+       x="1765.5521"
+       y="94.263939"
        id="text1185-9-7-1-1-8-1-0-4-2-8"><tspan
          sodipodi:role="line"
-         x="2282.1477"
-         y="250.26334"
+         x="1765.5521"
+         y="94.263939"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan31345-4-0-4-81-5-2">Apr.</tspan><tspan
          sodipodi:role="line"
-         x="2282.1477"
-         y="268.26001"
+         x="1765.5521"
+         y="112.26062"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
          id="tspan49906-7-3-8-2-8-9">2028</tspan></text>
     <g
        id="g1267-4-9"
-       transform="translate(720,-3e-5)">
+       transform="translate(203.40434,-155.99944)">
       <path
          style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 1200,220.00002 v 9.99999 0"
@@ -1682,7 +1359,7 @@
     </g>
     <g
        id="g1267-4-5-2"
-       transform="translate(960,-4e-5)">
+       transform="translate(443.40434,-155.99945)">
       <path
          style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 1200,220.00002 v 9.99999 0"
@@ -1720,7 +1397,7 @@
     </g>
     <g
        id="g1267-4-5-9-9"
-       transform="translate(840,-3e-5)">
+       transform="translate(323.40434,-155.99944)">
       <path
          style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 1200,220.00002 v 9.99999 0"
@@ -1758,8 +1435,116 @@
     </g>
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 2280,219.99998 v 9.99999 0"
+       d="m 1763.4043,64.000578 v 9.99999 0"
        id="path29548-5-1-3-6-3-1-0-3-4-2-0-0" />
+    <rect
+       style="opacity:0.75;fill:#241f31;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.751473;stroke-opacity:1"
+       id="rect917-0-0-4-4-9-4-5-3-9-2-36"
+       width="38.418175"
+       height="23.151052"
+       x="1605.6135"
+       y="-41.172161"
+       ry="1.1605872" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.98878;stroke-dasharray:none;stroke-opacity:1"
+       id="rect917-0-0-4-4-9-4-5-3-9-2-36-7"
+       width="186.42949"
+       height="110.40546"
+       x="1594.5294"
+       y="-73.753708"
+       ry="5.5347452" />
+    <rect
+       style="opacity:0.75;fill:#241f31;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50949;stroke-opacity:1"
+       id="rect917-0-0-4-4-9-4-5-3-9-2-6"
+       width="21.197233"
+       height="19.28739"
+       x="1611.8163"
+       y="-41.883858"
+       ry="0.96689767" />
+    <text
+       xml:space="preserve"
+       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1690.4917"
+       y="-53.687912"
+       id="text1185-3-55-4-0-0-0-1-1-6-4-3-5"><tspan
+         sodipodi:role="line"
+         x="1690.4917"
+         y="-53.687912"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+         id="tspan10317-2-9-1-4-6-5-6-6-5">Legend</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1656.0988"
+       y="-27.899874"
+       id="text1185-3-55-4-0-0-0-1-1-6-4-3-5-2"><tspan
+         sodipodi:role="line"
+         x="1656.0988"
+         y="-27.899874"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+         id="tspan10317-2-9-1-4-6-5-6-6-5-9">Future</tspan></text>
+    <rect
+       style="opacity:1;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50949;stroke-opacity:1"
+       id="rect917-0-0-4-4-9-4-5-3-9-2-6-1"
+       width="21.197233"
+       height="19.28739"
+       x="1611.8671"
+       y="-17.756365"
+       ry="0.96689767" />
+    <text
+       xml:space="preserve"
+       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1659.087"
+       y="-3.6722763"
+       id="text1185-3-55-4-0-0-0-1-1-6-4-3-5-2-2"><tspan
+         sodipodi:role="line"
+         x="1659.087"
+         y="-3.6722763"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+         id="tspan10317-2-9-1-4-6-5-6-6-5-9-7">Current</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1667.363"
+       y="20.03771"
+       id="text1185-3-55-4-0-0-0-1-1-6-4-3-5-2-2-9"><tspan
+         sodipodi:role="line"
+         x="1667.363"
+         y="20.03771"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+         id="tspan10317-2-9-1-4-6-5-6-6-5-9-7-3">End-of-life</tspan></text>
+    <rect
+       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50949;stroke-opacity:1;opacity:0.5"
+       id="rect917-0-0-4-4-9-4-5-3-9-2-6-1-0"
+       width="21.197233"
+       height="19.28739"
+       x="1612.0239"
+       y="5.9667883"
+       ry="0.96689767" />
+    <rect
+       style="opacity:0.5;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.85786;stroke-opacity:1"
+       id="rect917-0-0-4-4-9-4-5-6"
+       width="120.80748"
+       height="45.000004"
+       x="703.10553"
+       y="-165.72791"
+       ry="2.2558987" />
+    <text
+       xml:space="preserve"
+       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="752.16809"
+       y="-147.18787"
+       id="text1185-3-55-4-0-0-0-1-2"><tspan
+         sodipodi:role="line"
+         x="752.16809"
+         y="-147.18787"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
+         id="tspan1">Nanbield</tspan><tspan
+         sodipodi:role="line"
+         x="752.16809"
+         y="-129.19119"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
+         id="tspan2">4.3</tspan></text>
   </g>
   <style
      type="text/css"

-- 
2.46.1



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH v3 1/2] ref-manual: release-process: update releases.svg
  2024-10-23  7:32 ` [PATCH v3 1/2] ref-manual: release-process: update releases.svg Antonin Godard
@ 2024-10-28 10:40   ` Quentin Schulz
  2024-10-28 13:53     ` Antonin Godard
  0 siblings, 1 reply; 9+ messages in thread
From: Quentin Schulz @ 2024-10-28 10:40 UTC (permalink / raw)
  To: Antonin Godard, docs; +Cc: Michael Opdenacker, Thomas Petazzoni

Hi Antonin,

On 10/23/24 9:32 AM, Antonin Godard wrote:
> * Add Walnascar release.
> * Remove dunfell, gatesgarth, hardknott, honister: these release are not
>    supported anymore. Start from kirkstone, which is still supported.
> 
> Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
> ---
>   documentation/ref-manual/svg/releases.svg | 907 ++++++++++++------------------
>   1 file changed, 346 insertions(+), 561 deletions(-)
> 
> diff --git a/documentation/ref-manual/svg/releases.svg b/documentation/ref-manual/svg/releases.svg
> index 036aa467cc2e646e99bc407bbf0ea7ff8825f57b..b1036e066ceb65a7391cec616cb4304094728f3f 100644
> --- a/documentation/ref-manual/svg/releases.svg
> +++ b/documentation/ref-manual/svg/releases.svg
> @@ -2,11 +2,14 @@
[...]
> +    <text
> +       xml:space="preserve"
> +       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
> +       x="1659.087"
> +       y="-3.6722763"
> +       id="text1185-3-55-4-0-0-0-1-1-6-4-3-5-2-2"><tspan
> +         sodipodi:role="line"
> +         x="1659.087"
> +         y="-3.6722763"
> +         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
> +         id="tspan10317-2-9-1-4-6-5-6-6-5-9-7">Current</tspan></text>

This is a bit dangerous as "current" keeps its meaning while time 
passes. So building docs from years ago from a tarball will still say 
"current" event though it isn't really supported anymore. The X axis 
showing the dates should be enough for people to get the idea, but maybe 
we can also add the last update date of the SVG after Current? e.g. 
"Current (Oct. 2024)"?

Additionally updating that SVG for all releases might be an issue. If we 
backport it "too far" then the release of the docs will not even be in 
that graph anymore, which is a bit odd. Moreover, the paragraph in the 
LTS section may become outdated as well.

A random thought I just had was to maybe treat this the same way we do 
with the migration manuals, that is to take the source from the last 
release/master and inject it into all earlier releases whenever we build 
the docs through the autobuilder. We could still have an outdated 
version if people build it from an old tarball but there's no much we 
can do about that sadly.

What do you think?

Cheers,
Quentin

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH v3 1/2] ref-manual: release-process: update releases.svg
  2024-10-28 10:40   ` Quentin Schulz
@ 2024-10-28 13:53     ` Antonin Godard
  2024-10-28 14:33       ` Quentin Schulz
  0 siblings, 1 reply; 9+ messages in thread
From: Antonin Godard @ 2024-10-28 13:53 UTC (permalink / raw)
  To: Quentin Schulz, docs; +Cc: Michael Opdenacker, Thomas Petazzoni

Hi Quentin,

On Mon Oct 28, 2024 at 11:40 AM CET, Quentin Schulz wrote:
> Hi Antonin,
>
> On 10/23/24 9:32 AM, Antonin Godard wrote:
>> * Add Walnascar release.
>> * Remove dunfell, gatesgarth, hardknott, honister: these release are not
>>    supported anymore. Start from kirkstone, which is still supported.
>>
>> Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
>> ---
>>   documentation/ref-manual/svg/releases.svg | 907 ++++++++++++------------------
>>   1 file changed, 346 insertions(+), 561 deletions(-)
>>
>> diff --git a/documentation/ref-manual/svg/releases.svg b/documentation/ref-manual/svg/releases.svg
>> index 036aa467cc2e646e99bc407bbf0ea7ff8825f57b..b1036e066ceb65a7391cec616cb4304094728f3f 100644
>> --- a/documentation/ref-manual/svg/releases.svg
>> +++ b/documentation/ref-manual/svg/releases.svg
>> @@ -2,11 +2,14 @@
> [...]
>> +    <text
>> +       xml:space="preserve"
>> +       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
>> +       x="1659.087"
>> +       y="-3.6722763"
>> +       id="text1185-3-55-4-0-0-0-1-1-6-4-3-5-2-2"><tspan
>> +         sodipodi:role="line"
>> +         x="1659.087"
>> +         y="-3.6722763"
>> +         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
>> +         id="tspan10317-2-9-1-4-6-5-6-6-5-9-7">Current</tspan></text>
>
> This is a bit dangerous as "current" keeps its meaning while time
> passes. So building docs from years ago from a tarball will still say
> "current" event though it isn't really supported anymore. The X axis
> showing the dates should be enough for people to get the idea, but maybe
> we can also add the last update date of the SVG after Current? e.g.
> "Current (Oct. 2024)"?

I agree on adding the date after current would timestamp the image and make it
valid for a given date. I like the idea of putting the current releases as the
most prominent color, so I guess we can keep "Current" but add the timestamp?

> Additionally updating that SVG for all releases might be an issue. If we
> backport it "too far" then the release of the docs will not even be in
> that graph anymore, which is a bit odd. Moreover, the paragraph in the
> LTS section may become outdated as well.

I would have thought that EoL releases would receive a last update that puts the
color of that release to the faded color, and then receive no updates to the
diagram anymore.

Is it that bad that reading the doc for an old release shows a outdated
"Current" state? Granted that they also show the timestamp mentioned above.

> A random thought I just had was to maybe treat this the same way we do
> with the migration manuals, that is to take the source from the last
> release/master and inject it into all earlier releases whenever we build
> the docs through the autobuilder. We could still have an outdated
> version if people build it from an old tarball but there's no much we
> can do about that sadly.
>
> What do you think?

I guess that's the ideal solution, and it shouldn't be too hard to add too!
(especially if code already exists for the migration manuals)

I can take a look on that when I have the time.

> Cheers,
> Quentin

Thanks for the insights!
Antonin

--
Antonin Godard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH v3 1/2] ref-manual: release-process: update releases.svg
  2024-10-28 13:53     ` Antonin Godard
@ 2024-10-28 14:33       ` Quentin Schulz
  2024-10-29  9:26         ` Antonin Godard
  0 siblings, 1 reply; 9+ messages in thread
From: Quentin Schulz @ 2024-10-28 14:33 UTC (permalink / raw)
  To: Antonin Godard, docs; +Cc: Michael Opdenacker, Thomas Petazzoni

Hi Antonin,

On 10/28/24 2:53 PM, Antonin Godard wrote:
> Hi Quentin,
> 
> On Mon Oct 28, 2024 at 11:40 AM CET, Quentin Schulz wrote:
>> Hi Antonin,
>>
>> On 10/23/24 9:32 AM, Antonin Godard wrote:
>>> * Add Walnascar release.
>>> * Remove dunfell, gatesgarth, hardknott, honister: these release are not
>>>     supported anymore. Start from kirkstone, which is still supported.
>>>
>>> Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
>>> ---
>>>    documentation/ref-manual/svg/releases.svg | 907 ++++++++++++------------------
>>>    1 file changed, 346 insertions(+), 561 deletions(-)
>>>
>>> diff --git a/documentation/ref-manual/svg/releases.svg b/documentation/ref-manual/svg/releases.svg
>>> index 036aa467cc2e646e99bc407bbf0ea7ff8825f57b..b1036e066ceb65a7391cec616cb4304094728f3f 100644
>>> --- a/documentation/ref-manual/svg/releases.svg
>>> +++ b/documentation/ref-manual/svg/releases.svg
>>> @@ -2,11 +2,14 @@
>> [...]
>>> +    <text
>>> +       xml:space="preserve"
>>> +       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
>>> +       x="1659.087"
>>> +       y="-3.6722763"
>>> +       id="text1185-3-55-4-0-0-0-1-1-6-4-3-5-2-2"><tspan
>>> +         sodipodi:role="line"
>>> +         x="1659.087"
>>> +         y="-3.6722763"
>>> +         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
>>> +         id="tspan10317-2-9-1-4-6-5-6-6-5-9-7">Current</tspan></text>
>>
>> This is a bit dangerous as "current" keeps its meaning while time
>> passes. So building docs from years ago from a tarball will still say
>> "current" event though it isn't really supported anymore. The X axis
>> showing the dates should be enough for people to get the idea, but maybe
>> we can also add the last update date of the SVG after Current? e.g.
>> "Current (Oct. 2024)"?
> 
> I agree on adding the date after current would timestamp the image and make it
> valid for a given date. I like the idea of putting the current releases as the
> most prominent color, so I guess we can keep "Current" but add the timestamp?
> 

That's an option, yes.

>> Additionally updating that SVG for all releases might be an issue. If we
>> backport it "too far" then the release of the docs will not even be in
>> that graph anymore, which is a bit odd. Moreover, the paragraph in the
>> LTS section may become outdated as well.
> 
> I would have thought that EoL releases would receive a last update that puts the
> color of that release to the faded color, and then receive no updates to the
> diagram anymore.
> 

You would still have more recent releases in the graph, even though at 
some point those also wouldn't be supported anymore.

> Is it that bad that reading the doc for an old release shows a outdated
> "Current" state? Granted that they also show the timestamp mentioned above.
> 

I am of the opinion of yes. Imagine a user getting Yocto from a vendor 
and the SVG that shows Current shows their release in there, which could 
have been EoL for a while already. It's not uncommon to have questions 
from people "stuck" on a very old release because of BSP layers from 
vendors which do not care about updating.

>> A random thought I just had was to maybe treat this the same way we do
>> with the migration manuals, that is to take the source from the last
>> release/master and inject it into all earlier releases whenever we build
>> the docs through the autobuilder. We could still have an outdated
>> version if people build it from an old tarball but there's no much we
>> can do about that sadly.
>>
>> What do you think?
> 
> I guess that's the ideal solution, and it shouldn't be too hard to add too!
> (especially if code already exists for the migration manuals)
> 

It'll be a bit odd though because people looking at an old release and 
the release won't appear in the graph.

There's no perfect solution that comes to mind right now though. Sooo, 
best effort for now and trying to not confuse people is a good 
compromise I think :)

Cheers,
Quentin


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH v3 1/2] ref-manual: release-process: update releases.svg
  2024-10-28 14:33       ` Quentin Schulz
@ 2024-10-29  9:26         ` Antonin Godard
  2024-10-29 10:57           ` Quentin Schulz
  0 siblings, 1 reply; 9+ messages in thread
From: Antonin Godard @ 2024-10-29  9:26 UTC (permalink / raw)
  To: Quentin Schulz, docs; +Cc: Michael Opdenacker, Thomas Petazzoni

Hi Quentin,

On Mon Oct 28, 2024 at 3:33 PM CET, Quentin Schulz wrote:
> Hi Antonin,
>
> On 10/28/24 2:53 PM, Antonin Godard wrote:
>> Hi Quentin,
>>
>> On Mon Oct 28, 2024 at 11:40 AM CET, Quentin Schulz wrote:
>>> Hi Antonin,
>>>
>>> On 10/23/24 9:32 AM, Antonin Godard wrote:
>>>> * Add Walnascar release.
>>>> * Remove dunfell, gatesgarth, hardknott, honister: these release are not
>>>>     supported anymore. Start from kirkstone, which is still supported.
>>>>
>>>> Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
>>>> ---
>>>>    documentation/ref-manual/svg/releases.svg | 907 ++++++++++++------------------
>>>>    1 file changed, 346 insertions(+), 561 deletions(-)
>>>>
>>>> diff --git a/documentation/ref-manual/svg/releases.svg b/documentation/ref-manual/svg/releases.svg
>>>> index 036aa467cc2e646e99bc407bbf0ea7ff8825f57b..b1036e066ceb65a7391cec616cb4304094728f3f 100644
>>>> --- a/documentation/ref-manual/svg/releases.svg
>>>> +++ b/documentation/ref-manual/svg/releases.svg
>>>> @@ -2,11 +2,14 @@
>>> [...]
>>>> +    <text
>>>> +       xml:space="preserve"
>>>> +       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
>>>> +       x="1659.087"
>>>> +       y="-3.6722763"
>>>> +       id="text1185-3-55-4-0-0-0-1-1-6-4-3-5-2-2"><tspan
>>>> +         sodipodi:role="line"
>>>> +         x="1659.087"
>>>> +         y="-3.6722763"
>>>> +         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
>>>> +         id="tspan10317-2-9-1-4-6-5-6-6-5-9-7">Current</tspan></text>
>>>
>>> This is a bit dangerous as "current" keeps its meaning while time
>>> passes. So building docs from years ago from a tarball will still say
>>> "current" event though it isn't really supported anymore. The X axis
>>> showing the dates should be enough for people to get the idea, but maybe
>>> we can also add the last update date of the SVG after Current? e.g.
>>> "Current (Oct. 2024)"?
>>
>> I agree on adding the date after current would timestamp the image and make it
>> valid for a given date. I like the idea of putting the current releases as the
>> most prominent color, so I guess we can keep "Current" but add the timestamp?
>>
>
> That's an option, yes.
>
>>> Additionally updating that SVG for all releases might be an issue. If we
>>> backport it "too far" then the release of the docs will not even be in
>>> that graph anymore, which is a bit odd. Moreover, the paragraph in the
>>> LTS section may become outdated as well.
>>
>> I would have thought that EoL releases would receive a last update that puts the
>> color of that release to the faded color, and then receive no updates to the
>> diagram anymore.
>>
>
> You would still have more recent releases in the graph, even though at
> some point those also wouldn't be supported anymore.
>
>> Is it that bad that reading the doc for an old release shows a outdated
>> "Current" state? Granted that they also show the timestamp mentioned above.
>>
>
> I am of the opinion of yes. Imagine a user getting Yocto from a vendor
> and the SVG that shows Current shows their release in there, which could
> have been EoL for a while already. It's not uncommon to have questions
> from people "stuck" on a very old release because of BSP layers from
> vendors which do not care about updating.
>
>>> A random thought I just had was to maybe treat this the same way we do
>>> with the migration manuals, that is to take the source from the last
>>> release/master and inject it into all earlier releases whenever we build
>>> the docs through the autobuilder. We could still have an outdated
>>> version if people build it from an old tarball but there's no much we
>>> can do about that sadly.
>>>
>>> What do you think?
>>
>> I guess that's the ideal solution, and it shouldn't be too hard to add too!
>> (especially if code already exists for the migration manuals)
>>
>
> It'll be a bit odd though because people looking at an old release and
> the release won't appear in the graph.

While adding it dynamically to the svg may be too hard (or is it? it is a text
file after all), we can still refer to the current release using the
`&DISTRO_NAME` syntax, maybe in a sentence above the graph.

> There's no perfect solution that comes to mind right now though. Sooo,
> best effort for now and trying to not confuse people is a good
> compromise I think :)

So perhaps:

- Add a date stamp after "Current".
- Automate the deployment of the svg file, like what's done for the migration
  manuals.
- Mention the documentation's release above the graph with &DISTRO_NAME.

Is the best we can do?

> Cheers,
> Quentin

Cheers,
Antonin

--
Antonin Godard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH v3 1/2] ref-manual: release-process: update releases.svg
  2024-10-29  9:26         ` Antonin Godard
@ 2024-10-29 10:57           ` Quentin Schulz
  2024-10-29 13:17             ` Antonin Godard
  0 siblings, 1 reply; 9+ messages in thread
From: Quentin Schulz @ 2024-10-29 10:57 UTC (permalink / raw)
  To: Antonin Godard, docs; +Cc: Michael Opdenacker, Thomas Petazzoni

Hi Antonin,

On 10/29/24 10:26 AM, Antonin Godard wrote:
> Hi Quentin,
> 
> On Mon Oct 28, 2024 at 3:33 PM CET, Quentin Schulz wrote:
>> Hi Antonin,
>>
>> On 10/28/24 2:53 PM, Antonin Godard wrote:
>>> Hi Quentin,
>>>
>>> On Mon Oct 28, 2024 at 11:40 AM CET, Quentin Schulz wrote:
>>>> Hi Antonin,
>>>>
>>>> On 10/23/24 9:32 AM, Antonin Godard wrote:
>>>>> * Add Walnascar release.
>>>>> * Remove dunfell, gatesgarth, hardknott, honister: these release are not
>>>>>      supported anymore. Start from kirkstone, which is still supported.
>>>>>
>>>>> Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
>>>>> ---
>>>>>     documentation/ref-manual/svg/releases.svg | 907 ++++++++++++------------------
>>>>>     1 file changed, 346 insertions(+), 561 deletions(-)
>>>>>
>>>>> diff --git a/documentation/ref-manual/svg/releases.svg b/documentation/ref-manual/svg/releases.svg
>>>>> index 036aa467cc2e646e99bc407bbf0ea7ff8825f57b..b1036e066ceb65a7391cec616cb4304094728f3f 100644
>>>>> --- a/documentation/ref-manual/svg/releases.svg
>>>>> +++ b/documentation/ref-manual/svg/releases.svg
>>>>> @@ -2,11 +2,14 @@
>>>> [...]
>>>>> +    <text
>>>>> +       xml:space="preserve"
>>>>> +       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
>>>>> +       x="1659.087"
>>>>> +       y="-3.6722763"
>>>>> +       id="text1185-3-55-4-0-0-0-1-1-6-4-3-5-2-2"><tspan
>>>>> +         sodipodi:role="line"
>>>>> +         x="1659.087"
>>>>> +         y="-3.6722763"
>>>>> +         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
>>>>> +         id="tspan10317-2-9-1-4-6-5-6-6-5-9-7">Current</tspan></text>
>>>>
>>>> This is a bit dangerous as "current" keeps its meaning while time
>>>> passes. So building docs from years ago from a tarball will still say
>>>> "current" event though it isn't really supported anymore. The X axis
>>>> showing the dates should be enough for people to get the idea, but maybe
>>>> we can also add the last update date of the SVG after Current? e.g.
>>>> "Current (Oct. 2024)"?
>>>
>>> I agree on adding the date after current would timestamp the image and make it
>>> valid for a given date. I like the idea of putting the current releases as the
>>> most prominent color, so I guess we can keep "Current" but add the timestamp?
>>>
>>
>> That's an option, yes.
>>
>>>> Additionally updating that SVG for all releases might be an issue. If we
>>>> backport it "too far" then the release of the docs will not even be in
>>>> that graph anymore, which is a bit odd. Moreover, the paragraph in the
>>>> LTS section may become outdated as well.
>>>
>>> I would have thought that EoL releases would receive a last update that puts the
>>> color of that release to the faded color, and then receive no updates to the
>>> diagram anymore.
>>>
>>
>> You would still have more recent releases in the graph, even though at
>> some point those also wouldn't be supported anymore.
>>
>>> Is it that bad that reading the doc for an old release shows a outdated
>>> "Current" state? Granted that they also show the timestamp mentioned above.
>>>
>>
>> I am of the opinion of yes. Imagine a user getting Yocto from a vendor
>> and the SVG that shows Current shows their release in there, which could
>> have been EoL for a while already. It's not uncommon to have questions
>> from people "stuck" on a very old release because of BSP layers from
>> vendors which do not care about updating.
>>
>>>> A random thought I just had was to maybe treat this the same way we do
>>>> with the migration manuals, that is to take the source from the last
>>>> release/master and inject it into all earlier releases whenever we build
>>>> the docs through the autobuilder. We could still have an outdated
>>>> version if people build it from an old tarball but there's no much we
>>>> can do about that sadly.
>>>>
>>>> What do you think?
>>>
>>> I guess that's the ideal solution, and it shouldn't be too hard to add too!
>>> (especially if code already exists for the migration manuals)
>>>
>>
>> It'll be a bit odd though because people looking at an old release and
>> the release won't appear in the graph.
> 
> While adding it dynamically to the svg may be too hard (or is it? it is a text
> file after all), we can still refer to the current release using the
> `&DISTRO_NAME` syntax, maybe in a sentence above the graph.
> 
>> There's no perfect solution that comes to mind right now though. Sooo,
>> best effort for now and trying to not confuse people is a good
>> compromise I think :)
> 
> So perhaps:
> 
> - Add a date stamp after "Current".
> - Automate the deployment of the svg file, like what's done for the migration
>    manuals.
> - Mention the documentation's release above the graph with &DISTRO_NAME.
> 

1) and 3) should be rather straightforward I hope. For 3) you could 
maybe just use Sphinx captions for example.

2) would need to happen in the autobuilder script for building the docs. 
If I remember correctly, I adapted the script so it can run locally too 
so you don't necessarily have to use the autobuilder. 
https://git.yoctoproject.org/yocto-autobuilder-helper/tree/scripts/run-docs-build. 
mmmmmm I think the supported release manuals entry is actually 
autogenerated by set_versions.py. I think you would want to add the svg 
(and the text somehow?) to this line 
https://git.yoctoproject.org/yocto-autobuilder-helper/tree/scripts/run-docs-build#n151 
?
It seems more involved than 1 and 3 for now so maybe more time consuming.

> Is the best we can do?
> 

It's a start for now, maybe we'll have more ideas in the future :)

Cheers,
Quentin


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH v3 1/2] ref-manual: release-process: update releases.svg
  2024-10-29 10:57           ` Quentin Schulz
@ 2024-10-29 13:17             ` Antonin Godard
  0 siblings, 0 replies; 9+ messages in thread
From: Antonin Godard @ 2024-10-29 13:17 UTC (permalink / raw)
  To: Quentin Schulz, docs; +Cc: Michael Opdenacker, Thomas Petazzoni

On Tue Oct 29, 2024 at 11:57 AM CET, Quentin Schulz wrote:
[...]
>> So perhaps:
>>
>> - Add a date stamp after "Current".
>> - Automate the deployment of the svg file, like what's done for the migration
>>    manuals.
>> - Mention the documentation's release above the graph with &DISTRO_NAME.
>>
>
> 1) and 3) should be rather straightforward I hope. For 3) you could
> maybe just use Sphinx captions for example.
>
> 2) would need to happen in the autobuilder script for building the docs.
> If I remember correctly, I adapted the script so it can run locally too
> so you don't necessarily have to use the autobuilder.
> https://git.yoctoproject.org/yocto-autobuilder-helper/tree/scripts/run-docs-build.
> mmmmmm I think the supported release manuals entry is actually
> autogenerated by set_versions.py. I think you would want to add the svg
> (and the text somehow?) to this line
> https://git.yoctoproject.org/yocto-autobuilder-helper/tree/scripts/run-docs-build#n151
> ?
> It seems more involved than 1 and 3 for now so maybe more time consuming.
>
>> Is the best we can do?
>>
>
> It's a start for now, maybe we'll have more ideas in the future :)

Thanks for the pointers! I'll probably send some patches this week…

> Cheers,
> Quentin

Cheers,
Antonin

--
Antonin Godard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH v3 2/2] ref-manual: release-process: refresh the current LTS releases
  2024-10-23  7:32 [PATCH v3 0/2] ref-manual: release process: update LTS section Antonin Godard
  2024-10-23  7:32 ` [PATCH v3 1/2] ref-manual: release-process: update releases.svg Antonin Godard
@ 2024-10-23  7:32 ` Antonin Godard
  1 sibling, 0 replies; 9+ messages in thread
From: Antonin Godard @ 2024-10-23  7:32 UTC (permalink / raw)
  To: docs; +Cc: Michael Opdenacker, Quentin Schulz, Thomas Petazzoni,
	Antonin Godard

Mention that Scarthgap the latest LTS in a bullet list next to
Kirkstone. Reword the parapraph a bit to make it clearer after this
change.

Reviewed-by: Michael Opdenacker <michael.opdenacker@rootcommit.com>
Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
---
 documentation/ref-manual/release-process.rst | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/documentation/ref-manual/release-process.rst b/documentation/ref-manual/release-process.rst
index 920794679d2256cf0f8e9677c7739e5540c4bdd4..75532addbdcd52cb0ab13ee8ffd57a70e1fc8045 100644
--- a/documentation/ref-manual/release-process.rst
+++ b/documentation/ref-manual/release-process.rst
@@ -103,13 +103,16 @@ have reached their End of Life (EOL) won't receive such updates.
 
 This started with version 3.1 ("Dunfell"), released in April 2020, which
 the project initially committed to supporting for two years, but this duration
-was later extended to four years. Similarly, the following :term:`LTS` release,
-version 4.0 ("Kirkstone"), was released two years later in May 2022 and the
-project committed to supporting it for four years too.
+was later extended to four years.
 
-Therefore, a new :term:`LTS` release is made every two years and is supported
-for four years. This offers more stability to project users and leaves more
-time to upgrade to the following :term:`LTS` release.
+A new :term:`LTS` release is made every two years and is supported for four
+years. This offers more stability to project users and leaves more time to
+upgrade to the following :term:`LTS` release.
+
+The currently supported :term:`LTS` releases are:
+
+-  Version 5.0 ("Scarthgap"), released in April 2024 and supported until April 2028.
+-  Version 4.0 ("Kirkstone"), released in May 2022 and supported until May 2026.
 
 See :yocto_wiki:`/Stable_Release_and_LTS` for details about the management
 of stable and :term:`LTS` releases.

-- 
2.46.1



^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2024-10-29 13:18 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-23  7:32 [PATCH v3 0/2] ref-manual: release process: update LTS section Antonin Godard
2024-10-23  7:32 ` [PATCH v3 1/2] ref-manual: release-process: update releases.svg Antonin Godard
2024-10-28 10:40   ` Quentin Schulz
2024-10-28 13:53     ` Antonin Godard
2024-10-28 14:33       ` Quentin Schulz
2024-10-29  9:26         ` Antonin Godard
2024-10-29 10:57           ` Quentin Schulz
2024-10-29 13:17             ` Antonin Godard
2024-10-23  7:32 ` [PATCH v3 2/2] ref-manual: release-process: refresh the current LTS releases Antonin Godard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox