Update (honestly not even sure what the change is)

author Devin Ulibarri <devinu@fsf.org>

Fri, 17 Nov 2023 22:18:30 +0000 (17:18 -0500)

committer Devin Ulibarri <devinu@fsf.org>

Fri, 17 Nov 2023 22:18:30 +0000 (17:18 -0500)
author Devin Ulibarri <devinu@fsf.org>
Fri, 17 Nov 2023 22:18:30 +0000 (17:18 -0500)
committer Devin Ulibarri <devinu@fsf.org>
Fri, 17 Nov 2023 22:18:30 +0000 (17:18 -0500)
diff --git a/output/FY2018.html b/output/FY2018.html

index 7b16b618b86e7539216a9532b32e6648f4859fe6..dc60cd4a4b78da1b63a75ea28d08015c0e4c71a7 100644 (file)
--- a/output/FY2018.html
+++ b/output/FY2018.html
@@ -1,54 +1,58 @@
  <!DOCTYPE html>
  <!DOCTYPE html>
-
  <html lang="en">
  <html lang="en">
-<head>
-<title>FY2018 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="./theme/css/b-side-base.css" rel="stylesheet"/>
+  <head>
+    <title>FY2018 Annual Report - Free Software Foundation Annual Reports</title>
+<link href="./theme/css/b-side-base.css" rel="stylesheet">
  <style>
  :root {
         --background: #f6faff; --brightaccent: #bde3ec; --darkaccent: #2870cc; --lightaccent: #79b4f2; --colortone: 185deg;
  }
  </style>
  <style>
  :root {
         --background: #f6faff; --brightaccent: #bde3ec; --darkaccent: #2870cc; --lightaccent: #79b4f2; --colortone: 185deg;
  }
  </style>
-<meta charset="utf-8"/>
-<meta content="width=680" name="viewport"><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
-<body>
+<meta charset="utf-8">
+<meta name="viewport" content="width=680" /><link href="./theme/css/b-side-post.css" rel="stylesheet">  </head>
+  <body>
  <header class="top-menu no-print">
  <header class="top-menu no-print">
-<nav class="top-menu">
-<ul>
-<li><a class="highlight" href="/">Index of reports</a></li>
-<li><a href="#">FY2018</a></li>
-<li><a href="#toc">Table of Contents</a></li>
-<li><a href="#associate-membership">Join the fsf</a></li>
-<li><a href="extra/2018.pdf">⬇PDF</a></li>
-</ul>
-</nav>
+  <nav class="top-menu">
+    <ul>
+            <li><a class="highlight" href="/">Index of reports</a></li>
+            <li><a href="#">FY2018</a></li>
+            <li><a href="#toc">Table of Contents</a></li>
+            <li><a href="#associate-membership">Join the fsf</a></li>
+            <li><a href="extra/2018.pdf">⬇PDF</a></li>
+    </ul>
+  </nav>
  </header>
  </header>
-<div class="document">
-<div id="head">
-<img alt="Free Software Foundation logo" class="fsflogo" src="./theme/fsf-logo.svg"/>
-<h1 class="title">FY2018 Annual Report</h1>
-<div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2018</p></div>
-<div class="dates"><p>(October 1, 2017 - September 30, 2018)</p></div>
-<div class="grid">
-<div class="column">
-<h4><a href="#licensing">Licensing</a></h4>
-<p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
-</div>
-<div class="column">
-<h4><a href="#campaigns">Campaigns</a></h4>
-<p>Empowering you to understand, adopt, develop, and defend free software</p>
-</div>
-<div class="column">
-<h4><a href="#tech">Tech</a></h4>
-<p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
-</div>
-<div class="column">
-<h4><a href="#financials">Operations</a></h4>
-<p>Running an efficient, effective nonprofit, using free software, supported by you</p>
-</div>
-</div>
-<div style="clear:both"></div> </div>
-<article>
+    <div class="document">
+      <div id="head">
+      <img class="fsflogo" alt="Free Software Foundation logo" src="./theme/fsf-logo.svg">
+      <h1 class="title">FY2018 Annual Report</h1>
+      <div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2018</p></div>
+      <div class="dates"><p>(October 1, 2017 - September 30, 2018)</p></div>
+        <div class="grid">
+         <div class="column">
+          <h4><a href="#licensing">Licensing</a></h4>
+          <p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
+         </div>
+         <div class="column">
+          <h4><a href="#campaigns">Campaigns</a></h4>
+          <p>Empowering you to understand, adopt, develop, and defend free software</p>
+         </div>
+         <div class="column">
+          <h4><a href="#tech">Tech</a></h4>
+          <p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
+         </div>
+         <div class="column">
+           <h4><a href="#financials">Operations</a></h4>
+           <p>Running an efficient, effective nonprofit, using free software, supported by you</p>
+         </div>
+        </div>
+        <div style="clear:both"></div>      </div>
+      <article>
+        <p>{% comment {</p>
+<p>Copyright (c) 2023 Free Software Foundation, Inc.</p>
+<p>This work is licensed under the Creative Commons Attribution-ShareAlike 4.0
+  International license (https://creativecommons.org/licenses/by-sa/4.0/)</p>
+<p>}%}</p>
  <blockquote>
  <p>The Free Software Foundation is a leader in the international movement for computer user freedom. We defend the rights of all software users and encourage the development and use of free <a href="https://www.gnu.org/philosophy/free-sw.html">"as in freedom"</a> software.</p>
  <p>This annual report highlights the Foundation's activities and achievements in fiscal year 2018 (October 1, 2017 — September 30, 2018) and includes a detailed financial statement.</p>
  <blockquote>
  <p>The Free Software Foundation is a leader in the international movement for computer user freedom. We defend the rights of all software users and encourage the development and use of free <a href="https://www.gnu.org/philosophy/free-sw.html">"as in freedom"</a> software.</p>
  <p>This annual report highlights the Foundation's activities and achievements in fiscal year 2018 (October 1, 2017 — September 30, 2018) and includes a detailed financial statement.</p>
@@ -107,7 +111,7 @@ materials, adding reviews of new licenses and <a href="https://www.fsf.org/blogs
  questions</a>, and
  published timely <a href="https://www.fsf.org/blogs/licensing">articles</a> on
  current topics and issues in free software licensing.</p>
  questions</a>, and
  published timely <a href="https://www.fsf.org/blogs/licensing">articles</a> on
  current topics and issues in free software licensing.</p>
-<p><img alt='Photo of speaker with long, light brown hair, glasses, and a T-shirt that says "Guix SD" with a chalkboard in the background.' class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2008/Thompson_02.medium.jpg"/></p>
+<p><img alt="Photo of speaker with long, light brown hair, glasses, and a T-shirt that says &quot;Guix SD&quot; with a chalkboard in the background." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2008/Thompson_02.medium.jpg"></p>
  <p class="caption">Dave Thompson, developer, speaking at LibrePlanet 2018 about GNU Guix.</p>
  <p class="credit">Photo credit: Kori Feener, 2018. CC BY-SA 4.0</p>
  <h3 id="fy2018-at-a-glance">FY2018 at a glance</h3>
  <p class="caption">Dave Thompson, developer, speaking at LibrePlanet 2018 about GNU Guix.</p>
  <p class="credit">Photo credit: Kori Feener, 2018. CC BY-SA 4.0</p>
  <h3 id="fy2018-at-a-glance">FY2018 at a glance</h3>
@@ -128,7 +132,7 @@ current topics and issues in free software licensing.</p>
  <dd>visitors to the Free Software Directory  </dd>
  </dl>
  <h3 id="respects-your-freedom-certification">Respects Your Freedom certification</h3>
  <dd>visitors to the Free Software Directory  </dd>
  </dl>
  <h3 id="respects-your-freedom-certification">Respects Your Freedom certification</h3>
-<p><img alt="RYF Logo" class="align-left width-40" src="images/RYF-logo.png"/></p>
+<p><img alt="RYF Logo" class="align-left width-40" src="images/RYF-logo.png"></p>
  <p>The FSF's Respects Your Freedom (RYF) product certification program
  encourages the creation and sale of hardware that will do as much as
  possible to respect your freedom and privacy.</p>
  <p>The FSF's Respects Your Freedom (RYF) product certification program
  encourages the creation and sale of hardware that will do as much as
  possible to respect your freedom and privacy.</p>
@@ -136,7 +140,10 @@ possible to respect your freedom and privacy.</p>
  Minifree Libreboot X200 Tablet.</p>
  </div>
  <div class="pagebreak"></div>
  Minifree Libreboot X200 Tablet.</p>
  </div>
  <div class="pagebreak"></div>
-<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"The FSF supports the freedom to use devices I own as I see fit, and to be secure in the knowledge that the software I'm using isn't compromising my privacy."</p></blockquote></div></p>
+<p>{% separator {
+  "title": "Why I joined the FSF",
+  "quote": "The FSF supports the freedom to use devices I own as I see fit, and to be secure in the knowledge that the software I'm using isn't compromising my privacy."
+}%}</p>
  <div class="col2">
  <h2 id="campaigns">Campaigns</h2>
  <p>The FSF campaigns team identifies important opportunities for free
  <div class="col2">
  <h2 id="campaigns">Campaigns</h2>
  <p>The FSF campaigns team identifies important opportunities for free
@@ -177,12 +184,15 @@ the legislative action under the <em>Congressional Review Act</em> (CRA) to
  reverse the repeal, and a motion to restore net neutrality passed in
  May, 2018. Various states, including California, Maine, and New York,
  have ongoing legal and legislative efforts to restore net neutrality.</p>
  reverse the repeal, and a motion to restore net neutrality passed in
  May, 2018. Various states, including California, Maine, and New York,
  have ongoing legal and legislative efforts to restore net neutrality.</p>
-<p><img alt="A photo of a LibrePlanet speaker in front of a chalkboard." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2010/Thornton_02.medium.jpg"/></p>
+<p><img alt="A photo of a LibrePlanet speaker in front of a chalkboard." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2010/Thornton_02.medium.jpg"></p>
  <p class="caption">Kat Thornton giving a talk on "Pathways for discovery of free software"</p>
  <p class="credit">Credit: Kori Feener, 2018. CC BY-SA 4.0 </p>
  </div>
  <div class="pagebreak"></div>
  <p class="caption">Kat Thornton giving a talk on "Pathways for discovery of free software"</p>
  <p class="credit">Credit: Kori Feener, 2018. CC BY-SA 4.0 </p>
  </div>
  <div class="pagebreak"></div>
-<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"The movement [against] net neutrality being abolished inspired me to join the FSF and help out other foundations to help ensure a free Internet and free world."</p></blockquote></div></p>
+<p>{% separator {
+  "title": "Why I joined the FSF",
+  "quote": "The movement [against] net neutrality being abolished inspired me to join the FSF and help out other foundations to help ensure a free Internet and free world."
+}%}</p>
  <div class="col2">
  <h3 id="libreplanet-conference-celebrates-its-tenth-anniversary">LibrePlanet conference celebrates its tenth anniversary</h3>
  <p>The <a href="https://libreplanet.org/2018/">tenth annual LibrePlanet</a> was held
  <div class="col2">
  <h3 id="libreplanet-conference-celebrates-its-tenth-anniversary">LibrePlanet conference celebrates its tenth anniversary</h3>
  <p>The <a href="https://libreplanet.org/2018/">tenth annual LibrePlanet</a> was held
@@ -230,7 +240,7 @@ Commons, The Document Foundation, the Electronic Frontier Foundation,
  and more. Here in Boston, we visited the Apple Store and talked with
  shoppers about their digital rights and how Apple devices abuse those
  rights using DRM.</p>
  and more. Here in Boston, we visited the Apple Store and talked with
  shoppers about their digital rights and how Apple devices abuse those
  rights using DRM.</p>
-<p><img alt='Protester holds "Eliminate DRM" signs outside of Apple store.' class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/1802/boston-apple-store-opening-eliminate-drm.jpg"/></p>
+<p><img alt="Protester holds &quot;Eliminate DRM&quot; signs outside of Apple store." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/1802/boston-apple-store-opening-eliminate-drm.jpg"></p>
  <p class="caption">Protesters showed their opposition to DRM and conversed with passersby at the Apple store in downtown Boston.</p>
  <p class="credit">Credit: Free Software Foundation, 2008. Public Domain Mark 1.0</p>
  </div>
  <p class="caption">Protesters showed their opposition to DRM and conversed with passersby at the Apple store in downtown Boston.</p>
  <p class="credit">Credit: Free Software Foundation, 2008. Public Domain Mark 1.0</p>
  </div>
@@ -262,7 +272,11 @@ rights using DRM.</p>
  </dl>
  </div>
  <div class="pagebreak"></div>
  </dl>
  </div>
  <div class="pagebreak"></div>
-<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"Nonfree software is subversive of the rights of software users (i.e. all citizens of the world)."</p></blockquote></div></p>
+
+<p>{% separator {
+  "title": "Why I joined the FSF",
+  "quote": "Nonfree software is subversive of the rights of software users (i.e. all citizens of the world)."
+}%}</p>
  <div class="col2">
  <h2 id="tech">Tech</h2>
  <h3 id="infrastructure-for-free-software-development-and-activism">Infrastructure for free software development and activism</h3>
  <div class="col2">
  <h2 id="tech">Tech</h2>
  <h3 id="infrastructure-for-free-software-development-and-activism">Infrastructure for free software development and activism</h3>
@@ -296,7 +310,7 @@ banner.</p>
  software community, maintains gnu.org together with the help of
  volunteers, and works with interns, who are advancing their skills and
  knowledge in working with and creating free software.</p>
  software community, maintains gnu.org together with the help of
  volunteers, and works with interns, who are advancing their skills and
  knowledge in working with and creating free software.</p>
-<p><img alt="Two people, with their backs turned to the camera wearing jackets look at a computer, which is slightly out of focus. The computer displays text." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/1940/Hallway_38.medium.jpg"/></p>
+<p><img alt="Two people, with their backs turned to the camera wearing jackets look at a computer, which is slightly out of focus. The computer displays text." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/1940/Hallway_38.medium.jpg"></p>
  <p class="caption">LibrePlanet presenters use laptops that run all free software, provided by the FSF tech team.</p>
  <p class="credit">Credit: Kori Feener, 2018. CC BY 4.0</p>
  <h3 id="infrastructure-for-free-software-development-and-activism_1">Infrastructure for free software development and activism</h3>
  <p class="caption">LibrePlanet presenters use laptops that run all free software, provided by the FSF tech team.</p>
  <p class="credit">Credit: Kori Feener, 2018. CC BY 4.0</p>
  <h3 id="infrastructure-for-free-software-development-and-activism_1">Infrastructure for free software development and activism</h3>
@@ -345,15 +359,15 @@ all relevant pages and websites.</p>
  <dd>Amazon EC2 instances</dd>
  </dl>
  <h3 id="working-together-for-free-software">Working Together for Free Software</h3>
  <dd>Amazon EC2 instances</dd>
  </dl>
  <h3 id="working-together-for-free-software">Working Together for Free Software</h3>
-<p><a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=50"><img alt="GNU Guix logo" src="images/guix.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=22"><img alt="GNU Mailman logo" src="images/mailman.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=36"><img alt="GNU MediaGoblin logo" src="images/mediagoblin.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=10"><img alt="GNU Octave logo" src="images/octave.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=16"><img alt="GNU Radio logo" src="images/gnuradio.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=21"><img alt="GNUstep" src="https://static.fsf.org/nosvn/images/GNUstep_logo.png"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=57"><img alt="GNU Toolchain logo" src="images/gnu-toolchain.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=19"><img alt="Replicant logo" src="images/replicant.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=58"><img alt="SeaGL logo" src="images/seagl.png"/></a></p>
+<p><a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=50"><img alt="GNU Guix logo" src="images/guix.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=22"><img alt="GNU Mailman logo" src="images/mailman.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=36"><img alt="GNU MediaGoblin logo" src="images/mediagoblin.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=10"><img alt="GNU Octave logo" src="images/octave.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=16"><img alt="GNU Radio logo" src="images/gnuradio.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=21"><img alt="GNUstep" src="https://static.fsf.org/nosvn/images/GNUstep_logo.png"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=57"><img alt="GNU Toolchain logo" src="images/gnu-toolchain.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=19"><img alt="Replicant logo" src="images/replicant.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=58"><img alt="SeaGL logo" src="images/seagl.png"></a></p>
  <p>The FSF acts as fiscal sponsor for free software projects and events
  whose scope and purpose align with the FSF’s mission. Participating
  projects benefit from the FSF’s nonprofit status, administrative
  <p>The FSF acts as fiscal sponsor for free software projects and events
  whose scope and purpose align with the FSF’s mission. Participating
  projects benefit from the FSF’s nonprofit status, administrative
@@ -363,9 +377,27 @@ software community via the <a href="https://www.fsf.org/working-together/fund">W
  Fund</a>.</p>
  </div>
  <div class="pagebreak"></div>
  Fund</a>.</p>
  </div>
  <div class="pagebreak"></div>
-<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"Free software positively impacts my life every hour of every day."</p></blockquote></div></p>
+<p>{% separator {
+  "title": "Why I joined the FSF",
+  "quote": "Free software positively impacts my life every hour of every day."
+}%}</p>
  <h2 id="financial-statement">Financial Statement</h2>
  <h2 id="financial-statement">Financial Statement</h2>
-<p><img alt="A pie chart" class="matplotlib" src="images/fa2018.png"/></p>
+<p>{%
+    matplotlib {
+        "filename": "fa2018",
+        "data" : [
+         {"title": "Program\nServices",
+         "values": 1076394,
+         "colors": "steelblue"},
+         {"title": "Management\nand General",
+         "values": 95105,
+         "colors": "royalblue"},
+         {"title": "Fundraising",
+         "values": 65639,
+         "colors": "dodgerblue"}
+        ]
+    }
+%}</p>
  <p>The following is a visualization of the Free Software Foundation's FY
  2018 financial statement. The original documents can be found at
  <a href="https://www.fsf.org/about/financial">https://www.fsf.org/about/financial</a>.</p>
  <p>The following is a visualization of the Free Software Foundation's FY
  2018 financial statement. The original documents can be found at
  <a href="https://www.fsf.org/about/financial">https://www.fsf.org/about/financial</a>.</p>
@@ -531,6 +563,7 @@ Fund</a>.</p>
  </div>
  </div>
  <div class="pagebreak"></div>
  </div>
  </div>
  <div class="pagebreak"></div>
+
  <h2 id="donors">Donors</h2>
  <p>This is a snapshot of donors to the FSF. The majority of the
  organization's support each year comes from individuals giving less
  <h2 id="donors">Donors</h2>
  <p>This is a snapshot of donors to the FSF. The majority of the
  organization's support each year comes from individuals giving less
@@ -767,9 +800,12 @@ care so much about free software.</p>
    members, and corporate patrons worldwide who make our work possible.</p>
  </div>
  <div class="pagebreak"></div>
    members, and corporate patrons worldwide who make our work possible.</p>
  </div>
  <div class="pagebreak"></div>
-<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"The FSF gives me hope today, and by joining, I want to support not just free software, but also freedom, justice and equality throughout the world."</p></blockquote></div></p>
+<p>{% separator {
+  "title": "Why I joined the FSF",
+  "quote": "The FSF gives me hope today, and by joining, I want to support not just free software, but also freedom, justice and equality throughout the world."
+}%}</p>
  <div class="col2">
  <div class="col2">
-<p><img alt="An image of a keyboard" class="colortone" src="images/donors-opener.jpg"/></p>
+<p><img alt="An image of a keyboard" class="colortone" src="images/donors-opener.jpg"></p>
  <h2 id="associate-membership">Associate Membership</h2>
  <h3 id="join-the-free-software-foundation">Join the Free Software Foundation</h3>
  <p>Our mission is to promote computer user freedom and defend the rights
  <h2 id="associate-membership">Associate Membership</h2>
  <h3 id="join-the-free-software-foundation">Join the Free Software Foundation</h3>
  <p>Our mission is to promote computer user freedom and defend the rights
@@ -786,10 +822,11 @@ to free software by <a href="https://my.fsf.org/join">becoming a Free Software F
  Member</a>. Learn more at <a href="https://fsf.org">https://fsf.org</a>.</p>
  </div>
  <div class="pagebreak"></div>
  Member</a>. Learn more at <a href="https://fsf.org">https://fsf.org</a>.</p>
  </div>
  <div class="pagebreak"></div>
+
  <h2 id="leadership-and-staff">Leadership and Staff</h2>
  <div class="boardcolumn width-25 float-left" style="padding-right:2rem">
  <h3 id="board-of-directors">Board of Directors</h3>
  <h2 id="leadership-and-staff">Leadership and Staff</h2>
  <div class="boardcolumn width-25 float-left" style="padding-right:2rem">
  <h3 id="board-of-directors">Board of Directors</h3>
-<p><img alt="Richard M. Stallman" class="width-50 colortone" src="images/richard-stallman.jpg"/></p>
+<p><img alt="Richard M. Stallman" class="width-50 colortone" src="images/richard-stallman.jpg"></p>
  <h4 id="richard-m-stallman">Richard M. Stallman</h4>
  <p>Founder and President</p>
  <h4 id="gerald-j-sussman">Gerald J. Sussman</h4>
  <h4 id="richard-m-stallman">Richard M. Stallman</h4>
  <p>Founder and President</p>
  <h4 id="gerald-j-sussman">Gerald J. Sussman</h4>
@@ -808,91 +845,92 @@ Member</a>. Learn more at <a href="https://fsf.org">https://fsf.org</a>.</p>
  <div class="staffcolumn width-70 float-left">
  <h3 id="leadership">Leadership</h3>
  <div class="staff">
  <div class="staffcolumn width-70 float-left">
  <h3 id="leadership">Leadership</h3>
  <div class="staff">
-<p><img alt="John Sullivan" class="image-process-thumb" src="images/staff/derivatives/thumb/johns.jpg"/></p>
+<p><img alt="John Sullivan" class="image-process-thumb" src="images/staff/johns.jpg"></p>
  <h4 id="john-sullivan">John Sullivan</h4>
  <p>Executive Director</p>
  </div>
  <div class="staff">
  <h4 id="john-sullivan">John Sullivan</h4>
  <p>Executive Director</p>
  </div>
  <div class="staff">
-<p><img alt="John Hsieh" class="image-process-thumb" src="images/staff/derivatives/thumb/johnh.jpg"/></p>
+<p><img alt="John Hsieh" class="image-process-thumb" src="images/staff/johnh.jpg"></p>
  <h4 id="john-hsieh">John Hsieh</h4>
  <p>Deputy Director</p>
  </div>
  <div class="staff">
  <h4 id="john-hsieh">John Hsieh</h4>
  <p>Deputy Director</p>
  </div>
  <div class="staff">
-<p><img alt="Rubén Rodríguez" class="image-process-thumb" src="images/staff/derivatives/thumb/ruben.jpg"/></p>
+<p><img alt="Rubén Rodríguez" class="image-process-thumb" src="images/staff/ruben.jpg"></p>
  <h4 id="ruben-rodriguez">Rubén Rodríguez</h4>
  <p>Chief Technology Officer </p>
  </div>
  <h3 id="licensing">Licensing</h3>
  <div class="staff">
  <h4 id="ruben-rodriguez">Rubén Rodríguez</h4>
  <p>Chief Technology Officer </p>
  </div>
  <h3 id="licensing">Licensing</h3>
  <div class="staff">
-<p><img alt="Donald Robertson" class="image-process-thumb" src="images/staff/derivatives/thumb/donald.jpg"/></p>
+<p><img alt="Donald Robertson" class="image-process-thumb" src="images/staff/donald.jpg"></p>
  <h4 id="donald-robertson">Donald Robertson</h4>
  <p>Licensing &amp; Compliance Manager</p>
  </div>
  <div class="staff">
  <h4 id="donald-robertson">Donald Robertson</h4>
  <p>Licensing &amp; Compliance Manager</p>
  </div>
  <div class="staff">
-<p><img alt="Craig Topham" class="image-process-thumb" src="images/staff/derivatives/thumb/craig.jpg"/></p>
+<p><img alt="Craig Topham" class="image-process-thumb" src="images/staff/craig.jpg"></p>
  <h4 id="craig-topham">Craig Topham</h4>
  <p>Copyright &amp; Licensing Associate </p>
  </div>
  <h3 id="campaigns_1">Campaigns</h3>
  <div class="staff">
  <h4 id="craig-topham">Craig Topham</h4>
  <p>Copyright &amp; Licensing Associate </p>
  </div>
  <h3 id="campaigns_1">Campaigns</h3>
  <div class="staff">
-<p><img alt="Molly de Blanc" class="image-process-thumb" src="images/staff/derivatives/thumb/molly.jpg"/></p>
+<p><img alt="Molly de Blanc" class="image-process-thumb" src="images/staff/molly.jpg"></p>
  <h4 id="molly-de-blanc">Molly de Blanc</h4>
  <p>Campaigns Manager</p>
  </div>
  <div class="staff">
  <h4 id="molly-de-blanc">Molly de Blanc</h4>
  <p>Campaigns Manager</p>
  </div>
  <div class="staff">
-<p><img alt="Dana Morgenstein" class="image-process-thumb" src="images/staff/derivatives/thumb/dana.jpg"/></p>
+<p><img alt="Dana Morgenstein" class="image-process-thumb" src="images/staff/dana.jpg"></p>
  <h4 id="dana-morgenstein">Dana Morgenstein</h4>
  <p>Outreach &amp; Communications Coordinator</p>
  </div>
  <div class="staff">
  <h4 id="dana-morgenstein">Dana Morgenstein</h4>
  <p>Outreach &amp; Communications Coordinator</p>
  </div>
  <div class="staff">
-<p><img alt="Georgia Young" class="image-process-thumb" src="images/staff/derivatives/thumb/georgia.jpg"/></p>
+<p><img alt="Georgia Young" class="image-process-thumb" src="images/staff/georgia.jpg"></p>
  <h4 id="georgia-young">Georgia Young</h4>
  <p>Program Manager</p>
  </div>
  <h3 id="tech_1">Tech</h3>
  <div class="staff">
  <h4 id="georgia-young">Georgia Young</h4>
  <p>Program Manager</p>
  </div>
  <h3 id="tech_1">Tech</h3>
  <div class="staff">
-<p><img alt="Andrew Engelbrecht" class="image-process-thumb" src="images/staff/derivatives/thumb/andrew.jpg"/></p>
+<p><img alt="Andrew Engelbrecht" class="image-process-thumb" src="images/staff/andrew.jpg"></p>
  <h4 id="andrew-engelbrecht">Andrew Engelbrecht</h4>
  <p>Web Developer</p>
  </div>
  <div class="staff">
  <h4 id="andrew-engelbrecht">Andrew Engelbrecht</h4>
  <p>Web Developer</p>
  </div>
  <div class="staff">
-<p><img alt="Ian Kelling" class="image-process-thumb" src="images/staff/derivatives/thumb/ian.jpg"/></p>
+<p><img alt="Ian Kelling" class="image-process-thumb" src="images/staff/ian.jpg"></p>
  <h4 id="ian-kelling">Ian Kelling</h4>
  <p>Senior Systems Administrator</p>
  </div>
  <h3 id="operations">Operations</h3>
  <div class="staff">
  <h4 id="ian-kelling">Ian Kelling</h4>
  <p>Senior Systems Administrator</p>
  </div>
  <h3 id="operations">Operations</h3>
  <div class="staff">
-<p><img alt="Matt Lavallee" class="image-process-thumb" src="images/staff/derivatives/thumb/mattlav.jpg"/></p>
+<p><img alt="Matt Lavallee" class="image-process-thumb" src="images/staff/mattlav.jpg"></p>
  <h4 id="matt-lavallee">Matt Lavallee</h4>
  <p>Operations Assistant</p>
  </div>
  <div class="staff">
  <h4 id="matt-lavallee">Matt Lavallee</h4>
  <p>Operations Assistant</p>
  </div>
  <div class="staff">
-<p><img alt="No photo" src="https://web.archive.org/web/20180925153039im_/https://static.fsf.org/fsforg/img/jeanne.jpg"/></p>
+<p><img alt="No photo" src="https://web.archive.org/web/20180925153039im_/https://static.fsf.org/fsforg/img/jeanne.jpg"></p>
  <h4 id="jeanne-rasata">Jeanne Rasata</h4>
  <p>Assistant to the President </p>
  </div>
  </div>
  <h4 id="jeanne-rasata">Jeanne Rasata</h4>
  <p>Assistant to the President </p>
  </div>
  </div>
-</article>
+      </article>
  </div>
  <footer class="bside-footer">
  </div>
  <footer class="bside-footer">
-<img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
-<div>
-<p>Copyright ©  2015–2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
-<p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
-<p>Download the <a href="https://vcs.fsf.org/?p=financial-reports.git">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
-</div>
-<nav>
-<ul class="menu">
-<li><a class="highlight" href="FY2018.html">FY2018 Annual Report</a></li>
-<li><a href="#licensing">Licensing</a></li>
-<li><a href="#campaigns">Campaigns</a></li>
-<li><a href="#tech">Tech</a></li>
-<li><a href="#financials">Financials</a></li>
-<li><a href="#donors">Donors</a></li>
-<li><a href="#associate-membership">Join the FSF</a></li>
-<li><a href="extra/2018.pdf">⬇ PDF</a></li>
-</ul>
-</nav>
+ <img src="theme/fsf-logo.svg" onerror="this.src='images/fsf-logo.png'" alt="Free Software Foundation logo"></p>
+  <div>
+    <p>Copyright &copy;  2015&ndash;2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
+    <p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
+    <p>Download the <a href="https://vcs.fsf.org/?p=financial-reports.git">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
+  </div>
+
+  <nav>
+          <ul class="menu">
+           <li><a class="highlight" href="FY2018.html">FY2018 Annual Report</a></li>
+            <li><a href="#licensing">Licensing</a></li>
+            <li><a href="#campaigns">Campaigns</a></li>
+            <li><a href="#tech">Tech</a></li>
+            <li><a href="#financials">Financials</a></li>
+            <li><a href="#donors">Donors</a></li>
+            <li><a href="#associate-membership">Join the FSF</a></li>
+           <li><a href="extra/2018.pdf">⬇ PDF</a></li>
+          </ul>
+  </nav>
  </footer>
  </footer>
-</body>
+  </body>
  </html>
 \ No newline at end of file
  </html>
 \ No newline at end of file
diff --git a/output/FY2019.html b/output/FY2019.html

index 4614973540fd86220395f963bb6cab4f4c979016..114df08953ddb60ea93453e209bcc5bc8f4bc20b 100644 (file)
--- a/output/FY2019.html
+++ b/output/FY2019.html
@@ -1,54 +1,58 @@
  <!DOCTYPE html>
  <!DOCTYPE html>
-
  <html lang="en">
  <html lang="en">
-<head>
-<title>FY2019 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="./theme/css/b-side-base.css" rel="stylesheet"/>
+  <head>
+    <title>FY2019 Annual Report - Free Software Foundation Annual Reports</title>
+<link href="./theme/css/b-side-base.css" rel="stylesheet">
  <style>
  :root {
         --background: #f6faff; --brightaccent: #bde3ec; --darkaccent: #2870cc; --lightaccent: #79b4f2; --colortone: 185deg;
  }
  </style>
  <style>
  :root {
         --background: #f6faff; --brightaccent: #bde3ec; --darkaccent: #2870cc; --lightaccent: #79b4f2; --colortone: 185deg;
  }
  </style>
-<meta charset="utf-8"/>
-<meta content="width=680" name="viewport"><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
-<body>
+<meta charset="utf-8">
+<meta name="viewport" content="width=680" /><link href="./theme/css/b-side-post.css" rel="stylesheet">  </head>
+  <body>
  <header class="top-menu no-print">
  <header class="top-menu no-print">
-<nav class="top-menu">
-<ul>
-<li><a class="highlight" href="/">Index of reports</a></li>
-<li><a href="#">FY2019</a></li>
-<li><a href="#toc">Table of Contents</a></li>
-<li><a href="#associate-membership">Join the fsf</a></li>
-<li><a href="extra/2019.pdf">⬇PDF</a></li>
-</ul>
-</nav>
+  <nav class="top-menu">
+    <ul>
+            <li><a class="highlight" href="/">Index of reports</a></li>
+            <li><a href="#">FY2019</a></li>
+            <li><a href="#toc">Table of Contents</a></li>
+            <li><a href="#associate-membership">Join the fsf</a></li>
+            <li><a href="extra/2019.pdf">⬇PDF</a></li>
+    </ul>
+  </nav>
  </header>
  </header>
-<div class="document">
-<div id="head">
-<img alt="Free Software Foundation logo" class="fsflogo" src="./theme/fsf-logo.svg"/>
-<h1 class="title">FY2019 Annual Report</h1>
-<div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2019</p></div>
-<div class="dates"><p>(October 1, 2018 - September 30, 2019)</p></div>
-<div class="grid">
-<div class="column">
-<h4><a href="#licensing">Licensing</a></h4>
-<p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
-</div>
-<div class="column">
-<h4><a href="#campaigns">Campaigns</a></h4>
-<p>Empowering you to understand, adopt, develop, and defend free software</p>
-</div>
-<div class="column">
-<h4><a href="#tech">Tech</a></h4>
-<p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
-</div>
-<div class="column">
-<h4><a href="#financials">Operations</a></h4>
-<p>Running an efficient, effective nonprofit, using free software, supported by you</p>
-</div>
-</div>
-<div style="clear:both"></div> </div>
-<article>
+    <div class="document">
+      <div id="head">
+      <img class="fsflogo" alt="Free Software Foundation logo" src="./theme/fsf-logo.svg">
+      <h1 class="title">FY2019 Annual Report</h1>
+      <div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2019</p></div>
+      <div class="dates"><p>(October 1, 2018 - September 30, 2019)</p></div>
+        <div class="grid">
+         <div class="column">
+          <h4><a href="#licensing">Licensing</a></h4>
+          <p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
+         </div>
+         <div class="column">
+          <h4><a href="#campaigns">Campaigns</a></h4>
+          <p>Empowering you to understand, adopt, develop, and defend free software</p>
+         </div>
+         <div class="column">
+          <h4><a href="#tech">Tech</a></h4>
+          <p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
+         </div>
+         <div class="column">
+           <h4><a href="#financials">Operations</a></h4>
+           <p>Running an efficient, effective nonprofit, using free software, supported by you</p>
+         </div>
+        </div>
+        <div style="clear:both"></div>      </div>
+      <article>
+        <p>{% comment {</p>
+<p>Copyright (c) 2023 Free Software Foundation, Inc.</p>
+<p>This work is licensed under the Creative Commons Attribution-ShareAlike 4.0
+  International license (https://creativecommons.org/licenses/by-sa/4.0/)</p>
+<p>}%}</p>
  <blockquote>
  <p>The Free Software Foundation is a leader in the international movement for computer user freedom. We defend the rights of all software users and encourage the development and use of free <a href="https://www.gnu.org/philosophy/free-sw.html">"as in freedom"</a> software.</p>
  <p>This annual report highlights the Foundation's activities and achievements in fiscal year 2019 (October 1, 2018 — September 30, 2019) and includes a detailed financial statement.</p>
  <blockquote>
  <p>The Free Software Foundation is a leader in the international movement for computer user freedom. We defend the rights of all software users and encourage the development and use of free <a href="https://www.gnu.org/philosophy/free-sw.html">"as in freedom"</a> software.</p>
  <p>This annual report highlights the Foundation's activities and achievements in fiscal year 2019 (October 1, 2018 — September 30, 2019) and includes a detailed financial statement.</p>
@@ -96,11 +100,11 @@ certified devices to forty-six. We have been working with the tech
  team to launch a new version of the RYF website. The current page
  simply lists each certification chronologically. The new site enables
  users to browse and search by categories and retailers.</p>
  team to launch a new version of the RYF website. The current page
  simply lists each certification chronologically. The new site enables
  users to browse and search by categories and retailers.</p>
-<p><img alt="ThinkPenguin exhibitor table at LibrePlanet 2019." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2129/thinkpenguin-table.jpg"/></p>
+<p><img alt="ThinkPenguin exhibitor table at LibrePlanet 2019." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2129/thinkpenguin-table.jpg"></p>
  <p class="caption">ThinkPenguin exhibitor table at LibrePlanet 2019. ThinkPenguin offers many products with RYF certification.</p>
  <p class="credit">Credit: Free Software Foundation 2019. CC BY-SA.</p>
  </div>
  <p class="caption">ThinkPenguin exhibitor table at LibrePlanet 2019. ThinkPenguin offers many products with RYF certification.</p>
  <p class="credit">Credit: Free Software Foundation 2019. CC BY-SA.</p>
  </div>
-<hr/>
+<hr>
  <div class="col2">
  <h3 id="fy2019-at-a-glance">FY2019 at a glance</h3>
  <dl>
  <div class="col2">
  <h3 id="fy2019-at-a-glance">FY2019 at a glance</h3>
  <dl>
@@ -122,7 +126,7 @@ users to browse and search by categories and retailers.</p>
  <dd>packages in the Free Software Directory</dd>
  </dl>
  <h3 id="respects-your-freedom-certification">Respects Your Freedom certification</h3>
  <dd>packages in the Free Software Directory</dd>
  </dl>
  <h3 id="respects-your-freedom-certification">Respects Your Freedom certification</h3>
-<p><img alt="RYF Logo" class="align-left width-40" src="images/RYF-logo.png"/></p>
+<p><img alt="RYF Logo" class="align-left width-40" src="images/RYF-logo.png"></p>
  <p>The FSF's Respects Your Freedom (RYF) product certification program
  encourages the creation and sale of hardware that will do as much as
  possible to respect your freedom and privacy.</p>
  <p>The FSF's Respects Your Freedom (RYF) product certification program
  encourages the creation and sale of hardware that will do as much as
  possible to respect your freedom and privacy.</p>
@@ -138,7 +142,10 @@ possible to respect your freedom and privacy.</p>
  </ul>
  </div>
  <div class="pagebreak"></div>
  </ul>
  </div>
  <div class="pagebreak"></div>
-<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"I've used GNU software for years and wanted to support the FSF in general."</p></blockquote></div></p>
+<p>{% separator {
+  "title": "Why I joined the FSF",
+  "quote": "I've used GNU software for years and wanted to support the FSF in general."
+}%}</p>
  <div class="col2">
  <h2 id="campaigns">Campaigns</h2>
  <p>The FSF campaigns team identifies important opportunities for free
  <div class="col2">
  <h2 id="campaigns">Campaigns</h2>
  <p>The FSF campaigns team identifies important opportunities for free
@@ -146,7 +153,7 @@ software adoption, education, and development; empowers people against
  specific threats to their freedom; and implements strategies to move
  us closer to a free society. This year welcomed two new members to the
  campaigns team, Greg Farough and Zoë Kooyman.</p>
  specific threats to their freedom; and implements strategies to move
  us closer to a free society. This year welcomed two new members to the
  campaigns team, Greg Farough and Zoë Kooyman.</p>
-<p><img alt="A photo of a panel at LibrePlanet 2019." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2199/friday-party-busy.jpg"/></p>
+<p><img alt="A photo of a panel at LibrePlanet 2019." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2199/friday-party-busy.jpg"></p>
  <p class="caption">There are plenty of opportunities to meet and greet during every annual LibrePlanet conference. </p>
  <p class="credit">Credit: Rubén Rodríguez, 2019. CC BY-SA 4.0 </p>
  <h4 id="community-meetings">Community meetings:</h4>
  <p class="caption">There are plenty of opportunities to meet and greet during every annual LibrePlanet conference. </p>
  <p class="credit">Credit: Rubén Rodríguez, 2019. CC BY-SA 4.0 </p>
  <h4 id="community-meetings">Community meetings:</h4>
@@ -212,7 +219,7 @@ Deb Nicholson both shared their work, talking about "OpenStreetMap"
  mapping developments and the free software community challenges we
  face.</p>
  </div>
  mapping developments and the free software community challenges we
  face.</p>
  </div>
-<hr/>
+<hr>
  <div class="col2">
  <h3 id="international-day-against-drm">International Day Against DRM</h3>
  <p>For IDAD 2019, themed "Right to read," we called on Pearson and other
  <div class="col2">
  <h3 id="international-day-against-drm">International Day Against DRM</h3>
  <p>For IDAD 2019, themed "Right to read," we called on Pearson and other
@@ -233,7 +240,7 @@ encourage all readers to use them, whether on the latest hardcover
  bestseller or the textbook you use in class (while you still have
  one).</p>
  <p>They have been translated into <a href="https://www.defectivebydesign.org/dayagainstdrm/2019/dust-jacket">ten different languages</a>.</p>
  bestseller or the textbook you use in class (while you still have
  one).</p>
  <p>They have been translated into <a href="https://www.defectivebydesign.org/dayagainstdrm/2019/dust-jacket">ten different languages</a>.</p>
-<p><img alt='Photo of two books, both wrapped in a dust jacket that says "Eliminate DRM. Uphold the right to learn."' class="image-process-article-image" src="https://static.fsf.org/nosvn/dbd/day_against_drm/2019/dj2-2.jpg"/></p>
+<p><img alt="Photo of two books, both wrapped in a dust jacket that says &quot;Eliminate DRM. Uphold the right to learn.&quot;" class="image-process-article-image" src="https://static.fsf.org/nosvn/dbd/day_against_drm/2019/dj2-2.jpg"></p>
  <p class="caption">In 2019, we designed dust jackets that you can slip onto a book to help raise awareness around DRM.</p>
  <p class="credit">Credit: Free Software Foundation, 2019. CC BY-SA 3.0</p>
  <div>
  <p class="caption">In 2019, we designed dust jackets that you can slip onto a book to help raise awareness around DRM.</p>
  <p class="credit">Credit: Free Software Foundation, 2019. CC BY-SA 3.0</p>
  <div>
@@ -269,7 +276,10 @@ one).</p>
  </div>
  </div>
  <div class="pagebreak"></div>
  </div>
  </div>
  <div class="pagebreak"></div>
-<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Thank you for the <em>Bulletin</em></h4> <blockquote><p>"I received the <em>FSF Bulletin</em> last week and would like to thank you! I really enjoyed reading it. I know it may be costly to produce such a things, but, in my opinion, they are important."</p></blockquote></div></p>
+<p>{% separator {
+  "title": "Thank you for the <em>Bulletin</em>",
+  "quote": "I received the <em>FSF Bulletin</em> last week and would like to thank you! I really enjoyed reading it. I know it may be costly to produce such a things, but, in my opinion, they are important."
+}%}</p>
  <div class="col2">
  <h2 id="tech">Tech</h2>
  <h3 id="infrastructure-for-free-software-development-and-activism">Infrastructure for free software development and activism</h3>
  <div class="col2">
  <h2 id="tech">Tech</h2>
  <h3 id="infrastructure-for-free-software-development-and-activism">Infrastructure for free software development and activism</h3>
@@ -277,7 +287,7 @@ one).</p>
  <ul>
  <li>Email server upgrades: GNU Mailman servers at lists.fsf.org and
    lists.gnu.org were upgraded</li>
  <ul>
  <li>Email server upgrades: GNU Mailman servers at lists.fsf.org and
    lists.gnu.org were upgraded</li>
-<li>New RYF website: <https: ryf.fsf.org=""></https:></li>
+<li>New RYF website: <https://ryf.fsf.org/></li>
  <li>CIVICRM upgrade: We recently upgraded CiviCRM to its latest
    version. We worked on a script that helps streamline the process of
    rebasing our custom patches onto CiviCRM core.</li>
  <li>CIVICRM upgrade: We recently upgraded CiviCRM to its latest
    version. We worked on a script that helps streamline the process of
    rebasing our custom patches onto CiviCRM core.</li>
@@ -326,7 +336,7 @@ forum</a>. The
  forum software we chose to use is Discourse. The JavaScript is free
  software, and a link to all source code can be found in the footer of
  the website.</p>
  forum software we chose to use is Discourse. The JavaScript is free
  software, and a link to all source code can be found in the footer of
  the website.</p>
-<p><img alt="The FSF tech team and several volunteers and attendees pose at LibrePlanet 2019." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2192/tech-volunteers-hallway.medium.jpg"/></p>
+<p><img alt="The FSF tech team and several volunteers and attendees pose at LibrePlanet 2019." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2192/tech-volunteers-hallway.medium.jpg"></p>
  <p class="caption">Every year at LibrePlanet, technical voluteers and staff work together to keep the conference running smoothly and free.</p>
  <p class="credit">Credit: Anonymous, CC BY 4.0</p>
  <!--
  <p class="caption">Every year at LibrePlanet, technical voluteers and staff work together to keep the conference running smoothly and free.</p>
  <p class="credit">Credit: Anonymous, CC BY 4.0</p>
  <!--
@@ -343,15 +353,15 @@ the website.</p>
  <div class="col2" markdown="1">
  -->
  <h3 id="working-together-for-free-software">Working Together for Free Software</h3>
  <div class="col2" markdown="1">
  -->
  <h3 id="working-together-for-free-software">Working Together for Free Software</h3>
-<p><a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=50"><img alt="GNU Guix logo" src="images/guix.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=22"><img alt="GNU Mailman logo" src="images/mailman.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=36"><img alt="GNU MediaGoblin logo" src="images/mediagoblin.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=10"><img alt="GNU Octave logo" src="images/octave.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=16"><img alt="GNU Radio logo" src="images/gnuradio.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=21"><img alt="GNUstep" src="https://static.fsf.org/nosvn/images/GNUstep_logo.png"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=57"><img alt="GNU Toolchain logo" src="images/gnu-toolchain.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=19"><img alt="Replicant logo" src="images/replicant.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=58"><img alt="SeaGL logo" src="images/seagl.png"/></a></p>
+<p><a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=50"><img alt="GNU Guix logo" src="images/guix.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=22"><img alt="GNU Mailman logo" src="images/mailman.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=36"><img alt="GNU MediaGoblin logo" src="images/mediagoblin.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=10"><img alt="GNU Octave logo" src="images/octave.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=16"><img alt="GNU Radio logo" src="images/gnuradio.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=21"><img alt="GNUstep" src="https://static.fsf.org/nosvn/images/GNUstep_logo.png"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=57"><img alt="GNU Toolchain logo" src="images/gnu-toolchain.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=19"><img alt="Replicant logo" src="images/replicant.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=58"><img alt="SeaGL logo" src="images/seagl.png"></a></p>
  <p>The FSF acts as fiscal sponsor for free software projects and events
  whose scope and purpose align with the FSF’s mission. Participating
  projects benefit from the FSF’s nonprofit status, administrative
  <p>The FSF acts as fiscal sponsor for free software projects and events
  whose scope and purpose align with the FSF’s mission. Participating
  projects benefit from the FSF’s nonprofit status, administrative
@@ -361,9 +371,27 @@ software community via the <a href="https://www.fsf.org/working-together/fund">W
  Fund</a>.</p>
  </div>
  <div class="pagebreak"></div>
  Fund</a>.</p>
  </div>
  <div class="pagebreak"></div>
-<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"I'm renewing my membership today because over the past two years I've come to realize just how big of a role proprietary software plays in the problems in our society, and I've seen the vitality of free software. I fully support the Foundation in its work."</p></blockquote></div></p>
+<p>{% separator {
+  "title": "Why I joined the FSF",
+  "quote": "I'm renewing my membership today because over the past two years I've come to realize just how big of a role proprietary software plays in the problems in our society, and I've seen the vitality of free software. I fully support the Foundation in its work."
+}%}</p>
  <h2 id="financial-statement">Financial Statement</h2>
  <h2 id="financial-statement">Financial Statement</h2>
-<p><img alt="A pie chart" class="matplotlib" src="images/fa2019.png"/></p>
+<p>{%
+    matplotlib {
+        "filename": "fa2019",
+        "data" : [
+         {"title": "Program\nServices",
+         "values": 1076394,
+         "colors": "steelblue"},
+         {"title": "Management\nand General",
+         "values": 95105,
+         "colors": "royalblue"},
+         {"title": "Fundraising",
+         "values": 65639,
+         "colors": "dodgerblue"}
+        ]
+    }
+%}</p>
  <p>The following is a visualization of the Free Software Foundation's FY
  2019 financial statement. The original documents can be found at
  <a href="https://www.fsf.org/about/financial">https://www.fsf.org/about/financial</a>.</p>
  <p>The following is a visualization of the Free Software Foundation's FY
  2019 financial statement. The original documents can be found at
  <a href="https://www.fsf.org/about/financial">https://www.fsf.org/about/financial</a>.</p>
@@ -529,6 +557,7 @@ Fund</a>.</p>
  </div>
  </div>
  <div class="pagebreak"></div>
  </div>
  </div>
  <div class="pagebreak"></div>
+
  <h2 id="donors">Donors</h2>
  <p>This page is a snapshot of donors to the FSF. The majority of the
  organization's support each year comes from individuals giving less
  <h2 id="donors">Donors</h2>
  <p>This page is a snapshot of donors to the FSF. The majority of the
  organization's support each year comes from individuals giving less
@@ -709,9 +738,12 @@ care so much about free software.</p>
    members, and corporate patrons worldwide who make our work possible.</p>
  </div>
  <div class="pagebreak"></div>
    members, and corporate patrons worldwide who make our work possible.</p>
  </div>
  <div class="pagebreak"></div>
-<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"I value software freedom and the emphasis on controlling your own information."</p></blockquote></div></p>
+<p>{% separator {
+  "title": "Why I joined the FSF",
+  "quote": "I value software freedom and the emphasis on controlling your own information."
+}%}</p>
  <div class="column2">
  <div class="column2">
-<p><img alt="An image of a keyboard" class="colortone" src="images/donors-opener.jpg"/></p>
+<p><img alt="An image of a keyboard" class="colortone" src="images/donors-opener.jpg"></p>
  </div>
  <div class="column2">
  <h2 id="associate-membership">Associate Membership</h2>
  </div>
  <div class="column2">
  <h2 id="associate-membership">Associate Membership</h2>
@@ -730,6 +762,7 @@ to free software by <a href="https://my.fsf.org/join">becoming a Free Software F
  Member</a>. Learn more at <a href="https://fsf.org">https://fsf.org</a>.</p>
  </div>
  <div class="pagebreak"></div>
  Member</a>. Learn more at <a href="https://fsf.org">https://fsf.org</a>.</p>
  </div>
  <div class="pagebreak"></div>
+
  <h2 id="leadership-and-staff">Leadership and Staff</h2>
  <div class="boardcolumn width-25 float-left" style="padding-right:2rem">
  <h3 id="board-of-directors">Board of Directors</h3>
  <h2 id="leadership-and-staff">Leadership and Staff</h2>
  <div class="boardcolumn width-25 float-left" style="padding-right:2rem">
  <h3 id="board-of-directors">Board of Directors</h3>
@@ -751,101 +784,102 @@ Member</a>. Learn more at <a href="https://fsf.org">https://fsf.org</a>.</p>
  <div class="staffcolumn width-70 float-left">
  <h3 id="leadership">Leadership</h3>
  <div class="staff">
  <div class="staffcolumn width-70 float-left">
  <h3 id="leadership">Leadership</h3>
  <div class="staff">
-<p><img alt="John Sullivan" class="image-process-thumb" src="images/staff/derivatives/thumb/johns.jpg"/></p>
+<p><img alt="John Sullivan" class="image-process-thumb" src="images/staff/johns.jpg"></p>
  <h4 id="john-sullivan">John Sullivan</h4>
  <p>Executive Director</p>
  </div>
  <div class="staff">
  <h4 id="john-sullivan">John Sullivan</h4>
  <p>Executive Director</p>
  </div>
  <div class="staff">
-<p><img alt="John Hsieh" class="image-process-thumb" src="images/staff/derivatives/thumb/johnh.jpg"/></p>
+<p><img alt="John Hsieh" class="image-process-thumb" src="images/staff/johnh.jpg"></p>
  <h4 id="john-hsieh">John Hsieh</h4>
  <p>Deputy Director, Clerk</p>
  </div>
  <div class="staff">
  <h4 id="john-hsieh">John Hsieh</h4>
  <p>Deputy Director, Clerk</p>
  </div>
  <div class="staff">
-<p><img alt="Rubén Rodríguez" class="image-process-thumb" src="images/staff/derivatives/thumb/ruben.jpg"/></p>
+<p><img alt="Rubén Rodríguez" class="image-process-thumb" src="images/staff/ruben.jpg"></p>
  <h4 id="ruben-rodriguez">Rubén Rodríguez</h4>
  <p>Chief Technology Officer </p>
  </div>
  <h3 id="licensing">Licensing</h3>
  <div class="staff">
  <h4 id="ruben-rodriguez">Rubén Rodríguez</h4>
  <p>Chief Technology Officer </p>
  </div>
  <h3 id="licensing">Licensing</h3>
  <div class="staff">
-<p><img alt="Donald Robertson" class="image-process-thumb" src="images/staff/derivatives/thumb/donald.jpg"/></p>
+<p><img alt="Donald Robertson" class="image-process-thumb" src="images/staff/donald.jpg"></p>
  <h4 id="donald-robertson">Donald Robertson</h4>
  <p>Licensing &amp; Compliance Manager</p>
  </div>
  <div class="staff">
  <h4 id="donald-robertson">Donald Robertson</h4>
  <p>Licensing &amp; Compliance Manager</p>
  </div>
  <div class="staff">
-<p><img alt="Craig Topham" class="image-process-thumb" src="images/staff/derivatives/thumb/craig.jpg"/></p>
+<p><img alt="Craig Topham" class="image-process-thumb" src="images/staff/craig.jpg"></p>
  <h4 id="craig-topham">Craig Topham</h4>
  <p>Copyright &amp; Licensing Associate </p>
  </div>
  <h3 id="campaigns_1">Campaigns</h3>
  <div class="staff">
  <h4 id="craig-topham">Craig Topham</h4>
  <p>Copyright &amp; Licensing Associate </p>
  </div>
  <h3 id="campaigns_1">Campaigns</h3>
  <div class="staff">
-<p><img alt="Greg Farough" class="image-process-thumb" src="images/staff/derivatives/thumb/greg.jpg"/></p>
+<p><img alt="Greg Farough" class="image-process-thumb" src="images/staff/greg.jpg"></p>
  <h4 id="greg-farough">Greg Farough</h4>
  <p>Campaigns Manager</p>
  </div>
  <div class="staff">
  <h4 id="greg-farough">Greg Farough</h4>
  <p>Campaigns Manager</p>
  </div>
  <div class="staff">
-<p><img alt="Dana Morgenstein" class="image-process-thumb" src="images/staff/derivatives/thumb/dana.jpg"/></p>
+<p><img alt="Dana Morgenstein" class="image-process-thumb" src="images/staff/dana.jpg"></p>
  <h4 id="dana-morgenstein">Dana Morgenstein</h4>
  <p>Outreach &amp; Communications Coordinator</p>
  </div>
  <div class="staff">
  <h4 id="dana-morgenstein">Dana Morgenstein</h4>
  <p>Outreach &amp; Communications Coordinator</p>
  </div>
  <div class="staff">
-<p><img alt="Zoë Kooyman" class="image-process-thumb" src="images/staff/derivatives/thumb/zoe.jpg"/></p>
+<p><img alt="Zoë Kooyman" class="image-process-thumb" src="images/staff/zoe.jpg"></p>
  <h4 id="zoe-kooyman">Zoë Kooyman</h4>
  <p>Program Manager</p>
  </div>
  <h3 id="tech_1">Tech</h3>
  <div class="staff">
  <h4 id="zoe-kooyman">Zoë Kooyman</h4>
  <p>Program Manager</p>
  </div>
  <h3 id="tech_1">Tech</h3>
  <div class="staff">
-<p><img alt="Andrew Engelbrecht" class="image-process-thumb" src="images/staff/derivatives/thumb/andrew.jpg"/></p>
+<p><img alt="Andrew Engelbrecht" class="image-process-thumb" src="images/staff/andrew.jpg"></p>
  <h4 id="andrew-engelbrecht">Andrew Engelbrecht</h4>
  <p>Senior Systems Administrator</p>
  </div>
  <div class="staff">
  <h4 id="andrew-engelbrecht">Andrew Engelbrecht</h4>
  <p>Senior Systems Administrator</p>
  </div>
  <div class="staff">
-<p><img alt="Ian Kelling" class="image-process-thumb" src="images/staff/derivatives/thumb/ian.jpg"/></p>
+<p><img alt="Ian Kelling" class="image-process-thumb" src="images/staff/ian.jpg"></p>
  <h4 id="ian-kelling">Ian Kelling</h4>
  <p>Senior Systems Administrator</p>
  </div>
  <div class="staff">
  <h4 id="ian-kelling">Ian Kelling</h4>
  <p>Senior Systems Administrator</p>
  </div>
  <div class="staff">
-<p><img alt="Michael McMahon" class="image-process-thumb" src="images/staff/derivatives/thumb/michael.jpg"/></p>
+<p><img alt="Michael McMahon" class="image-process-thumb" src="images/staff/michael.jpg"></p>
  <h4 id="michael-mcmahon">Michael McMahon</h4>
  <p>Web Developer</p>
  </div>
  <h3 id="operations">Operations</h3>
  <div class="staff">
  <h4 id="michael-mcmahon">Michael McMahon</h4>
  <p>Web Developer</p>
  </div>
  <h3 id="operations">Operations</h3>
  <div class="staff">
-<p><img alt="Matt Lavallee" class="image-process-thumb" src="images/staff/derivatives/thumb/mattlav.jpg"/></p>
+<p><img alt="Matt Lavallee" class="image-process-thumb" src="images/staff/mattlav.jpg"></p>
  <h4 id="matt-lavallee">Matt Lavallee</h4>
  <p>Operations Assistant</p>
  </div>
  <div class="staff">
  <h4 id="matt-lavallee">Matt Lavallee</h4>
  <p>Operations Assistant</p>
  </div>
  <div class="staff">
-<p><img alt="Jeanne Rasata" class="image-process-thumb" src="images/staff/derivatives/thumb/jeanne.jpg"/></p>
+<p><img alt="Jeanne Rasata" class="image-process-thumb" src="images/staff/jeanne.jpg"></p>
  <h4 id="jeanne-rasata">Jeanne Rasata</h4>
  <p>Assistant to the President</p>
  </div>
  <div class="staff">
  <h4 id="jeanne-rasata">Jeanne Rasata</h4>
  <p>Assistant to the President</p>
  </div>
  <div class="staff">
-<p><img alt="Dawn Bryanton Peterson" class="image-process-thumb" src="images/staff/derivatives/thumb/dawn.jpg"/></p>
+<p><img alt="Dawn Bryanton Peterson" class="image-process-thumb" src="images/staff/dawn.jpg"></p>
  <h4 id="dawn-bryanton-peterson">Dawn Bryanton Peterson</h4>
  <p>Business Operations Manager</p>
  </div>
  </div>
  <h4 id="dawn-bryanton-peterson">Dawn Bryanton Peterson</h4>
  <p>Business Operations Manager</p>
  </div>
  </div>
-</article>
+      </article>
  </div>
  <footer class="bside-footer">
  </div>
  <footer class="bside-footer">
-<img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
-<div>
-<p>Copyright ©  2015–2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
-<p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
-<p>Download the <a href="https://vcs.fsf.org/?p=financial-reports.git">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
-</div>
-<nav>
-<ul class="menu">
-<li><a class="highlight" href="FY2019.html">FY2019 Annual Report</a></li>
-<li><a href="#licensing">Licensing</a></li>
-<li><a href="#campaigns">Campaigns</a></li>
-<li><a href="#tech">Tech</a></li>
-<li><a href="#financials">Financials</a></li>
-<li><a href="#donors">Donors</a></li>
-<li><a href="#associate-membership">Join the FSF</a></li>
-<li><a href="extra/2019.pdf">⬇ PDF</a></li>
-</ul>
-</nav>
+ <img src="theme/fsf-logo.svg" onerror="this.src='images/fsf-logo.png'" alt="Free Software Foundation logo"></p>
+  <div>
+    <p>Copyright &copy;  2015&ndash;2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
+    <p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
+    <p>Download the <a href="https://vcs.fsf.org/?p=financial-reports.git">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
+  </div>
+
+  <nav>
+          <ul class="menu">
+           <li><a class="highlight" href="FY2019.html">FY2019 Annual Report</a></li>
+            <li><a href="#licensing">Licensing</a></li>
+            <li><a href="#campaigns">Campaigns</a></li>
+            <li><a href="#tech">Tech</a></li>
+            <li><a href="#financials">Financials</a></li>
+            <li><a href="#donors">Donors</a></li>
+            <li><a href="#associate-membership">Join the FSF</a></li>
+           <li><a href="extra/2019.pdf">⬇ PDF</a></li>
+          </ul>
+  </nav>
  </footer>
  </footer>
-</body>
+  </body>
  </html>
 \ No newline at end of file
  </html>
 \ No newline at end of file
diff --git a/output/FY2020.html b/output/FY2020.html

index dcabd71562b8f82a5fa1d5943c8e77000c7361fe..0bedd0083ad3c155798a8ca8c1a2128748e5dafb 100644 (file)
--- a/output/FY2020.html
+++ b/output/FY2020.html
@@ -1,54 +1,58 @@
  <!DOCTYPE html>
  <!DOCTYPE html>
-
  <html lang="en">
  <html lang="en">
-<head>
-<title>FY2020 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="./theme/css/b-side-base.css" rel="stylesheet"/>
+  <head>
+    <title>FY2020 Annual Report - Free Software Foundation Annual Reports</title>
+<link href="./theme/css/b-side-base.css" rel="stylesheet">
  <style>
  :root {
         --background: #f6faff; --brightaccent: #bde3ec; --darkaccent: #2870cc; --lightaccent: #79b4f2; --colortone: 185deg;
  }
  </style>
  <style>
  :root {
         --background: #f6faff; --brightaccent: #bde3ec; --darkaccent: #2870cc; --lightaccent: #79b4f2; --colortone: 185deg;
  }
  </style>
-<meta charset="utf-8"/>
-<meta content="width=680" name="viewport"><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
-<body>
+<meta charset="utf-8">
+<meta name="viewport" content="width=680" /><link href="./theme/css/b-side-post.css" rel="stylesheet">  </head>
+  <body>
  <header class="top-menu no-print">
  <header class="top-menu no-print">
-<nav class="top-menu">
-<ul>
-<li><a class="highlight" href="/">Index of reports</a></li>
-<li><a href="#">FY2020</a></li>
-<li><a href="#toc">Table of Contents</a></li>
-<li><a href="#associate-membership">Join the fsf</a></li>
-<li><a href="extra/2020.pdf">⬇PDF</a></li>
-</ul>
-</nav>
+  <nav class="top-menu">
+    <ul>
+            <li><a class="highlight" href="/">Index of reports</a></li>
+            <li><a href="#">FY2020</a></li>
+            <li><a href="#toc">Table of Contents</a></li>
+            <li><a href="#associate-membership">Join the fsf</a></li>
+            <li><a href="extra/2020.pdf">⬇PDF</a></li>
+    </ul>
+  </nav>
  </header>
  </header>
-<div class="document">
-<div id="head">
-<img alt="Free Software Foundation logo" class="fsflogo" src="./theme/fsf-logo.svg"/>
-<h1 class="title">FY2020 Annual Report</h1>
-<div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2020</p></div>
-<div class="dates"><p>(October 1, 2019 - September 30, 2020)</p></div>
-<div class="grid">
-<div class="column">
-<h4><a href="#licensing">Licensing</a></h4>
-<p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
-</div>
-<div class="column">
-<h4><a href="#campaigns">Campaigns</a></h4>
-<p>Empowering you to understand, adopt, develop, and defend free software</p>
-</div>
-<div class="column">
-<h4><a href="#tech">Tech</a></h4>
-<p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
-</div>
-<div class="column">
-<h4><a href="#financials">Operations</a></h4>
-<p>Running an efficient, effective nonprofit, using free software, supported by you</p>
-</div>
-</div>
-<div style="clear:both"></div> </div>
-<article>
+    <div class="document">
+      <div id="head">
+      <img class="fsflogo" alt="Free Software Foundation logo" src="./theme/fsf-logo.svg">
+      <h1 class="title">FY2020 Annual Report</h1>
+      <div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2020</p></div>
+      <div class="dates"><p>(October 1, 2019 - September 30, 2020)</p></div>
+        <div class="grid">
+         <div class="column">
+          <h4><a href="#licensing">Licensing</a></h4>
+          <p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
+         </div>
+         <div class="column">
+          <h4><a href="#campaigns">Campaigns</a></h4>
+          <p>Empowering you to understand, adopt, develop, and defend free software</p>
+         </div>
+         <div class="column">
+          <h4><a href="#tech">Tech</a></h4>
+          <p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
+         </div>
+         <div class="column">
+           <h4><a href="#financials">Operations</a></h4>
+           <p>Running an efficient, effective nonprofit, using free software, supported by you</p>
+         </div>
+        </div>
+        <div style="clear:both"></div>      </div>
+      <article>
+        <p>{% comment {</p>
+<p>Copyright (c) 2023 Free Software Foundation, Inc.</p>
+<p>This work is licensed under the Creative Commons Attribution-ShareAlike 4.0
+  International license (https://creativecommons.org/licenses/by-sa/4.0/)</p>
+<p>}%}</p>
  <blockquote>
  <p>The Free Software Foundation is a leader in the international movement for computer user freedom. We defend the rights of all software users and encourage the development and use of free <a href="https://www.gnu.org/philosophy/free-sw.html">"as in freedom"</a> software.</p>
  <p>This annual report highlights the Foundation's activities and achievements in fiscal year 2020 (October 1, 2019 — September 30, 2020) and includes a detailed financial statement.</p>
  <blockquote>
  <p>The Free Software Foundation is a leader in the international movement for computer user freedom. We defend the rights of all software users and encourage the development and use of free <a href="https://www.gnu.org/philosophy/free-sw.html">"as in freedom"</a> software.</p>
  <p>This annual report highlights the Foundation's activities and achievements in fiscal year 2020 (October 1, 2019 — September 30, 2020) and includes a detailed financial statement.</p>
@@ -96,7 +100,7 @@ site</a>.</p>
  more accessible as an ongoing resource. We also updated an entry on
  trade secrets in the GPL FAQ, as well as updates for other resources
  such as our license recommendation page.</p>
  more accessible as an ongoing resource. We also updated an entry on
  trade secrets in the GPL FAQ, as well as updates for other resources
  such as our license recommendation page.</p>
-<p><img alt="John Sullivan speaking at the FSF Continuing Legal Education Seminar in Raleigh, NC." class="image-process-article-image" src="https://static.fsf.org/nosvn/magazine/2020-spring/images/john-cle.jpg"/></p>
+<p><img alt="John Sullivan speaking at the FSF Continuing Legal Education Seminar in Raleigh, NC." class="image-process-article-image" src="https://static.fsf.org/nosvn/magazine/2020-spring/images/john-cle.jpg"></p>
  <p class="caption">John Sullivan, Executive Director of the FSF, does a presentation at the FSF Continuing Legal Education Seminar in Raleigh, North Carolina, in October 2019.</p>
  <p class="credit">Credit: Free Software Foundation, 2019. CC BY-SA 4.0 </p>
  </div>
  <p class="caption">John Sullivan, Executive Director of the FSF, does a presentation at the FSF Continuing Legal Education Seminar in Raleigh, North Carolina, in October 2019.</p>
  <p class="credit">Credit: Free Software Foundation, 2019. CC BY-SA 4.0 </p>
  </div>
@@ -121,7 +125,7 @@ such as our license recommendation page.</p>
  </div>
  <div class="col1">
  <h3 id="respects-your-freedom-certification">Respects Your Freedom certification</h3>
  </div>
  <div class="col1">
  <h3 id="respects-your-freedom-certification">Respects Your Freedom certification</h3>
-<p><img alt="RYF Logo" class="align-left width-40" src="images/RYF-logo.png"/></p>
+<p><img alt="RYF Logo" class="align-left width-40" src="images/RYF-logo.png"></p>
  <p>The FSF's Respects Your Freedom (RYF) product certification program
  encourages the creation and sale of hardware that will do as much as
  possible to respect your freedom and privacy.</p>
  <p>The FSF's Respects Your Freedom (RYF) product certification program
  encourages the creation and sale of hardware that will do as much as
  possible to respect your freedom and privacy.</p>
@@ -132,7 +136,10 @@ users to browse and search by categories and retailers, and makes
  finding what they are looking for simpler.</p>
  </div>
  <div class="pagebreak"></div>
  finding what they are looking for simpler.</p>
  </div>
  <div class="pagebreak"></div>
-<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"I believe in Free Software!"</p></blockquote></div></p>
+<p>{% separator {
+  "title": "Why I joined the FSF",
+  "quote": "I believe in Free Software!"
+}%}</p>
  <div class="col2">
  <h2 id="campaigns">Campaigns</h2>
  <h4 id="new-videos">New videos</h4>
  <div class="col2">
  <h2 id="campaigns">Campaigns</h2>
  <h4 id="new-videos">New videos</h4>
@@ -226,7 +233,7 @@ Commons</a>,
  and
  <a href="https://www.april.org/en/international-day-against-drm-friday-december-4th-2020">April</a>,
  among others.</p>
  and
  <a href="https://www.april.org/en/international-day-against-drm-friday-december-4th-2020">April</a>,
  among others.</p>
-<p><img alt='Screenshot of BBB discussion with Pouhiou and Eda Nano of Framasoft for FSF35 anniversary event."' class="image-process-article-image" src="https://static.fsf.org/nosvn/fy20photos/bbb-framasoft.png"/></p>
+<p><img alt="Screenshot of BBB discussion with Pouhiou and Eda Nano of Framasoft for FSF35 anniversary event.&quot;" class="image-process-article-image" src="https://static.fsf.org/nosvn/fy20photos/bbb-framasoft.png"></p>
  <p class="caption">The FSF held a number of online activities in 2020, utilizing free software tools such as BigBlueButton.</p>
  <p class="credit">Credit: Free Software Foundation, 2023. CC BY-SA 4.0</p>
  </div>
  <p class="caption">The FSF held a number of online activities in 2020, utilizing free software tools such as BigBlueButton.</p>
  <p class="credit">Credit: Free Software Foundation, 2023. CC BY-SA 4.0</p>
  </div>
@@ -258,7 +265,11 @@ among others.</p>
  </dl>
  </div>
  <div class="pagebreak"></div>
  </dl>
  </div>
  <div class="pagebreak"></div>
-<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"Supporting the future of GNU, and I want to use the email forwarding service when contributing to projects."</p></blockquote></div></p>
+
+<p>{% separator {
+  "title": "Why I joined the FSF",
+  "quote": "Supporting the future of GNU, and I want to use the email forwarding service when contributing to projects."
+}%}</p>
  <div class="col2">
  <h2 id="tech">Tech</h2>
  <h3 id="infrastructure-for-free-software-development-and-activism">Infrastructure for free software development and activism</h3>
  <div class="col2">
  <h2 id="tech">Tech</h2>
  <h3 id="infrastructure-for-free-software-development-and-activism">Infrastructure for free software development and activism</h3>
@@ -334,7 +345,7 @@ with the campaigns team.</p>
  maintaining gnu.org with the help of volunteers, and working with
  interns who are advancing their skills and knowledge in working with
  and creating free software.</p>
  maintaining gnu.org with the help of volunteers, and working with
  interns who are advancing their skills and knowledge in working with
  and creating free software.</p>
-<p><img alt="FSF Web Developer Michael McMahon poses with the 3D printers in his garage that are being used to manufacture protective gear and medical supplies in the HACKERS and HOSPITALS initiative.." class="image-process-article-image" src="https://static.fsf.org/nosvn/magazine/2020-spring/images/michael-cover.jpg"/></p>
+<p><img alt="FSF Web Developer Michael McMahon poses with the 3D printers in his garage that are being used to manufacture protective gear and medical supplies in the HACKERS and HOSPITALS initiative.." class="image-process-article-image" src="https://static.fsf.org/nosvn/magazine/2020-spring/images/michael-cover.jpg"></p>
  <p class="caption">In response to the COVID-19 pandemic, free software supporters took swift action to assist hospitals by creating protective gear.</p>
  <p class="credit">Credit: Javier Sepulveda, 2020. Photo used with permission. </p>
  </div>
  <p class="caption">In response to the COVID-19 pandemic, free software supporters took swift action to assist hospitals by creating protective gear.</p>
  <p class="credit">Credit: Javier Sepulveda, 2020. Photo used with permission. </p>
  </div>
@@ -362,7 +373,7 @@ method for managing cryptocurrency wallets for the Foundation.</p>
  <p>The main infrastructure firewalls were redesigned with a much more
  strict set of policies, including blocking all unexpected outgoing
  traffic.</p>
  <p>The main infrastructure firewalls were redesigned with a much more
  strict set of policies, including blocking all unexpected outgoing
  traffic.</p>
-<p><img alt="The FSF tech team helps brings server hardware to life as part of the migration to a new colocation facility, June 2019." class="image-process-article-image" src="https://static.fsf.org/nosvn/magazine/2020-spring/images/IMG_20190701_142702-techteamcolo.jpg"/></p>
+<p><img alt="The FSF tech team helps brings server hardware to life as part of the migration to a new colocation facility, June 2019." class="image-process-article-image" src="https://static.fsf.org/nosvn/magazine/2020-spring/images/IMG_20190701_142702-techteamcolo.jpg"></p>
  <p class="caption">In 2020, we added a KVM server to our 'gnuhope' stack, which allows us to run more virtual machines in the newer cluster.</p>
  <p class="credit">Credit: Rubén Rodríguez, 2020. CC BY-SA 4.0</p>
  </div>
  <p class="caption">In 2020, we added a KVM server to our 'gnuhope' stack, which allows us to run more virtual machines in the newer cluster.</p>
  <p class="credit">Credit: Rubén Rodríguez, 2020. CC BY-SA 4.0</p>
  </div>
@@ -378,15 +389,15 @@ treat everyone as a EU resident for the purpose of privacy policies,
  drafted and applied a new privacy policy, and added links to it from
  all relevant pages and sites.</p>
  <h3 id="working-together-for-free-software">Working Together for Free Software</h3>
  drafted and applied a new privacy policy, and added links to it from
  all relevant pages and sites.</p>
  <h3 id="working-together-for-free-software">Working Together for Free Software</h3>
-<p><a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=50"><img alt="GNU Guix logo" src="images/guix.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=22"><img alt="GNU Mailman logo" src="images/mailman.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=36"><img alt="GNU MediaGoblin logo" src="images/mediagoblin.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=10"><img alt="GNU Octave logo" src="images/octave.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=16"><img alt="GNU Radio logo" src="images/gnuradio.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=21"><img alt="GNUstep" src="https://static.fsf.org/nosvn/images/GNUstep_logo.png"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=57"><img alt="GNU Toolchain logo" src="images/gnu-toolchain.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=19"><img alt="Replicant logo" src="images/replicant.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=58"><img alt="SeaGL logo" src="images/seagl.png"/></a></p>
+<p><a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=50"><img alt="GNU Guix logo" src="images/guix.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=22"><img alt="GNU Mailman logo" src="images/mailman.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=36"><img alt="GNU MediaGoblin logo" src="images/mediagoblin.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=10"><img alt="GNU Octave logo" src="images/octave.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=16"><img alt="GNU Radio logo" src="images/gnuradio.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=21"><img alt="GNUstep" src="https://static.fsf.org/nosvn/images/GNUstep_logo.png"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=57"><img alt="GNU Toolchain logo" src="images/gnu-toolchain.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=19"><img alt="Replicant logo" src="images/replicant.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=58"><img alt="SeaGL logo" src="images/seagl.png"></a></p>
  <p>The FSF acts as fiscal sponsor for free software projects and events
  whose scope and purpose align with the FSF’s mission. Participating
  projects benefit from the FSF’s nonprofit status, administrative
  <p>The FSF acts as fiscal sponsor for free software projects and events
  whose scope and purpose align with the FSF’s mission. Participating
  projects benefit from the FSF’s nonprofit status, administrative
@@ -396,9 +407,28 @@ software community via the <a href="https://www.fsf.org/working-together/fund">W
  Fund</a>.</p>
  </div>
  <div class="pagebreak"></div>
  Fund</a>.</p>
  </div>
  <div class="pagebreak"></div>
-<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"Free software is necessary for personal freedom and freedom of information. It is our best tool to fight against mass survelliance and authoritarian states."</p></blockquote></div></p>
+
+<p>{% separator {
+  "title": "Why I joined the FSF",
+  "quote": "Free software is necessary for personal freedom and freedom of information. It is our best tool to fight against mass survelliance and authoritarian states."
+}%}</p>
  <h2 id="financial-statement">Financial Statement</h2>
  <h2 id="financial-statement">Financial Statement</h2>
-<p><img alt="A pie chart" class="matplotlib" src="images/fa2020.png"/></p>
+<p>{%
+    matplotlib {
+        "filename": "fa2020",
+        "data" : [
+         {"title": "Program\nServices",
+         "values": 1076394,
+         "colors": "steelblue"},
+         {"title": "Management\nand General",
+         "values": 95105,
+         "colors": "royalblue"},
+         {"title": "Fundraising",
+         "values": 65639,
+         "colors": "dodgerblue"}
+        ]
+    }
+%}</p>
  <p>The following is a visualization of the Free Software Foundation's FY
  2020 financial statement. The original documents can be found at
  <a href="https://www.fsf.org/about/financial">https://www.fsf.org/about/financial</a>.</p>
  <p>The following is a visualization of the Free Software Foundation's FY
  2020 financial statement. The original documents can be found at
  <a href="https://www.fsf.org/about/financial">https://www.fsf.org/about/financial</a>.</p>
@@ -735,7 +765,7 @@ care so much about free software.</p>
    "quote": "The FSF gives me hope today, and by joining, I want to support not just free software, but also freedom, justice and equality throughout the world."
  }%}</p>
  <div class="column2">
    "quote": "The FSF gives me hope today, and by joining, I want to support not just free software, but also freedom, justice and equality throughout the world."
  }%}</p>
  <div class="column2">
-<p><img alt="An image of a keyboard" class="colortone" src="images/donors-opener.jpg"/></p>
+<p><img alt="An image of a keyboard" class="colortone" src="images/donors-opener.jpg"></p>
  </div>
  <div class="column2">
  <h2 id="associate-membership">Associate Membership</h2>
  </div>
  <div class="column2">
  <h2 id="associate-membership">Associate Membership</h2>
@@ -757,7 +787,7 @@ Member</a>. Learn more at <a href="https://fsf.org">https://fsf.org</a>.</p>
  <h2 id="leadership-and-staff">Leadership and Staff</h2>
  <div class="boardcolumn width-25 float-left" style="padding-right:2rem">
  <h3 id="board-of-directors">Board of Directors</h3>
  <h2 id="leadership-and-staff">Leadership and Staff</h2>
  <div class="boardcolumn width-25 float-left" style="padding-right:2rem">
  <h3 id="board-of-directors">Board of Directors</h3>
-<p><img alt="Geoffrey Knauth" class="width-50 colortone" src="https://web.archive.org/web/20200928074435im_/https://static.fsf.org/nosvn/images/staff-photos/board/geoff-in-maryland.jpg"/></p>
+<p><img alt="Geoffrey Knauth" class="width-50 colortone" src="https://web.archive.org/web/20200928074435im_/https://static.fsf.org/nosvn/images/staff-photos/board/geoff-in-maryland.jpg"></p>
  <h4 id="geoffrey-knauth">Geoffrey Knauth</h4>
  <p>President and Treasurer</p>
  <h4 id="alexandre-oliva">Alexandre Oliva</h4>
  <h4 id="geoffrey-knauth">Geoffrey Knauth</h4>
  <p>President and Treasurer</p>
  <h4 id="alexandre-oliva">Alexandre Oliva</h4>
@@ -774,102 +804,103 @@ Member</a>. Learn more at <a href="https://fsf.org">https://fsf.org</a>.</p>
  <div class="staffcolumn width-70 float-left">
  <h3 id="leadership">Leadership</h3>
  <div class="staff">
  <div class="staffcolumn width-70 float-left">
  <h3 id="leadership">Leadership</h3>
  <div class="staff">
-<p><img alt="John Sullivan" class="image-process-thumb" src="images/staff/derivatives/thumb/johns.jpg"/></p>
+<p><img alt="John Sullivan" class="image-process-thumb" src="images/staff/johns.jpg"></p>
  <h4 id="john-sullivan">John Sullivan</h4>
  <p>Executive Director</p>
  </div>
  <div class="staff">
  <h4 id="john-sullivan">John Sullivan</h4>
  <p>Executive Director</p>
  </div>
  <div class="staff">
-<p><img alt="John Hsieh" class="image-process-thumb" src="images/staff/derivatives/thumb/johnh.jpg"/></p>
+<p><img alt="John Hsieh" class="image-process-thumb" src="images/staff/johnh.jpg"></p>
  <h4 id="john-hsieh">John Hsieh</h4>
  <p>Deputy Director</p>
  </div>
  <div class="staff">
  <h4 id="john-hsieh">John Hsieh</h4>
  <p>Deputy Director</p>
  </div>
  <div class="staff">
-<p><img alt="Rubén Rodríguez" class="image-process-thumb" src="images/staff/derivatives/thumb/ruben.jpg"/></p>
+<p><img alt="Rubén Rodríguez" class="image-process-thumb" src="images/staff/ruben.jpg"></p>
  <h4 id="ruben-rodriguez">Rubén Rodríguez</h4>
  <p>Chief Technology Officer </p>
  </div>
  <h3 id="licensing">Licensing</h3>
  <div class="staff">
  <h4 id="ruben-rodriguez">Rubén Rodríguez</h4>
  <p>Chief Technology Officer </p>
  </div>
  <h3 id="licensing">Licensing</h3>
  <div class="staff">
-<p><img alt="Donald Robertson" class="image-process-thumb" src="images/staff/derivatives/thumb/donald.jpg"/></p>
+<p><img alt="Donald Robertson" class="image-process-thumb" src="images/staff/donald.jpg"></p>
  <h4 id="donald-robertson">Donald Robertson</h4>
  <p>Licensing &amp; Compliance Manager</p>
  </div>
  <div class="staff">
  <h4 id="donald-robertson">Donald Robertson</h4>
  <p>Licensing &amp; Compliance Manager</p>
  </div>
  <div class="staff">
-<p><img alt="Craig Topham" class="image-process-thumb" src="images/staff/derivatives/thumb/craig.jpg"/></p>
+<p><img alt="Craig Topham" class="image-process-thumb" src="images/staff/craig.jpg"></p>
  <h4 id="craig-topham">Craig Topham</h4>
  <p>Copyright &amp; Licensing Associate </p>
  </div>
  <h3 id="campaigns_1">Campaigns</h3>
  <div class="staff">
  <h4 id="craig-topham">Craig Topham</h4>
  <p>Copyright &amp; Licensing Associate </p>
  </div>
  <h3 id="campaigns_1">Campaigns</h3>
  <div class="staff">
-<p><img alt="Greg Farough" class="image-process-thumb" src="images/staff/derivatives/thumb/greg.jpg"/></p>
+<p><img alt="Greg Farough" class="image-process-thumb" src="images/staff/greg.jpg"></p>
  <h4 id="greg-farough">Greg Farough</h4>
  <p>Campaigns Manager</p>
  </div>
  <div class="staff">
  <h4 id="greg-farough">Greg Farough</h4>
  <p>Campaigns Manager</p>
  </div>
  <div class="staff">
-<p><img alt="Dana Morgenstein" class="image-process-thumb" src="images/staff/derivatives/thumb/dana.jpg"/></p>
+<p><img alt="Dana Morgenstein" class="image-process-thumb" src="images/staff/dana.jpg"></p>
  <h4 id="dana-morgenstein">Dana Morgenstein</h4>
  <p>Outreach &amp; Communications Coordinator</p>
  </div>
  <div class="staff">
  <h4 id="dana-morgenstein">Dana Morgenstein</h4>
  <p>Outreach &amp; Communications Coordinator</p>
  </div>
  <div class="staff">
-<p><img alt="Zoë Kooyman" class="image-process-thumb" src="images/staff/derivatives/thumb/zoe.jpg"/></p>
+<p><img alt="Zoë Kooyman" class="image-process-thumb" src="images/staff/zoe.jpg"></p>
  <h4 id="zoe-kooyman">Zoë Kooyman</h4>
  <p>Program Manager</p>
  </div>
  <h3 id="tech_1">Tech</h3>
  <div class="staff">
  <h4 id="zoe-kooyman">Zoë Kooyman</h4>
  <p>Program Manager</p>
  </div>
  <h3 id="tech_1">Tech</h3>
  <div class="staff">
-<p><img alt="Andrew Engelbrecht" class="image-process-thumb" src="images/staff/derivatives/thumb/andrew.jpg"/></p>
+<p><img alt="Andrew Engelbrecht" class="image-process-thumb" src="images/staff/andrew.jpg"></p>
  <h4 id="andrew-engelbrecht">Andrew Engelbrecht</h4>
  <p>Senior Systems Administrator</p>
  </div>
  <div class="staff">
  <h4 id="andrew-engelbrecht">Andrew Engelbrecht</h4>
  <p>Senior Systems Administrator</p>
  </div>
  <div class="staff">
-<p><img alt="Ian Kelling" class="image-process-thumb" src="images/staff/derivatives/thumb/ian.jpg"/></p>
+<p><img alt="Ian Kelling" class="image-process-thumb" src="images/staff/ian.jpg"></p>
  <h4 id="ian-kelling">Ian Kelling</h4>
  <p>Senior Systems Administrator</p>
  </div>
  <div class="staff">
  <h4 id="ian-kelling">Ian Kelling</h4>
  <p>Senior Systems Administrator</p>
  </div>
  <div class="staff">
-<p><img alt="Michael McMahon" class="image-process-thumb" src="images/staff/derivatives/thumb/michael.jpg"/></p>
+<p><img alt="Michael McMahon" class="image-process-thumb" src="images/staff/michael.jpg"></p>
  <h4 id="michael-mcmahon">Michael McMahon</h4>
  <p>Web Developer</p>
  </div>
  <h3 id="operations">Operations</h3>
  <div class="staff">
  <h4 id="michael-mcmahon">Michael McMahon</h4>
  <p>Web Developer</p>
  </div>
  <h3 id="operations">Operations</h3>
  <div class="staff">
-<p><img alt="Matt Lavallee" class="image-process-thumb" src="images/staff/derivatives/thumb/mattlav.jpg"/></p>
+<p><img alt="Matt Lavallee" class="image-process-thumb" src="images/staff/mattlav.jpg"></p>
  <h4 id="matt-lavallee">Matt Lavallee</h4>
  <p>Operations Assistant</p>
  </div>
  <div class="staff">
  <h4 id="matt-lavallee">Matt Lavallee</h4>
  <p>Operations Assistant</p>
  </div>
  <div class="staff">
-<p><img alt="Jeanne Rasata" class="image-process-thumb" src="images/staff/derivatives/thumb/jeanne.jpg"/></p>
+<p><img alt="Jeanne Rasata" class="image-process-thumb" src="images/staff/jeanne.jpg"></p>
  <h4 id="jeanne-rasata">Jeanne Rasata</h4>
  <p>Membership Coordinator </p>
  </div>
  <div class="staff">
  <h4 id="jeanne-rasata">Jeanne Rasata</h4>
  <p>Membership Coordinator </p>
  </div>
  <div class="staff">
-<p><img alt="Dawn Bryanton Peterson" class="image-process-thumb" src="images/staff/derivatives/thumb/dawn.jpg"/></p>
+<p><img alt="Dawn Bryanton Peterson" class="image-process-thumb" src="images/staff/dawn.jpg"></p>
  <h4 id="dawn-bryanton-peterson">Dawn Bryanton Peterson</h4>
  <p>Business Operations Manager</p>
  </div>
  </div>
  </div>
  <h4 id="dawn-bryanton-peterson">Dawn Bryanton Peterson</h4>
  <p>Business Operations Manager</p>
  </div>
  </div>
  </div>
-</article>
+      </article>
  </div>
  <footer class="bside-footer">
  </div>
  <footer class="bside-footer">
-<img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
-<div>
-<p>Copyright ©  2015–2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
-<p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
-<p>Download the <a href="https://vcs.fsf.org/?p=financial-reports.git">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
-</div>
-<nav>
-<ul class="menu">
-<li><a class="highlight" href="FY2020.html">FY2020 Annual Report</a></li>
-<li><a href="#licensing">Licensing</a></li>
-<li><a href="#campaigns">Campaigns</a></li>
-<li><a href="#tech">Tech</a></li>
-<li><a href="#financials">Financials</a></li>
-<li><a href="#donors">Donors</a></li>
-<li><a href="#associate-membership">Join the FSF</a></li>
-<li><a href="extra/2020.pdf">⬇ PDF</a></li>
-</ul>
-</nav>
+ <img src="theme/fsf-logo.svg" onerror="this.src='images/fsf-logo.png'" alt="Free Software Foundation logo"></p>
+  <div>
+    <p>Copyright &copy;  2015&ndash;2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
+    <p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
+    <p>Download the <a href="https://vcs.fsf.org/?p=financial-reports.git">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
+  </div>
+
+  <nav>
+          <ul class="menu">
+           <li><a class="highlight" href="FY2020.html">FY2020 Annual Report</a></li>
+            <li><a href="#licensing">Licensing</a></li>
+            <li><a href="#campaigns">Campaigns</a></li>
+            <li><a href="#tech">Tech</a></li>
+            <li><a href="#financials">Financials</a></li>
+            <li><a href="#donors">Donors</a></li>
+            <li><a href="#associate-membership">Join the FSF</a></li>
+           <li><a href="extra/2020.pdf">⬇ PDF</a></li>
+          </ul>
+  </nav>
  </footer>
  </footer>
-</body>
+  </body>
  </html>
 \ No newline at end of file
  </html>
 \ No newline at end of file
diff --git a/output/author/free-software-foundation.html b/output/author/free-software-foundation.html

index 56a52f051d3b040333c346c11dc69522a750150b..f5dc36ba9fd0f1b2e783fa667b0d0963dea15f56 100644 (file)
--- a/output/author/free-software-foundation.html
+++ b/output/author/free-software-foundation.html
@@ -1,68 +1,69 @@
  <!DOCTYPE html>
  <!DOCTYPE html>
-
  <html lang="en">
  <html lang="en">
-<head>
-<title>Free Software Foundation - Free Software Foundation Annual Reports</title>
-<link href="./theme/css/b-side-base.css" rel="stylesheet"/>
-<meta charset="utf-8"/>
-<meta content="width=680" name="viewport"><link href="./theme/css/b-side-wide.css" rel="stylesheet"/> </meta></head>
-<body>
+  <head>
+    <title>Free Software Foundation - Free Software Foundation Annual Reports</title>
+<link href="./theme/css/b-side-base.css" rel="stylesheet">
+<meta charset="utf-8">
+<meta name="viewport" content="width=680" /><link href="./theme/css/b-side-wide.css" rel="stylesheet">  </head>
+  <body>
  <header class="top-menu no-print">
  <header class="top-menu no-print">
-<nav class="top-menu">
-<ul>
-<li><a href="#">Free Software Foundation Annual Reports</a></li>
-<li><a href="https://my.fsf.org">Join the fsf</a></li>
-</ul>
-</nav>
+  <nav class="top-menu">
+    <ul>
+            <li><a href="#">Free Software Foundation Annual Reports</a></li>
+            <li><a href="https://my.fsf.org">Join the fsf</a></li>
+    </ul>
+  </nav>
  </header>
  </header>
-<section>
-<div>
-<h1>Free Software Foundation</h1>
+  <section>
+       <div>
+         <h1>Free Software Foundation</h1>       
  <div class="bside-summary">
  <h2><a href="/FY2020.html" rel="bookmark">Fiscal year 2020</a></h2>
  <ul class="bulletless">
  <div class="bside-summary">
  <h2><a href="/FY2020.html" rel="bookmark">Fiscal year 2020</a></h2>
  <ul class="bulletless">
-<li class="smaller dim"><em><time datetime="2023-06-15T10:20:00-04:00">October 1, 2019 - September 30, 2020</time></em></li>
-<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
+       <li class="smaller dim"><em><time datetime="2023-06-15T10:20:00-04:00">October 1, 2019 - September 30, 2020</time></em></li>
+       <li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
  </ul>
  </div><div class="bside-summary">
  <h2><a href="/FY2019.html" rel="bookmark">Fiscal year 2019</a></h2>
  <ul class="bulletless">
  </ul>
  </div><div class="bside-summary">
  <h2><a href="/FY2019.html" rel="bookmark">Fiscal year 2019</a></h2>
  <ul class="bulletless">
-<li class="smaller dim"><em><time datetime="2023-06-14T10:20:00-04:00">October 1, 2018 - September 30, 2019</time></em></li>
-<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
+       <li class="smaller dim"><em><time datetime="2023-06-14T10:20:00-04:00">October 1, 2018 - September 30, 2019</time></em></li>
+       <li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
  </ul>
  </div><div class="bside-summary">
  <h2><a href="/FY2018.html" rel="bookmark">Fiscal year 2018</a></h2>
  <ul class="bulletless">
  </ul>
  </div><div class="bside-summary">
  <h2><a href="/FY2018.html" rel="bookmark">Fiscal year 2018</a></h2>
  <ul class="bulletless">
-<li class="smaller dim"><em><time datetime="2023-06-13T10:20:00-04:00">October 1, 2017 - September 30, 2018</time></em></li>
-<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
+       <li class="smaller dim"><em><time datetime="2023-06-13T10:20:00-04:00">October 1, 2017 - September 30, 2018</time></em></li>
+       <li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
  </ul>
  </div><div class="bside-summary">
  <h2><a href="/fy2017.html" rel="bookmark">Fiscal year 2017</a></h2>
  <ul class="bulletless">
  </ul>
  </div><div class="bside-summary">
  <h2><a href="/fy2017.html" rel="bookmark">Fiscal year 2017</a></h2>
  <ul class="bulletless">
-<li class="smaller dim"><em><time datetime="2017-12-05T10:20:00-05:00">October 1, 2016 - September 30, 2017</time></em></li>
-<li class="smaller dim"><a href="https://www.fsf.org/annual-reports/fy2017/fsf-report-2017-site.tar.gz">Sources and materials</a></li>
+       <li class="smaller dim"><em><time datetime="2017-12-05T10:20:00-05:00">October 1, 2016 - September 30, 2017</time></em></li>
+       <li class="smaller dim"><a href="https://www.fsf.org/annual-reports/fy2017/fsf-report-2017-site.tar.gz">Sources and materials</a></li>
  </ul>
  </div><div class="bside-summary">
  <h2><a href="https://static.fsf.org/nosvn/annual-reports/FY16_LR.pdf" rel="bookmark">Fiscal year 2016</a></h2>
  <ul class="bulletless">
  </ul>
  </div><div class="bside-summary">
  <h2><a href="https://static.fsf.org/nosvn/annual-reports/FY16_LR.pdf" rel="bookmark">Fiscal year 2016</a></h2>
  <ul class="bulletless">
-<li class="smaller dim"><em><time datetime="2016-12-05T10:20:00-05:00">October 1, 2015 - September 30, 2016</time></em></li>
-<li class="smaller dim"><a href="https://static.fsf.org/nosvn/annual-reports/Annual_Report_FY16_source_files.tar.gz">Sources and materials</a></li>
+       <li class="smaller dim"><em><time datetime="2016-12-05T10:20:00-05:00">October 1, 2015 - September 30, 2016</time></em></li>
+       <li class="smaller dim"><a href="https://static.fsf.org/nosvn/annual-reports/Annual_Report_FY16_source_files.tar.gz">Sources and materials</a></li>
  </ul>
  </div><div class="bside-summary">
  <h2><a href="https://static.fsf.org/nosvn/annual-reports/FY2015_annual_report_LR.pdf" rel="bookmark">Fiscal year 2015</a></h2>
  <ul class="bulletless">
  </ul>
  </div><div class="bside-summary">
  <h2><a href="https://static.fsf.org/nosvn/annual-reports/FY2015_annual_report_LR.pdf" rel="bookmark">Fiscal year 2015</a></h2>
  <ul class="bulletless">
-<li class="smaller dim"><em><time datetime="2015-12-05T10:20:00-05:00">October 1, 2014 - September 30, 2015</time></em></li>
-<li class="smaller dim"><a href="https://static.fsf.org/nosvn/annual-reports/fy15-report.tar">Sources and materials</a></li>
+       <li class="smaller dim"><em><time datetime="2015-12-05T10:20:00-05:00">October 1, 2014 - September 30, 2015</time></em></li>
+       <li class="smaller dim"><a href="https://static.fsf.org/nosvn/annual-reports/fy15-report.tar">Sources and materials</a></li>
  </ul>
  </ul>
-</div> </div>
-</section>
+</div>         </div>
+  </section>
+
  <footer class="bside-footer">
  <footer class="bside-footer">
-<img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
-<div>
-<p>Copyright ©  2015–2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
-<p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
-<p>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
-</div>
+ <img src="theme/fsf-logo.svg" onerror="this.src='images/fsf-logo.png'" alt="Free Software Foundation logo"></p>
+  <div>
+    <p>Copyright &copy;  2015&ndash;2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
+    <p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
+    <p>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
+  </div>
+
  </footer>
  </footer>
-</body>
+  </body>
  </html>
 \ No newline at end of file
  </html>
 \ No newline at end of file
diff --git a/output/fy2015.html b/output/fy2015.html

index b9b05fde18c7c6c4a99a3388c4da5f19acd68115..e379caa4d0f2e482a37b53998408528af4d76d21 100644 (file)
--- a/output/fy2015.html
+++ b/output/fy2015.html
@@ -1,70 +1,71 @@
  <!DOCTYPE html>
  <!DOCTYPE html>
-
  <html lang="en">
  <html lang="en">
-<head>
-<title>FY2015 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="./theme/css/b-side-base.css" rel="stylesheet"/>
-<meta charset="utf-8"/>
-<meta content="width=680" name="viewport"><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
-<body>
+  <head>
+    <title>FY2015 Annual Report - Free Software Foundation Annual Reports</title>
+<link href="./theme/css/b-side-base.css" rel="stylesheet">
+<meta charset="utf-8">
+<meta name="viewport" content="width=680" /><link href="./theme/css/b-side-post.css" rel="stylesheet">  </head>
+  <body>
  <header class="top-menu no-print">
  <header class="top-menu no-print">
-<nav class="top-menu">
-<ul>
-<li><a class="highlight" href="/">Index of reports</a></li>
-<li><a href="#">FY2015</a></li>
-<li><a href="#toc">Table of Contents</a></li>
-<li><a href="#associate-membership">Join the fsf</a></li>
-<li><a href="extra/2015.pdf">⬇PDF</a></li>
-</ul>
-</nav>
+  <nav class="top-menu">
+    <ul>
+            <li><a class="highlight" href="/">Index of reports</a></li>
+            <li><a href="#">FY2015</a></li>
+            <li><a href="#toc">Table of Contents</a></li>
+            <li><a href="#associate-membership">Join the fsf</a></li>
+            <li><a href="extra/2015.pdf">⬇PDF</a></li>
+    </ul>
+  </nav>
  </header>
  </header>
-<div class="document">
-<div id="head">
-<img alt="Free Software Foundation logo" class="fsflogo" src="./theme/fsf-logo.svg"/>
-<h1 class="title">FY2015 Annual Report</h1>
-<div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2015</p></div>
-<div class="dates"><p>(October 1, 2014 - September 30, 2015)</p></div>
-<div class="grid">
-<div class="column">
-<h4><a href="#licensing">Licensing</a></h4>
-<p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
-</div>
-<div class="column">
-<h4><a href="#campaigns">Campaigns</a></h4>
-<p>Empowering you to understand, adopt, develop, and defend free software</p>
-</div>
-<div class="column">
-<h4><a href="#tech">Tech</a></h4>
-<p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
-</div>
-<div class="column">
-<h4><a href="#financials">Operations</a></h4>
-<p>Running an efficient, effective nonprofit, using free software, supported by you</p>
-</div>
-</div>
-<div style="clear:both"></div> </div>
-<article>
-</article>
+    <div class="document">
+      <div id="head">
+      <img class="fsflogo" alt="Free Software Foundation logo" src="./theme/fsf-logo.svg">
+      <h1 class="title">FY2015 Annual Report</h1>
+      <div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2015</p></div>
+      <div class="dates"><p>(October 1, 2014 - September 30, 2015)</p></div>
+        <div class="grid">
+         <div class="column">
+          <h4><a href="#licensing">Licensing</a></h4>
+          <p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
+         </div>
+         <div class="column">
+          <h4><a href="#campaigns">Campaigns</a></h4>
+          <p>Empowering you to understand, adopt, develop, and defend free software</p>
+         </div>
+         <div class="column">
+          <h4><a href="#tech">Tech</a></h4>
+          <p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
+         </div>
+         <div class="column">
+           <h4><a href="#financials">Operations</a></h4>
+           <p>Running an efficient, effective nonprofit, using free software, supported by you</p>
+         </div>
+        </div>
+        <div style="clear:both"></div>      </div>
+      <article>
+        
+      </article>
  </div>
  <footer class="bside-footer">
  </div>
  <footer class="bside-footer">
-<img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
-<div>
-<p>Copyright ©  2015–2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
-<p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
-<p>Download the <a href="https://static.fsf.org/nosvn/annual-reports/fy15-report.tar">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
-</div>
-<nav>
-<ul class="menu">
-<li><a class="highlight" href="fy2015.html">FY2015 Annual Report</a></li>
-<li><a href="#licensing">Licensing</a></li>
-<li><a href="#campaigns">Campaigns</a></li>
-<li><a href="#tech">Tech</a></li>
-<li><a href="#financials">Financials</a></li>
-<li><a href="#donors">Donors</a></li>
-<li><a href="#associate-membership">Join the FSF</a></li>
-<li><a href="extra/2015.pdf">⬇ PDF</a></li>
-</ul>
-</nav>
+ <img src="theme/fsf-logo.svg" onerror="this.src='images/fsf-logo.png'" alt="Free Software Foundation logo"></p>
+  <div>
+    <p>Copyright &copy;  2015&ndash;2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
+    <p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
+    <p>Download the <a href="https://static.fsf.org/nosvn/annual-reports/fy15-report.tar">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
+  </div>
+
+  <nav>
+          <ul class="menu">
+           <li><a class="highlight" href="fy2015.html">FY2015 Annual Report</a></li>
+            <li><a href="#licensing">Licensing</a></li>
+            <li><a href="#campaigns">Campaigns</a></li>
+            <li><a href="#tech">Tech</a></li>
+            <li><a href="#financials">Financials</a></li>
+            <li><a href="#donors">Donors</a></li>
+            <li><a href="#associate-membership">Join the FSF</a></li>
+           <li><a href="extra/2015.pdf">⬇ PDF</a></li>
+          </ul>
+  </nav>
  </footer>
  </footer>
-</body>
+  </body>
  </html>
 \ No newline at end of file
  </html>
 \ No newline at end of file
diff --git a/output/fy2016.html b/output/fy2016.html

index 4c448851e52389934ca6f460eff9c5266cc1adf7..ac3d414108d156b9f69777a51c29548844934fe9 100644 (file)
--- a/output/fy2016.html
+++ b/output/fy2016.html
@@ -1,70 +1,71 @@
  <!DOCTYPE html>
  <!DOCTYPE html>
-
  <html lang="en">
  <html lang="en">
-<head>
-<title>FY2016 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="./theme/css/b-side-base.css" rel="stylesheet"/>
-<meta charset="utf-8"/>
-<meta content="width=680" name="viewport"><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
-<body>
+  <head>
+    <title>FY2016 Annual Report - Free Software Foundation Annual Reports</title>
+<link href="./theme/css/b-side-base.css" rel="stylesheet">
+<meta charset="utf-8">
+<meta name="viewport" content="width=680" /><link href="./theme/css/b-side-post.css" rel="stylesheet">  </head>
+  <body>
  <header class="top-menu no-print">
  <header class="top-menu no-print">
-<nav class="top-menu">
-<ul>
-<li><a class="highlight" href="/">Index of reports</a></li>
-<li><a href="#">FY2016</a></li>
-<li><a href="#toc">Table of Contents</a></li>
-<li><a href="#associate-membership">Join the fsf</a></li>
-<li><a href="extra/2016.pdf">⬇PDF</a></li>
-</ul>
-</nav>
+  <nav class="top-menu">
+    <ul>
+            <li><a class="highlight" href="/">Index of reports</a></li>
+            <li><a href="#">FY2016</a></li>
+            <li><a href="#toc">Table of Contents</a></li>
+            <li><a href="#associate-membership">Join the fsf</a></li>
+            <li><a href="extra/2016.pdf">⬇PDF</a></li>
+    </ul>
+  </nav>
  </header>
  </header>
-<div class="document">
-<div id="head">
-<img alt="Free Software Foundation logo" class="fsflogo" src="./theme/fsf-logo.svg"/>
-<h1 class="title">FY2016 Annual Report</h1>
-<div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2016</p></div>
-<div class="dates"><p>(October 1, 2015 - September 30, 2016)</p></div>
-<div class="grid">
-<div class="column">
-<h4><a href="#licensing">Licensing</a></h4>
-<p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
-</div>
-<div class="column">
-<h4><a href="#campaigns">Campaigns</a></h4>
-<p>Empowering you to understand, adopt, develop, and defend free software</p>
-</div>
-<div class="column">
-<h4><a href="#tech">Tech</a></h4>
-<p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
-</div>
-<div class="column">
-<h4><a href="#financials">Operations</a></h4>
-<p>Running an efficient, effective nonprofit, using free software, supported by you</p>
-</div>
-</div>
-<div style="clear:both"></div> </div>
-<article>
-</article>
+    <div class="document">
+      <div id="head">
+      <img class="fsflogo" alt="Free Software Foundation logo" src="./theme/fsf-logo.svg">
+      <h1 class="title">FY2016 Annual Report</h1>
+      <div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2016</p></div>
+      <div class="dates"><p>(October 1, 2015 - September 30, 2016)</p></div>
+        <div class="grid">
+         <div class="column">
+          <h4><a href="#licensing">Licensing</a></h4>
+          <p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
+         </div>
+         <div class="column">
+          <h4><a href="#campaigns">Campaigns</a></h4>
+          <p>Empowering you to understand, adopt, develop, and defend free software</p>
+         </div>
+         <div class="column">
+          <h4><a href="#tech">Tech</a></h4>
+          <p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
+         </div>
+         <div class="column">
+           <h4><a href="#financials">Operations</a></h4>
+           <p>Running an efficient, effective nonprofit, using free software, supported by you</p>
+         </div>
+        </div>
+        <div style="clear:both"></div>      </div>
+      <article>
+        
+      </article>
  </div>
  <footer class="bside-footer">
  </div>
  <footer class="bside-footer">
-<img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
-<div>
-<p>Copyright ©  2015–2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
-<p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
-<p>Download the <a href="https://static.fsf.org/nosvn/annual-reports/Annual_Report_FY16_source_files.tar.gz">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
-</div>
-<nav>
-<ul class="menu">
-<li><a class="highlight" href="fy2016.html">FY2016 Annual Report</a></li>
-<li><a href="#licensing">Licensing</a></li>
-<li><a href="#campaigns">Campaigns</a></li>
-<li><a href="#tech">Tech</a></li>
-<li><a href="#financials">Financials</a></li>
-<li><a href="#donors">Donors</a></li>
-<li><a href="#associate-membership">Join the FSF</a></li>
-<li><a href="extra/2016.pdf">⬇ PDF</a></li>
-</ul>
-</nav>
+ <img src="theme/fsf-logo.svg" onerror="this.src='images/fsf-logo.png'" alt="Free Software Foundation logo"></p>
+  <div>
+    <p>Copyright &copy;  2015&ndash;2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
+    <p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
+    <p>Download the <a href="https://static.fsf.org/nosvn/annual-reports/Annual_Report_FY16_source_files.tar.gz">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
+  </div>
+
+  <nav>
+          <ul class="menu">
+           <li><a class="highlight" href="fy2016.html">FY2016 Annual Report</a></li>
+            <li><a href="#licensing">Licensing</a></li>
+            <li><a href="#campaigns">Campaigns</a></li>
+            <li><a href="#tech">Tech</a></li>
+            <li><a href="#financials">Financials</a></li>
+            <li><a href="#donors">Donors</a></li>
+            <li><a href="#associate-membership">Join the FSF</a></li>
+           <li><a href="extra/2016.pdf">⬇ PDF</a></li>
+          </ul>
+  </nav>
  </footer>
  </footer>
-</body>
+  </body>
  </html>
 \ No newline at end of file
  </html>
 \ No newline at end of file
diff --git a/output/fy2017.html b/output/fy2017.html

index 5ffada00f8380a5af648e2a04e8ec0bbff84736f..01bc4cbadfc770fc7775a3c8ab6ec30ecddd6f92 100644 (file)
--- a/output/fy2017.html
+++ b/output/fy2017.html
@@ -1,60 +1,64 @@
  <!DOCTYPE html>
  <!DOCTYPE html>
-
  <html lang="en">
  <html lang="en">
-<head>
-<title>FY2017 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="./theme/css/b-side-base.css" rel="stylesheet"/>
+  <head>
+    <title>FY2017 Annual Report - Free Software Foundation Annual Reports</title>
+<link href="./theme/css/b-side-base.css" rel="stylesheet">
  <style>
  :root {
         --background: #fffff6; --brightaccent: #ece1bd; --darkaccent: #ac4f30; --lightaccent: #d1b661; --colortone: -30deg;
  }
  </style>
  <style>
  :root {
         --background: #fffff6; --brightaccent: #ece1bd; --darkaccent: #ac4f30; --lightaccent: #d1b661; --colortone: -30deg;
  }
  </style>
-<meta charset="utf-8"/>
-<meta content="width=680" name="viewport"><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
-<body>
+<meta charset="utf-8">
+<meta name="viewport" content="width=680" /><link href="./theme/css/b-side-post.css" rel="stylesheet">  </head>
+  <body>
  <header class="top-menu no-print">
  <header class="top-menu no-print">
-<nav class="top-menu">
-<ul>
-<li><a class="highlight" href="/">Index of reports</a></li>
-<li><a href="#">FY2017</a></li>
-<li><a href="#toc">Table of Contents</a></li>
-<li><a href="#associate-membership">Join the fsf</a></li>
-<li><a href="extra/2017.pdf">⬇PDF</a></li>
-</ul>
-</nav>
+  <nav class="top-menu">
+    <ul>
+            <li><a class="highlight" href="/">Index of reports</a></li>
+            <li><a href="#">FY2017</a></li>
+            <li><a href="#toc">Table of Contents</a></li>
+            <li><a href="#associate-membership">Join the fsf</a></li>
+            <li><a href="extra/2017.pdf">⬇PDF</a></li>
+    </ul>
+  </nav>
  </header>
  </header>
-<div class="document">
-<div id="head">
-<img alt="Free Software Foundation logo" class="fsflogo" src="./theme/fsf-logo.svg"/>
-<h1 class="title">FY2017 Annual Report</h1>
-<div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2017</p></div>
-<div class="dates"><p>(October 1, 2016 - September 30, 2017)</p></div>
-<div class="grid">
-<div class="column">
-<h4><a href="#licensing">Licensing</a></h4>
-<p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
-</div>
-<div class="column">
-<h4><a href="#campaigns">Campaigns</a></h4>
-<p>Empowering you to understand, adopt, develop, and defend free software</p>
-</div>
-<div class="column">
-<h4><a href="#tech">Tech</a></h4>
-<p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
-</div>
-<div class="column">
-<h4><a href="#financials">Operations</a></h4>
-<p>Running an efficient, effective nonprofit, using free software, supported by you</p>
-</div>
-</div>
-<div style="clear:both"></div> </div>
-<article>
+    <div class="document">
+      <div id="head">
+      <img class="fsflogo" alt="Free Software Foundation logo" src="./theme/fsf-logo.svg">
+      <h1 class="title">FY2017 Annual Report</h1>
+      <div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2017</p></div>
+      <div class="dates"><p>(October 1, 2016 - September 30, 2017)</p></div>
+        <div class="grid">
+         <div class="column">
+          <h4><a href="#licensing">Licensing</a></h4>
+          <p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
+         </div>
+         <div class="column">
+          <h4><a href="#campaigns">Campaigns</a></h4>
+          <p>Empowering you to understand, adopt, develop, and defend free software</p>
+         </div>
+         <div class="column">
+          <h4><a href="#tech">Tech</a></h4>
+          <p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
+         </div>
+         <div class="column">
+           <h4><a href="#financials">Operations</a></h4>
+           <p>Running an efficient, effective nonprofit, using free software, supported by you</p>
+         </div>
+        </div>
+        <div style="clear:both"></div>      </div>
+      <article>
+        <p>{% comment {</p>
+<p>Copyright (c) 2022 Free Software Foundation, Inc.</p>
+<p>This work is licensed under the Creative Commons Attribution-ShareAlike 4.0
+  International license (https://creativecommons.org/licenses/by-sa/4.0/)</p>
+<p>}%}</p>
  <blockquote>
  <p>The Free Software Foundation is a leader in the international movement for computer user freedom. We defend the rights of all software users and encourage the development and use of free <a href="https://www.gnu.org/philosophy/free-sw.en.html">"as in freedom"</a> software.</p>
  <p>This annual report highlights the Foundation's activities and achievements in fiscal year 2017 (October 1, 2016 — September 30, 2017) and includes a detailed financial statement.</p>
  </blockquote>
  <blockquote>
  <p>The Free Software Foundation is a leader in the international movement for computer user freedom. We defend the rights of all software users and encourage the development and use of free <a href="https://www.gnu.org/philosophy/free-sw.en.html">"as in freedom"</a> software.</p>
  <p>This annual report highlights the Foundation's activities and achievements in fiscal year 2017 (October 1, 2016 — September 30, 2017) and includes a detailed financial statement.</p>
  </blockquote>
-<div class="width-33 float-left">
-<p><img alt="Portrait of John Sullivan" class="image-process-article-image letter" src="images/derivatives/article-image/john-sullivan.jpg"/></p>
+<div class="width-33 float-left ">
+<p><img alt="Portrait of John Sullivan" class="image-process-article-image letter" src="images/john-sullivan.jpg"></p>
  <blockquote>
  <p>Software filters the information we receive about the world and the messages we put out into the world, and that software must be free "as in freedom."</p>
  </blockquote>
  <blockquote>
  <p>Software filters the information we receive about the world and the messages we put out into the world, and that software must be free "as in freedom."</p>
  </blockquote>
@@ -70,7 +74,7 @@
  <p>FSF associate members drive this work, through their ongoing financial contributions, their commitment to the movement, and their sustained, informed, effective personal advocacy. If you haven't joined us yet, we need your support. We may be up against billions of dollars, but since we are fighting for billions of regular users, we have a massive advantage in numbers — so long as we can reach everyone. Please join us and help build these freedom-protecting defenses, without delay.</p>
  <p>Yours in freedom,</p>
  <div class="signature">
  <p>FSF associate members drive this work, through their ongoing financial contributions, their commitment to the movement, and their sustained, informed, effective personal advocacy. If you haven't joined us yet, we need your support. We may be up against billions of dollars, but since we are fighting for billions of regular users, we have a massive advantage in numbers — so long as we can reach everyone. Please join us and help build these freedom-protecting defenses, without delay.</p>
  <p>Yours in freedom,</p>
  <div class="signature">
-<p><img alt="Signature" src="images/JohnS-signature.png"/></p>
+<p><img alt="Signature" src="images/JohnS-signature.png"></p>
  <p><strong>John Sullivan</strong></p>
  <p>Executive Director</p>
  <p>SEPTEMBER 2018</p>
  <p><strong>John Sullivan</strong></p>
  <p>Executive Director</p>
  <p>SEPTEMBER 2018</p>
@@ -104,7 +108,7 @@
  <p>In FY17, we celebrated the tenth anniversary of the GNU General Public License version 3 (GPL). This is the free software copyleft license that ensures the user's right to run, study, share, and modify software. In addition to being the steward of the GPL, the FSF holds copyright on much of the GNU operating system. The licensing team spent the year accepting copyright assignments from software developers and corporations, investigating GPL violations, and answering licensing questions from the community.</p>
  <p>We championed copylefted projects, publishing another seven installments in an ongoing series of conversations with free software developers who choose GNU licenses for their work. We also certified a record number of devices under our Respects Your Freedom certification program, which identifies devices that do as much as possible to respect user freedom.</p>
  <p>Along with answering hundreds of licensing questions from the public, dedicated volunteers continued to expand and improve the Free Software Directory for nearly two million annual visitors, and we made inroads with government, helping the US Department of Defense to distribute free software. We also organized volunteers to create a workaround for Web site maintainers who want to register as an agent under the US Digital Millennium Copyright Act (DMCA) while avoiding the nonfree JavaScript the process currently requires.</p>
  <p>In FY17, we celebrated the tenth anniversary of the GNU General Public License version 3 (GPL). This is the free software copyleft license that ensures the user's right to run, study, share, and modify software. In addition to being the steward of the GPL, the FSF holds copyright on much of the GNU operating system. The licensing team spent the year accepting copyright assignments from software developers and corporations, investigating GPL violations, and answering licensing questions from the community.</p>
  <p>We championed copylefted projects, publishing another seven installments in an ongoing series of conversations with free software developers who choose GNU licenses for their work. We also certified a record number of devices under our Respects Your Freedom certification program, which identifies devices that do as much as possible to respect user freedom.</p>
  <p>Along with answering hundreds of licensing questions from the public, dedicated volunteers continued to expand and improve the Free Software Directory for nearly two million annual visitors, and we made inroads with government, helping the US Department of Defense to distribute free software. We also organized volunteers to create a workaround for Web site maintainers who want to register as an agent under the US Digital Millennium Copyright Act (DMCA) while avoiding the nonfree JavaScript the process currently requires.</p>
-<p><img alt="Photo of a man with light brown hair, glasses, and a brown, white, and red sweater, holding two small mobile phones in his hands." class="image-process-article-image" src="images/derivatives/article-image/licensing-gingerich_crop.jpg"/></p>
+<p><img alt="Photo of a man with light brown hair, glasses, and a brown, white, and red sweater, holding two small mobile phones in his hands." class="image-process-article-image" src="images/licensing-gingerich_crop.jpg"></p>
  <p class="caption">Denver Gingerich, a developer of packages under the AGPLv3 and other GNU licenses, speaking at LibrePlanet 2017 about free software for mobile phones.</p>
  <p class="credit">CREDIT: Kori Feener, CC-BY 4.0</p>
  <h3 id="fy2017-at-a-glance">FY2017 at a glance</h3>
  <p class="caption">Denver Gingerich, a developer of packages under the AGPLv3 and other GNU licenses, speaking at LibrePlanet 2017 about free software for mobile phones.</p>
  <p class="credit">CREDIT: Kori Feener, CC-BY 4.0</p>
  <h3 id="fy2017-at-a-glance">FY2017 at a glance</h3>
@@ -121,12 +125,15 @@
  <dd>visitors to the Free Software Directory</dd>
  </dl>
  <h3 id="respects-your-freedom-certification">Respects Your Freedom certification</h3>
  <dd>visitors to the Free Software Directory</dd>
  </dl>
  <h3 id="respects-your-freedom-certification">Respects Your Freedom certification</h3>
-<p><img alt="RYF Logo" class="align-left width-40" src="images/RYF-logo.png"/></p>
+<p><img alt="RYF Logo" class="align-left width-40" src="images/RYF-logo.png"></p>
  <p>The FSF's Respects Your Freedom product certification program encourages the creation and sale of hardware that will do as much as possible to respect your freedom and privacy.</p>
  <p>In FY17, fifteen devices from Technoethical became RYF certified: six laptops, two docking stations, a mainboard, three WiFi USB adapters, two internal WiFI devices, and a Bluetooth USB adapter. RYF certification was also awarded to three devices from Vikings: a USB stereo sound adapter, a mainboard, and a laptop, bringing the number of RYF certified devices to twenty-seven.</p>
  </div>
  <p>The FSF's Respects Your Freedom product certification program encourages the creation and sale of hardware that will do as much as possible to respect your freedom and privacy.</p>
  <p>In FY17, fifteen devices from Technoethical became RYF certified: six laptops, two docking stations, a mainboard, three WiFi USB adapters, two internal WiFI devices, and a Bluetooth USB adapter. RYF certification was also awarded to three devices from Vikings: a USB stereo sound adapter, a mainboard, and a laptop, bringing the number of RYF certified devices to twenty-seven.</p>
  </div>
-<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"Free software — the GNU/Linux platform in particular — is what made it possible twenty years ago for me to learn the skills to become a professional system administrator. It has been a rewarding career!"</p></blockquote></div></p>
-<p><img alt="A photo of a wall in Florida. Spraypainted on the wall is 'DRM' with a red circle and crossed out." class="image-process-article-image" src="images/derivatives/article-image/campaigns-drm.png"/></p>
+<p>{% separator {
+  "title": "Why I joined the FSF",
+  "quote": "Free software — the GNU/Linux platform in particular — is what made it possible twenty years ago for me to learn the skills to become a professional system administrator. It has been a rewarding career!"
+}%}</p>
+<p><img alt="A photo of a wall in Florida. Spraypainted on the wall is 'DRM' with a red circle and crossed out." class="image-process-article-image" src="images/campaigns-drm.png"></p>
  <p class="caption">34th Street Wall, Gainesville, Florida</p>
  <p class="credit">Credit: Gavin Baker, CC-BY-SA 4.0 </p>
  <div class="col2">
  <p class="caption">34th Street Wall, Gainesville, Florida</p>
  <p class="credit">Credit: Gavin Baker, CC-BY-SA 4.0 </p>
  <div class="col2">
@@ -143,7 +150,7 @@ International Day Against DRM</p>
  <p>Encrypted Media Extensions (EME) is just another way to dress up DRM. The FSF and the free software community organized to oppose a proposal by the World Wide Web Consortium (W3C) to make EME a Web standard. We called and wrote W3C president Tim Berners-Lee, asking him to keep the Web free. While we lost this battle, and EME became a Web standard, we're looking at our options for next steps. We are not giving up hope for a free Web, even if its inventor did.</p>
  <h3 id="free-people-free-net">Free people, free net</h3>
  <p>Internet freedom in the United States found itself on the national stage in 2017. Over the course of the year, Ajit Pai became chairman of the Federal Communications Commission (FCC) and instigated a war against net neutrality. The FSF joined with dozens of other organizations to raise awareness and organize in support of net neutrality.</p>
  <p>Encrypted Media Extensions (EME) is just another way to dress up DRM. The FSF and the free software community organized to oppose a proposal by the World Wide Web Consortium (W3C) to make EME a Web standard. We called and wrote W3C president Tim Berners-Lee, asking him to keep the Web free. While we lost this battle, and EME became a Web standard, we're looking at our options for next steps. We are not giving up hope for a free Web, even if its inventor did.</p>
  <h3 id="free-people-free-net">Free people, free net</h3>
  <p>Internet freedom in the United States found itself on the national stage in 2017. Over the course of the year, Ajit Pai became chairman of the Federal Communications Commission (FCC) and instigated a war against net neutrality. The FSF joined with dozens of other organizations to raise awareness and organize in support of net neutrality.</p>
-<p><img alt="Sumana Harihareswara gives the closing keynote at LibrePlanet 2017" class="image-process-article-image" src="images/derivatives/article-image/campaigns-stats-lp_small.jpg"/></p>
+<p><img alt="Sumana Harihareswara gives the closing keynote at LibrePlanet 2017" class="image-process-article-image" src="images/campaigns-stats-lp_small.jpg"></p>
  <p class="caption">Sumana Harihareswara gives the closing keynote at LibrePlanet 2017</p>
  <p class="credit">Credit: Kori Feener, CC-BY 4.0</p>
  <div>
  <p class="caption">Sumana Harihareswara gives the closing keynote at LibrePlanet 2017</p>
  <p class="credit">Credit: Kori Feener, CC-BY 4.0</p>
  <div>
@@ -168,7 +175,10 @@ International Day Against DRM</p>
  </div>
  </div>
  <div class="pagebreak"></div>
  </div>
  </div>
  <div class="pagebreak"></div>
-<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"To fight the dystopia of a DRM-overgrown world."</p></blockquote></div></p>
+<p>{% separator {
+  "title": "Why I joined the FSF",
+  "quote": "To fight the dystopia of a DRM-overgrown world."
+}%}</p>
  <div class="col2">
  <h2 id="tech">Tech</h2>
  <h3 id="infrastructure-for-free-software-development-and-activism">Infrastructure for free software development and activism</h3>
  <div class="col2">
  <h2 id="tech">Tech</h2>
  <h3 id="infrastructure-for-free-software-development-and-activism">Infrastructure for free software development and activism</h3>
@@ -188,7 +198,7 @@ International Day Against DRM</p>
  </dl>
  <p>And the team collaborates with the free software community, maintaining gnu.org with the help of volunteers, and working with interns who are advancing their skills and knowledge in working with and creating free software.</p>
  <p>The team introduced some new infrastructure using distributed Ceph storage and multiple KVM hosts for our new virtual machines. They started the next round of upgrades, including the implementation of a new mail server stack supporting over three thousand free software project mailing lists, and improving the LibrePlanet conference streaming setup by using Ansible to manage the laptops used for streaming, introducing new hardware, and using HUBAngl (streaming software created by an FSF intern).</p>
  </dl>
  <p>And the team collaborates with the free software community, maintaining gnu.org with the help of volunteers, and working with interns who are advancing their skills and knowledge in working with and creating free software.</p>
  <p>The team introduced some new infrastructure using distributed Ceph storage and multiple KVM hosts for our new virtual machines. They started the next round of upgrades, including the implementation of a new mail server stack supporting over three thousand free software project mailing lists, and improving the LibrePlanet conference streaming setup by using Ansible to manage the laptops used for streaming, introducing new hardware, and using HUBAngl (streaming software created by an FSF intern).</p>
-<p><img alt="A tiered classroom, filled with people. A person stands at the front of the room, beneath a large projection screen, giving a talk." class="image-process-article-image" src="images/derivatives/article-image/sysadmin-libreplanet.jpg"/></p>
+<p><img alt="A tiered classroom, filled with people. A person stands at the front of the room, beneath a large projection screen, giving a talk." class="image-process-article-image" src="images/sysadmin-libreplanet.jpg"></p>
  <p class="caption">The tech team maintains the free software infrastructure for all FSF operations, including the annual LibrePlanet conference.</p>
  <p class="credit">Credit: Kori Feener, CC-BY 4.0</p>
  <h3 id="defending-user-freedom-with-free-software">Defending user freedom with free software</h3>
  <p class="caption">The tech team maintains the free software infrastructure for all FSF operations, including the annual LibrePlanet conference.</p>
  <p class="credit">Credit: Kori Feener, CC-BY 4.0</p>
  <h3 id="defending-user-freedom-with-free-software">Defending user freedom with free software</h3>
@@ -206,20 +216,38 @@ International Day Against DRM</p>
  <dd>Amazon EC2 instances</dd>
  </dl>
  <h3 id="working-together-for-free-software">Working Together for Free Software</h3>
  <dd>Amazon EC2 instances</dd>
  </dl>
  <h3 id="working-together-for-free-software">Working Together for Free Software</h3>
-<p><a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=50"><img alt="GNU Guix logo" src="images/guix.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=22"><img alt="GNU Mailman logo" src="images/mailman.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=36"><img alt="GNU MediaGoblin logo" src="images/mediagoblin.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=10"><img alt="GNU Octave logo" src="images/octave.svg"/></a>
-<a class="logos" href="https://www.gnuradio.org/"><img alt="GNU Radio logo" src="images/gnuradio.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=57"><img alt="GNU Toolchain logo" src="images/gnu-toolchain.svg"/></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=19"><img alt="Replicant logo" src="images/replicant.svg"/></a>
-<a class="logos" href="https://seagl.org/"><img alt="SeaGL logo" src="images/seagl.png"/></a></p>
+<p><a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=50"><img alt="GNU Guix logo" src="images/guix.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=22"><img alt="GNU Mailman logo" src="images/mailman.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=36"><img alt="GNU MediaGoblin logo" src="images/mediagoblin.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=10"><img alt="GNU Octave logo" src="images/octave.svg"></a>
+<a class="logos" href="https://www.gnuradio.org/"><img alt="GNU Radio logo" src="images/gnuradio.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=57"><img alt="GNU Toolchain logo" src="images/gnu-toolchain.svg"></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=19"><img alt="Replicant logo" src="images/replicant.svg"></a>
+<a class="logos" href="https://seagl.org/"><img alt="SeaGL logo" src="images/seagl.png"></a></p>
  <p>The FSF acts as fiscal sponsor for free software projects and events whose scope and purpose align with the FSF’s mission. Participating projects benefit from the FSF’s nonprofit status, administrative infrastructure, and fundraising expertise. In FY17, these eight projects received $67,130 in direct support from the free software community via the Working Together for Free Software Fund.</p>
  </div>
  <div class="pagebreak"></div>
  <p>The FSF acts as fiscal sponsor for free software projects and events whose scope and purpose align with the FSF’s mission. Participating projects benefit from the FSF’s nonprofit status, administrative infrastructure, and fundraising expertise. In FY17, these eight projects received $67,130 in direct support from the free software community via the Working Together for Free Software Fund.</p>
  </div>
  <div class="pagebreak"></div>
-<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"I discovered GNU, and then learned about all the amazing work the FSF does for the tech community."</p></blockquote></div></p>
+<p>{% separator {
+  "title": "Why I joined the FSF",
+  "quote": "I discovered GNU, and then learned about all the amazing work the FSF does for the tech community."
+}%}</p>
  <h2 id="financial-statement">Financial Statement</h2>
  <h2 id="financial-statement">Financial Statement</h2>
-<p><img alt="A pie chart" class="matplotlib" src="images/fa2017.png"/></p>
+<p>{%
+    matplotlib {
+        "filename": "fa2017",
+        "data" : [
+         {"title": "Program\nServices",
+         "values": 1076394,
+         "colors": "chocolate"},
+         {"title": "Management\nand General",
+         "values": 95105,
+         "colors": "sienna"},
+         {"title": "Fundraising",
+         "values": 65639,
+         "colors": "brown"}
+        ]
+    }
+%}</p>
  <p>The following is a visualization of the Free Software Foundation's FY 2017 financial statement. The original documents can be found <a href="https://www.fsf.org/about/financial">here</a>.</p>
  <div class="nocollapse" style="clear:both">
  <div class="column3">
  <p>The following is a visualization of the Free Software Foundation's FY 2017 financial statement. The original documents can be found <a href="https://www.fsf.org/about/financial">here</a>.</p>
  <div class="nocollapse" style="clear:both">
  <div class="column3">
@@ -383,6 +411,7 @@ International Day Against DRM</p>
  </div>
  </div>
  <div class="pagebreak"></div>
  </div>
  </div>
  <div class="pagebreak"></div>
+
  <h2 id="donors">Donors</h2>
  <p>This list includes our patrons, in-kind supporters, and those who receive ThankGNUs for donations totaling over $500 in a year. The FSF appreciates and thanks the thousands of individual donors, members, and corporate patrons worldwide who make our work possible.</p>
  <h3 id="institutional-support">Institutional Support</h3>
  <h2 id="donors">Donors</h2>
  <p>This list includes our patrons, in-kind supporters, and those who receive ThankGNUs for donations totaling over $500 in a year. The FSF appreciates and thanks the thousands of individual donors, members, and corporate patrons worldwide who make our work possible.</p>
  <h3 id="institutional-support">Institutional Support</h3>
@@ -551,18 +580,22 @@ International Day Against DRM</p>
  </ul>
  </div>
  <div class="pagebreak"></div>
  </ul>
  </div>
  <div class="pagebreak"></div>
-<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"I simply use GNU tools every day."</p></blockquote></div></p>
+<p>{% separator {
+  "title": "Why I joined the FSF",
+  "quote": "I simply use GNU tools every day."
+}%}</p>
  <div class="col2">
  <div class="col2">
-<p><img alt="An image of a keyboard" class="colortone" src="images/donors-opener.jpg"/></p>
+<p><img alt="An image of a keyboard" class="colortone" src="images/donors-opener.jpg"></p>
  <h2 id="associate-membership">Associate Membership</h2>
  <h3 id="join-the-free-software-foundation">Join the Free Software Foundation</h3>
  <p>Our mission is to promote computer user freedom and defend the rights of all software users, worldwide. Though free software is used more widely than ever, it is under threat from a wide range of interests that profit from controlling and surveilling computer users. You can help put control over computers back in the hands of the people who use them! Try a free software program, or switch to a free operating system. Make a donation, or make a long term commitment to free software by becoming a Free Software Foundation Associate Member. Learn more at fsf.org.</p>
  </div>
  <div class="pagebreak"></div>
  <h2 id="associate-membership">Associate Membership</h2>
  <h3 id="join-the-free-software-foundation">Join the Free Software Foundation</h3>
  <p>Our mission is to promote computer user freedom and defend the rights of all software users, worldwide. Though free software is used more widely than ever, it is under threat from a wide range of interests that profit from controlling and surveilling computer users. You can help put control over computers back in the hands of the people who use them! Try a free software program, or switch to a free operating system. Make a donation, or make a long term commitment to free software by becoming a Free Software Foundation Associate Member. Learn more at fsf.org.</p>
  </div>
  <div class="pagebreak"></div>
+
  <h2 id="leadership-and-staff">Leadership and Staff</h2>
  <div class="boardcolumn width-25 float-left" style="padding-right:2rem">
  <h3 id="board-of-directors">Board of Directors</h3>
  <h2 id="leadership-and-staff">Leadership and Staff</h2>
  <div class="boardcolumn width-25 float-left" style="padding-right:2rem">
  <h3 id="board-of-directors">Board of Directors</h3>
-<p><img alt="Richard M. Stallman" class="width-60" src="images/richard-stallman.jpg"/></p>
+<p><img alt="Richard M. Stallman" class="width-60" src="images/richard-stallman.jpg"></p>
  <h4 id="richard-m-stallman">Richard M. Stallman</h4>
  <p>Founder and President</p>
  <h4 id="gerald-j-sussman">Gerald J. Sussman</h4>
  <h4 id="richard-m-stallman">Richard M. Stallman</h4>
  <p>Founder and President</p>
  <h4 id="gerald-j-sussman">Gerald J. Sussman</h4>
@@ -581,86 +614,87 @@ International Day Against DRM</p>
  <div class="staffcolumn width-70 float-left">
  <h3 id="leadership">Leadership</h3>
  <div class="staff">
  <div class="staffcolumn width-70 float-left">
  <h3 id="leadership">Leadership</h3>
  <div class="staff">
-<p><img alt="John Sullivan" class="image-process-thumb" src="images/staff/derivatives/thumb/johns.jpg"/></p>
+<p><img alt="John Sullivan" class="image-process-thumb" src="images/staff/johns.jpg"></p>
  <h4 id="john-sullivan">John Sullivan</h4>
  <p>Executive Director</p>
  </div>
  <div class="staff">
  <h4 id="john-sullivan">John Sullivan</h4>
  <p>Executive Director</p>
  </div>
  <div class="staff">
-<p><img alt="John Hsieh" class="image-process-thumb" src="images/staff/derivatives/thumb/johnh.jpg"/></p>
+<p><img alt="John Hsieh" class="image-process-thumb" src="images/staff/johnh.jpg"></p>
  <h4 id="john-hsieh">John Hsieh</h4>
  <p>Deputy Director</p>
  </div>
  <h3 id="licensing">Licensing</h3>
  <div class="staff">
  <h4 id="john-hsieh">John Hsieh</h4>
  <p>Deputy Director</p>
  </div>
  <h3 id="licensing">Licensing</h3>
  <div class="staff">
-<p><img alt="Donald Robertson" class="image-process-thumb" src="images/staff/derivatives/thumb/donald.jpg"/></p>
+<p><img alt="Donald Robertson" class="image-process-thumb" src="images/staff/donald.jpg"></p>
  <h4 id="donald-robertson">Donald Robertson</h4>
  <p>Licensing and Compliance Manager</p>
  </div>
  <div class="staff">
  <h4 id="donald-robertson">Donald Robertson</h4>
  <p>Licensing and Compliance Manager</p>
  </div>
  <div class="staff">
-<p><img alt="Craig Topham" class="image-process-thumb" src="images/staff/derivatives/thumb/craig.jpg"/></p>
+<p><img alt="Craig Topham" class="image-process-thumb" src="images/staff/craig.jpg"></p>
  <h4 id="craig-topham">Craig Topham</h4>
  <p>Copyright and Licensing Associate </p>
  </div>
  <h3 id="campaigns_1">Campaigns</h3>
  <div class="staff">
  <h4 id="craig-topham">Craig Topham</h4>
  <p>Copyright and Licensing Associate </p>
  </div>
  <h3 id="campaigns_1">Campaigns</h3>
  <div class="staff">
-<p><img alt="Molly de Blanc" class="image-process-thumb" src="images/staff/derivatives/thumb/molly.jpg"/></p>
+<p><img alt="Molly de Blanc" class="image-process-thumb" src="images/staff/molly.jpg"></p>
  <h4 id="molly-de-blanc">Molly de Blanc</h4>
  <p>Campaigns Manager</p>
  </div>
  <div class="staff">
  <h4 id="molly-de-blanc">Molly de Blanc</h4>
  <p>Campaigns Manager</p>
  </div>
  <div class="staff">
-<p><img alt="Dana Morgenstein" class="image-process-thumb" src="images/staff/derivatives/thumb/dana.jpg"/></p>
+<p><img alt="Dana Morgenstein" class="image-process-thumb" src="images/staff/dana.jpg"></p>
  <h4 id="dana-morgenstein">Dana Morgenstein</h4>
  <p>Outreach and Communications Coordinator</p>
  </div>
  <h3 id="tech_1">Tech</h3>
  <div class="staff">
  <h4 id="dana-morgenstein">Dana Morgenstein</h4>
  <p>Outreach and Communications Coordinator</p>
  </div>
  <h3 id="tech_1">Tech</h3>
  <div class="staff">
-<p><img alt="Andrew Engelbrecht" class="image-process-thumb" src="images/staff/derivatives/thumb/andrew.jpg"/></p>
+<p><img alt="Andrew Engelbrecht" class="image-process-thumb" src="images/staff/andrew.jpg"></p>
  <h4 id="andrew-engelbrecht">Andrew Engelbrecht</h4>
  <p>Senior Systems Administrator</p>
  </div>
  <div class="staff">
  <h4 id="andrew-engelbrecht">Andrew Engelbrecht</h4>
  <p>Senior Systems Administrator</p>
  </div>
  <div class="staff">
-<p><img alt="Ian Kelling" class="image-process-thumb" src="images/staff/derivatives/thumb/ian.jpg"/></p>
+<p><img alt="Ian Kelling" class="image-process-thumb" src="images/staff/ian.jpg"></p>
  <h4 id="ian-kelling">Ian Kelling</h4>
  <p>Senior Systems Administrator</p>
  </div>
  <div class="staff">
  <h4 id="ian-kelling">Ian Kelling</h4>
  <p>Senior Systems Administrator</p>
  </div>
  <div class="staff">
-<p><img alt="Ruben Rodriguez" class="image-process-thumb" src="images/staff/derivatives/thumb/ruben.jpg"/></p>
+<p><img alt="Ruben Rodriguez" class="image-process-thumb" src="images/staff/ruben.jpg"></p>
  <h4 id="ruben-rodriguez">Rubén Rodríguez</h4>
  <p>Chief Technology Officer </p>
  </div>
  <h3 id="operations">Operations</h3>
  <div class="staff">
  <h4 id="ruben-rodriguez">Rubén Rodríguez</h4>
  <p>Chief Technology Officer </p>
  </div>
  <h3 id="operations">Operations</h3>
  <div class="staff">
-<p><img alt="Matt Lavallee" class="image-process-thumb" src="images/staff/derivatives/thumb/mattlav.jpg"/></p>
+<p><img alt="Matt Lavallee" class="image-process-thumb" src="images/staff/mattlav.jpg"></p>
  <h4 id="matt-lavallee">Matt Lavallee</h4>
  <p>Operations Assistant</p>
  </div>
  <div class="staff">
  <h4 id="matt-lavallee">Matt Lavallee</h4>
  <p>Operations Assistant</p>
  </div>
  <div class="staff">
-<p><img alt="Jeanne Rasata" class="image-process-thumb" src="images/staff/derivatives/thumb/jeanne.jpg"/></p>
+<p><img alt="Jeanne Rasata" class="image-process-thumb" src="images/staff/jeanne.jpg"></p>
  <h4 id="jeanne-rasata">Jeanne Rasata</h4>
  <p>Assistant to the President </p>
  </div>
  </div>
  <h4 id="jeanne-rasata">Jeanne Rasata</h4>
  <p>Assistant to the President </p>
  </div>
  </div>
-</article>
+      </article>
  </div>
  <footer class="bside-footer">
  </div>
  <footer class="bside-footer">
-<img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
-<div>
-<p>Copyright ©  2015–2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
-<p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
-<p>Download the <a href="https://www.fsf.org/annual-reports/fy2017/fsf-report-2017-site.tar.gz">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
-</div>
-<nav>
-<ul class="menu">
-<li><a class="highlight" href="fy2017.html">FY2017 Annual Report</a></li>
-<li><a href="#licensing">Licensing</a></li>
-<li><a href="#campaigns">Campaigns</a></li>
-<li><a href="#tech">Tech</a></li>
-<li><a href="#financials">Financials</a></li>
-<li><a href="#donors">Donors</a></li>
-<li><a href="#associate-membership">Join the FSF</a></li>
-<li><a href="extra/2017.pdf">⬇ PDF</a></li>
-</ul>
-</nav>
+ <img src="theme/fsf-logo.svg" onerror="this.src='images/fsf-logo.png'" alt="Free Software Foundation logo"></p>
+  <div>
+    <p>Copyright &copy;  2015&ndash;2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
+    <p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
+    <p>Download the <a href="https://www.fsf.org/annual-reports/fy2017/fsf-report-2017-site.tar.gz">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
+  </div>
+
+  <nav>
+          <ul class="menu">
+           <li><a class="highlight" href="fy2017.html">FY2017 Annual Report</a></li>
+            <li><a href="#licensing">Licensing</a></li>
+            <li><a href="#campaigns">Campaigns</a></li>
+            <li><a href="#tech">Tech</a></li>
+            <li><a href="#financials">Financials</a></li>
+            <li><a href="#donors">Donors</a></li>
+            <li><a href="#associate-membership">Join the FSF</a></li>
+           <li><a href="extra/2017.pdf">⬇ PDF</a></li>
+          </ul>
+  </nav>
  </footer>
  </footer>
-</body>
+  </body>
  </html>
 \ No newline at end of file
  </html>
 \ No newline at end of file
diff --git a/output/index.html b/output/index.html

index 593c8e3695e8f13e9a162ebec1ab8722e054884f..506701f4d0516e3e942bf548f9300faced2b481d 100644 (file)
--- a/output/index.html
+++ b/output/index.html
@@ -1,74 +1,75 @@
  <!DOCTYPE html>
  <!DOCTYPE html>
-
  <html lang="en">
  <html lang="en">
-<head>
-<title>Free Software Foundation Annual Reports</title>
-<link href="./theme/css/b-side-base.css" rel="stylesheet"/>
-<meta charset="utf-8"/>
-<meta content="width=680" name="viewport"><link href="./theme/css/b-side-wide.css" rel="stylesheet"/><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
-<body>
+  <head>
+    <title>Free Software Foundation Annual Reports</title>
+<link href="./theme/css/b-side-base.css" rel="stylesheet">
+<meta charset="utf-8">
+<meta name="viewport" content="width=680" /><link href="./theme/css/b-side-wide.css" rel="stylesheet"><link href="./theme/css/b-side-post.css" rel="stylesheet">  </head>
+  <body>
  <header class="top-menu no-print">
  <header class="top-menu no-print">
-<nav class="top-menu">
-<ul>
-<li><a href="#">Free Software Foundation Annual Reports</a></li>
-<li><a href="https://my.fsf.org">Join the fsf</a></li>
-</ul>
-</nav>
+  <nav class="top-menu">
+    <ul>
+            <li><a href="#" >Free Software Foundation Annual Reports</a></li>
+            <li><a href="https://my.fsf.org">Join the fsf</a></li>
+    </ul>
+  </nav>
  </header>
  </header>
-<div class="document">
-<div class="index" id="head">
-<img alt="Free Software Foundation logo" class="fsflogo" src="./theme/fsf-logo.svg"/>
-<h1 style="color:#737373">Annual Reports</h1>
-<p>Here you will find the Free Software Foundation's Annual Reports, starting with FY2015.</p><br/>
-</div>
-<section>
-<div class="summarylist">
+  <div class="document">
+  <div id="head" class="index">
+      <img class="fsflogo" alt="Free Software Foundation logo" src="./theme/fsf-logo.svg"/>
+      <h1 style="color:#737373">Annual Reports</h1>
+      <p>Here you will find the Free Software Foundation's Annual Reports, starting with FY2015.</p><br>
+  </div>
+  <section>
+       <div class="summarylist">
  <div class="bside-summary">
  <h2><a href="/FY2020.html" rel="bookmark">Fiscal year 2020</a></h2>
  <ul class="bulletless">
  <div class="bside-summary">
  <h2><a href="/FY2020.html" rel="bookmark">Fiscal year 2020</a></h2>
  <ul class="bulletless">
-<li class="smaller dim"><em><time datetime="2023-06-15T10:20:00-04:00">October 1, 2019 - September 30, 2020</time></em></li>
-<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
+       <li class="smaller dim"><em><time datetime="2023-06-15T10:20:00-04:00">October 1, 2019 - September 30, 2020</time></em></li>
+       <li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
  </ul>
  </div><div class="bside-summary">
  <h2><a href="/FY2019.html" rel="bookmark">Fiscal year 2019</a></h2>
  <ul class="bulletless">
  </ul>
  </div><div class="bside-summary">
  <h2><a href="/FY2019.html" rel="bookmark">Fiscal year 2019</a></h2>
  <ul class="bulletless">
-<li class="smaller dim"><em><time datetime="2023-06-14T10:20:00-04:00">October 1, 2018 - September 30, 2019</time></em></li>
-<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
+       <li class="smaller dim"><em><time datetime="2023-06-14T10:20:00-04:00">October 1, 2018 - September 30, 2019</time></em></li>
+       <li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
  </ul>
  </div><div class="bside-summary">
  <h2><a href="/FY2018.html" rel="bookmark">Fiscal year 2018</a></h2>
  <ul class="bulletless">
  </ul>
  </div><div class="bside-summary">
  <h2><a href="/FY2018.html" rel="bookmark">Fiscal year 2018</a></h2>
  <ul class="bulletless">
-<li class="smaller dim"><em><time datetime="2023-06-13T10:20:00-04:00">October 1, 2017 - September 30, 2018</time></em></li>
-<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
+       <li class="smaller dim"><em><time datetime="2023-06-13T10:20:00-04:00">October 1, 2017 - September 30, 2018</time></em></li>
+       <li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
  </ul>
  </div><div class="bside-summary">
  <h2><a href="/fy2017.html" rel="bookmark">Fiscal year 2017</a></h2>
  <ul class="bulletless">
  </ul>
  </div><div class="bside-summary">
  <h2><a href="/fy2017.html" rel="bookmark">Fiscal year 2017</a></h2>
  <ul class="bulletless">
-<li class="smaller dim"><em><time datetime="2017-12-05T10:20:00-05:00">October 1, 2016 - September 30, 2017</time></em></li>
-<li class="smaller dim"><a href="https://www.fsf.org/annual-reports/fy2017/fsf-report-2017-site.tar.gz">Sources and materials</a></li>
+       <li class="smaller dim"><em><time datetime="2017-12-05T10:20:00-05:00">October 1, 2016 - September 30, 2017</time></em></li>
+       <li class="smaller dim"><a href="https://www.fsf.org/annual-reports/fy2017/fsf-report-2017-site.tar.gz">Sources and materials</a></li>
  </ul>
  </div><div class="bside-summary">
  <h2><a href="https://static.fsf.org/nosvn/annual-reports/FY16_LR.pdf" rel="bookmark">Fiscal year 2016</a></h2>
  <ul class="bulletless">
  </ul>
  </div><div class="bside-summary">
  <h2><a href="https://static.fsf.org/nosvn/annual-reports/FY16_LR.pdf" rel="bookmark">Fiscal year 2016</a></h2>
  <ul class="bulletless">
-<li class="smaller dim"><em><time datetime="2016-12-05T10:20:00-05:00">October 1, 2015 - September 30, 2016</time></em></li>
-<li class="smaller dim"><a href="https://static.fsf.org/nosvn/annual-reports/Annual_Report_FY16_source_files.tar.gz">Sources and materials</a></li>
+       <li class="smaller dim"><em><time datetime="2016-12-05T10:20:00-05:00">October 1, 2015 - September 30, 2016</time></em></li>
+       <li class="smaller dim"><a href="https://static.fsf.org/nosvn/annual-reports/Annual_Report_FY16_source_files.tar.gz">Sources and materials</a></li>
  </ul>
  </div><div class="bside-summary">
  <h2><a href="https://static.fsf.org/nosvn/annual-reports/FY2015_annual_report_LR.pdf" rel="bookmark">Fiscal year 2015</a></h2>
  <ul class="bulletless">
  </ul>
  </div><div class="bside-summary">
  <h2><a href="https://static.fsf.org/nosvn/annual-reports/FY2015_annual_report_LR.pdf" rel="bookmark">Fiscal year 2015</a></h2>
  <ul class="bulletless">
-<li class="smaller dim"><em><time datetime="2015-12-05T10:20:00-05:00">October 1, 2014 - September 30, 2015</time></em></li>
-<li class="smaller dim"><a href="https://static.fsf.org/nosvn/annual-reports/fy15-report.tar">Sources and materials</a></li>
+       <li class="smaller dim"><em><time datetime="2015-12-05T10:20:00-05:00">October 1, 2014 - September 30, 2015</time></em></li>
+       <li class="smaller dim"><a href="https://static.fsf.org/nosvn/annual-reports/fy15-report.tar">Sources and materials</a></li>
  </ul>
  </ul>
-</div> </div>
-</section>
-</div>
+</div>         </div>
+  </section>
+  </div>
+
  <footer class="bside-footer">
  <footer class="bside-footer">
-<img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
-<div>
-<p>Copyright ©  2015–2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
-<p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
-<p>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
-</div>
+ <img src="theme/fsf-logo.svg" onerror="this.src='images/fsf-logo.png'" alt="Free Software Foundation logo"></p>
+  <div>
+    <p>Copyright &copy;  2015&ndash;2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
+    <p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
+    <p>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
+  </div>
+
  </footer>
  </footer>
-</body>
+  </body>
  </html>
 \ No newline at end of file
  </html>
 \ No newline at end of file
author	Devin Ulibarri <devinu@fsf.org>
	Fri, 17 Nov 2023 22:18:30 +0000 (17:18 -0500)
committer	Devin Ulibarri <devinu@fsf.org>
	Fri, 17 Nov 2023 22:18:30 +0000 (17:18 -0500)
output/FY2018.html		patch \| blob \| blame \| history
output/FY2019.html		patch \| blob \| blame \| history
output/FY2020.html		patch \| blob \| blame \| history
output/author/free-software-foundation.html		patch \| blob \| blame \| history
output/fy2015.html		patch \| blob \| blame \| history
output/fy2016.html		patch \| blob \| blame \| history
output/fy2017.html		patch \| blob \| blame \| history
output/index.html		patch \| blob \| blame \| history