The problem is a free-surface flow of a fluid, emerging from a semi-infinite container. The fluid is assumed to be inviscid, incompressible and the flow to be two dimensional and irrotational. When surface tension is neglected the free surface leaves the wall of the container tangentially. We show that when surface tension is taken into account, there is, in general, a train of waves on the free surface and a discontinuity in slope where the free surface separates from the wall of the container. These new solutions include, as particular cases, previously obtained solutions for which the free surface is waveless in the far field. Although the calculations are presented for a special flow configuration, the results are general and apply to other potential free surface flows where a free-surface intersects a rigid wall.