dhcp cleanup

audience/remote_work.markdown

@@ -34,7 +34,7 @@ We provide a [[services/windows terminal server]] `winlogin.phys.ethz.ch` and a
 
 You may also request remote RDP access to your managed Windows workstation. If you enable RDP on unmanaged machines, please set strong passwords and keep in mind that you need VPN for access from outside ETH.
 
-In case you don't know the name of your computer, have a look at [registration.phys.ethz.ch](https://registration.phys.ethz.ch), which lists all hosts registered on your name. The `Sent Name` is used for the `sentname.dhcp.phys.ethz.ch` DynDNS, and the `DNS Name` corresponds to static `dnsname.ethz.ch` hostnames.
+In case you don't know the name of your computer, have a look at [registration.phys.ethz.ch](https://registration.phys.ethz.ch), which lists all hosts registered on your name. The `Sent Name` is used for the `sentname.dhcp[-int].phys.ethz.ch` DynDNS, and the `DNS Name` corresponds to static `dnsname.ethz.ch` hostnames.
 
 ### Filemaker Databases
 After installing of the Filemaker application, you need to configure our server which is described [[here|services/filemaker]]. For access from outside ETH you need [[VPN|services/how to use vpn]].

backups/backuppc_linux.markdown

@@ -6,13 +6,13 @@ BackupPC on Linux and other Unices works by fetching or restoring backups via SS
 Configuring DHClient to send a hostname
 ---------------------------------------
 
-If you don't have a static IP address, add to your dhclient.conf (look for it in /etc/ or /etc/dhcp*/) the following line:
+If you don't have a static IP address, add to your dhclient.conf (look for it in `/etc/` or `/etc/dhcp*/`) the following line:
 
 ```
 send host-name "your-prefered-hostname-without-domainname";
 ```
 
-where _your-prefered-hostname-without-domainname_ is a unique hostname you'd like to see in front of ".dhcp.phys.ethz.ch".
+where _your-prefered-hostname-without-domainname_ is a unique hostname you'd like to see in front of ".dhcp[-int].phys.ethz.ch".
 
 Backing Up a Single Directory
 -----------------------------

linux/self_managed_linux_machines.markdown

@@ -4,7 +4,7 @@ Configuration hints for self-managed Linux Machines
 Sending Hostname for Dynamic DNS
 --------------------------------
 
-If you want your Linux host accessible via dynamic DNS at `<yourhost>.dhcp.phys.ethz.ch`, make sure that `send host-name` is used in `/etc/dhcp/dhclient.conf`.
+If you want your Linux host accessible via dynamic DNS at `<yourhost>.dhcp[-int].phys.ethz.ch`, make sure that `send host-name` is used in `/etc/dhcp/dhclient.conf`.
 
 For more recent versions of ISC's dhclient, the following line in `/etc/dhcp/dhclient.conf` should suffice:
 
@@ -18,4 +18,4 @@ Older versions may need an explicit name there. Please use a name without domain
 send host-name "johns-laptop";
 ```
 
-If nobody else uses that name, you remotely can access your computer by using e.g. `johns-laptop.dhcp.phys.ethz.ch` (continuing the example from above).
+If nobody else uses that name, you remotely can access your computer by using e.g. `johns-laptop.dhcp[-int].phys.ethz.ch` (continuing the example from above).

network/802_1x.markdown

 ETH Docking network with 802.1x
 ===============================
 
-In collaboration with our colleagues in Informatikdienste we've migrated almost all our network sockets to the ETH docking network. This uses the IEEE [802.1x protocol](https://en.wikipedia.org/wiki/IEEE_802.1X) that will allow us to virtually patch any VLAN to each individual client. This also paves the way for the upcoming [VoIP](https://en.wikipedia.org/wiki/Voice_over_IP) telephony deployment in D-PHYS.
-
-New clients that connect to the network for the first time will display an OS popup or a generic [ETH page](http://nic.phys.ethz.ch/wp-content/uploads/2016/09/eth.png), instead of the well-known [ISG D-PHYS landing page](http://nic.phys.ethz.ch/wp-content/uploads/2016/09/phys.png).
+In collaboration with our colleagues in Informatikdienste we've migrated almost all our network sockets to the ETH docking network. This uses the IEEE [802.1x protocol](https://en.wikipedia.org/wiki/IEEE_802.1X) that will allow us to virtually patch any VLAN to each individual client.
 
 This works the same way as the ETH wifi. You either supply your n.ethz credentials in the popup or you log in via the landing page. Your machine will then be patched into the ETH docking network.
 
-If you have a specific reason to have your machine in our D-PHYS network instead (HPx::745 for the technically inclined), please let us know and we will register your MAC address in our database. All existing machines at D-PHYS have been preregistered for HPx::745 in order to avoid any confusion. Certain macOS clients will need a bit of persuasion however, the required steps are described [[here|osx/802_1x]].
+If you have a specific reason to have your machine in our D-PHYS network instead, please let us know and we will register your MAC address in our database. Certain macOS clients will need a bit of persuasion however, the required steps are described [[here|osx/802_1x]].

services/hostnames_of_our_services.markdown

@@ -19,7 +19,6 @@ These are the official hostnames you should use when accessing one of our servic
 | debian.ethz.ch, ftp.ch.debian.org                  | [Debian](http://www.debian.org/) Mirror           |                                             |
 | xymon.phys.ethz.ch                                 | [Xymon](http://xymon.sourceforge.net/) Monitoring |                                             |
 | wiki.phys.ethz.ch                                  | Wikis                                             |                                             |
-| dhcp.phys.ethz.ch                                  | DHCP Service                                      | [[Readme|network/]]                         |
 | registration.phys.ethz.ch                          | Reactivate network registration of your computers | [[Readme|network/]]                         |
 | sql.phys.ethz.ch                                   | SQL Server (database only)                        |                                             |
 | sqlweb.phys.ethz.ch                                | SQL Server (for webshares and websites)           | [[Readme|web/webshares]]                    |