bug#16802: @w for long option names

[Karl Berry]

    Something like the attached patch?  

Exactly.  Thanks.

    It gets rid of most @kbd instances, too.

I don't think @kbd should ever be used with option names.
(Aside from actual examples of command lines being typed as input. :)

karl