CAPILLARITY EFFECTS ON SURFACE GRAVITY-WAVES IN A CYLINDRICAL CONTAINER - WETTING BOUNDARY-CONDITIONS