
o return matches rather than do a substitution

o improve layout of .Rd arg list

