The right place for changes... ?

["J.C. Roberts" <unknown_(_at_)_abac_(_dot_)_com>]

I'm wondering what is the "standard practice" for making changes to
kernel config files. For example if I wanted to add:

`option GATEWAY'

should I uncomment it in
/usr/src/sys/conf/GENERIC

or should I add the line to
/usr/src/sys/arch/{$ARCH}/conf/GENERIC

To some degree it's a personal preference but I'm just curious how
most people handle it.

Thanks,

JCR