update list of sponsors, add logo's and link to the nlnet projects

README.md

@@ -125,17 +125,21 @@ It is important to run with docker host networking, so mox can use the public
 IPs and has correct remote IP information for incoming connections (important
 for junk filtering and rate-limiting).
 
-# Future/development
+# Development
 
 See develop.txt for instructions/tips for developing on mox.
 
-Mox will receiving funding in 2024 and 2025 through NLnet/EU's NGI0 Zero Core,
+# Sponsors
-see https://nlnet.nl/project/Mox-Automation/.
 
-Mox received funding in 2023 and 2024 through NLnet/EU's NGI0 Entrust, see
+Thanks to NLnet foundation, the European Commission's NGI programme, and the
-https://nlnet.nl/project/Mox/.
+Netherlands Ministry of the Interior and Kingdom Relations for financial
+support:
 
-## Roadmap
+- 2024/2025, NLnet NGI0 Zero Core, https://nlnet.nl/project/Mox-Automation/
+- 2024, NLnet e-Commons Fund, https://nlnet.nl/project/Mox-API/
+- 2023/2024, NLnet NGI0 Entrust, https://nlnet.nl/project/Mox/
+
+# Roadmap
 
 - "mox setup" command, using admin web interface for interactive setup
 - Automate DNS management, for setup and maintenance, such as DANE/DKIM key rotation
@@ -177,9 +181,9 @@ There are many smaller improvements to make as well, search for "todo" in the co
 There is currently no plan to implement the following. Though this may
 change in the future.
 
-- Functioning as SMTP relay
+- Functioning as an SMTP relay without authentication
 - POP3
-- Delivery to (unix) OS system users
+- Delivery to (unix) OS system users (mbox/Maildir)
 - Support for pluggable delivery mechanisms
 
 

genwebsite.sh

@@ -24,7 +24,7 @@ mkdir html/features
 (
 	cat features/index.md
 	echo
-	sed -n -e '/# FAQ/q' -e '/## Roadmap/,/# FAQ/p' < ../README.md
+	sed -n -e 's/^# Roadmap/## Roadmap/' -e '/# FAQ/q' -e '/# Roadmap/,/# FAQ/p' < ../README.md
 	echo
 	echo 'Also see the [Protocols](../protocols/) page for implementation status, and (non)-plans.'
 ) | go run website.go 'Features' >html/features/index.html

website/index.md

@@ -69,6 +69,7 @@ Not ready for a full setup yet? Try mox in less than a minute:
 localserve". It serves a local-only SMTP/IMAP/Webmail/etc for testing and
 development. No setup required.
 
+
 ## Background
 
 Work on mox started in 2021. Admins were migrating their emails to just a few
@@ -85,8 +86,16 @@ single easy to use and maintain application.
 
 ## Sponsors
 
-Mox will receiving funding in 2024 and 2025 through NLnet/EU's NGI0 Zero Core,
+Thanks to [NLnet foundation](https://nlnet.nl/), the European Commission's
-see https://nlnet.nl/project/Mox-Automation/.
+[NGI](https://ngi.eu) programme, and the Netherlands Ministry of the Interior
+and Kingdom Relations for financial support:
 
-Mox received funding in 2023 and 2024 through NLnet/EU's NGI0 Entrust, see
+- [2024/2025](https://nlnet.nl/project/Mox-Automation/), NLnet NGI0 Zero Core
-https://nlnet.nl/project/Mox/.
+- [2024](https://nlnet.nl/project/Mox-API/), NLnet e-Commons Fund
+- [2023/2024](https://nlnet.nl/project/Mox/), NLnet NGI0 Entrust
+
+<div class="logos">
+<a href="https://nlnet.nl/entrust/"><img src="files/ngi0entrust.svg" alt="Logo of NGI Zero Entrust" /></a>
+<a href="https://nlnet.nl/core/"><img src="files/ngi0core.svg" alt="Logo of NGI Zero Core" /></a>
+<a href="https://www.government.nl/ministries/ministry-of-the-interior-and-kingdom-relations"><img src="files/minbzk.svg" alt="Logo of financial supporter Netherlands Ministry of the Interior and Kingdom Relations" /></a>
+</div>

website/website.go

@@ -443,6 +443,8 @@ h2 { background: linear-gradient(90deg, #6dd5fd 0%, #77e8e3 100%); display: inli
 .two > div { flex-basis: 50%; max-width: 50em; }
 .toc { display: flex; gap: 2em; margin-bottom: 3ex; }
 .toc ul { margin-bottom: 0; }
+.logos { text-align: center; }
+.logos img { max-height: 50px; max-width: 120px; display: inline-block; vertical-align: top; }
 
 @media (min-width:1025px) {
 	.nav { box-shadow: inset 0 0 10px rgba(0, 0, 0, 0.075); min-height: 100vh; }