Merge branch 'main' into 'main'

Some network-related changes.

See merge request infra/static-pages/camp2023-infos!49

docs/faq.md

@@ -132,8 +132,10 @@ Yes, see GSM.
 
 ## Network
 
+As usual there will be wired and wireless networks with speeds up to 10G available. See the main [Network](network.md) page for more details.
+
 ### 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 hello@c3noc.net. Please send your requests in English.
+Yes. In the current network-planning each Datenklo will have 100BASE-TX/1000BASE-T/10GBASE-T ethernet ports available for end-users. 
 
 ## Power
 

docs/network.md

 # Network
 
+As usual, we will provide a fast wired and wireless network.
+
 ## Rules of Conduct
 
  * Be fair! Do not do to others what you do not wish done to yourself!🌈
@@ -24,6 +26,8 @@ Optionally, bring & connect a small ethernet switch when connecting multiple dev
 
 Wired connections are unfiltered. If you have (older) devices that cannot be trusted with unrestricted incoming connections, bring a router or firewall (and disable the wifi!). 
 
+We don't have (m)any fibre/SFP+ ports available in the DKs this time. 
+
 ## Wireless
 
 You can't live without wireless access, so we've built an awesome wireless network again. 
@@ -94,6 +98,10 @@ To keep the wireless working for you, keep a few things in mind:
 
 There will unfortunately be no co-location service at Camp. You are welcome to host a server in your tent/village and you can get a 10-gigabit copper uplink from one of the nearby datenklos.
 
+## Special requests
+
+Do you have some special requirements not listed above? We can try to help! You can contact us in English via hello@c3noc.net.
+
 ## Supporters
 
 This is a list of companies providing network hardware and connectivity services. The event would not have been possible without their support (and a few unlisted), and we thank them for it.