clean up the last few sections so that they are consistent

svn path=/main/branches/2.0/; revision=2260
10 files changed