* www/merge-tracking/design.html   (merge-history): Fix broken link to the notes file, and tweak    surrounding text.
* www/merge-tracking/design.html
  (merge-history): Fix broken link to the notes file, and tweak
   surrounding text.

Suggested by: Guido Haarmans <ghaarmans@collab.net>

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion