Clean up the text before 2.2.1

And mention DHCP, too