Merge branch 'stable' into 2022-dev

Getting ready to merge from 2022-dev back into stable, to go live

diff --cc 2022/includes/home-content.html
index b9c33354b2d5086bcdf098337fa6bbf5d464bf56,99806b96e4d3df6f033e3021542958e2fc755a7e..c167ec8943fb3f2e6fcf098ffd0a491fffb57805
--- 1/2022/includes/home-content.html
--- 2/2022/includes/home-content.html
+++ b/2022/includes/home-content.html
@@@ -1,6 -1,4 +1,6 @@@
 -<p>LibrePlanet (March 19&20, online) is the annual conference hosted by the Free Software Foundation. LibrePlanet provides an opportunity for community activists, domain experts, and people seeking solutions for themselves to come together in order to discuss current issues in technology and ethics.</p>
 +<h3>About LibrePlanet</h3>
 +
- <p>LibrePlanet is the annual conference hosted by the Free Software Foundation. LibrePlanet provides an opportunity for community activists, domain experts, and people seeking solutions for themselves to come together in order to discuss current issues in technology and ethics.</p>
++<p>LibrePlanet (March 19 &amp; 20, online) is the annual conference hosted by the Free Software Foundation. LibrePlanet provides an opportunity for community activists, domain experts, and people seeking solutions for themselves to come together in order to discuss current issues in technology and ethics.</p>
  
  <p>This year's LibrePlanet theme is <strong>"Living Liberation"</strong>. LibrePlanet speakers will urge people to continue to make free software part of their daily lives, one decision at a time. All of us communicate the importance of technological freedom, both in terms of educating newcomers about the crucial implications of the free software philosophy, and sustaining all those who contribute to the liberation of technology.</p>