merge in updates from NetServ
drwxr-xr-x - doc
drwxr-xr-x - src