merge docbook reorganization changes