That's the former type. Maybe my sentence was too messy to clearly distinguish them. Ships generate a V-shaped surface wave and (deep enough) submarines don't.