From 88464588edd9f60b54f53817d66341b4a266908f Mon Sep 17 00:00:00 2001 From: Jeltz Date: Wed, 3 Nov 2021 11:52:34 +0100 Subject: [PATCH 1/8] Replace 'WiFi' with 'Wi-Fi' --- content/connection.en.md | 32 ++++++++++++++++---------------- content/connection.fr.md | 32 ++++++++++++++++---------------- content/faq.en.md | 6 +++--- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/content/connection.en.md b/content/connection.en.md index dedcb72..3392c61 100644 --- a/content/connection.en.md +++ b/content/connection.en.md @@ -6,7 +6,7 @@ menu: toc: true --- -The WiFi network at Aurore is protected by `WPA2-Enterprise` authentication +The Wi-Fi network at Aurore is protected by `WPA2-Enterprise` authentication and the wired network is protected by an authentication by captive portal. In both cases the connection requires a login and a password. @@ -39,9 +39,9 @@ a new machine: at the first connection
-## WiFi on Windows 8, 8.1, 10 and 11 +## Wi-Fi on Windows 8, 8.1, 10 and 11 -Select the WiFi network `Aurore`, and enter your login and password directly. +Select the Wi-Fi network `Aurore`, and enter your login and password directly. You should have Internet access in less than 10 minutes. If you have a security alert regarding our certificates, @@ -49,7 +49,7 @@ ignore it the first time you connect and validate the certificate.
-## WiFi on Windows XP, Vista ou 7 +## Wi-Fi on Windows XP, Vista ou 7
@@ -68,9 +68,9 @@ they are no longer secure and cause security problems for the network.
-## WiFi on MacOS +## Wi-Fi on MacOS -Select the WiFi network `Aurore` +Select the Wi-Fi network `Aurore` and enter your login and password directly. You should have Internet access in less than 10 minutes. @@ -78,9 +78,9 @@ You should have Internet access in less than 10 minutes.
-## WiFi on Android +## Wi-Fi on Android -Select the WiFi network `Aurore`. +Select the Wi-Fi network `Aurore`. Please choose: @@ -94,9 +94,9 @@ You should have Internet access in less than 10 minutes.
-## WiFi on iOS +## Wi-Fi on iOS -Select the WiFi network `Aurore` +Select the Wi-Fi network `Aurore` and enter your login and password directly. You should have Internet access in less than 10 minutes. @@ -106,10 +106,10 @@ At the first connection the device asks you to rely on our certificate.
-## WiFi on Linux +## Wi-Fi on Linux The vast majority of Linux distributions (Ubuntu, Debian, Fedora...) -use the NetworkManager tool to manage the WiFi connection. +use the NetworkManager tool to manage the Wi-Fi connection. Select the wifi network `Aurore` then : @@ -125,13 +125,13 @@ You should have Internet access in less than 10 minutes.
-## WiFi on other devices +## Wi-Fi on other devices For game consoles, the vast majority (Xbox, Playstation, Nintendo Switch...) do not support `WPA2-Enterprise`. If you wish to connect this device, then you must either go through -the Ethernet cable, or buy a WiFi router that you plug into the Ethernet port -of your room to have your own WiFi network. +the Ethernet cable, or buy a Wi-Fi router that you plug into the Ethernet port +of your room to have your own Wi-Fi network. The advantage of a router is to create your own private network, isolating your other users' home devices. @@ -160,7 +160,7 @@ You should also receive an email notification.
If you have a machine that can't surf the Internet - (e.g. a WiFi router), then you will need to manually create your + (e.g. a Wi-Fi router), then you will need to manually create your wired machine. Get the MAC address of your machine, then log in to the intranet. diff --git a/content/connection.fr.md b/content/connection.fr.md index 7aac596..716f11c 100644 --- a/content/connection.fr.md +++ b/content/connection.fr.md @@ -6,7 +6,7 @@ menu: toc: true --- -Le WiFi à Aurore est protégé par une authentification `WPA2-Entreprise` +Le Wi-Fi à Aurore est protégé par une authentification `WPA2-Entreprise` et la connexion filaire est protégée par une authentification par portail captif. Dans les deux cas la connexion requiert un identifiant et un mot de passe. @@ -40,9 +40,9 @@ une nouvelle machine : à la première connexion,
-## WiFi sur Windows 8, 8.1, 10 et 11 +## Wi-Fi sur Windows 8, 8.1, 10 et 11 -Sélectionnez le réseau WiFi `Aurore`, et entrez directement vos identifiants. +Sélectionnez le réseau Wi-Fi `Aurore`, et entrez directement vos identifiants. Vous devriez bénéficier d'un accès Internet en moins de 10 minutes. Si vous avez une alerte de sécurité concernant nos certificats, @@ -50,7 +50,7 @@ ignorez la à la première connexion et validez le certificat.
-## WiFi sur Windows XP, Vista ou 7 +## Wi-Fi sur Windows XP, Vista ou 7
@@ -72,18 +72,18 @@ données et que vous signiez une décharge.
-## WiFi sur MacOS +## Wi-Fi sur MacOS -Sélectionnez le réseau WiFi `Aurore` et entrez directement vos identifiants. +Sélectionnez le réseau Wi-Fi `Aurore` et entrez directement vos identifiants. Vous devriez bénéficier d'un accès Internet en moins de 10 minutes. {{< figure src="../../images/content/wifi-macos.png" title="" >}}
-## WiFi sur Android +## Wi-Fi sur Android -Sélectionnez le réseau WiFi `Aurore`. +Sélectionnez le réseau Wi-Fi `Aurore`. Choisissez : @@ -97,9 +97,9 @@ Vous devriez bénéficier d'un accès Internet en moins de 10 minutes.
-## WiFi sur iOS +## Wi-Fi sur iOS -Sélectionnez le réseau WiFi `Aurore` et entrez directement vos identifiants. +Sélectionnez le réseau Wi-Fi `Aurore` et entrez directement vos identifiants. Vous devriez bénéficier d'un accès Internet en moins de 10 minutes. À la première connexion l'appareil vous demande de vous fier à notre certificat. @@ -108,10 +108,10 @@ Vous devriez bénéficier d'un accès Internet en moins de 10 minutes.
-## WiFi sur une distribution Linux +## Wi-Fi sur une distribution Linux La grande majorité des distributions Linux (Ubuntu, Debian, Fedora...) -utilise l'outil NetworkManager pour gérer la connexion WiFi. +utilise l'outil NetworkManager pour gérer la connexion Wi-Fi. Sélectionnez le réseau wifi `Aurore` puis : @@ -127,13 +127,13 @@ Vous devriez bénéficier d'un accès Internet en moins de 10 minutes.
-## WiFi sur les autres périphériques +## Wi-Fi sur les autres périphériques Pour les consoles de jeux, la grande majorité (Xbox, Playstation, Nintendo Switch...) ne supportent pas le `WPA2-Entreprise`. Si vous souhaitez connecter ce périphérique, alors il faut soit passer par -le câble Ethernet, soit acheter un routeur WiFi que vous branchez dans -votre chambre pour avoir votre propre réseau WiFi. +le câble Ethernet, soit acheter un routeur Wi-Fi que vous branchez dans +votre chambre pour avoir votre propre réseau Wi-Fi. L'avantage d'un routeur est de créer votre propre réseau privé, isolant votre périphérique domestique des autres usagers. @@ -164,7 +164,7 @@ Vous devriez également recevoir une notification par courriel.
Si vous avez une machine qui ne peut pas naviguer sur Internet - (par exemple un routeur WiFi), alors vous devrez créer manuellement votre + (par exemple un routeur Wi-Fi), alors vous devrez créer manuellement votre machine filaire. Munissez-vous de l'adresse MAC de votre machine, puis connectez-vous à l'intranet. diff --git a/content/faq.en.md b/content/faq.en.md index fd227f5..b69a273 100644 --- a/content/faq.en.md +++ b/content/faq.en.md @@ -121,7 +121,7 @@ You should know that our network identifies devices by their MAC address, normal If you have any doubts, we advise you to change your password. If the notifications about added machines keep coming back, this is undoubtedly the first option and you can rest easy. If they stop quickly, then you've kicked someone out and you can rest easy too. :smile: Don't forget, what happens with **your** account is **your** legal and technical responsibility, even if you lend it out. -### I want to manage my WiFi or wired machines. +### I want to manage my Wi-Fi or wired machines. Directly on [the intranet](https://intranet.auro.re/users/mon_profil/). @@ -135,11 +135,11 @@ Former members can still use all the services for life, except for the Internet ### Is there a Aurore box? -We do not offer an Internet box. Each Crous room is already equipped with an RJ45 socket to which you can plug in your computer and WiFi is available from terminals throughout the buildings. +We do not offer an Internet box. Each Crous room is already equipped with an RJ45 socket to which you can plug in your computer and Wi-Fi is available from terminals throughout the buildings. ### How do I connect my game console? -Our WiFi network requires a special authentication protocol, called "WPA2 Enterprise", which is not always supported by game consoles. On the other hand, connecting via Ethernet cable does not require any special protocol. An alternative solution is to create your own WiFi network using a wired computer sharing the WiFi connection or a WiFi router (see previous section). +Our Wi-Fi network requires a special authentication protocol, called "WPA2 Enterprise", which is not always supported by game consoles. On the other hand, connecting via Ethernet cable does not require any special protocol. An alternative solution is to create your own Wi-Fi network using a wired computer sharing the Wi-Fi connection or a Wi-Fi router (see previous section). ### I need help and you take a long time to get back to me :( From aa16b9125b1dd98329206562c9a2841a5dc024b5 Mon Sep 17 00:00:00 2001 From: Jeltz Date: Wed, 3 Nov 2021 11:59:59 +0100 Subject: [PATCH 2/8] Upgrade to Windows 11 instead of 10 --- content/connection.en.md | 2 +- content/connection.fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/connection.en.md b/content/connection.en.md index 3392c61..253a9fb 100644 --- a/content/connection.en.md +++ b/content/connection.en.md @@ -58,7 +58,7 @@ ignore it the first time you connect and validate the certificate.
Microsoft has decided to no longer distribute security updates for Windows 7 since January 14, 2020. - We strongly encourage you to upgrade to Windows 10 or Linux + We strongly encourage you to upgrade to Windows 11 or Linux which in both cases is free.
diff --git a/content/connection.fr.md b/content/connection.fr.md index 716f11c..682b9f5 100644 --- a/content/connection.fr.md +++ b/content/connection.fr.md @@ -59,7 +59,7 @@ ignorez la à la première connexion et validez le certificat.
Microsoft a décidé de ne plus distribuer des mises à jour de sécurité pour Windows 7 depuis le 14 janvier 2020. - Nous vous encourageons très fortement à passer sur Windows 10 ou Linux + Nous vous encourageons très fortement à passer sur Windows 11 ou Linux ce qui est dans les deux cas gratuit.
From 506df99277cc8a520f60c8cebeaacbdcbc8a99e8 Mon Sep 17 00:00:00 2001 From: Jeltz Date: Wed, 3 Nov 2021 12:01:51 +0100 Subject: [PATCH 3/8] Replace 'identifiers' with 'credentials' --- content/connection.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/connection.en.md b/content/connection.en.md index 253a9fb..5d83cfc 100644 --- a/content/connection.en.md +++ b/content/connection.en.md @@ -31,7 +31,7 @@ a new machine: at the first connection
The machine MUST NOT be already registered on another account! - If you lend your identifiers, then this other person will + If you lend your credentials, then this other person will no longer be able to register his machine on the network. If this is the case you need to contact us.
From 8cf62b6045f02ddd325d9c3c5c3b289be652b29e Mon Sep 17 00:00:00 2001 From: Jeltz Date: Wed, 3 Nov 2021 12:09:21 +0100 Subject: [PATCH 4/8] Fix some typos & sentences in connection.en.md --- content/connection.en.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/content/connection.en.md b/content/connection.en.md index 5d83cfc..70908a4 100644 --- a/content/connection.en.md +++ b/content/connection.en.md @@ -72,7 +72,7 @@ they are no longer secure and cause security problems for the network. Select the Wi-Fi network `Aurore` and enter your login and password directly. -You should have Internet access in less than 10 minutes. +You should have access to the internet in less than 10 minutes. {{< figure src="../../images/content/wifi-macos.png" title="" >}} @@ -88,7 +88,7 @@ Please choose: * Authentication step 2: `MSCHAPV2`, * Enter your login and password directly. -You should have Internet access in less than 10 minutes. +You should have access to the internet in less than 10 minutes. {{< figure src="../../images/content/wifi-android.jpg" title="" >}} @@ -98,9 +98,9 @@ You should have Internet access in less than 10 minutes. Select the Wi-Fi network `Aurore` and enter your login and password directly. -You should have Internet access in less than 10 minutes. +You should have access to the internet in less than 10 minutes. -At the first connection the device asks you to rely on our certificate. +During the first connection the device asks you to trust our certificate. {{< figure src="../../images/content/wifi-ios.jpg" title="" >}} @@ -109,17 +109,17 @@ At the first connection the device asks you to rely on our certificate. ## Wi-Fi on Linux The vast majority of Linux distributions (Ubuntu, Debian, Fedora...) -use the NetworkManager tool to manage the Wi-Fi connection. +use the `NetworkManager` tool to manage the Wi-Fi connection. -Select the wifi network `Aurore` then : +Select the wifi network `Aurore` then: * Authentication: `Secure EAP (PEAP)`, * Phase 2 authentication: `MSCHAPV2`, * Check the box `No CA certificate required`, unless you want to download - every 3 months our certificate, + our certificate every 3 months, * Enter your login and password directly. -You should have Internet access in less than 10 minutes. +You should have access to the internet in less than 10 minutes. {{< figure src="../../images/content/wifi-linux.jpg" title="" >}} @@ -129,21 +129,21 @@ You should have Internet access in less than 10 minutes. For game consoles, the vast majority (Xbox, Playstation, Nintendo Switch...) do not support `WPA2-Enterprise`. -If you wish to connect this device, then you must either go through -the Ethernet cable, or buy a Wi-Fi router that you plug into the Ethernet port +If you wish to connect this device, then you must either use the wired +network, or buy a Wi-Fi router that you plug into the RJ45 port of your room to have your own Wi-Fi network. The advantage of a router is to create your own private network, isolating your -other users' home devices. +devices from other users.
## Wired network Each room has an "RJ45" Ethernet port. -If we do not have a cable to connect your computer, -one free cable will be given to you, when you first joined. -You can also purchase a USB/USB-C to Ethernet adapter at any time. +If you do not have a cable to connect your computer, you can purchase one from +[the intranet](https://intranet.auro.re). +You can also purchase a USB/USB-C to RJ45 adapter at any time. Connect directly by cable, in your room for example. A pop-up window should open. If it doesn't, go to @@ -151,7 +151,7 @@ A pop-up window should open. If it doesn't, go to Then identify yourself with your username and password and follow the instructions. -You should have Internet access in less than 10 minutes. +You should have access to the internet in less than 10 minutes. You should also receive an email notification.
From 86eef98dfa33a890b916d6ce85c7d8c9379cae52 Mon Sep 17 00:00:00 2001 From: Jeltz Date: Wed, 3 Nov 2021 12:11:33 +0100 Subject: [PATCH 5/8] Remove unused email addresses --- content/contact.en.md | 6 +----- content/contact.fr.md | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/content/contact.en.md b/content/contact.en.md index 27bd27f..ed5be31 100644 --- a/content/contact.en.md +++ b/content/contact.en.md @@ -10,7 +10,7 @@ We are *Association pour l'Union des Rézo des Résidences Etudiantes* ## By opening a ticket -You can open a ticket on our intranet by follwing this link : +You can open a ticket on our intranet by follwing this link: . We recommend using this mean of contact for a connection problem, an user account problem or a payment problem. @@ -19,10 +19,6 @@ account problem or a payment problem. **Administrative Council** : -**Communication service** : - -**Events organisation** : - **Technical support** : **Treasury** : diff --git a/content/contact.fr.md b/content/contact.fr.md index e8f0bb7..ac700ca 100644 --- a/content/contact.fr.md +++ b/content/contact.fr.md @@ -19,10 +19,6 @@ compte utilisateur ou paiement. **Conseil d'Administration** : -**Service communication** : - -**Organisation d'évenements** : - **Support technique** : **Trésorerie** : From bde87d9e6e069ffd933d0d3ee8206b2a040100d4 Mon Sep 17 00:00:00 2001 From: Jeltz Date: Wed, 3 Nov 2021 12:15:36 +0100 Subject: [PATCH 6/8] Replace 'matrix.org' with 'matrix' This is the official protocol name. --- content/contact.en.md | 4 ++-- content/contact.fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/contact.en.md b/content/contact.en.md index ed5be31..57e9502 100644 --- a/content/contact.en.md +++ b/content/contact.en.md @@ -23,9 +23,9 @@ account problem or a payment problem. **Treasury** : -## Via Matrix.org +## Via Matrix -Matrix.org is an open and federated chat protocol. You may join a support room +Matrix is an open and federated chat protocol. You may join a support room dedicated to help members by follwing this link : . diff --git a/content/contact.fr.md b/content/contact.fr.md index ac700ca..821ed1d 100644 --- a/content/contact.fr.md +++ b/content/contact.fr.md @@ -23,9 +23,9 @@ compte utilisateur ou paiement. **Trésorerie** : -## Par Matrix.org +## Par Matrix -Matrix.org est un protocole de communication ouvert et fédéré. Vous pouvez +Matrix est un protocole de communication ouvert et fédéré. Vous pouvez rejoindre un salon de support dédié aux adhérents en suivant ce lien : . From 1a02bb86d80445453794470ae3c37e46800e8f59 Mon Sep 17 00:00:00 2001 From: Jeltz Date: Wed, 3 Nov 2021 12:27:57 +0100 Subject: [PATCH 7/8] Use the correct SIRET identifier --- content/contact.en.md | 7 ++++--- content/contact.fr.md | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/content/contact.en.md b/content/contact.en.md index 57e9502..b77d252 100644 --- a/content/contact.en.md +++ b/content/contact.en.md @@ -45,9 +45,10 @@ dedicated to help members by follwing this link : ``` Aurore -Résidence Universitaire Jardins de Fleming -21 Rue André Maginot, 91400 Orsay -SIRET : 844 681 601 00010 +Résidence universitaire les jardins de Fleming +21, rue André Maginot +91400 Orsay +SIRET : 844 681 601 00028 ``` Aurore is registered to the [RIPE](https://www.ripe.net/) as `AS43619`. diff --git a/content/contact.fr.md b/content/contact.fr.md index 821ed1d..73df810 100644 --- a/content/contact.fr.md +++ b/content/contact.fr.md @@ -45,9 +45,10 @@ rejoindre un salon de support dédié aux adhérents en suivant ce lien : ``` Aurore -Résidence Universitaire Jardins de Fleming -21 Rue André Maginot, 91400 Orsay -SIRET : 844 681 601 00010 +Résidence universitaire les jardins de Fleming +21 rue André Maginot +91400 Orsay +SIRET : 844 681 601 00028 ``` Aurore est enregistrée auprès du [RIPE](https://www.ripe.net/) avec le numéro From b436c85b760577420c9afca5f00e7a29eb5bd439 Mon Sep 17 00:00:00 2001 From: Jeltz Date: Wed, 3 Nov 2021 13:14:36 +0100 Subject: [PATCH 8/8] Capitalize 'internet' --- content/connection.en.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/connection.en.md b/content/connection.en.md index 70908a4..2217e0b 100644 --- a/content/connection.en.md +++ b/content/connection.en.md @@ -72,7 +72,7 @@ they are no longer secure and cause security problems for the network. Select the Wi-Fi network `Aurore` and enter your login and password directly. -You should have access to the internet in less than 10 minutes. +You should have access to the Internet in less than 10 minutes. {{< figure src="../../images/content/wifi-macos.png" title="" >}} @@ -88,7 +88,7 @@ Please choose: * Authentication step 2: `MSCHAPV2`, * Enter your login and password directly. -You should have access to the internet in less than 10 minutes. +You should have access to the Internet in less than 10 minutes. {{< figure src="../../images/content/wifi-android.jpg" title="" >}} @@ -98,7 +98,7 @@ You should have access to the internet in less than 10 minutes. Select the Wi-Fi network `Aurore` and enter your login and password directly. -You should have access to the internet in less than 10 minutes. +You should have access to the Internet in less than 10 minutes. During the first connection the device asks you to trust our certificate. @@ -119,7 +119,7 @@ Select the wifi network `Aurore` then: our certificate every 3 months, * Enter your login and password directly. -You should have access to the internet in less than 10 minutes. +You should have access to the Internet in less than 10 minutes. {{< figure src="../../images/content/wifi-linux.jpg" title="" >}} @@ -151,7 +151,7 @@ A pop-up window should open. If it doesn't, go to Then identify yourself with your username and password and follow the instructions. -You should have access to the internet in less than 10 minutes. +You should have access to the Internet in less than 10 minutes. You should also receive an email notification.