merge with inet-2.3 - doc directory