partners update

- DG-i don't currently provide hardware
- fastly fronts security.debian.org
- leaseweb upgraded storage this year
- there hasn't been a separate experimental buildd network at man-da for a long time
- move Telegraaf to the "old partners" section
- delete unreferenced sponsor logos
- add missing ampere logo for 2020

13 files changed, 23 insertions, 30 deletions

diff --git a/english/partners/2020/images/ampere.jpg b/english/partners/2020/images/ampere.jpg
new file mode 100644
index 00000000000..fa198a07b45
--- /dev/null
+++ b/english/partners/2020/images/ampere.jpg
diff --git a/english/partners/2020/images/freenode.png b/english/partners/2020/images/freenode.png
deleted file mode 100644
index f9351a96ca2..00000000000
--- a/english/partners/2020/images/freenode.png
+++ /dev/null
diff --git a/english/partners/2020/images/opensourcepress.png b/english/partners/2020/images/opensourcepress.png
deleted file mode 100644
index 1a20b3efc0c..00000000000
--- a/english/partners/2020/images/opensourcepress.png
+++ /dev/null
diff --git a/english/partners/2020/images/progeny.png b/english/partners/2020/images/progeny.png
deleted file mode 100644
index b21aeef38e5..00000000000
--- a/english/partners/2020/images/progeny.png
+++ /dev/null
diff --git a/english/partners/2020/images/sun.png b/english/partners/2020/images/sun.png
deleted file mode 100644
index 855d13dfba7..00000000000
--- a/english/partners/2020/images/sun.png
+++ /dev/null
diff --git a/english/partners/2020/images/tmi_logo.png b/english/partners/2020/images/tmi_logo.png
deleted file mode 100644
index c57473b9045..00000000000
--- a/english/partners/2020/images/tmi_logo.png
+++ /dev/null
diff --git a/english/partners/2020/images/valogo.jpg b/english/partners/2020/images/valogo.jpg
deleted file mode 100644
index 6bbc4fee29e..00000000000
--- a/english/partners/2020/images/valogo.jpg
+++ /dev/null
diff --git a/english/partners/2020/partners.data b/english/partners/2020/partners.data
index e9396c7e513..cfe1ca1be58 100644
--- a/english/partners/2020/partners.data
+++ b/english/partners/2020/partners.data
@@ -220,17 +220,6 @@
 
  <hr>
  
- <div id="Telegraaf">
- <partnerlogo "Telegraaf Media ICT BV" tmi_logo.png "https://www.telegraaf.nl/">
- <partnerdesc>
- <telegraaf1>
- <telegraaf2>
- <telegraaf3>
- </partnerdesc>
- </div>
-
- <hr>
- 
  <div id="Thomas-Krenn">
  <partnerlogo "Thomas-Krenn.AG" thomas-krenn.png "https://www.thomas-krenn.com/">
  <partnerdesc>
diff --git a/english/partners/images/freenode.png b/english/partners/images/freenode.png
deleted file mode 100644
index f9351a96ca2..00000000000
--- a/english/partners/images/freenode.png
+++ /dev/null
diff --git a/english/partners/images/progeny.png b/english/partners/images/progeny.png
deleted file mode 100644
index b21aeef38e5..00000000000
--- a/english/partners/images/progeny.png
+++ /dev/null
diff --git a/english/partners/images/sun.png b/english/partners/images/sun.png
deleted file mode 100644
index 855d13dfba7..00000000000
--- a/english/partners/images/sun.png
+++ /dev/null
diff --git a/english/partners/images/valogo.jpg b/english/partners/images/valogo.jpg
deleted file mode 100644
index 6bbc4fee29e..00000000000
--- a/english/partners/images/valogo.jpg
+++ /dev/null
diff --git a/english/partners/partners.def b/english/partners/partners.def
index fa9bef74db9..d179cb4a662 100644
--- a/english/partners/partners.def
+++ b/english/partners/partners.def
@@ -77,9 +77,10 @@
  </define-tag> 
  
 ## dg-i
+# last update: 2020/11/26
  
  <define-tag dg-i1 whitespace=delete> 
- <p><gettext domain="partners"><a href="http://www.dg-i.net/">DG-i</a> provides the Debian project with hardware and hosting services from their colocation sites via high-speed connection. <a href="https://wiki.debian.org">wiki.debian.org</a> received an IBM x360 server. </gettext></p> 
+ <p><gettext domain="partners"><a href="http://www.dg-i.net/">DG-i</a> provides the Debian project with hosting services from their colocation sites via high-speed connection.</gettext></p> 
 </define-tag> 
  
  <define-tag dg-i2 whitespace=delete> 
@@ -96,10 +97,10 @@
  </define-tag> 
  
 ## Fastly
-# last update: 2017/11/25 (New addition)
+# last update: 2020/11/26
  
  <define-tag fastly1 whitespace=delete>
- <p><gettext domain="partners"><a href="https://www.fastly.com/">Fastly</a> provides Debian with content delivery network (CDN) services and is helping us deliver packages to users through <a href="https://deb.debian.org/">deb.debian.org</a>.</gettext></p> \
+ <p><gettext domain="partners"><a href="https://www.fastly.com/">Fastly</a> provides Debian with content delivery network (CDN) services and is helping us deliver packages to users through <a href="https://deb.debian.org/">deb.debian.org</a> and <a href="http://security.debian.org">security.debian.org</a>.</gettext></p>
  </define-tag> 
  <define-tag fastly2 whitespace=delete> 
  <p><gettext domain="partners">Fastly’s edge cloud platform provides advanced application delivery and cloud security for the world’s most popular online destinations. Fastly works with the best of the Internet, serving 14 trillion requests each month, more than 10 percent of all internet requests.</gettext></p> 
@@ -146,10 +147,10 @@
  
 ## Leaseweb
 # date added: 2017/05/20
-# last update: 2017/05/20
+# last update: 2020/11/26
  
  <define-tag leaseweb1 whitespace=delete>
- <p><gettext domain="partners"><a href="https://www.leaseweb.com/">LeaseWeb</a> has been one of two partners that provide the infrastructure for the <a href="https://snapshot.debian.org">Debian OS Snapshot Archive</a> since <a href="https://www.debian.org/News/2014/20141014">October 2014</a>, providing 80 Terabytes (TB) of capacity. In 2017 they renewed their support by provisioning two additional dedicated servers that expanded the storage at their location by 50%, enough to accommodate anticipated growth for years to come.</gettext></p> \
+ <p><gettext domain="partners"><a href="https://www.leaseweb.com/">LeaseWeb</a> has been one of two partners that provide the infrastructure for the <a href="https://snapshot.debian.org">Debian OS Snapshot Archive</a> since <a href="https://www.debian.org/News/2014/20141014">October 2014</a>, providing 300 Terabytes (TB) of capacity. In 2020 they renewed their support by provisioning new dedicated servers with bigger disk drives, enough to accommodate anticipated growth for years to come.</gettext></p> \
  </define-tag> 
  <define-tag leaseweb2 whitespace=delete> 
  <p><gettext domain="partners">LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering customers on-demand, world-class hosting solutions, from dedicated servers to cloud solutions. You can learn more about LeaseWeb visiting their <a href="https://www.leaseweb.com/">website</a>.</gettext></p> 
@@ -165,9 +166,10 @@
  </define-tag> 
 
 ## Man-Da 
+# last update: 2020/11/26
  
   <define-tag man-da1 whitespace=delete> 
-<p><gettext domain="partners"><a href="http://www.man-da.de/">man-da.de GmbH</a> is the backbone provider of the Metropolitan Area Network Darmstadt. It is supporting Debian by hosting several debian.org and debian.net servers as well as the buildd network for experimental and debconf.org machines.</gettext></p> 
+<p><gettext domain="partners"><a href="http://www.man-da.de/">man-da.de GmbH</a> is the backbone provider of the Metropolitan Area Network Darmstadt. It is supporting Debian by hosting several debian.org and debian.net servers.</gettext></p> 
 </define-tag> 
  
  <define-tag man-da2 whitespace=delete> 
@@ -176,7 +178,6 @@
 
 ## OSUOSL
 # last update: 2017/06/23 (new logo)
-# partner of the month 20170812 - until November 2017
 
 <define-tag osuosl1 whitespace=delete> 
  <p><gettext domain="partners"><a href="http://osuosl.org/">The Oregon State University Open Source Lab</a> provides hosting and administration services to the Debian project.</gettext></p> 
@@ -216,18 +217,6 @@
  <p><gettext domain="partners">StackPath is a platform of secure edge services that enables developers to protect, accelerate, and innovate cloud properties ranging from websites to media delivery and IoT services.</gettext></p>
  </define-tag>
 
-## Telegraaf
- 
- <define-tag telegraaf1 whitespace=delete> 
- <p><gettext domain="partners"><a href="http://www.telegraaf.nl/">Telegraaf Media ICT BV</a> is supporting the Debian community by donating hardware, rackspace and bandwidth for the Debian server hosting alioth, arch and svn.</gettext></p> 
-</define-tag> 
- <define-tag telegraaf2 whitespace=delete> 
- <p><gettext domain="partners">Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins are highly motivated Debian users and some of them also Debian maintainers.</gettext></p> 
-</define-tag> 
- <define-tag telegraaf3 whitespace=delete> 
- <p><gettext domain="partners">Telegraaf Media Group runs some of the most popular Dutch websites (http://www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as the two biggest newspapers in The Netherlands.</gettext></p> 
-</define-tag> 
- 
 ## Thomas Krenn
  
  <define-tag thomaskrenn1 whitespace=delete> 
@@ -336,3 +325,18 @@
  <define-tag simtec2 whitespace=delete> 
  <p><gettext domain="partners">Simtec is a leading provider of ARM based computing products. We have a range of <a href="http://www.simtec.co.uk/products/boards.html">boards</a> which serve a wide range of uses within the embedded market. We provide a complete range of products and solutions which can be tailored to suit the customers needs from off the shelf integrator solutions right through to fully custom designs. All of our products ship with open source tools and operating systems.</gettext></p> 
  </define-tag> 
+
+
+## Telegraaf
+# last update: 2020/11/26 - removal
+ 
+ <define-tag telegraaf1 whitespace=delete> 
+ <p><gettext domain="partners"><a href="http://www.telegraaf.nl/">Telegraaf Media ICT BV</a> is supporting the Debian community by donating hardware, rackspace and bandwidth for the Debian server hosting alioth, arch and svn.</gettext></p> 
+</define-tag> 
+ <define-tag telegraaf2 whitespace=delete> 
+ <p><gettext domain="partners">Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins are highly motivated Debian users and some of them also Debian maintainers.</gettext></p> 
+</define-tag> 
+ <define-tag telegraaf3 whitespace=delete> 
+ <p><gettext domain="partners">Telegraaf Media Group runs some of the most popular Dutch websites (http://www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as the two biggest newspapers in The Netherlands.</gettext></p> 
+</define-tag> 
+