Minor ON CONFLICT related comments and doc fixes.

Andres Freund <andres@anarazel.de>

Commit: e8898e9169c851c2b8c98f981c1c4755a5758f8e
Author: Andres Freund <andres@anarazel.de>
Date: 2015-05-08T17:24:14Z
Releases: 9.5.0
Minor ON CONFLICT related comments and doc fixes.

Geoff Winkless, Stephen Frost, Peter Geoghegan and me.

Files