Thomas, Vincent, could you try to find out which patch is "better" content-wise? Two patches per minute is too much for me :~) Don't worry about the DocBook side of things, I will care about this.