some edits; mention Solaris changes
resolve minor merge conflict in inst/NEWS.Rd due to unpushed edits