We prove real analyticity of all the streamlines, including the free surface, of a gravity- or capillary-gravity-driven steady flow of water over a flat bed, with a Holder continuous vorticity function, provided that the propagating speed of the wave on the free surface exceeds the horizontal fluid velocity throughout the flow. Furthermore, if the vorticity possesses some Gevrey regularity of index s, then the stream function of class C (2,mu) admits the same Gevrey regularity throughout the fluid domain; in particular if the Gevrey index s equals 1, then we obtain analyticity of the stream function. The regularity results hold not only for periodic or solitary-water waves, but also for any solution to the hydrodynamic equations of class C (2,mu) .