Add separate wifi page

account/index.markdown

@@ -42,6 +42,7 @@ This account is required to access your @phys.ethz.ch [[mail/]], network file [[
 | Windows Login | [terminal server](/services/windows_terminal_server_login_on_ltsp_thin_clients/) | Windows Terminal Server     |
 | D-PHYS E-Mail | [[mail/]], [webmail](https://webmail.phys.ethz.ch/)                              | @phys.ethz.ch               |
 | File Storage  | [[storage/]]                                                                     | Personal home, Group shares |
+| Groups        | [[/account/groups]]                                                              | Group/Access management     |
 | Backups       | [[backups/]], [[backups/backuppc/]]                                              | Daily backups               |
 | Web services  | [[web/]]                                                                         | Websites (*.phys.ethz.ch)   |
 | Public html   | [homepage howto](/web/how_to_get_a_personal_homepage/)                           | Personal/Group Homepages    |

network/eduroam_wifi_on_android.markdown

+# Eduroam Wifi on Android
+
+In case your Android device does not automatically detect the settings of the eduroam wireless network at ETH, the following screenshot shows the required configuration.
+
+[[!img /media/network/eduroam_android.png size="400x"]]

network/index.markdown

@@ -21,11 +21,7 @@ All computers are automatically registered in the dynamic DNS under the name _**
 Wireless Network
 ----------------
 
-The official [WiFi documentation](https://www.ethz.ch/services/en/it-services/service-desk/wifi-change.html) explains how to use the [wireless networks](https://www.ethz.ch/services/en/it-services/catalogue/networks-connections/office.html) provided by the [Informatikdienste](http://www.id.ethz.ch).
-
-If you have a visitor for only a couple of days who needs to access the wireless or VPN, you can create a [[day guest account|account/eth_guest_account]].
-
-In case you have special devices that require wireless access, please contact us to connect them to the IoT network.
+To connect to the wireless network (WiFi) from your mobile devices, please refer to [[/network/wireless]].
 
 VPN (Virtual Private Network)
 -----------------------------

network/wireless.markdown

-# Wireless
+# Wireless (Wi-Fi)
 
-todo
+The official [WiFi documentation](https://www.ethz.ch/services/en/it-services/service-desk/wifi-change.html) explains in detail how to use the [wireless networks](https://www.ethz.ch/services/en/it-services/catalogue/networks-connections/office.html) provided by the [Informatikdienste](http://www.id.ethz.ch).
+
+If you have a visitor for only a couple of days who needs to access the wireless or VPN, you can create a [[day guest account|account/eth_guest_account]].
+
+In case you have special devices that require wireless access, please [[contact us|/services/contact]] to connect them to the IoT network.
+
+## Best practices
+
+If you are connecting for the first time or you need to re-connect your mobile device use an unloaded access point. This means better not do this in crowded places like the cafeteria, canteen or exteriors. There have been reports of problems when connecting from such places.
+
+Connect your mobile device to the **eduroam** and/or **eduroam-5** networks, which offers access for members of universities from many countries [around the world](https://www.eduroam.org/where/).
+
+## Quick guide
+
+For most devices automatic mode should work and you can leave everything on default settings. However on some mobile devices you may have to specify some of the following settings to connect to the wireless network:
+
+| Name                           | Value                                 |
+|--------------------------------|---------------------------------------|
+| Network name                   | eduroam                               |
+| Wi-Fi security                 | WPA & WPA2 Enterprise                 |
+| Authentication                 | Protected EAP (PEAP)                  |
+| Anonymous identity             | *leave empty*                         |
+| CA certificate                 | *leave empty* / (none)                |
+| CA validation                  | Check no CA required / Don't validate |
+| PEAP version                   | Automatic                             |
+| Phase 2 (inner) authentication | MSCHAPv2                              |
+| Username (for employees)       | <ETH username>@staff-net.ethz.ch      |
+| Username (for students)        | <ETH username>@student-net.ethz.ch    |
+| Password                       | Network password (WIFI/VPN)           |
+
+Where `<ETH username>` is your username from the [ETH Account (nethz Account)](/account) and the password your Network password (WIFI/VPN). Should you be unsure, you can check if these credentials work [here](https://sslvpn.ethz.ch/).
+
+## Additional instructions
+
+- [Official WiFi documentation](https://www.ethz.ch/services/en/it-services/service-desk/wifi-change.html)
+- [WiFi on Linux](/linux/eduroam_wifi_on_linux)
+- [WiFi on Android](/network/eduroam_wifi_on_android)

services/linuxws.markdown

@@ -10,9 +10,9 @@ Several Readmes offer more information:
   * [[linux/Software on the D-PHYS Linux Computers]]
   * [[linux/How to use USB Harddisk or USB Memorysticks]]
   * [[linux/General Overview over Linux at the Department of Physics]]
-  * [VPN with Linux](linux/vpnc_with_linux/)
+  * [VPN with Linux](/linux/vpnc_with_linux/)
   * [Restore Home, Mail, Groupshare on Linux](backups/restore/)
-  * [WiFi on Linux](linux/eduroam_wifi_on_linux/)
+  * [WiFi on Linux](/linux/eduroam_wifi_on_linux/)
 
 The general [[services/workstations]] page shows you the locations of the publicly accessible rooms equipped with our Linux workstations.