Change name of surfnet to SURF or SURFconext

pages/en/issuance-surfconext.md

@@ -45,7 +45,7 @@ At this stage this attribute issuance is available only for students
 and staff members of a limited number of institutions in higher
 education in the Netherlands. Are you studying or working at such an
 institution but does your institution not occur in the list at the <a
-href="/uitgifte/surfnet?action=login">SURFconext
+href="/uitgifte/surfconext?action=login">SURFconext
 issuance page</a>? This means that your institution has not "switched
 on" the connection to the foundation <a
 href="https://privacybydesign.foundation/en">Privacy by Design</a>.

pages/en/issuance.md

@@ -52,7 +52,7 @@ Attributes (differs per network): first name, family name, email address, birth
 
 **Attributes via your educational institution**  
 Attributes: given name, family name, email address, institution, staff/student, local registration number  
-<a class="button" href="/issuance/surfnet/edugain">
+<a class="button" href="/issuance/surfconext/edugain">
 <img src="/images/edugain.png">Load attributes via eduGAIN</a>  
 Notice: this is an experimental service. We appreciate any feedback at irma 'at' privacybydesign.foundation, preferably with screenshots if something goes wrong.
 
@@ -79,8 +79,8 @@ Attributes: name, birth date, sex, address, zip code, city, BSN
 
 **Attributes via your dutch educational institute**  
 Attributes: given name, family name, email address, institution, staff/student, local registration number  
-<a class="button" href="/issuance/surfnet?action=login">
-<img src="/images/surfnet.png">Load attributes via SURFconext</a>  
+<a class="button" href="/issuance/surfconext?action=login">
+<img src="/images/surfconext.png">Load attributes via SURFconext</a>  
 [More information](/issuance-surfconext)
 
 **Attributen via the AGB-register --- issued by the foundation [nuts.nl](https://nuts.nl) from Vektis**  

pages/meetings.md

@@ -19,8 +19,8 @@ atmosphere is open and very much content-oriented.
 
  * **Online location:** [IRMA-meet](https://www.irma-meet.nl/).
 
- * **Physical location:** SURFnet, Hoog Overborch (Hoog Catharijne), Utrecht
-   [route](https://www.surf.nl/over-surf/contact/routebeschrijving-surf-surfmarket-en-surfnet/index.html),
+ * **Physical location:** SURF, Hoog Overborch (Hoog Catharijne), Utrecht
+   [route](https://www.surf.nl/contact-en-support/contact-met-surf),
    about 5 min. walking distance from Utrecht Central train station.
 
  * **Language:** mix of English and Dutch, depending on speaker and

pages/pages-root-folder/index-en.md

@@ -78,7 +78,7 @@ other parties, among which:
     encryption possible with identity-based
     cryptography'](https://www.ngi.eu/news/2019/08/20/user-friendly-email-encryption-possible-with-identity-based-cryptography/)
 
- * [SURFnet](https://www.surf.nl/en/services-and-products/surfconext/index.html),
+ * [SURF](https://www.surf.nl/en/services-and-products/surfconext/index.html),
    for issuing and verifying of attributes through SURFconext.
 
  * [Nuts](https://nuts.nl), for an open infrastructure in healthcare,

pages/pages-root-folder/index.md

@@ -64,8 +64,8 @@ verschillende andere partijen, waaronder in het bijzonder:
    with identity-based
    cryptography'](https://www.ngi.eu/news/2019/08/20/user-friendly-email-encryption-possible-with-identity-based-cryptography/).
 
- * [SURFnet](https://www.surfnet.nl), voor uitgifte en controle van
-   attributen via [surfconext](https://www.surfconext.nl);
+ * [SURF](https://www.surf.nl), voor uitgifte en controle van
+   attributen via [SURFconext](https://www.surfconext.nl);
 
  * [Nuts](https://nuts.nl), voor een open infrastructuur in de zorg,
    zie ook de portal voor zorgverleners

pages/uitgifte-surfconext.md

@@ -45,7 +45,7 @@ Vooralsnog is deze attribuut uitgifte via surfconext alleen
 beschikbaar voor studenten en medewerkers van een beperkt aantal
 instellingen in het hoger onderwijs.  Studeert of werkt u aan zo'n
 instelling, maar komt deze niet voor in de lijst op de <a
-href="/uitgifte/surfnet?action=login">SURFconext
+href="/uitgifte/surfconext?action=login">SURFconext
 uitgifte pagina</a>, dan heeft uw instelling de aansluiting met de
 stichting <a href="https://privacybydesign.foundation/">Privacy by
 Design</a> niet "aangezet". In dat geval kunt u geen attributen via

pages/uitgifte.md

@@ -60,13 +60,13 @@ Verkrijg (enige variatie per netwerk): voornaam, achternaam, e-mailadres, geboor
 
 **Attributen via uw (Nederlandse) onderwijsinstelling**  
 Verkrijg: voornaam, achternaam, emailadres, instelling, medewerker/student, lokaal registratienummer  
-<a class="button" href="/uitgifte/surfnet">
-<img src="/images/surfnet.png">Laad attributen via SURFconext</a>  
+<a class="button" href="/uitgifte/surfconext">
+<img src="/images/surfconext.png">Laad attributen via SURFconext</a>  
 [Meer informatie](/uitgifte-surfconext)
 
 **Attributen via uw (internationale) onderwijsinstelling**  
 Verkrijg: voornaam, achternaam, emailadres, instelling, medewerker/student, lokaal registratienummer  
-<a class="button" href="/uitgifte/surfnet/edugain">
+<a class="button" href="/uitgifte/surfconext/edugain">
 <img src="/images/edugain.png">Laad attributen via eduGAIN</a>  
 Opmerking: dit is een experimentele aansluiting. We ontvangen graag feedback op irma 'at' privacybydesign.foundation.
 <!-- [Meer informatie](/uitgifte-surfconext) -->