Finally updated wrt. 12/29 meeting notes.

Last update (whitespace at end of lines) to make this document reflect
the decisions made at the 29 December conventions meeting, except for
some C++-specific issues.