Merge branch 'main' into 'main'

Updated FAQ to 10Gbit

See merge request !3

docs/faq.md

@@ -69,8 +69,8 @@ Yes, see GSM.
 
 ## Network
 
-### Will there be Gigabit Ethernet in the Datenklo?
-Yes. In the current network-planning each Datenklo will have gigabit copper ports available for end-users. Do you need fibre uplink and/or 10GbE uplink? This is available in very limited supply, please contact the NOC in advance via [TODO]. Please send your requests in English.
+### Will there be (Ten)Gigabit Ethernet in the Datenklo?
+Yes. In the current network-planning each Datenklo will have 100BASE-TX/1000BASE-T/10GBASE-T ethernet ports available for end-users. Do you need fibre uplink? This is available in very limited supply, please contact the NOC in advance via [TODO]. Please send your requests in English.
 
 ## Power